From 1f9b8bbea98ca4c22df3a440839a5231c216f54d Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Mon, 19 Apr 2021 00:19:14 +0800
Subject: [PATCH] baiki backdate imbangduga

---
 app/Http/Controllers/GadaiController.php | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 8254c8f..ec53c06 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1939,16 +1939,16 @@ class GadaiController extends Controller
 
             $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
-            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
-            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
+            ->where([['t_gadai','<=','2021-04-13'],['sttebus','=','']])
+            ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=','2021-04-13']])
             ->sum('pinjaman');
 
-            $gadaibaru = Gadai::on($cawangan['mysql'])
-            ->where('tagpalsu','=',0)
-            ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
-            ->sum('pinjaman');
+            // $gadaibaru = Gadai::on($cawangan['mysql'])
+            // ->where('tagpalsu','=',0)
+            // ->where([['t_gadai','>=','2021-04-14'],['sttebus','=',''],['t_gadai','<=',$request->tarikh]])
+            // ->sum('pinjaman');
 
-            $rekod_pinjamandiberi = $rekod_pinjamandiberi - $gadaibaru;
+            // $rekod_pinjamandiberi;
 
         $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
 
@@ -1962,10 +1962,12 @@ class GadaiController extends Controller
 
         if($request->tarikh > '2021-04-13'){
         $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
-        ->where('tagpalsu','=',0)
-        ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
-        // ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
-        ->sum('pinjaman');
+            ->where('tagpalsu','=',0)
+            // ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=',''],['t_update','<=',$request->tarikh]])
+            ->where([['t_gadai','<=',$request->tarikh],['t_gadai','>','2021-04-13'],['sttebus','=','']])
+            // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
+            ->orWhere([['t_update','>',$request->tarikh],['sttebus','!=',''],['t_gadai','<=',$request->tarikh],['t_gadai','>=','2021-04-14']])
+            ->sum('pinjaman');
         }
 
         return response()->json($rekod_pinjamandiberi);