diff --git a/app/Filters/ExpenseFilters.php b/app/Filters/ExpenseFilters.php index 5308728385..18c549f1fd 100644 --- a/app/Filters/ExpenseFilters.php +++ b/app/Filters/ExpenseFilters.php @@ -108,13 +108,19 @@ class ExpenseFilters extends QueryFilters if (in_array('paid', $status_parameters)) { $query->orWhere(function ($query) { - $query->whereNotNull('payment_date'); + $query->whereNotNull('payment_date') + ->orWhere('transaction_reference', '!=', '') + ->orWhereNotNull('transaction_reference'); }); } if (in_array('unpaid', $status_parameters)) { $query->orWhere(function ($query) { - $query->whereNull('payment_date'); + $query->whereNull('payment_date') + ->where(function ($query) { + $query->where('transaction_reference', '') + ->orWhereNull('transaction_reference'); + }); }); } diff --git a/app/Http/Requests/Expense/StoreExpenseRequest.php b/app/Http/Requests/Expense/StoreExpenseRequest.php index 80a441089b..a85cac327a 100644 --- a/app/Http/Requests/Expense/StoreExpenseRequest.php +++ b/app/Http/Requests/Expense/StoreExpenseRequest.php @@ -73,6 +73,10 @@ class StoreExpenseRequest extends Request $input = $this->decodePrimaryKeys($input); + if(isset($input['invoice_id'])){ + unset($input['invoice_id']); + } + if ($this->file('documents') instanceof \Illuminate\Http\UploadedFile) { $this->files->set('documents', [$this->file('documents')]); }