From f9df54be867eaa0d0d61c185f2dd61ab4e37ba56 Mon Sep 17 00:00:00 2001
From: afiq <afiqzakwanhamdan@gmail.com>
Date: Mon, 22 Feb 2021 14:31:59 +0800
Subject: [PATCH] upah baru

---
 app/Http/Controllers/GadaiController.php | 108 ++++++---
 app/Http/Controllers/TebusController.php | 283 ++++++++++++-----------
 2 files changed, 229 insertions(+), 162 deletions(-)

diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index 2bf4782..d5f8ff7 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -255,6 +255,44 @@ class GadaiController extends Controller
         return response()->json($gadai);
     }
 
+    public function kiraupahTawarruq($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')
+                    ->where('kodcaw','=',$kodcaw)
+                    ->first();
+
+        $gadai_data = Gadai::on($cawangan['mysql'])
+                    ->where('norujukan','=',$norujukan)
+                    ->first();
+
+        if($gadai_data['tempoh'] > 6){
+            $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+
+            $upah_semasa_round = round($upahsemasa_raw,2);
+    
+            $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
+        }else{
+            if($gadai_data['tempoh'] == 6){
+                if($gadai_data['bakiupah'] != 0){
+                    $upah_semasa = $gadai_data['bakiupah'];
+                }else{
+                    $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+
+                    $upah_semasa_round = round($upahsemasa_raw,2);
+            
+                    $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
+                }
+            }else{
+                $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+
+                $upah_semasa_round = round($upahsemasa_raw,2);
+        
+                $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
+            }
+        }
+
+        return $upah_semasa;
+    }
+
     public function updateGadaiMarhunOnline($kodcaw,$norujukan,Request $request)
     {
         $current = Carbon::now();
@@ -263,23 +301,26 @@ class GadaiController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
-        $upahsemasa = $gadai['jbg'] * (($gadai['kadarupah']/100 )* $gadai['bakipjm']);
+        $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
         
-        if($request->bayaran < $upahsemasa){
-            $upahsemasa = $request->bayaran;
-        }
-
-        $baki_upah = $gadai['bakiupah'] - $request->bayaran;
-        $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
-        if($gadai['bakipjm'] == null){
-            $baki_pinjaman = $gadai['pinjaman'];
-        }else{
-            $baki_pinjaman = $gadai['bakipjm'];
-        }
-        
-        if($baki_upah < 0){
-            $baki_pinjaman = $baki_pinjaman + $baki_upah;
+        if($gadai['tempoh'] > 6){
+            $baki_bayaran = $request->bayaran - $upahsemasa;
+            $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
+            $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
             $baki_upah = 0;
+        }else{
+            $baki_upah = $gadai['bakiupah'] - $request->bayaran;
+            $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
+            if($gadai['bakipjm'] == null){
+                $baki_pinjaman = $gadai['pinjaman'];
+            }else{
+                $baki_pinjaman = $gadai['bakipjm'];
+            }
+            
+            if($baki_upah < 0){
+                $baki_pinjaman = $baki_pinjaman + $baki_upah;
+                $baki_upah = 0;
+            }
         }
 
         $transaction = Transaction::on('mysql7')->create([
@@ -287,7 +328,7 @@ class GadaiController extends Controller
             'norujukan' => $norujukan,
             'nokp' => $gadai['nokp'],
             'teller' => 'online',
-            'kodcaw' => 'online',
+            'kodcaw' => $kodcaw,
             'duit_masuk' => $request->bayaran,
             'created_at' => $current,
             'bakiharga' => $baki_hargajualan,
@@ -297,7 +338,7 @@ class GadaiController extends Controller
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $upahsemasa,
             'tarikh_bayaran'=> $current,
-            'kodcaw'=> 'online'
+            'kodcaw'=> $kodcaw
         ]);
 
         $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
@@ -318,23 +359,26 @@ class GadaiController extends Controller
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
-        $upahsemasa = $gadai['jbg'] * (($gadai['kadarupah']/100 )* $gadai['bakipjm']);
-        
-        if($request->bayaran < $upahsemasa){
-            $upahsemasa = $request->bayaran;
-        }
+        $upahsemasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
-        $baki_upah = $gadai['bakiupah'] - $request->bayaran;
-        $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
-        if($gadai['bakipjm'] == null){
-            $baki_pinjaman = $gadai['pinjaman'];
-        }else{
-            $baki_pinjaman = $gadai['bakipjm'];
-        }
-        
-        if($baki_upah < 0){
-            $baki_pinjaman = $baki_pinjaman + $baki_upah;
+        if($gadai['tempoh'] > 6){
+            $baki_bayaran = $request->bayaran - $upahsemasa;
+            $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;
+            $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
             $baki_upah = 0;
+        }else{
+            $baki_upah = $gadai['bakiupah'] - $request->bayaran;
+            $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
+            if($gadai['bakipjm'] == null){
+                $baki_pinjaman = $gadai['pinjaman'];
+            }else{
+                $baki_pinjaman = $gadai['bakipjm'];
+            }
+            
+            if($baki_upah < 0){
+                $baki_pinjaman = $baki_pinjaman + $baki_upah;
+                $baki_upah = 0;
+            }
         }
 
         $transaction = Transaction::on('mysql7')->create([
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 4555d27..0628287 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -27,7 +27,8 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        $upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+
+        $upah_semasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
 
         $transaction = Transaction::on('mysql7')
                     ->where('norujukan','=',$norujukan)
@@ -49,14 +50,14 @@ class TebusController extends Controller
             $totalBayaranKeuntungan += $untung['bayaran_keuntungan'];
         }
 
-        $rebet = $gadai_data['upah12'] - $totalBayaranKeuntungan - $upahsemasa;
+        $rebet = $gadai_data['upah12'] - $totalBayaranKeuntungan - $upah_semasa;
 
         $harga_tebus = $gadai_data['bakihargajualan'] - $rebet;
 
         return response()->json($harga_tebus);
     }
 
-    public function upahTawarruq($kodcaw,$norujukan){
+    public function kiraupahTawarruq($kodcaw,$norujukan){
         $cawangan = Cawangan::on('mysql7')
                     ->where('kodcaw','=',$kodcaw)
                     ->first();
@@ -65,9 +66,39 @@ class TebusController extends Controller
                     ->where('norujukan','=',$norujukan)
                     ->first();
 
-        $upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+        if($gadai_data['tempoh'] > 6){
+            $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
 
-        return response()->json($upahsemasa);
+            $upah_semasa_round = number_format($upahsemasa_raw,2);
+            $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
+        }else{
+            if($gadai_data['tempoh'] == 6){
+                if($gadai_data['bakiupah'] != 0){
+                    $upah_semasa = $gadai_data['bakiupah'];
+                }else{
+                    $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+
+                    $upah_semasa_round = round($upahsemasa_raw,2);
+            
+                    $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
+                }
+            }else{
+                $upahsemasa_raw = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
+
+                $upah_semasa_round = round($upahsemasa_raw,2);
+        
+                $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
+            }
+        }
+
+        return $upah_semasa;
+    }
+
+    public function upahTawarruq($kodcaw,$norujukan){
+        
+        $upah_semasa = $this->kiraupahTawarruq($kodcaw,$norujukan);
+
+        return response()->json(number_format($upah_semasa,2));
     }
 
     public function tebusSeparuhTawarruq($kodcaw,$norujukan,Request $request){
@@ -82,6 +113,10 @@ class TebusController extends Controller
 
         $upahsemasa = $gadai_data['jbg'] * (($gadai_data['kadarupah']/100 )* $gadai_data['bakipjm']);
 
+        $upah_semasa_round = round($upahsemasa,2);
+
+        $upah_semasa = (float)substr($upah_semasa_round, 0, -1);
+
         $array_recno_marhun = $request->array_recno;
 
         $margin_pembiayaan = round(($gadai_data['bakipjm']/$gadai_data['nilaimarhun'])*100,2);
@@ -96,9 +131,13 @@ class TebusController extends Controller
             $total_harga_tebus += $harga_tebus;
         }
 
+        $total_harga_tebus_round = round($total_harga_tebus,2);
+
+        $totalhargatebus = (float)substr($total_harga_tebus_round, 0, -1);
+
         // $total_harga_tebus += $upahsemasa;
 
-        return response()->json($total_harga_tebus);
+        return response()->json($totalhargatebus);
     }
 
     public function tebusNotTawarruq($kodcaw,$norujukan){
@@ -185,8 +224,7 @@ class TebusController extends Controller
         return response()->json($total_harga_tebus);
     }
 
-    function rebet($kodcaw,$norujukan)
-    {
+    function rebet($kodcaw,$norujukan){
         $cawangan = Cawangan::on('mysql7')
             ->where('kodcaw','=',$kodcaw)
             ->first();
@@ -204,8 +242,7 @@ class TebusController extends Controller
         return floatval(number_format($rebet,2));
     }
 
-    function rebetselepastawarruq($kodcaw,$norujukan)
-    {
+    function rebetselepastawarruq($kodcaw,$norujukan){
         $cawangan = Cawangan::on('mysql7')
                     ->where('kodcaw','=',$kodcaw)
                     ->first();
@@ -240,10 +277,7 @@ class TebusController extends Controller
         return floatval(number_format($rebet,2));
     }
 
-
-
-    public function tebusUpdate($kodcaw,$norujukan,Request $request)
-    {
+    public function tebusUpdate($kodcaw,$norujukan,Request $request){
         $current = Carbon::now();
         $current = new Carbon();
 
@@ -321,149 +355,138 @@ class TebusController extends Controller
         return response()->json($tebus);
     }
 
-        public function listPenebusanBaru($kodcaw)
-        {
-      
-          $current = Carbon::now();
-          $current = new Carbon();
-          $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
-          $gadai = Tebus::on($cawangan['mysql'])
-                      ->where([['t_tebus','=',$current->toDateString()],['tagterima','=',0]])
-                      ->get();
-      
-              return response()->json($gadai);
-      
-        }
+    public function listPenebusanBaru($kodcaw){
     
-        public function listSerahKhazanah($kodcaw)
-        {
-     
-            $current = Carbon::now();
-            $current = new Carbon();
+        $current = Carbon::now();
+        $current = new Carbon();
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $gadai = Tebus::on($cawangan['mysql'])
+                    ->where([['t_tebus','=',$current->toDateString()],['tagterima','=',0]])
+                    ->get();
     
-            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
-    
-            $gadai = Tebus::on($cawangan['mysql'])
-            ->where([['t_tebus','=',$current->toDateString()],['tagterima','=',1]])
-            ->get();
             return response()->json($gadai);
     
-        }
+    }
 
-        public function tagterimaupdate($kodcaw,$norujukan)
-        {
-            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+    public function listSerahKhazanah($kodcaw){
+    
+        $current = Carbon::now();
+        $current = new Carbon();
 
-            $update_inoutmar = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
-                'tagterima' => 1
-            ));
-        }
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-        public function AllWakil($kodcaw)
-        {
-            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $gadai = Tebus::on($cawangan['mysql'])
+        ->where([['t_tebus','=',$current->toDateString()],['tagterima','=',1]])
+        ->get();
+        return response()->json($gadai);
 
-            $wakil = Wakil::on($cawangan['mysql'])
-            ->orderBy('nowakil','desc')
-            ->get();
+    }
 
-            return response()->json($wakil,200);
-        }
+    public function tagterimaupdate($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-        public function getWakil($kodcaw,$icno)
-        {
-            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $update_inoutmar = Tebus::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
+            'tagterima' => 1
+        ));
+    }
 
-            $wakil = Wakil::on($cawangan['mysql'])
-            ->where('nokp','=',$icno)
-            ->get();
+    public function AllWakil($kodcaw){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-            return response()->json($wakil,200);
-        }
+        $wakil = Wakil::on($cawangan['mysql'])
+        ->orderBy('nowakil','desc')
+        ->get();
 
-        public function getWakilbycode($kodcaw,$nowakil)
-        {
-            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        return response()->json($wakil,200);
+    }
 
-            $wakil = Wakil::on($cawangan['mysql'])
-            ->where('nowakil','=',$nowakil)
-            ->get();
+    public function getWakil($kodcaw,$icno){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-            return response()->json($wakil,200);
-        }
+        $wakil = Wakil::on($cawangan['mysql'])
+        ->where('nokp','=',$icno)
+        ->get();
 
-        public function createWakil($kodcaw,$icno,Request $request)
-        {
-            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        return response()->json($wakil,200);
+    }
 
-            $wakil_create = Wakil::on($cawangan['mysql'])->create([
+    public function getWakilbycode($kodcaw,$nowakil){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-                'kodcaw' => $kodcaw,
-                'nopelanggan' => $request->nopelanggan,
-                'nowakil' => $request->nowakil,
-                'nama' => $request->nama,
-                'nokp' => $icno,
-                'hubungan' => $request->hubungan,
-                'alamat1' => $request->alamat,
-                'telefon' => $request->telefon,
-                'nota' => $request->nota
-                
-            ]);
+        $wakil = Wakil::on($cawangan['mysql'])
+        ->where('nowakil','=',$nowakil)
+        ->get();
 
-            return response()->json($wakil_create ,201);
-        }
+        return response()->json($wakil,200);
+    }
 
-        public function listhistorypenebusan($kodcaw,Request $request)
-        {
-            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+    public function createWakil($kodcaw,$icno,Request $request){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-            $listtebus = Tebus::on($cawangan['mysql'])
-                      ->where('norujukan','=',$request->norujukan)
-                      ->get();
-      
-              return response()->json($listtebus);
-        }
+        $wakil_create = Wakil::on($cawangan['mysql'])->create([
 
+            'kodcaw' => $kodcaw,
+            'nopelanggan' => $request->nopelanggan,
+            'nowakil' => $request->nowakil,
+            'nama' => $request->nama,
+            'nokp' => $icno,
+            'hubungan' => $request->hubungan,
+            'alamat1' => $request->alamat,
+            'telefon' => $request->telefon,
+            'nota' => $request->nota
+            
+        ]);
 
-        public function getAdvansur($kodcaw,$norujukan)
-        {
-            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        return response()->json($wakil_create ,201);
+    }
 
-            $listadvansur = Advansur::on($cawangan['mysql'])
-            ->where('norujukan','=',$norujukan)
-            ->orderBy('tarikh','desc')
-            ->get();
+    public function listhistorypenebusan($kodcaw,Request $request){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-            return response()->json($listadvansur,200);
-        }
+        $listtebus = Tebus::on($cawangan['mysql'])
+                    ->where('norujukan','=',$request->norujukan)
+                    ->get();
+    
+            return response()->json($listtebus);
+    }
 
-        public function createAdvansur($kodcaw,Request $request)
-        {
-            $current = Carbon::now();
-            $current = new Carbon();
+    public function getAdvansur($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 
-            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $listadvansur = Advansur::on($cawangan['mysql'])
+        ->where('norujukan','=',$norujukan)
+        ->orderBy('tarikh','desc')
+        ->get();
 
-            $create_advansur = Advansur::on($cawangan['mysql'])->create([
-                'tarikh'=> $current->toDateString(),
-                'noresit'=> 0,
-                'norujukan' => $request->norujukan,
-                'nopelanggan' => $request->nopelanggan,
-                'nilaimarhun' => $request->nilaimarhun,
-                'pinjaman' => $request->pinjaman,
-                'kadarupah' => $request->kadarupah,
-                'glcode' => $request->glcode,
-                'upahsebenar' => $request->upahsebenar,
-                'upahdibayar' => $request->upahdibayar,
-                'teller' => $request->teller,
-                'prkod' => $request->prkod,
-                'jbg' => $request->jbg,
-                'nowakil' => $request->nowakil,
-                'hubungan' => $request->hubungan,
-                'status' => 0,
-                'historygadaian' => $request->historygadaian
-            ]);
+        return response()->json($listadvansur,200);
+    }
 
-            return response()->json($create_advansur ,201);
-        }
+    public function createAdvansur($kodcaw,Request $request){
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $create_advansur = Advansur::on($cawangan['mysql'])->create([
+            'tarikh'=> $current->toDateString(),
+            'noresit'=> 0,
+            'norujukan' => $request->norujukan,
+            'nopelanggan' => $request->nopelanggan,
+            'nilaimarhun' => $request->nilaimarhun,
+            'pinjaman' => $request->pinjaman,
+            'kadarupah' => $request->kadarupah,
+            'glcode' => $request->glcode,
+            'upahsebenar' => $request->upahsebenar,
+            'upahdibayar' => $request->upahdibayar,
+            'teller' => $request->teller,
+            'prkod' => $request->prkod,
+            'jbg' => $request->jbg,
+            'nowakil' => $request->nowakil,
+            'hubungan' => $request->hubungan,
+            'status' => 0,
+            'historygadaian' => $request->historygadaian
+        ]);
+
+        return response()->json($create_advansur ,201);
+    }
 }