From 772d8d036ff021f0bf75e0d2d3e7ca53818a138f Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Tue, 6 Dec 2022 13:26:37 +1100
Subject: [PATCH] add payment to bank transaction matching

---
 app/Jobs/Bank/MatchBankTransactions.php | 1 +
 app/Utils/Traits/GeneratesCounter.php   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/Bank/MatchBankTransactions.php b/app/Jobs/Bank/MatchBankTransactions.php
index e52cc7f39a02..2fb5611fbb16 100644
--- a/app/Jobs/Bank/MatchBankTransactions.php
+++ b/app/Jobs/Bank/MatchBankTransactions.php
@@ -389,6 +389,7 @@ class MatchBankTransactions implements ShouldQueue
 
         $this->bt->invoice_ids = collect($invoices)->pluck('hashed_id')->implode(',');
         $this->bt->status_id = BankTransaction::STATUS_CONVERTED;
+        $this->bt->payment_id = $payment->id
         $this->bt->save();
     }
 
diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php
index 604caa117419..533b5b60ddaf 100644
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@@ -751,7 +751,7 @@ trait GeneratesCounter
             $replace[] = $client->number;
 
             $search[] = '{$client_id_number}';
-            $replace[] = $client->id_number;
+            $replace[] = $client->id_number ?: $client->number;
 
             $search[] = '{$clientIdNumber}';
             $replace[] = $client->id_number ?: $client->number;