Fix renew restriction #2610

This commit is contained in:
Martin Lensment 2015-06-10 15:06:20 +03:00
parent 414b906261
commit cb02ac4c93
3 changed files with 4 additions and 4 deletions

View file

@ -245,7 +245,7 @@ class Domain < ActiveRecord::Base
def renewable?
if Setting.days_to_renew_domain_before_expire != 0
if (valid_to - Time.zone.now).to_i / 1.day >= Setting.days_to_renew_domain_before_expire
if ((valid_to - Time.zone.now).to_i / 1.day) + 1 >= Setting.days_to_renew_domain_before_expire
return false
end
end

View file

@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20150609103333) do
ActiveRecord::Schema.define(version: 20150610112238) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"

View file

@ -1999,7 +1999,7 @@ describe 'EPP Domain', epp: true do
end
it 'does not renew a domain unless less than 90 days till expiration' do
domain.valid_to = Time.zone.now.to_date + 91.days
domain.valid_to = Time.zone.now.to_date + 90.days
domain.save
exp_date = domain.valid_to.to_date
@ -2013,7 +2013,7 @@ describe 'EPP Domain', epp: true do
response[:results][0][:msg].should == 'Object is not eligible for renewal'
response[:results][0][:result_code].should == '2105'
domain.valid_to = Time.zone.now.to_date + 90.days
domain.valid_to = Time.zone.now.to_date + 89.days
domain.save
exp_date = domain.valid_to.to_date