EveryPay/BankLink: Select specific Invoice to mark as paid

app/models/bank_transaction.rb

@@ -24,15 +24,20 @@ class BankTransaction < ApplicationRecord
     @registrar ||= Invoice.find_by(reference_no: parsed_ref_number)&.buyer
   end
 
-
   # For successful binding, reference number, invoice id and sum must match with the invoice
-  def autobind_invoice
+  def autobind_invoice(invoice_no: nil)
     return if binded?
     return unless registrar
-    return unless invoice
-    return unless invoice.payable?
 
-    create_activity(registrar, invoice)
+    inv = if invoice_no.nil?
+            invoice
+          else
+            Invoice.find_by(number: invoice_no)
+          end
+    return unless inv
+    return unless inv.payable?
+
+    create_activity(registrar, inv)
   end
 
   def bind_invoice(invoice_no)

app/models/payment_orders/bank_link.rb

@@ -51,6 +51,7 @@ module PaymentOrders
     def complete_transaction
       return unless valid_response_from_intermediary? && settled_payment?
 
+      self.status = 'paid'
       transaction = BankTransaction.where(description: invoice.order).first_or_initialize(
         description: invoice.order,
         reference_no: invoice.reference_no,
@@ -66,7 +67,7 @@ module PaymentOrders
       transaction.paid_at         = Time.parse(response['VK_T_DATETIME'])
 
       transaction.save!
-      transaction.autobind_invoice
+      transaction.autobind_invoice(invoice_no: invoice.number)
     end
 
     def settled_payment?

app/models/payment_orders/every_pay.rb

@@ -36,6 +36,7 @@ module PaymentOrders
 
     def complete_transaction
       return unless valid_response_from_intermediary? && settled_payment?
+      self.status = 'paid'
 
       transaction = BankTransaction.where(description: invoice.order).first_or_initialize(
         description: invoice.order,
@@ -48,7 +49,8 @@ module PaymentOrders
       transaction.paid_at = Date.strptime(response['timestamp'], '%s')
       transaction.buyer_name = response['cc_holder_name']
 
-      transaction.autobind_invoice
+      transaction.save!
+      transaction.autobind_invoice(invoice_no: invoice.number)
     end
 
     def base_params