From 946ccabb57fcf883595ba423a0795e80d8b30488 Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Wed, 7 Apr 2021 16:57:28 +0800
Subject: [PATCH] fix skit imbang duga

---
 app/Http/Controllers/GadaiController.php | 24 ++++++++++++++----------
 routes/web.php                           |  2 ++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index dea0e97..be631bc 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1986,28 +1986,32 @@ class GadaiController extends Controller
             ->sum('pinjaman');
 
         
-        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);
     }
 
+    public function CalculationPembiayaanTawarruq($kodcaw,Request $request)
+    {
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
+
+        $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');
+
+        return response()->json($rekod_pinjamandiberi);
+    }
+
     public function CalculationKeuntungan($kodcaw,Request $request)
     {
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$request->kodcaw)->first();
diff --git a/routes/web.php b/routes/web.php
index 9bfedaa..cf672b0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -327,6 +327,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //-- Harta Semasa --//
     $router->get('PinjamanDiberi/{kodcaw}',['uses'=>'GadaiController@CalculationPinjamanDiberi']); //pinjaman diberi
+    $router->get('PembiayaanDiberiTawarruq/{kodcaw}',['uses'=>'GadaiController@CalculationPembiayaanTawarruq']); //pembiayaan tawarruq
+
     $router->get('TunaiDiTangan/{kodcaw}',['uses'=>'VaultController@TunaiDiTangan']); //Tunai di tangan
     $router->get('PenghutangKakitangan/{kodcaw}',['uses'=>'TebusController@PenghutangKakitangan']); //Penghutang Kakitangan