From c2969fa8777a4693174eb49211942dea8d29be0a Mon Sep 17 00:00:00 2001 From: olegphenomenon Date: Tue, 8 Feb 2022 10:27:47 +0200 Subject: [PATCH] change logic for generate invoice --- app/controllers/admin/invoices_controller.rb | 14 ++++++------- .../eis_billing/base_controller.rb | 2 ++ .../eis_billing/payment_status_controller.rb | 3 +++ .../registrar/deposits_controller.rb | 18 +++++++---------- app/models/registrar.rb | 20 ++++++++++++------- .../eis_billing/get_invoice_number.rb | 4 ---- 6 files changed, 32 insertions(+), 29 deletions(-) diff --git a/app/controllers/admin/invoices_controller.rb b/app/controllers/admin/invoices_controller.rb index 8410b6ca7..ba1b69ebf 100644 --- a/app/controllers/admin/invoices_controller.rb +++ b/app/controllers/admin/invoices_controller.rb @@ -13,7 +13,7 @@ module Admin if @invoice&.persisted? flash[:notice] = t(:record_created) - send_invoice_data_to_billing_system + # send_invoice_data_to_billing_system redirect_to [:admin, @invoice] else flash.now[:alert] = t(:failed_to_create_record) @@ -102,13 +102,13 @@ module Admin invoices.where(account_activities: { created_at: date_from..date_until }) end - def send_invoice_data_to_billing_system - add_invoice_instance = EisBilling::AddDeposits.new(@invoice) - result = add_invoice_instance.send_invoice + # def send_invoice_data_to_billing_system + # add_invoice_instance = EisBilling::AddDeposits.new(@invoice) + # result = add_invoice_instance.send_invoice - link = JSON.parse(result.body)['everypay_link'] + # link = JSON.parse(result.body)['everypay_link'] - @invoice.update(payment_link: link) - end + # @invoice.update(payment_link: link) + # end end end diff --git a/app/controllers/eis_billing/base_controller.rb b/app/controllers/eis_billing/base_controller.rb index 213806ce1..d10ec1936 100644 --- a/app/controllers/eis_billing/base_controller.rb +++ b/app/controllers/eis_billing/base_controller.rb @@ -1,5 +1,7 @@ module EisBilling class BaseController < ApplicationController + # load_and_authorize_resource + skip_authorization_check # Temporary solution skip_before_action :verify_authenticity_token # Temporary solution end diff --git a/app/controllers/eis_billing/payment_status_controller.rb b/app/controllers/eis_billing/payment_status_controller.rb index 9147ecf76..4a4a12e9a 100644 --- a/app/controllers/eis_billing/payment_status_controller.rb +++ b/app/controllers/eis_billing/payment_status_controller.rb @@ -8,6 +8,9 @@ module EisBilling sum = params[:standing_amount] everypay_response = params + logger.info 'REQUEST FROM BILLING' + logger.info params + payment_status = define_payment_status(params[:payment_state]) invoice = Invoice.find_by(number: invoice_number) diff --git a/app/controllers/registrar/deposits_controller.rb b/app/controllers/registrar/deposits_controller.rb index 7076b4de0..d852f23db 100644 --- a/app/controllers/registrar/deposits_controller.rb +++ b/app/controllers/registrar/deposits_controller.rb @@ -12,7 +12,7 @@ class Registrar if @invoice flash[:notice] = t(:please_pay_the_following_invoice) - send_invoice_data_to_billing_system + # send_invoice_data_to_billing_system redirect_to [:registrar, @invoice] else flash[:alert] = @deposit.errors.full_messages.join(', ') @@ -22,18 +22,14 @@ class Registrar private - def send_invoice_data_to_billing_system - add_invoice_instance = EisBilling::AddDeposits.new(@invoice) - result = add_invoice_instance.send_invoice + # def send_invoice_data_to_billing_system + # add_invoice_instance = EisBilling::AddDeposits.new(@invoice) + # result = add_invoice_instance.send_invoice - Rails.logger.info "Deposits controller ------->" - Rails.logger.info result.body - Rails.logger.info "-----------------------------------------" + # link = JSON.parse(result.body)['everypay_link'] - link = JSON.parse(result.body)['everypay_link'] - - @invoice.update(payment_link: link) - end + # @invoice.update(payment_link: link) + # end def deposit_params params.require(:deposit).permit(:amount, :description) diff --git a/app/models/registrar.rb b/app/models/registrar.rb index fa93272f1..d7fc255d5 100644 --- a/app/models/registrar.rb +++ b/app/models/registrar.rb @@ -107,15 +107,21 @@ class Registrar < ApplicationRecord .deliver_later(wait: 1.minute) end - SendEInvoiceJob.set(wait: 1.minute).perform_now(invoice.id, payable: payable) + unless Rails.env.staging? + SendEInvoiceJob.set(wait: 1.minute).perform_now(invoice.id, payable: payable) + end - # add_invoice_instance = EisBilling::AddDeposits.new(invoice) - # result = add_invoice_instance.send_invoice + add_invoice_instance = EisBilling::AddDeposits.new(invoice) + result = add_invoice_instance.send_invoice - # Rails.logger.info "Invoice created from transaction ------->" - # Rails.logger.info invoice - # Rails.logger.info result.body - # Rails.logger.info "-----------------------------------------" + link = JSON.parse(result.body)['everypay_link'] + + invoice.update(payment_link: link) + + Rails.logger.info "Invoice created from transaction ------->" + Rails.logger.info invoice + Rails.logger.info result.body + Rails.logger.info "-----------------------------------------" invoice end diff --git a/app/services/eis_billing/get_invoice_number.rb b/app/services/eis_billing/get_invoice_number.rb index b045fbbcd..bd273df0e 100644 --- a/app/services/eis_billing/get_invoice_number.rb +++ b/app/services/eis_billing/get_invoice_number.rb @@ -1,10 +1,6 @@ module EisBilling class GetInvoiceNumber < EisBilling::Base def self.send_invoice - p "+++++++++++" - Rails.logger.info invoice_number_generator_url - p "+++++++++++" - send_request end