From 822ba038a08986ec642f5b1cb888a15d1cd950b3 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 29 May 2024 13:10:50 +1000
Subject: [PATCH] Fixes for converting matched payment transactions

---
 app/Jobs/Bank/MatchBankTransactions.php        | 2 ++
 app/Repositories/BankTransactionRepository.php | 3 +--
 app/Services/Payment/DeletePayment.php         | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Jobs/Bank/MatchBankTransactions.php b/app/Jobs/Bank/MatchBankTransactions.php
index 5748dcecc052..2dabff1e05c7 100644
--- a/app/Jobs/Bank/MatchBankTransactions.php
+++ b/app/Jobs/Bank/MatchBankTransactions.php
@@ -289,6 +289,8 @@ class MatchBankTransactions implements ShouldQueue
 
     private function createPayment($invoices, float $amount): void
     {
+        
+        $this->attachable_invoices = [];
         $this->available_balance = $amount;
 
         \DB::connection(config('database.default'))->transaction(function () use ($invoices) {
diff --git a/app/Repositories/BankTransactionRepository.php b/app/Repositories/BankTransactionRepository.php
index b734fb5c5aab..f7d275ae9057 100644
--- a/app/Repositories/BankTransactionRepository.php
+++ b/app/Repositories/BankTransactionRepository.php
@@ -26,7 +26,6 @@ class BankTransactionRepository extends BaseRepository
             $bank_transaction->bank_integration_id = $data['bank_integration_id'];
         }
 
-
         $bank_transaction->fill($data);
         $bank_transaction->save();
 
@@ -43,7 +42,7 @@ class BankTransactionRepository extends BaseRepository
         $data['transactions'] = $bank_transactions->map(function ($bt) {
             return ['id' => $bt->id, 'invoice_ids' => $bt->invoice_ids, 'ninja_category_id' => $bt->ninja_category_id];
         })->toArray();
-
+        
         $bts = (new MatchBankTransactions($user->company()->id, $user->company()->db, $data))->handle();
     }
 
diff --git a/app/Services/Payment/DeletePayment.php b/app/Services/Payment/DeletePayment.php
index c7d0a63270c6..74973c0f8a46 100644
--- a/app/Services/Payment/DeletePayment.php
+++ b/app/Services/Payment/DeletePayment.php
@@ -59,6 +59,7 @@ class DeletePayment
         $this->payment->delete();
 
         BankTransaction::query()->where('payment_id', $this->payment->id)->cursor()->each(function ($bt) {
+            $bt->invoice_ids = null;
             $bt->payment_id = null;
             $bt->status_id = 1;
             $bt->save();