added reference number as argument for oneoff endpoint

internetee · Sep 1, 2022 · 81a0bfc · 81a0bfc
1 parent d29d8aa
commit 81a0bfc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/app/controllers/invoices_controller.rb b/app/controllers/invoices_controller.rb
@@ -65,8 +65,10 @@ def add_credit
 
   def pay
     invoice_number = params[:invoice_number]
+    reference_no = params[:reference_no]
     response = Billing::Oneoff.send_invoice(invoice_number: invoice_number.to_s,
-                                            customer_url: callback_url)
+                                            customer_url: callback_url,
+                                            reference_number: reference_no)
 
     if response['error'].present?
       flash.alert = response['error']['message']

diff --git a/app/services/billing/oneoff.rb b/app/services/billing/oneoff.rb
@@ -1,15 +1,16 @@
 module Billing
   class Oneoff
     include Billing::Request
-    attr_reader :invoice_number, :customer_url
+    attr_reader :invoice_number, :customer_url, :reference_number
 
-    def initialize(invoice_number:, customer_url:)
+    def initialize(invoice_number:, customer_url:, reference_number:)
       @invoice_number = invoice_number
       @customer_url = customer_url
+      @reference_number = reference_number
     end
 
-    def self.send_invoice(invoice_number:, customer_url:)
-      fetcher = new(invoice_number: invoice_number, customer_url: customer_url)
+    def self.send_invoice(invoice_number:, customer_url:, reference_number:)
+      fetcher = new(invoice_number: invoice_number, customer_url: customer_url, reference_number: reference_number)
       fetcher.send_it
     end
 
@@ -19,7 +20,8 @@ def send_it
 
     def params
       { invoice_number: invoice_number,
-        customer_url: customer_url }
+        customer_url: customer_url,
+        reference_number: reference_number }
     end
 
     def invoice_oneoff_url

diff --git a/app/views/invoices/show.html.erb b/app/views/invoices/show.html.erb
@@ -19,8 +19,7 @@
                 </div>
                 <% if @invoice[:payable] && @invoice[:payment_link].present? %>
                     <div class="col-xs-auto">
-                        <%#= button_to t(:pay), pay_path(invoice_number: @invoice[:number]), method: :post, class: 'button button--secondary' %>
-                        <%= link_to t(:pay), @invoice[:payment_link], target: :_blank, class: 'button button--secondary' %>
+                        <%= button_to t(:pay), pay_path(invoice_number: @invoice[:number], reference_no: @invoice[:reference_no]), method: :post, class: 'button button--secondary' %>
                     </div>
                 <% end %>
                 <% if @invoice[:cancellable] %>

diff --git a/spec/services/oneoff_spec.rb b/spec/services/oneoff_spec.rb
@@ -9,7 +9,7 @@
     stub_request(:post, "#{Billing::Connection::BASE_URL}/api/v1/invoice_generator/oneoff")
       .to_return(status: 200, body: "{\"oneoff_redirect_link\": \"everypay/go\"}", headers: {})
 
-    response = described_class.send_invoice(invoice_number: '332211', customer_url: 'http://fake.ee')
+    response = described_class.send_invoice(invoice_number: '332211', customer_url: 'http://fake.ee', reference_number: '33322')
 
     expect(response["oneoff_redirect_link"].to_s).to eq("everypay/go")
   end