Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 23:04: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:39:21 +11:00
parent 7ca4e27059
commit 0399e7ce6d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -64,7 +64,7 @@ class MatchBankTransactionRequest extends Request
if(array_key_exists('payment_id', $inputs['transactions'][$key]) && strlen($inputs['transactions'][$key]['payment_id']) >= 1){ if(array_key_exists('payment_id', $inputs['transactions'][$key]) && strlen($inputs['transactions'][$key]['payment_id']) >= 1){
$inputs['transactions'][$key]['payment_id'] = $this->decodePrimaryKey($inputs['transactions'][$key]['payment_id']); $inputs['transactions'][$key]['payment_id'] = $this->decodePrimaryKey($inputs['transactions'][$key]['payment_id']);
$p = Payment::withTrashed()->find($inputs['transactions'][$key]['payment_id']); $p = Payment::withTrashed()->where('company_id', auth()->user()->company()->id)->where($inputs['transactions'][$key]['payment_id'])->first();
/*Ensure we don't relink an existing payment*/ /*Ensure we don't relink an existing payment*/
if(!$p || is_numeric($p->transaction_id)){ if(!$p || is_numeric($p->transaction_id)){
@ -75,7 +75,7 @@ class MatchBankTransactionRequest extends Request
if(array_key_exists('expense_id', $inputs['transactions'][$key]) && strlen($inputs['transactions'][$key]['expense_id']) >= 1){ if(array_key_exists('expense_id', $inputs['transactions'][$key]) && strlen($inputs['transactions'][$key]['expense_id']) >= 1){
$inputs['transactions'][$key]['expense_id'] = $this->decodePrimaryKey($inputs['transactions'][$key]['expense_id']); $inputs['transactions'][$key]['expense_id'] = $this->decodePrimaryKey($inputs['transactions'][$key]['expense_id']);
$e = Expense::withTrashed()->find($inputs['transactions'][$key]['expense_id']); $e = Expense::withTrashed()->where('company_id', auth()->user()->company()->id)->where($inputs['transactions'][$key]['expense_id'])->first();
/*Ensure we don't relink an existing expense*/ /*Ensure we don't relink an existing expense*/
if(!$e || is_numeric($e->transaction_id)) if(!$e || is_numeric($e->transaction_id))