From 368e904d5e9bde4a3e8e55b57e51f74a87f01e6f Mon Sep 17 00:00:00 2001
From: olegphenomenon <oleg.hasjanov@eestiinternet.ee>
Date: Mon, 18 Apr 2022 11:50:33 +0300
Subject: [PATCH] fixed reload balance and directo

---
 app/jobs/directo_invoice_forward_job.rb          |  6 ++++++
 app/services/eis_billing/send_data_to_directo.rb |  4 ++++
 db/structure.sql                                 | 15 ++-------------
 lib/tasks/registrars/reload_balance.rake         |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/jobs/directo_invoice_forward_job.rb b/app/jobs/directo_invoice_forward_job.rb
index 04da1a424..5892f3f14 100644
--- a/app/jobs/directo_invoice_forward_job.rb
+++ b/app/jobs/directo_invoice_forward_job.rb
@@ -22,6 +22,12 @@ class DirectoInvoiceForwardJob < ApplicationJob
         next
       end
 
+      p ">>>>>>>>>>>>>>> invoice"
+      p invoice
+      p ">>>>>>>>>>>>>>>>>> invoice as directo"
+      p invoice.as_directo_json
+      p ">>>>>>>>>>>>>>>>>>>>>.."
+
       @client.invoices.add_with_schema(invoice: invoice.as_directo_json, schema: 'prepayment')
     end
 
diff --git a/app/services/eis_billing/send_data_to_directo.rb b/app/services/eis_billing/send_data_to_directo.rb
index 266475b31..78311cfc9 100644
--- a/app/services/eis_billing/send_data_to_directo.rb
+++ b/app/services/eis_billing/send_data_to_directo.rb
@@ -12,6 +12,10 @@ module EisBilling
         initiator: INITIATOR,
       }
 
+      p ">>>>>>>>>>>>>>>>>>>>>...prepared_data.to_json"
+      p prepared_data.to_json
+      p ">>>>>>>>>>>>>>>>>>>>>"
+
       http = EisBilling::Base.base_request(url: directo_url)
       http.post(directo_url, prepared_data.to_json, EisBilling::Base.headers)
     end
diff --git a/db/structure.sql b/db/structure.sql
index 1b8a59242..a7f475fc0 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -5404,7 +5404,6 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20220106123143'),
 ('20220113201642'),
 ('20220113220809'),
-<<<<<<< HEAD
 ('20220124105717'),
 ('20220216113112'),
 ('20220228093211'),
@@ -5413,15 +5412,5 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20220413073315'),
 ('20220413084536'),
 ('20220413084748'),
-('20220504090512');
-=======
-('20220406085500'),
-('20220413073315'),
-('20220413084536'),
-('20220413084748'),
-('20220124105717'),
-('20220216113112'),
-('20220228093211'),
-('20220316140727'),
-('20220412130856');
->>>>>>> fixed structure sql conflict
+('20220504090512'),
+('20220406085500');
diff --git a/lib/tasks/registrars/reload_balance.rake b/lib/tasks/registrars/reload_balance.rake
index 937af45f7..2fdc01675 100644
--- a/lib/tasks/registrars/reload_balance.rake
+++ b/lib/tasks/registrars/reload_balance.rake
@@ -17,7 +17,7 @@ namespace :registrars do
         next if reload_pending || !threshold_reached
 
         Registrar.transaction do
-          registrar.issue_prepayment_invoice(reload_amount)
+          registrar.issue_prepayment_invoice(reload_amount, 'reload balance')
           registrar.settings['balance_auto_reload']['pending'] = true
           registrar.save!
         end