Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -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:48:17 +11:00
parent ccb98aaf06
commit 3a1f1f5f8e
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,13 +66,8 @@ class MatchBankTransactionRequest extends Request
$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()->where('company_id', auth()->user()->company()->id)->where('id', $inputs['transactions'][$key]['payment_id'])->first(); $p = Payment::withTrashed()->where('company_id', auth()->user()->company()->id)->where('id', $inputs['transactions'][$key]['payment_id'])->first();
nlog(auth()->user()->company()->id);
nlog($inputs['transactions'][$key]['payment_id']);
nlog($p->toArray());
/*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)){
nlog("unlinking for some reason");
unset($inputs['transactions'][$key]); unset($inputs['transactions'][$key]);
} }

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

@ -113,13 +113,13 @@ class MatchBankTransactions implements ShouldQueue
{ {
nlog($input); nlog($input);
if(array_key_exists('invoice_ids', $input) && strlen($input['invoice_ids']) > 1) if(array_key_exists('invoice_ids', $input) && strlen($input['invoice_ids']) >= 1)
$this->matchInvoicePayment($input); $this->matchInvoicePayment($input);
elseif(array_key_exists('payment_id', $input) && strlen($input['payment_id']) > 1) elseif(array_key_exists('payment_id', $input) && strlen($input['payment_id']) >= 1)
$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);
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)) 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);
} }