Merge pull request #98 from internetee/94-fix-invoice-payment-error

Removed reference no param from invoice payment
internetee · Jun 7, 2023 · 9776768 · 9776768
2 parents 4390ef6 + 9ee78c1
commit 9776768
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 7 deletions.
diff --git a/app/controllers/invoices_controller.rb b/app/controllers/invoices_controller.rb
@@ -65,10 +65,8 @@ 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,
-                                            reference_number: reference_no)
+                                            customer_url: callback_url)
 
     if response['error'].present?
       flash.alert = response['error']['message']

diff --git a/app/services/billing/oneoff.rb b/app/services/billing/oneoff.rb
@@ -3,13 +3,13 @@ class Oneoff
     include Billing::Request
     attr_reader :invoice_number, :customer_url, :reference_number
 
-    def initialize(invoice_number:, customer_url:, reference_number:)
+    def initialize(invoice_number:, customer_url:, reference_number: nil)
       @invoice_number = invoice_number
       @customer_url = customer_url
       @reference_number = reference_number
     end
 
-    def self.send_invoice(invoice_number:, customer_url:, reference_number:)
+    def self.send_invoice(invoice_number:, customer_url:, reference_number: nil)
       fetcher = new(invoice_number: invoice_number, customer_url: customer_url, reference_number: reference_number)
       fetcher.send_it
     end

diff --git a/app/views/invoices/partials/_invoice.html.erb b/app/views/invoices/partials/_invoice.html.erb
@@ -18,7 +18,7 @@
     <td><%= currency(invoice[:total].to_f) %></td>
     <td class="table--action">
         <% if invoice[:payable] && invoice[:payment_link].present? %>
-            <%= link_to '<i class="fas fa-credit-card"></i>'.html_safe, pay_path(invoice_number: invoice[:number], reference_no: invoice[:reference_no]), data: { 'turbo-method': :post } %>
+            <%= link_to '<i class="fas fa-credit-card"></i>'.html_safe, pay_path(invoice_number: invoice[:number]), data: { 'turbo-method': :post } %>
         <% end %>
     </td>
     <td class="table--action">

diff --git a/app/views/invoices/show.html.erb b/app/views/invoices/show.html.erb
@@ -19,7 +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], reference_no: @invoice[:reference_no]), method: :post, class: 'button button--secondary' %>
+                        <%= button_to t(:pay), pay_path(invoice_number: @invoice[:number]), method: :post, class: 'button button--secondary' %>
                     </div>
                 <% end %>
                 <% if @invoice[:cancellable] && !@invoice[:monthly_invoice] %>