From 82708b046c9c7c1e6238f1b5f1193afddb3ccb7f Mon Sep 17 00:00:00 2001
From: "e.arrahn" <e.arrahn@gmail.com>
Date: Wed, 19 May 2021 16:39:23 +0800
Subject: [PATCH] daripada server

---
 app/Http/Controllers/GadaiController.php | 17 +++++++++--------
 app/Http/Controllers/TebusController.php |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 38d1a59..d005710 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -926,10 +926,6 @@ class GadaiController extends Controller
         $array_kawalanstok = [];
 
 
-        $kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
-                            ->get();
-
-
         ////////////
         ///GADAI////
         ///////////
@@ -1083,6 +1079,10 @@ class GadaiController extends Controller
 
         if($kodcaw == 'KB2')
         {
+
+		$kawalanstoklama = KawalanStokLama::on($cawangan['mysql'])
+                            ->get();
+
             foreach($kawalanstoklama as $indexgad => $gadaikawalanstok)
             {
                 //Gadai 
@@ -2181,6 +2181,9 @@ class GadaiController extends Controller
             case '1STOP':
                 $tarikhtawarruq = '2021-05-09';
             break;
+	    case '020301';
+                $tarikhtawarruq = '2021-05-19';
+            break;
           }
 
         $rekod_emaspalsu = Gadai::on($cawangan['mysql'])
@@ -2277,10 +2280,8 @@ class GadaiController extends Controller
 
         $transaksi = TransaksiKeuntungan::on('mysql7')
                     ->join($cawangan['db_name'].'.gadai as db2','transaksi_keuntungan.norujukan','=','db2.norujukan')
-                    ->where('db2.sttebus','=','')
-                    // ->where('tarikh_bayaran' ,'>=', $datetawarruq)
-                    ->where('db2.hargajualan','<>','null')
-                    ->where('tarikh_bayaran' ,'<=', $daterequest)
+                    ->where([['db2.sttebus','=',''],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
+                    ->orWhere([['db2.sttebus','!=',''],['db2.t_update','>',$request->tarikh],['db2.hargajualan','<>','null'],['tarikh_bayaran' ,'<=', $daterequest]])
                     ->sum('bayaran_pembiayaan');
 
         return response($transaksi);
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 7734ed3..9795d8a 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -155,7 +155,7 @@ class TebusController extends Controller
         $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
         
         $upah_sebenar = $upah_asal - $rebet;
-        $upahsemasa = $upah_sebenar * $gadai_data['jbg'];
+        $upahsemasa = $upah_sebenar * $gadai_data['tempoh'];
         $upah_semasa = bcdiv(round($upahsemasa,2),1,1);
         $upah_semasa = number_format($upah_semasa,2);
         if(strpos($upah_semasa,',')){
@@ -185,7 +185,7 @@ class TebusController extends Controller
         $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
         
         $upah_sebenar = $upah_asal - $rebet;
-        $upahsemasa = $upah_sebenar * $gadai_data['jbg'];
+        $upahsemasa = $upah_sebenar * $gadai_data['tempoh'];
         $upah_semasa = bcdiv(round($upahsemasa,2),1,1);
         $upah_semasa = number_format($upah_semasa,2);
         if(strpos($upah_semasa,',')){