From 6459e89705271823d1a72388007c8868343e7b9f Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Tue, 15 Mar 2016 16:59:46 +0200 Subject: [PATCH 1/2] Story#105855968 - counter is outside of namespace --- app/models/directo.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/directo.rb b/app/models/directo.rb index 96d418ae0..e64bf99e1 100644 --- a/app/models/directo.rb +++ b/app/models/directo.rb @@ -74,6 +74,7 @@ class Directo < ActiveRecord::Base raise "Directo counter is out of period" end + directo_next = last_directo 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") @@ -118,7 +119,7 @@ class Directo < ActiveRecord::Base # generating XML if items.any? - directo_next = last_directo + 1 + directo_next += 1 invoice_counter.next builder = Nokogiri::XML::Builder.new(encoding: "UTF-8") do |xml| From 57bf11517c496999de517396f21c8357d243269c Mon Sep 17 00:00:00 2001 From: Vladimir Krylov Date: Tue, 15 Mar 2016 17:00:34 +0200 Subject: [PATCH 2/2] Story#115405945 - better debug message on directo --- 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 e64bf99e1..caa721db7 100644 --- a/app/models/directo.rb +++ b/app/models/directo.rb @@ -71,7 +71,7 @@ class Directo < ActiveRecord::Base max_directo = Setting.directo_monthly_number_max.presence.try(:to_i) last_directo = [Setting.directo_monthly_number_last.presence.try(:to_i), min_directo].compact.max || 0 if max_directo && max_directo <= last_directo - raise "Directo counter is out of period" + raise "Directo counter is out of period (max allowed number is smaller than last counter number)" end directo_next = last_directo