diff --git a/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php b/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php index b16cbb8e6427..b687b0f84bb2 100644 --- a/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php +++ b/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php @@ -66,13 +66,8 @@ class MatchBankTransactionRequest extends Request $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(); -nlog(auth()->user()->company()->id); -nlog($inputs['transactions'][$key]['payment_id']); -nlog($p->toArray()); - /*Ensure we don't relink an existing payment*/ if(!$p || is_numeric($p->transaction_id)){ - nlog("unlinking for some reason"); unset($inputs['transactions'][$key]); } diff --git a/app/Jobs/Bank/MatchBankTransactions.php b/app/Jobs/Bank/MatchBankTransactions.php index 0adf666189ac..12d79b9b80b5 100644 --- a/app/Jobs/Bank/MatchBankTransactions.php +++ b/app/Jobs/Bank/MatchBankTransactions.php @@ -112,14 +112,14 @@ class MatchBankTransactions implements ShouldQueue foreach($this->input as $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); - 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); - 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); - 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); }