Apply filter on partner and category transactions

nafiesl · Jan 25, 2020 · 949dea4 · 949dea4
1 parent 60d4ebd
commit 949dea4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php
@@ -54,7 +54,7 @@ public function show(Category $category)
         $categories = [];
         $editableTransaction = null;
         $year = request('year', date('Y'));
-        $partners = $this->getPartnerList();
+        $partners = $this->getPartnerList()->prepend('-- '.__('transaction.no_partner').' --', 'null');
 
         $defaultStartDate = auth()->user()->account_start_date ?: date('Y-m').'-01';
         $startDate = request('start_date', $defaultStartDate);

diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
@@ -128,7 +128,11 @@ protected function getCategoryTransactions(Category $category, array $criteria)
             $queryBuilder->where('description', 'like', '%'.$query.'%');
         });
         $transactionQuery->when($partnerId, function ($queryBuilder, $partnerId) {
-            $queryBuilder->where('partner_id', $partnerId);
+            if ($partnerId == 'null') {
+                $queryBuilder->whereNull('partner_id');
+            } else {
+                $queryBuilder->where('partner_id', $partnerId);
+            }
         });
 
         return $transactionQuery->orderBy('date', 'desc')->with('partner')->get();
@@ -157,7 +161,11 @@ protected function getPartnerTransactions(Partner $partner, array $criteria)
         $transactionQuery->whereBetween('date', [$startDate, $endDate]);
 
         $transactionQuery->when($categoryId, function ($queryBuilder, $categoryId) {
-            $queryBuilder->where('category_id', $categoryId);
+            if ($categoryId == 'null') {
+                $queryBuilder->whereNull('category_id');
+            } else {
+                $queryBuilder->where('category_id', $categoryId);
+            }
         });
 
         return $transactionQuery->orderBy('date', 'desc')->with('category')->get();

diff --git a/app/Http/Controllers/PartnerController.php b/app/Http/Controllers/PartnerController.php
@@ -58,7 +58,7 @@ public function show(Partner $partner)
         $partners = [];
         $editableTransaction = null;
         $year = request('year', date('Y'));
-        $categories = $this->getCategoryList();
+        $categories = $this->getCategoryList()->prepend('-- '.__('transaction.no_category').' --', 'null');
 
         $defaultStartDate = auth()->user()->account_start_date ?: date('Y-m').'-01';
         $startDate = request('start_date', $defaultStartDate);