From bbec3dafc28de545a0fcb250bea8f98d6cec7af8 Mon Sep 17 00:00:00 2001 From: denisdulici Date: Sat, 20 Oct 2018 16:29:48 +0300 Subject: [PATCH] fixed #563 --- app/Http/Controllers/Banking/Transactions.php | 7 ++++--- app/Models/Setting/Category.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/Http/Controllers/Banking/Transactions.php b/app/Http/Controllers/Banking/Transactions.php index d108eb7fa..d2ef17e91 100644 --- a/app/Http/Controllers/Banking/Transactions.php +++ b/app/Http/Controllers/Banking/Transactions.php @@ -30,12 +30,13 @@ class Transactions extends Controller $types = collect(['expense' => 'Expense', 'income' => 'Income']) ->prepend(trans('general.all_type', ['type' => trans_choice('general.types', 2)]), ''); - - $categories = collect(Category::enabled()->type('income')->pluck('name', 'id')) - ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), ''); $type = $request->get('type'); + $type_cats = empty($type) ? ['income', 'expense'] : $type; + $categories = collect(Category::enabled()->type($type_cats)->pluck('name', 'id')) + ->prepend(trans('general.all_type', ['type' => trans_choice('general.categories', 2)]), ''); + if ($type != 'income') { $this->addTransactions(Payment::collect(['paid_at'=> 'desc']), trans_choice('general.expenses', 1)); $this->addTransactions(BillPayment::collect(['paid_at'=> 'desc']), trans_choice('general.expenses', 1), trans_choice('general.bills', 1)); diff --git a/app/Models/Setting/Category.php b/app/Models/Setting/Category.php index 11c715ccf..bec76d73e 100644 --- a/app/Models/Setting/Category.php +++ b/app/Models/Setting/Category.php @@ -56,7 +56,7 @@ class Category extends Model */ public function scopeType($query, $type) { - return $query->where('type', $type); + return $query->whereIn('type', (array) $type); } /**