fix dashboard

2021-04-20 21:43:57 +08:00
parent 451ec36d33
commit cbf21fca23
1 changed files with 30 additions and 8 deletions
@@ -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);
    }