Merge 949dea4 into dafedec

nafiesl · Jan 25, 2020 · 5cca1f0 · 5cca1f0
2 parents dafedec + 949dea4
commit 5cca1f0
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 11 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
@@ -2,13 +2,13 @@
 
 namespace App\Http\Controllers;
 
-use App\Category;
 use App\Partner;
+use App\Category;
 use App\Transaction;
-use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Foundation\Validation\ValidatesRequests;
+use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 
 class Controller extends BaseController
 {
@@ -44,11 +44,19 @@ protected function getTansactions($yearMonth)
         $transactionQuery->where('description', 'like', '%'.request('query').'%');
 
         $transactionQuery->when($categoryId, function ($queryBuilder, $categoryId) {
-            $queryBuilder->where('category_id', $categoryId);
+            if ($categoryId == 'null') {
+                $queryBuilder->whereNull('category_id');
+            } else {
+                $queryBuilder->where('category_id', $categoryId);
+            }
         });
 
         $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('category', 'partner')->get();
@@ -120,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();
@@ -149,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);

diff --git a/app/Http/Controllers/TransactionsController.php b/app/Http/Controllers/TransactionsController.php
@@ -26,8 +26,8 @@ public function index()
 
         $transactions = $this->getTansactions($yearMonth);
 
-        $categories = $this->getCategoryList();
-        $partners = $this->getPartnerList();
+        $categories = $this->getCategoryList()->prepend('-- '.__('transaction.no_category').' --', 'null');
+        $partners = $this->getPartnerList()->prepend('-- '.__('transaction.no_partner').' --', 'null');
 
         if (in_array(request('action'), ['edit', 'delete']) && request('id') != null) {
             $editableTransaction = Transaction::find(request('id'));

diff --git a/resources/lang/en/transaction.php b/resources/lang/en/transaction.php
@@ -21,6 +21,8 @@
     'end_balance'     => 'End Balance',
     'current_balance' => 'Current Balance',
     'balance'         => 'Balance',
+    'no_category'     => 'No Category',
+    'no_partner'      => 'No Partner',
 
     // Actions
     'add_income'     => 'Add Income',

diff --git a/resources/lang/id/transaction.php b/resources/lang/id/transaction.php
@@ -21,6 +21,8 @@
     'end_balance'     => 'Saldo Akhir',
     'current_balance' => 'Saldo Saat Ini',
     'balance'         => 'Saldo',
+    'no_category'     => 'Tanpa Kategori',
+    'no_partner'      => 'Tanpa Partner',
 
     // Actions
     'add_income'     => 'Input Pemasukan',