From 701b474efaecc4351fe49ddf459fa9b02c376397 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Mon, 24 Oct 2022 15:51:34 +1100 Subject: [PATCH] Bank Transactions matching default category ID --- app/Http/Controllers/BankTransactionController.php | 2 +- .../Requests/BankTransaction/MatchBankTransactionRequest.php | 2 +- app/Jobs/Bank/MatchBankTransactions.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/BankTransactionController.php b/app/Http/Controllers/BankTransactionController.php index 4a3253540fe8..dd891e64dde7 100644 --- a/app/Http/Controllers/BankTransactionController.php +++ b/app/Http/Controllers/BankTransactionController.php @@ -548,7 +548,7 @@ class BankTransactionController extends BaseController public function match(MatchBankTransactionRequest $request) { - MatchBankTransactions::dispatch(auth()->user()->company()->id, auth()->user()->company()->db, $request->all()); + // MatchBankTransactions::dispatch(auth()->user()->company()->id, auth()->user()->company()->db, $request->all()); $bt = (new MatchBankTransactions(auth()->user()->company()->id, auth()->user()->company()->db, $request->all()))->handle(); diff --git a/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php b/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php index 65bda81d1087..61d8cfd1b04f 100644 --- a/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php +++ b/app/Http/Requests/BankTransaction/MatchBankTransactionRequest.php @@ -49,7 +49,7 @@ class MatchBankTransactionRequest extends Request if(array_key_exists('id', $input)) $input['id'] = $this->decodePrimaryKey($input['id']); - if(array_key_exists('ninja_category_id', $input)) + if(array_key_exists('ninja_category_id', $input) && strlen($input['ninja_category_id']) >= 1) $input['ninja_category_id'] = $this->decodePrimaryKey($input['ninja_category_id']); $input = $this->decodePrimaryKeys($input); diff --git a/app/Jobs/Bank/MatchBankTransactions.php b/app/Jobs/Bank/MatchBankTransactions.php index 206b0a1e420e..de45021f9b7c 100644 --- a/app/Jobs/Bank/MatchBankTransactions.php +++ b/app/Jobs/Bank/MatchBankTransactions.php @@ -296,7 +296,7 @@ class MatchBankTransactions implements ShouldQueue private function resolveCategory() :?int { - if(array_key_exists('ninja_category_id', $this->input) && strlen($this->input['ninja_category_id']) > 1){ + if(array_key_exists('ninja_category_id', $this->input) && (int)$this->input['ninja_category_id'] > 1){ $this->bt->ninja_category_id = $this->input['ninja_category_id']; $this->bt->save(); nlog("ninja category set");