diff --git a/app/controllers/admin/registrars_controller.rb b/app/controllers/admin/registrars_controller.rb index cf8c89505..eec50d064 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 + :country_code, :email, :phone, :billing_email, :code, :exclude_in_monthly_directo ) end end diff --git a/app/models/directo.rb b/app/models/directo.rb index 8ebf8fbf0..96d418ae0 100644 --- a/app/models/directo.rb +++ b/app/models/directo.rb @@ -74,7 +74,7 @@ class Directo < ActiveRecord::Base raise "Directo counter is out of period" end - Registrar.find_each do |registrar| + Registrar.where.not(exclude_in_monthly_directo: 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 f00bf6a14..fbe2530d4 100644 --- a/app/views/admin/registrars/_form.haml +++ b/app/views/admin/registrars/_form.haml @@ -82,6 +82,11 @@ = f.label :code .col-md-7 = 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 + .col-md-7 + = f.check_box :exclude_in_monthly_directo, 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 new file mode 100644 index 000000000..c6ae4d31b --- /dev/null +++ b/db/migrate/20160311085956_add_exclude_monthly_directo_to_registrar.rb @@ -0,0 +1,5 @@ +class AddExcludeMonthlyDirectoToRegistrar < ActiveRecord::Migration + def change + add_column :registrars, :exclude_in_monthly_directo, :boolean, default: false + end +end