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

Bank Transactions matching default category ID

Browse Source
This commit is contained in:
David Bomba 2022-10-24 15:51:34 +11:00
parent e96a6aaf13
commit 701b474efa
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/BankTransactionController.php
View File

@ -548,7 +548,7 @@ class BankTransactionController extends BaseController
public function match(MatchBankTransactionRequest $request) 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(); $bt = (new MatchBankTransactions(auth()->user()->company()->id, auth()->user()->company()->db, $request->all()))->handle();

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

@ -49,7 +49,7 @@ class MatchBankTransactionRequest extends Request
if(array_key_exists('id', $input)) if(array_key_exists('id', $input))
$input['id'] = $this->decodePrimaryKey($input['id']); $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['ninja_category_id'] = $this->decodePrimaryKey($input['ninja_category_id']);
$input = $this->decodePrimaryKeys($input); $input = $this->decodePrimaryKeys($input);

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

@ -296,7 +296,7 @@ class MatchBankTransactions implements ShouldQueue
private function resolveCategory() :?int 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->ninja_category_id = $this->input['ninja_category_id'];
$this->bt->save(); $this->bt->save();
nlog("ninja category set"); nlog("ninja category set");