From a950e9e4a7b9e922bb3ae437a20efa69c061ed75 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Wed, 16 Mar 2016 15:52:51 +0200 Subject: [PATCH 1/3] Story#105855968 - Directo payment term on directo monthly nvoice is also taken from directo_receipt_payment_term --- app/models/directo.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/directo.rb b/app/models/directo.rb index caa721db7..3fe6b8eec 100644 --- a/app/models/directo.rb +++ b/app/models/directo.rb @@ -126,7 +126,7 @@ class Directo < ActiveRecord::Base xml.invoices{ xml.invoice("Number" =>directo_next, "InvoiceDate" =>invoices_until.strftime(date_format), - "PaymentTerm" =>"E", + "PaymentTerm" =>Setting.directo_receipt_payment_term, "CustomerCode"=>registrar.directo_handle, "Language" =>"", "Currency" =>registrar_activities.first.currency, From c957bce55301c9fa6076fb7f341a7acf8cf236d0 Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Wed, 16 Mar 2016 17:48:35 +0200 Subject: [PATCH 2/3] Story#105855968 - change registrar parameter from exclude_in_monthly_directo to test_registrar be used more widely --- app/controllers/admin/registrars_controller.rb | 2 +- app/models/directo.rb | 2 +- app/views/admin/registrars/_form.haml | 4 ++-- ...0160311085956_add_exclude_monthly_directo_to_registrar.rb | 5 ----- db/migrate/20160311085957_add_test_registrar_to_registrar.rb | 5 +++++ 5 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 db/migrate/20160311085956_add_exclude_monthly_directo_to_registrar.rb create mode 100644 db/migrate/20160311085957_add_test_registrar_to_registrar.rb 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 From 60c9a0a766a8a299405b633251e9096579d7cfca Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Wed, 16 Mar 2016 17:50:19 +0200 Subject: [PATCH 3/3] Story#105855968 - show Registrar#test_registrar in admin/registrars --- app/views/admin/registrars/index.haml | 3 +++ config/locales/en.yml | 1 + 2 files changed, 4 insertions(+) diff --git a/app/views/admin/registrars/index.haml b/app/views/admin/registrars/index.haml index 8ba45d205..4e1c78294 100644 --- a/app/views/admin/registrars/index.haml +++ b/app/views/admin/registrars/index.haml @@ -14,12 +14,15 @@ = sort_link(@q, 'reg_no', t(:reg_no)) %th{class: 'col-xs-4'} = t(:credit_balance) + %th{class: 'col-xs-4'} + = t(:test_registrar) %tbody - @registrars.each do |x| %tr %td= link_to(x, [:admin, x]) %td= x.reg_no %td= "#{x.balance}" + %td= "#{x.test_registrar}" .row .col-md-12 = paginate @registrars diff --git a/config/locales/en.yml b/config/locales/en.yml index 27495c382..16628072c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -937,3 +937,4 @@ en: add_blocked_domain: 'Add domain to blocked list' edit_pw: 'Edit Pw' optional: 'Optional' + test_registrar: "Test registrar?"