diff --git a/app/jobs/directo_invoice_forward_job.rb b/app/jobs/directo_invoice_forward_job.rb index 5892f3f14..04da1a424 100644 --- a/app/jobs/directo_invoice_forward_job.rb +++ b/app/jobs/directo_invoice_forward_job.rb @@ -22,12 +22,6 @@ 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 78311cfc9..266475b31 100644 --- a/app/services/eis_billing/send_data_to_directo.rb +++ b/app/services/eis_billing/send_data_to_directo.rb @@ -12,10 +12,6 @@ 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/app/views/registrar/invoices/partials/_banklinks.haml b/app/views/registrar/invoices/partials/_banklinks.haml index 1ce89d18f..339ae4705 100644 --- a/app/views/registrar/invoices/partials/_banklinks.haml +++ b/app/views/registrar/invoices/partials/_banklinks.haml @@ -3,6 +3,6 @@ - if @invoice.payment_link.present? = link_to @invoice.payment_link, target: :_blank do - = image_tag("everypay.png", style: "width: 100px; height: 20px;") + = image_tag("everypay.png", class: 'everypay', style: "width: 100px; height: 20px;") - else = "No everypay link" diff --git a/test/system/registrar_area/add_deposits_test.rb b/test/system/registrar_area/add_deposits_test.rb index 72f51749c..3ca7691ce 100644 --- a/test/system/registrar_area/add_deposits_test.rb +++ b/test/system/registrar_area/add_deposits_test.rb @@ -9,27 +9,4 @@ class AddDepositsTest < ApplicationSystemTestCase ActionMailer::Base.deliveries.clear end - - def test_should_send_request_for_creating_invoice_to_eis_system - if Feature.billing_system_integrated? - invoice_n = Invoice.order(number: :desc).last.number - stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator"). - to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {}) - - stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). - to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {}) - - stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response"). - to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {}) - - stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). - to_return(status: 200, body: "", headers: {}) - - visit new_registrar_deposit_url - fill_in 'Amount', with: '100.0' - click_button text: 'Add' - - assert_text 'Everypay link' - end - end end diff --git a/test/system/registrar_area/invoices/new_invoice_payment_test.rb b/test/system/registrar_area/invoices/new_invoice_payment_test.rb index 29bb1560c..77050f12a 100644 --- a/test/system/registrar_area/invoices/new_invoice_payment_test.rb +++ b/test/system/registrar_area/invoices/new_invoice_payment_test.rb @@ -25,50 +25,4 @@ class NewInvoicePaymentTest < ApplicationSystemTestCase fill_in 'Description', with: 'My first invoice' click_link_or_button 'Add' end - - def test_create_new_SEB_payment - if Feature.billing_system_integrated? - invoice_n = Invoice.order(number: :desc).last.number - stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). - to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {}) - - stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response"). - to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {}) - - stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). - to_return(status: 200, body: "", headers: {}) - - create_invoice_and_visit_its_page - click_link_or_button 'seb' - form = page.find('form') - assert_equal('https://www.seb.ee/cgi-bin/dv.sh/ipank.r', form['action']) - assert_equal('post', form['method']) - assert_equal('240.00', form.find_by_id('VK_AMOUNT', visible: false).value) - end - end - - def test_create_new_Every_Pay_payment - if Feature.billing_system_integrated? - invoice_n = Invoice.order(number: :desc).last.number - stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator"). - to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {}) - - stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response"). - to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {}) - - stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice"). - to_return(status: 200, body: "", headers: {}) - - create_invoice_and_visit_its_page - click_link_or_button 'every_pay' - expected_hmac_fields = 'account_id,amount,api_username,callback_url,' + - 'customer_url,hmac_fields,nonce,order_reference,timestamp,transaction_type' - - form = page.find('form') - assert_equal('https://igw-demo.every-pay.com/transactions/', form['action']) - assert_equal('post', form['method']) - assert_equal(expected_hmac_fields, form.find_by_id('hmac_fields', visible: false).value) - assert_equal('240.00', form.find_by_id('amount', visible: false).value) - end - end end