From 4d5203096e08493e7bf9fd7c8badba1e25aaae6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergei=20Ts=C3=B5ganov?= Date: Thu, 11 Aug 2022 11:11:52 +0300 Subject: [PATCH] Modified lhv connect controller --- .../eis_billing/lhv_connect_transactions_controller.rb | 6 +++++- app/models/bank_transaction.rb | 10 ++-------- test/models/bank_transaction_test.rb | 4 ---- test/tasks/invoices/process_payments_test.rb | 5 ----- 4 files changed, 7 insertions(+), 18 deletions(-) diff --git a/app/controllers/eis_billing/lhv_connect_transactions_controller.rb b/app/controllers/eis_billing/lhv_connect_transactions_controller.rb index 3c914bd27..2e5996881 100644 --- a/app/controllers/eis_billing/lhv_connect_transactions_controller.rb +++ b/app/controllers/eis_billing/lhv_connect_transactions_controller.rb @@ -34,7 +34,11 @@ module EisBilling def create_invoice_if_missing(transaction) Invoice.create_from_transaction!(transaction) unless transaction.autobindable? - transaction.autobind_invoice + invoice = transaction.autobind_invoice + return unless invoice.paid? + + EisBilling::SendInvoiceStatus.send_info(invoice_number: invoice.number, + status: 'paid') end def transaction_attributes(incoming_transaction) diff --git a/app/models/bank_transaction.rb b/app/models/bank_transaction.rb index 46d597e61..b8bf3eb77 100644 --- a/app/models/bank_transaction.rb +++ b/app/models/bank_transaction.rb @@ -46,17 +46,11 @@ class BankTransaction < ApplicationRecord payment_order.save! if create_activity(registrar, invoice) - status = 'paid' payment_order.paid! else - status = 'failed' - payment_order.update(notes: 'Failed to create activity', status: status) + payment_order.update(notes: 'Failed to create activity', status: 'failed') end - - return unless Feature.billing_system_integrated? - - EisBilling::SendInvoiceStatus.send_info(invoice_number: invoice.number, - status: status) + invoice end def bind_invoice(invoice_no, manual: false) diff --git a/test/models/bank_transaction_test.rb b/test/models/bank_transaction_test.rb index 5f2503cb1..8cb62ab48 100644 --- a/test/models/bank_transaction_test.rb +++ b/test/models/bank_transaction_test.rb @@ -4,10 +4,6 @@ class BankTransactionTest < ActiveSupport::TestCase setup do @registrar = registrars(:bestnames) @invoice = invoices(:one) - if Feature.billing_system_integrated? - stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_status') - .to_return(status: 200, body: '', headers: {}) - end end def test_matches_against_invoice_nubmber_and_reference_number diff --git a/test/tasks/invoices/process_payments_test.rb b/test/tasks/invoices/process_payments_test.rb index e080bd9fa..60ef3d8d8 100644 --- a/test/tasks/invoices/process_payments_test.rb +++ b/test/tasks/invoices/process_payments_test.rb @@ -30,11 +30,6 @@ class ProcessPaymentsTaskTest < ActiveJob::TestCase [message] end end - - if Feature.billing_system_integrated? - stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_status') - .to_return(status: 200, body: '', headers: {}) - end end def test_not_raises_error_if_bad_reference