diff --git a/app/controllers/registrar/deposits_controller.rb b/app/controllers/registrar/deposits_controller.rb index 36d631ef2..0464dd9f1 100644 --- a/app/controllers/registrar/deposits_controller.rb +++ b/app/controllers/registrar/deposits_controller.rb @@ -24,7 +24,11 @@ class Registrar def send_invoice_data_to_billing_system add_invoice_instance = EisBilling::AddDeposits.new(@invoice) - add_invoice_instance.send_invoice + result = add_invoice_instance.send_invoice + + p "+++++++++++++ result" + p JSON.parse(result.body)['everypay_link'] + p "+++++++++++++" end def deposit_params diff --git a/app/services/eis_billing/add_deposits.rb b/app/services/eis_billing/add_deposits.rb index 1214d1293..bf334d326 100644 --- a/app/services/eis_billing/add_deposits.rb +++ b/app/services/eis_billing/add_deposits.rb @@ -13,31 +13,42 @@ module EisBilling private def parse_invoice - invoice = @invoice.to_json(except: [ :order_reference, - :created_at, - :updated_at, - :e_invoice_sent_at, - :items_attributes]) + data = {} + data[:transaction_amount] = invoice.total.to_s + data[:order_reference] = invoice.number + data[:customer_name] = invoice.buyer_name + data[:customer_email] = invoice.buyer_email + data[:custom_field_1] = invoice.description + data[:custom_field_2] = 'registry' + data[:invoice_number] = invoice.number - parsed_data = JSON.parse(invoice) - parsed_data['role'] = 'registrar' - parsed_data['source'] = 'registry' - parsed_data['description'] = 'some' if parsed_data['description'] == '' + data - parsed_data = replace_key(json_obj: parsed_data, old_key: 'total', new_key: 'transaction_amount') - parsed_data = replace_key(json_obj: parsed_data, old_key: 'reference_no', new_key: 'reference_number') + # invoice = @invoice.to_json(except: [ :order_reference, + # :created_at, + # :updated_at, + # :e_invoice_sent_at, + # :items_attributes]) - invoice_items_json = @invoice.items.to_json(except: [ :created_at, :updated_at ]) - parsed_data['items'] = JSON.parse(invoice_items_json) - parsed_data + # parsed_data = JSON.parse(invoice) + # parsed_data['role'] = 'registrar' + # parsed_data['source'] = 'registry' + # parsed_data['description'] = 'some' if parsed_data['description'] == '' + + # parsed_data = replace_key(json_obj: parsed_data, old_key: 'total', new_key: 'transaction_amount') + # parsed_data = replace_key(json_obj: parsed_data, old_key: 'reference_no', new_key: 'reference_number') + + # invoice_items_json = @invoice.items.to_json(except: [ :created_at, :updated_at ]) + # parsed_data['items'] = JSON.parse(invoice_items_json) + # parsed_data end - def replace_key(json_obj:, old_key:, new_key:) - json_obj[new_key] = json_obj[old_key] - json_obj.delete(old_key) + # def replace_key(json_obj:, old_key:, new_key:) + # json_obj[new_key] = json_obj[old_key] + # json_obj.delete(old_key) - json_obj - end + # json_obj + # end def base_request(json_obj:) uri = URI(invoice_generator_url) diff --git a/db/migrate/20220124105717_add_payment_link_to_invoice.rb b/db/migrate/20220124105717_add_payment_link_to_invoice.rb new file mode 100644 index 000000000..a2b283ea8 --- /dev/null +++ b/db/migrate/20220124105717_add_payment_link_to_invoice.rb @@ -0,0 +1,5 @@ +class AddPaymentLinkToInvoice < ActiveRecord::Migration[6.1] + def change + add_column :invoices, :payment_link, :string + end +end diff --git a/db/structure.sql b/db/structure.sql index 8280ecd9e..9bec3df49 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -5413,5 +5413,3 @@ INSERT INTO "schema_migrations" (version) VALUES ('20220413084536'), ('20220413084748'), ('20220504090512'); - -