From 96b1ee84e7eeef88e77fd998ab082f37632da517 Mon Sep 17 00:00:00 2001
From: afiq <afiqzakwanhamdan@gmail.com>
Date: Mon, 15 Feb 2021 12:34:36 +0800
Subject: [PATCH] pembiayaan semasa

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

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index b8418f7..0ee4533 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -1140,16 +1140,19 @@ class GadaiController extends Controller
         return response()->json(number_format($upahTerkumpul,2));
     }
 
-    public function outstandingSemasaCustomer($ic){
-        $cawangan_all = Cawangan::on('mysql7')->get();
+    public function outstandingSemasaCustomer($ic,$kodcaw){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
         $total_pembiayaan = 0;
-        foreach($cawangan_all as $index=>$cawangan){
-            $gadai = Gadai::on($cawangan['mysql'])->where([['nokp','=',$ic],['sttebus','=','']])->get();
-            if(sizeof($gadai) != 0){
-                foreach($gadai as $index=>$gadai_detail){
+        $gadai = Gadai::on($cawangan['mysql'])->where([['nokp','=',$ic],['sttebus','=','']])->get();
+        if(is_array($gadai) || is_object($gadai)){
+            foreach($gadai as $index=>$gadai_detail){
+                if($gadai_detail['pinjaman'] != 0 || $gadai_detail['pinjaman'] != null){
+                    $total_pembiayaan += $gadai_detail['bakipjm'];
+                }else{
                     $total_pembiayaan += $gadai_detail['pinjaman'];
                 }
+                
             }
         }
 
diff --git a/routes/web.php b/routes/web.php
index 988a5e1..1ca7a28 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -63,7 +63,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('gadaiansemasa/belum_serah/{kodcaw}',['uses'=>'GadaiController@getGadaianBelumSerah']);
     $router->get('gadai/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanGadai']);
 
-    $router->get('gadai/customers/{ic}/outstandingsemasa',['uses'=>'GadaiController@outstandingSemasaCustomer']);
+    $router->get('gadai/customers/{ic}/outstandingsemasa/{kodcaw}',['uses'=>'GadaiController@outstandingSemasaCustomer']);
     $router->put('gadai/updatehistory/{kodcaw}/{norujukan}',['uses'=>'GadaiController@updateHistoryGadai']);
 
     $router->get('senarai/lelong/{kodcaw}',['uses'=>'GadaiController@senaraiLelong']);