diff --git a/app/controllers/admin/registrars_controller.rb b/app/controllers/admin/registrars_controller.rb index eec50d064..be4b7d092 100644 --- a/app/controllers/admin/registrars_controller.rb +++ b/app/controllers/admin/registrars_controller.rb @@ -57,7 +57,7 @@ class Admin::RegistrarsController < AdminController def registrar_params params.require(:registrar).permit( :name, :reg_no, :vat_no, :street, :city, :state, :zip, :billing_address, - :country_code, :email, :phone, :billing_email, :code, :exclude_in_monthly_directo + :country_code, :email, :phone, :billing_email, :code, :test_registrar ) end end diff --git a/app/models/directo.rb b/app/models/directo.rb index 3fe6b8eec..0bfdd4548 100644 --- a/app/models/directo.rb +++ b/app/models/directo.rb @@ -75,7 +75,7 @@ class Directo < ActiveRecord::Base end directo_next = last_directo - Registrar.where.not(exclude_in_monthly_directo: true).find_each do |registrar| + Registrar.where.not(test_registrar: true).find_each do |registrar| unless registrar.cash_account Rails.logger.info("[DIRECTO] Monthly invoice for registrar #{registrar.id} has been skipped as it doesn't has cash_account") next diff --git a/app/views/admin/registrars/_form.haml b/app/views/admin/registrars/_form.haml index fbe2530d4..48cfc8066 100644 --- a/app/views/admin/registrars/_form.haml +++ b/app/views/admin/registrars/_form.haml @@ -84,9 +84,9 @@ = f.text_field(:code, class: 'form-control', disabled: !f.object.new_record?) .form-group .col-md-4.control-label - = f.label :exclude_in_monthly_directo + = f.label :test_registrar .col-md-7 - = f.check_box :exclude_in_monthly_directo, class: 'form-control' + = f.check_box :test_registrar, class: 'form-control' %hr .row diff --git a/db/migrate/20160311085956_add_exclude_monthly_directo_to_registrar.rb b/db/migrate/20160311085956_add_exclude_monthly_directo_to_registrar.rb deleted file mode 100644 index c6ae4d31b..000000000 --- a/db/migrate/20160311085956_add_exclude_monthly_directo_to_registrar.rb +++ /dev/null @@ -1,5 +0,0 @@ -class AddExcludeMonthlyDirectoToRegistrar < ActiveRecord::Migration - def change - add_column :registrars, :exclude_in_monthly_directo, :boolean, default: false - end -end diff --git a/db/migrate/20160311085957_add_test_registrar_to_registrar.rb b/db/migrate/20160311085957_add_test_registrar_to_registrar.rb new file mode 100644 index 000000000..b8b05cbd7 --- /dev/null +++ b/db/migrate/20160311085957_add_test_registrar_to_registrar.rb @@ -0,0 +1,5 @@ +class AddTestRegistrarToRegistrar < ActiveRecord::Migration + def change + add_column :registrars, :test_registrar, :boolean, default: false + end +end