From 7ca4e270590d46ee3706b4791b3d15f3c922f9ea Mon Sep 17 00:00:00 2001 From: David Bomba Date: Fri, 16 Dec 2022 10:36:53 +1100 Subject: [PATCH] Updates for payment filters --- .../BankTransaction/MatchBankTransactionRequest.php | 6 +++--- app/Jobs/Bank/MatchBankTransactions.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php b/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php index 959e22dbb511..c8484cd20924 100644 --- a/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php +++ b/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php @@ -67,7 +67,7 @@ class MatchBankTransactionRequest extends Request $p = Payment::withTrashed()->find($inputs['transactions'][$key]['payment_id']); /*Ensure we don't relink an existing payment*/ - if(!$p || $p->transaction_id){ + if(!$p || is_numeric($p->transaction_id)){ unset($inputs['transactions'][$key]); } @@ -78,8 +78,8 @@ class MatchBankTransactionRequest extends Request $e = Expense::withTrashed()->find($inputs['transactions'][$key]['expense_id']); /*Ensure we don't relink an existing expense*/ - if(!$e || $e->transaction_id) - $inputs['transactions'][$key]['expense_id'] = null; + if(!$e || is_numeric($e->transaction_id)) + unset($inputs['transactions'][$key]['expense_id']); } diff --git a/app/Jobs/Bank/MatchBankTransactions.php b/app/Jobs/Bank/MatchBankTransactions.php index 1b75f85707f1..73e669caa8bc 100644 --- a/app/Jobs/Bank/MatchBankTransactions.php +++ b/app/Jobs/Bank/MatchBankTransactions.php @@ -117,7 +117,7 @@ class MatchBankTransactions implements ShouldQueue $this->linkPayment($input); elseif(array_key_exists('expense_id', $input) && strlen($input['expense_id']) > 1) $this->linkExpense($input); - else + elseif((array_key_exists('vendor_id', $input) && strlen($input['vendor_id']) > 1) || (array_key_exists('ninja_category_id', $input) && strlen($input['ninja_category_id']) > 1)) $this->matchExpense($input); }