From ba47124d94b423f3703f1547cdd9b680c3226e32 Mon Sep 17 00:00:00 2001
From: hafifierahman <muhdhafifie97@gmail.com>
Date: Mon, 3 Jan 2022 10:59:01 +0800
Subject: [PATCH] fix latest

---
 app/Http/Controllers/GadaiController.php | 21 ++++++++++++++-------
 app/Http/Controllers/TebusController.php | 16 ++++++++--------
 2 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 4d1cf40..fe2ed83 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2728,18 +2728,25 @@ class GadaiController extends Controller
             ->where([['t_gadai','<=',$request->tarikh],['sttebus','=','']])
             ->sum('pinjaman');
 
-            $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
+        $rekod_pinjamandiberi = Gadai::on($cawangan['mysql'])
             ->where('tagpalsu','=',0)
             ->where([['t_gadai','<=',$tarikhtawarruq],['sttebus','=','']])
             ->orWhere([['sttebus','!=',''],['t_update','>',$request->tarikh],['t_gadai','<=',$tarikhtawarruq]])
             ->sum('pinjaman');
 
-        // if($kodcaw === '011232')
-        // {
-        //     $rekod_pinjamandiberi -= 282;
-        // }            
+        $totalemas = 0;
+        $totalpinjaman = 0;
+        if($kodcaw === 'GC')
+        {
+            $totalemas = floatval($rekod_emaspalsu) - 10000;
+            $totalpinjaman = floatval($rekod_pinjamandiberi) + 10000;
 
-        $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
+        }else{
+            $totalemas = $rekod_emaspalsu;
+            $totalpinjaman = $rekod_pinjamandiberi;
+        }
+
+        $array_rekodemas = ['pinjamankoop' => $totalpinjaman,'emaspalsu' => $totalemas];
 
         return response()->json($array_rekodemas);
     }
@@ -2981,7 +2988,7 @@ class GadaiController extends Controller
                         ->where('trans.trans_type','=','A')
                         ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
                         ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
-                        ->whereYear('tarikh_bayaran','=',$current->year)
+                        // ->whereYear('tarikh_bayaran','=',$current->year)
                         ->where('trans.kodcaw',$request->kodcaw)
                         // ->whereNotNull('db2.hargajualan')
                         // ->sum('bayaran_keuntungan');
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 770093a..9b79047 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -1090,7 +1090,7 @@ class TebusController extends Controller
             // ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
             ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'>=', $request->mula)
             ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
-            ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
+            // ->whereYear('transaksi_keuntungan.tarikh_bayaran','=',$current->year)
             // ->whereNull('db2.hargajualan')
             // ->sum('bayaran_keuntungan');
             // ->get();
@@ -1112,18 +1112,18 @@ class TebusController extends Controller
 
         $upahtebus = Tebus::on($cawangan['mysql'])
             ->where([['t_tebus','>=',$request->mula],['t_tebus','<=',$request->hingga],['t_tebus','>','2013-12-31']])
-            ->whereYear('t_tebus','=',$current->year)
+            // ->whereYear('t_tebus','=',$current->year)
             ->sum('upahdibayar');
 
         $upahlelong = Lelong::on($cawangan['mysql'])
             ->where([['t_jual','>=',$request->mula],['t_jual','<=',$request->hingga],['t_jual','>','2013-12-31']])
-            ->whereYear('t_jual','=',$current->year)
+            // ->whereYear('t_jual','=',$current->year)
             ->sum('bakiupah');
 
         $upahansur = Advansur::on($cawangan['mysql'])
             ->where('tarikh','>=',$request->mula)
             ->where('tarikh','<=',$request->hingga)
-            ->whereYear('tarikh','=',$current->year)
+            // ->whereYear('tarikh','=',$current->year)
             ->sum('upahdibayar');
 
 
@@ -1664,7 +1664,7 @@ class TebusController extends Controller
             $keuntungan_data = TransaksiKeuntungan::on('mysql7')
                 ->whereDate('transaksi_keuntungan.tarikh_bayaran', '<=', $request->hingga)
                 ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<', $dateSM)
-                ->whereYear('tarikh_bayaran','=',$current->year)
+                // ->whereYear('tarikh_bayaran','=',$current->year)
                 ->where('kodcaw',$request->kodcaw)
                 ->pluck('norujukan');
 
@@ -1676,13 +1676,13 @@ class TebusController extends Controller
                 ->whereDate('tarikh_bayaran', '<=', $request->hingga)
                 ->whereDate('tarikh_bayaran', '>=', $request->mula)
                 ->whereDate('tarikh_bayaran' ,'<', $dateSM)
-                ->whereYear('tarikh_bayaran','=',$current->year)
+                // ->whereYear('tarikh_bayaran','=',$current->year)
                 ->sum('bayaran_keuntungan');
 
             $keuntunganreducing_data = TransaksiKeuntungan::on('mysql7')
                 ->whereDate('transaksi_keuntungan.tarikh_bayaran' ,'<=', $request->hingga)
                 ->whereDate('transaksi_keuntungan.tarikh_bayaran','>=', $request->mula)
-                ->whereYear('tarikh_bayaran','=',$current->year)
+                // ->whereYear('tarikh_bayaran','=',$current->year)
                 ->where('kodcaw',$request->kodcaw)
                 ->pluck('norujukan');
 
@@ -1692,7 +1692,7 @@ class TebusController extends Controller
                 ->whereIn('norujukan',$gadaiData)
                 ->whereDate('tarikh_bayaran' ,'<=', $request->hingga)
                 ->whereDate('tarikh_bayaran','>=', $request->mula)
-                ->whereYear('tarikh_bayaran','=',$current->year)
+                // ->whereYear('tarikh_bayaran','=',$current->year)
                 ->sum('keuntungan_rebet');
 
             $total = ($keuntungan + $keuntunganreducing);