From da8ed07029e069591639cc435e0687b8f9aac9d4 Mon Sep 17 00:00:00 2001
From: fifi97 <gamingfin@live.com>
Date: Sun, 28 Mar 2021 08:02:49 +0800
Subject: [PATCH] biasa la

---
 app/Http/Controllers/GadaiController.php  | 14 +++++++++-
 app/Http/Controllers/LelongController.php | 32 +++++++++++++++++------
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index c1e471f..c366859 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1967,12 +1967,24 @@ class GadaiController extends Controller
             // ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$request->tarikh]])
             ->sum('pinjaman');
 
-        $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+        
+        if($request->tarikh <= '2021-02-25')
+        {
+            $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]])
             ->sum('pinjaman');
 
+        }
+        else{
+            $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+            ->where('tagpalsu','=',0)
+            ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
+            ->orWhere([['sttebus','!=',''],['t_update','>','2021-02-25'],['t_gadai','<=',$request->tarikh]])
+            ->sum('pinjaman');
+        }
+
         $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
 
         return response()->json($array_rekodemas);
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 1b6f228..3c23f3c 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -148,14 +148,30 @@ class LelongController extends Controller
         $rugilelonglama = imbangdugalama::on($cawangan['mysql'])
             ->sum('rugi_lelong');
 
-        $bakilelong = Lelong::on($cawangan['mysql'])
-        ->where('t_jual','<=',$request->tarikh)
-        ->where(function($query) use ($tarikhbaru){
-            $query->whereNull('trkhtuntut')
-                  ->orWhere('trkhtuntut','>',$tarikhbaru);
-        })
-        ->where('baki','>=',0)
-        ->sum('baki');
+
+        if($request->tarikh <= '2021-02-25')
+        {
+            $bakilelong = Lelong::on($cawangan['mysql'])
+            ->where('t_jual','<=',$request->tarikh)
+            ->where(function($query) use ($tarikhbaru){
+                $query->whereNull('trkhtuntut')
+                      ->orWhere('trkhtuntut','>',$tarikhbaru);
+            })
+            ->where('baki','>=',0)
+            ->sum('baki');
+        }else{
+            $bakilelong = Lelong::on($cawangan['mysql'])
+            ->where('t_jual','<=',$request->tarikh)
+            ->where(function($query) use ($tarikhbaru){
+                $query->whereNull('trkhtuntut')
+                      ->orWhere('trkhtuntut','>','2021-02-25');
+            })
+            ->where('baki','>=',0)
+            ->sum('baki');
+        } 
+       
+
+
 
         $ansrugi = AnsRugi::on($cawangan['mysql'])
             ->sum('bayaran');