From fc44f5dee07af9680371b95def63f86b6235b24b Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Thu, 22 Apr 2021 09:00:23 +0800
Subject: [PATCH 1/2] laporan aktif

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

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index c27bb84..c709384 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2122,27 +2122,33 @@ class GadaiController extends Controller
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
 
-
-        $arrayrekodemaspalsu = [];
-
-        $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
+        $rekodaudit = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',1)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
             ->get();
 
-
-        dd($rekod_emaspalsu);
-
-        $total = Gadai::on($cawangan['mysql'])
+        $totalrekod = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',1)
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
-        array_push($arrayrekodemaspalsu,["rekod" => $rekod_emaspalsu, "total" => $total]);
+        $totalberat = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',1)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->sum('berat');
 
-        dd($arrayrekodemaspalsu);
-        return response()->json();
+        $totalnilaimarhun = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',1)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh]])
+            ->sum('nilaimarhun');
+
+        $arrayrekod = ['rekod' => $rekodaudit, 'total' => $totalrekod,'totalberat' => $totalberat,'totalnilaimarhun' =>  $totalnilaimarhun];
+
+        return response()->json($arrayrekod,200);
     }
 
 }

From 7bf66c7a04a315c4be3da491ed7558f4959652e2 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Thu, 22 Apr 2021 14:26:39 +0800
Subject: [PATCH 2/2] reducing method

---
 app/Http/Controllers/TebusController.php | 22 ++++++++++++++++++++--
 routes/web.php                           |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index ce032e6..b96cde6 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -733,18 +733,36 @@ class TebusController extends Controller
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
+        $dateSM = new Carbon('2021-04-21');
+        $dateSM->addDays(1);
+
+        $dateRM = new Carbon('2021-04-22');
+        $dateRM->addDays(1);
+
         $current = Carbon::now();
         $current = new Carbon();
 
         $keuntungan = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
                     // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
-                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
+                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $dateSM)
                     ->whereYear('tarikh_bayaran','=',$current->year)
                     ->whereNotNull('db2.hargajualan')
                     ->sum('bayaran_keuntungan');
 
-        return response($keuntungan);
+        $keuntunganreducing = TransaksiKeuntungan::on('mysql7')
+                    ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
+                    // ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $datetawarruq)
+                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'<=', $daterequest)
+                    ->where('transaksi_keuntungan.tarikh_bayaran' ,'>=', $dateRM)
+                    ->whereYear('tarikh_bayaran','=',$current->year)
+                    ->whereNotNull('db2.hargajualan')
+                    ->sum('bayaran_keuntungan');
+
+
+        $total = $keuntungan + $keuntunganreducing;
+
+        return response($total);
     }
 
     public function RebetCalculation($kodcaw,Request $request)
diff --git a/routes/web.php b/routes/web.php
index b223bdc..ff3e100 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -357,7 +357,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //-- Untung Rugi --//
     $router->get('UntungRugiCalculation/{kodcaw}',['uses'=>'TebusController@untungrugicalculation']); //panjar
-
+