From 9601a2c50026c8ecdf022b8fbf1b0c4a76efeb78 Mon Sep 17 00:00:00 2001
From: "e.arrahn" <e.arrahn@gmail.com>
Date: Fri, 7 May 2021 16:59:48 +0800
Subject: [PATCH] production

---
 app/Http/Controllers/GadaiController.php | 5 +++--
 app/Http/Controllers/TebusController.php | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 7498b05..aff9ae0 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2337,6 +2337,7 @@ class GadaiController extends Controller
     public function updateJBGsemasa(){
         $cawangan = Cawangan::on('mysql7')->get();
         $current = Carbon::now();
+
         foreach($cawangan as $cawangan_mysql){
             $all_gadai = Gadai::on($cawangan_mysql['mysql'])->whereNotIn('sttebus',['L','T'])->get();
             foreach($all_gadai as $gadai){
@@ -2345,7 +2346,7 @@ class GadaiController extends Controller
                 }else{
                     $tarikh_update = Carbon::parse($gadai['t_update'].' 00:00:00' );
                 }
-                $tarikh_gadai = Carbon::parse($gadai['t_gadai'].' '. $gadai['masa']);
+                $tarikh_gadai = Carbon::parse($gadai['t_gadai']. ' 00:00:00');
 
                 $diff_gadai = date_diff($tarikh_gadai,$current);
                 $year_gadai = $diff_gadai->format("%y") * 12;
@@ -2381,4 +2382,4 @@ class GadaiController extends Controller
         }
         return response()->json('successful',200);
     }
-}
\ No newline at end of file
+}
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index efda1e5..7534388 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -831,7 +831,7 @@ class TebusController extends Controller
         $daterequest = new Carbon($request->tarikh);
         $daterequest->addDays(1);
 
-        $dateSM = new Carbon('2021-04-21');
+        $dateSM = new Carbon('2021-04-24');
         $dateSM->addDays(1);
 
         $current = Carbon::now();
@@ -840,6 +840,7 @@ class TebusController extends Controller
         $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')
@@ -849,6 +850,7 @@ class TebusController extends Controller
                     ->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('keuntungan_rebet');