Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 00:17:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Minor fixes

Browse Source
This commit is contained in:
David Bomba 2022-09-23 16:54:22 +10:00
parent 99704a3dbd
commit a53f3edae6
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Report/ProfitLossRequest.php
View File

@ -31,7 +31,7 @@ class ProfitLossRequest extends Request
'start_date' => 'string|date', 'start_date' => 'string|date',
'end_date' => 'string|date', 'end_date' => 'string|date',
'is_income_billed' => 'required|bail|bool', 'is_income_billed' => 'required|bail|bool',
'is_expense_billed' => 'required|bail|bool', 'is_expense_billed' => 'bool',
'include_tax' => 'required|bail|bool', 'include_tax' => 'required|bail|bool',
'date_range' => 'sometimes|string', 'date_range' => 'sometimes|string',
'send_email' => 'bool', 'send_email' => 'bool',

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

@ -293,8 +293,11 @@ class MatchBankTransactions implements ShouldQueue
private function resolveCategory() :?int private function resolveCategory() :?int
{ {
if(array_key_exists('ninja_category_id', $this->input)) if(array_key_exists('ninja_category_id', $this->input)){
$this->bt->ninja_category_id = $this->input['ninja_category_id'];
$this->bt->save();
return $this->input['ninja_category_id']; return $this->input['ninja_category_id'];
}
$category = $this->categories->firstWhere('highLevelCategoryId', $this->bt->category_id); $category = $this->categories->firstWhere('highLevelCategoryId', $this->bt->category_id);

1
app/Models/BankTransaction.php
View File

@ -32,6 +32,7 @@ class BankTransaction extends BaseModel
'date', 'date',
'description', 'description',
'base_type', 'base_type',
'expense_id',
]; ];
protected $dates = [ protected $dates = [