Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 07:14:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updates for payment filters

Browse Source
This commit is contained in:
David Bomba 2022-12-16 10:36:53 +11:00
parent b964f5d482
commit 7ca4e27059
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php
View File

@ -67,7 +67,7 @@ class MatchBankTransactionRequest extends Request
$p = Payment::withTrashed()->find($inputs['transactions'][$key]['payment_id']); $p = Payment::withTrashed()->find($inputs['transactions'][$key]['payment_id']);
/*Ensure we don't relink an existing payment*/ /*Ensure we don't relink an existing payment*/
if(!$p || $p->transaction_id){ if(!$p || is_numeric($p->transaction_id)){
unset($inputs['transactions'][$key]); unset($inputs['transactions'][$key]);
} }
@ -78,8 +78,8 @@ class MatchBankTransactionRequest extends Request
$e = Expense::withTrashed()->find($inputs['transactions'][$key]['expense_id']); $e = Expense::withTrashed()->find($inputs['transactions'][$key]['expense_id']);
/*Ensure we don't relink an existing expense*/ /*Ensure we don't relink an existing expense*/
if(!$e || $e->transaction_id) if(!$e || is_numeric($e->transaction_id))
$inputs['transactions'][$key]['expense_id'] = null; unset($inputs['transactions'][$key]['expense_id']);
} }

2
app/Jobs/Bank/MatchBankTransactions.php
View File

@ -117,7 +117,7 @@ class MatchBankTransactions implements ShouldQueue
$this->linkPayment($input); $this->linkPayment($input);
elseif(array_key_exists('expense_id', $input) && strlen($input['expense_id']) > 1) elseif(array_key_exists('expense_id', $input) && strlen($input['expense_id']) > 1)
$this->linkExpense($input); $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); $this->matchExpense($input);
} }