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

Invoice numbers should be ints #2690

Browse source
This commit is contained in:
Martin Lensment 2015-06-26 12:50:24 +03:00
parent fadfd903a2
commit a6cc53a0bf
3 changed files with 4 additions and 3 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

2
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

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)