From cbf21fca233a33b7d851e55f20a2e9773fcbc8a2 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Tue, 20 Apr 2021 21:43:57 +0800
Subject: [PATCH] fix dashboard

---
 app/Http/Controllers/GadaiController.php | 38 +++++++++++++++++++-----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index c385231..70285d0 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -581,18 +581,40 @@ class GadaiController extends Controller
         //Gadai Terkumpul
         $gadai = Gadai::on($cawangan['mysql'])
         ->where('sttebus','=','')
+        ->whereNull('hargajualan')
         ->whereYear('t_gadai','=',$current->year)
-        ->orderBy('t_gadai','desc')
         ->sum('pinjaman');
 
-        //Tebus Terkumpul
-        $tebus = Tebus::on($cawangan['mysql'])
-        ->where('jenistebus','=','T')
-        ->whereYear('t_tebus','=',$current->year)
-        ->orderBy('t_tebus','desc')
+        $gadaitawarruq = Gadai::on($cawangan['mysql'])
+        ->where('sttebus','=','')
+        ->whereNotNull('hargajualan')
+        ->whereYear('t_gadai','=',$current->year)
         ->sum('pinjaman');
 
-        //Upah Terkumpul
+        // //Tebus Terkumpul
+        // $tebus = Tebus::on($cawangan['mysql'])
+        // ->where('jenistebus','=','T')
+        // ->whereNull('hargajualan')
+        // ->whereYear('t_tebus','=',$current->year)
+        // ->sum('pinjaman');
+
+        // $tebustawarruq = Tebus::on($cawangan['mysql'])
+        // ->where('jenistebus','=','T')
+        // ->whereNotNull('hargajualan')
+        // ->whereYear('t_tebus','=',$current->year)
+        // ->sum('pinjaman');
+
+        $tebus = Gadai::on($cawangan['mysql'])
+        ->where('sttebus','=','T')
+        ->whereNull('hargajualan')
+        ->whereYear('t_gadai','=',$current->year)
+        ->sum('pinjaman');
+
+        $tebustawarruq = Gadai::on($cawangan['mysql'])
+        ->where('sttebus','=','T')
+        ->whereNotNull('hargajualan')
+        ->whereYear('t_gadai','=',$current->year)
+        ->sum('pinjaman');
 
 
         //Variasi
@@ -605,7 +627,7 @@ class GadaiController extends Controller
         ->orderBy('t_gadai','desc')
         ->sum('pinjaman');
 
-        array_push($array_dashboard,["gadai" => $gadai,"tebus" => $tebus, "variasi" => $variasi, "outstanding" => $outstanding]);
+        array_push($array_dashboard,["gadai" => $gadai,"gadaitawarruq" => $gadaitawarruq,"tebus" => $tebus,"tebustawarruq" => $tebustawarruq, "variasi" => $variasi, "outstanding" => $outstanding]);
 
         return response()->json($array_dashboard);
     }