diff --git a/app/Http/Requests/Report/ProfitLossRequest.php b/app/Http/Requests/Report/ProfitLossRequest.php index 2886b4eb1944..3b3e7802d010 100644 --- a/app/Http/Requests/Report/ProfitLossRequest.php +++ b/app/Http/Requests/Report/ProfitLossRequest.php @@ -31,7 +31,7 @@ class ProfitLossRequest extends Request 'start_date' => 'string|date', 'end_date' => 'string|date', 'is_income_billed' => 'required|bail|bool', - 'is_expense_billed' => 'required|bail|bool', + 'is_expense_billed' => 'bool', 'include_tax' => 'required|bail|bool', 'date_range' => 'sometimes|string', 'send_email' => 'bool', diff --git a/app/Jobs/Bank/MatchBankTransactions.php b/app/Jobs/Bank/MatchBankTransactions.php index 05f31fad0bdb..4f9fb07ffb73 100644 --- a/app/Jobs/Bank/MatchBankTransactions.php +++ b/app/Jobs/Bank/MatchBankTransactions.php @@ -293,8 +293,11 @@ class MatchBankTransactions implements ShouldQueue 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']; + } $category = $this->categories->firstWhere('highLevelCategoryId', $this->bt->category_id); diff --git a/app/Models/BankTransaction.php b/app/Models/BankTransaction.php index 2efa9560334f..00d69ceb620e 100644 --- a/app/Models/BankTransaction.php +++ b/app/Models/BankTransaction.php @@ -32,6 +32,7 @@ class BankTransaction extends BaseModel 'date', 'description', 'base_type', + 'expense_id', ]; protected $dates = [