zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-05-19 02:39:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:domify/registry

Browse source
This commit is contained in:
Priit Tark 2015-06-26 14:13:14 +03:00
commit 3960b890f0
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/admin/settings_controller.rb
View file

@ -43,6 +43,7 @@ class Admin::SettingsController < AdminController
settings[k] = v.to_i if Setting[k].class == Fixnum settings[k] = v.to_i if Setting[k].class == Fixnum
settings[k] = v.to_f if Setting[k].class == Float settings[k] = v.to_f if Setting[k].class == Float
settings[k] = (v == 'true' ? true : false) if [TrueClass, FalseClass].include?(Setting[k].class) settings[k] = (v == 'true' ? true : false) if [TrueClass, FalseClass].include?(Setting[k].class)
settings[k] = v if Setting[k].class == String
end end
settings settings
end end

4
app/models/invoice.rb
View file

@ -19,7 +19,7 @@ class Invoice < ActiveRecord::Base
def set_invoice_number def set_invoice_number
last_no = Invoice.order(number: :desc).where('number IS NOT NULL').limit(1).pluck(:number).first last_no = Invoice.order(number: :desc).where('number IS NOT NULL').limit(1).pluck(:number).first
if last_no if last_no && last_no >= Setting.invoice_number_min.to_i
self.number = last_no + 1 self.number = last_no + 1
else else
self.number = Setting.invoice_number_min.to_i self.number = Setting.invoice_number_min.to_i
@ -40,7 +40,7 @@ class Invoice < ActiveRecord::Base
cr_at = Time.zone.now - Setting.days_to_keep_overdue_invoices_active.days cr_at = Time.zone.now - Setting.days_to_keep_overdue_invoices_active.days
invoices = Invoice.unbinded.where( invoices = Invoice.unbinded.where(
'due_date < ? AND created_at < ? AND cancelled_at IS NULL', Time.zone.now, cr_at 'due_date < ? AND cancelled_at IS NULL', cr_at
) )
count = invoices.update_all(cancelled_at: Time.zone.now) count = invoices.update_all(cancelled_at: Time.zone.now)

4
config/initializers/initial_settings.rb
View file

@ -28,8 +28,8 @@ if con.present? && con.table_exists?('settings')
Setting.save_default(:eis_bank, 'LHV Pank') Setting.save_default(:eis_bank, 'LHV Pank')
Setting.save_default(:eis_swift, 'LHVBEE22') Setting.save_default(:eis_swift, 'LHVBEE22')
Setting.save_default(:eis_invoice_contact, 'Martti Õigus') Setting.save_default(:eis_invoice_contact, 'Martti Õigus')
Setting.save_default(:invoice_number_min, '131050') Setting.save_default(:invoice_number_min, 131050)
Setting.save_default(:invoice_number_max, '149999') Setting.save_default(:invoice_number_max, 149999)
Setting.save_default(:days_to_keep_overdue_invoices_active, 30) Setting.save_default(:days_to_keep_overdue_invoices_active, 30)
Setting.save_default(:days_to_renew_domain_before_expire, 90) Setting.save_default(:days_to_renew_domain_before_expire, 90)
Setting.save_default(:expire_warning_period, 15) Setting.save_default(:expire_warning_period, 15)

2
spec/models/invoice_spec.rb
View file

@ -71,7 +71,7 @@ describe Invoice do
end end
it 'should cancel overdue invoices' do it 'should cancel overdue invoices' do
Fabricate(:invoice, created_at: Time.zone.now - 35.days, due_date: Time.zone.now - 1.days) Fabricate(:invoice, created_at: Time.zone.now - 35.days, due_date: Time.zone.now - 30.days)
Invoice.cancel_overdue_invoices Invoice.cancel_overdue_invoices
Invoice.where(cancelled_at: nil).count.should == 1 Invoice.where(cancelled_at: nil).count.should == 1
end end