From dd7c01f77afc12af4731c097481776674cfd51ab Mon Sep 17 00:00:00 2001
From: MUHD HAFIFIE <Cyclonepipi@fidin-3.local>
Date: Mon, 6 Sep 2021 11:01:49 +0800
Subject: [PATCH] fix merge

---
 app/Http/Controllers/GadaiController.php  |  4 +++-
 app/Http/Controllers/LelongController.php |  4 +++-
 app/Http/Controllers/TebusController.php  |  7 +++++--
 app/Http/Controllers/VaultController.php  | 10 ----------
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 4e97892..7481f2f 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -2419,7 +2419,9 @@ class GadaiController extends Controller
             // $rekod_pinjamandiberi;
 
         if($kodcaw === '011232')
-          $rekod_pinjamandiberi -= 282;
+        {
+            $rekod_pinjamandiberi -= 282;
+        }            
 
         $array_rekodemas = ['pinjamankoop' => $rekod_pinjamandiberi,'emaspalsu' => $rekod_emaspalsu];
 
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index c09e025..fc37193 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -223,7 +223,9 @@ class LelongController extends Controller
         }
 
         if($kodcaw === '011232')
+        {
             $bakilelong += 6;
+        }
 
         $arraylelong = ['bakilelong' => $bakilelong, 'rugilelong' => $rugitotal];
 
@@ -496,7 +498,7 @@ class LelongController extends Controller
         ->sum('cajlelong');
 
         if($kodcaw === '011232')
-            $cajlelong += 122.5;
+            $cajlelong +=122.5;
 
         return response()->json($cajlelong,200);
     }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 8bb2172..4c5e809 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -568,7 +568,8 @@ class TebusController extends Controller
         ->whereNotNull('hargajualan')
         ->where('hargajualan','<>','bakihargajualan');
 
-        $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
+        // $totalpenebusantawarruq = ($tebustawarruq->sum('tebus.pinjaman') - $tebustawarruqansuran->sum('gad.pinjaman')) + $tebustawarruqansuran->sum('gad.bakipjm');
+        $totalpenebusantawarruq = $tebustawarruq->sum('tebus.pinjaman');
         $bilpenebusantawarruq = $tebustawarruq->count();
         $totalrebatetawarruq = $tebustawarruq->sum('tebus.rebate');
         $totalkeuntungantawarruq = $tebustawarruq->sum('tebus.bakiupah');
@@ -929,7 +930,9 @@ class TebusController extends Controller
         $total = $keuntungansebelumtawarruq + $keuntungan;
 
         if($kodcaw === '011232')
-          $total += 623.5;
+        {
+            $total +=623.5;
+        }
 
         return response()->json($total,200);
     }
diff --git a/app/Http/Controllers/VaultController.php b/app/Http/Controllers/VaultController.php
index ccd243e..66daf7f 100644
--- a/app/Http/Controllers/VaultController.php
+++ b/app/Http/Controllers/VaultController.php
@@ -400,16 +400,6 @@ class VaultController extends Controller
    {
       $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-      // $pendahuluan = Vault::on($cawangan['mysql'])
-      // ->where('kodcaw','=',$kodcaw)
-      // ->where('tarikh','<=', $request->tarikh)
-      // ->sum('pendahuluan');
-
-      // $serahan = Vault::on($cawangan['mysql'])
-      // ->where('kodcaw','=',$kodcaw)
-      // ->where('tarikh','<=', $request->tarikh)
-      // ->sum('serahan');
-
       $serahanpkb = '1000/020';
       $serahanjmc = '1000/026';
       $pendahuluanpkb = '7000/102';