From 43d9206713454e76275f12c39b408db0114b8212 Mon Sep 17 00:00:00 2001
From: Afiq Zakwan Hamdan <afiqzakwanhamdan@gmail.com>
Date: Thu, 22 Apr 2021 14:12:26 +0800
Subject: [PATCH] rlm

---
 app/Http/Controllers/TebusController.php | 40 +++++++++++++++++++-----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index ce032e6..b99a2c7 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -128,20 +128,42 @@ class TebusController extends Controller
         $gadai_data = Gadai::on($cawangan['mysql'])
                     ->where('norujukan','=',$norujukan)
                     ->first();
-        // dd($gadai_data);
+
+        $upah_semasa = $this->kiraUpahNotTawarruq($kodcaw,$norujukan);
+
+        $harga_tebus = $upah_semasa + $gadai_data['pinjaman'];
+
+        return response()->json($harga_tebus);
+    }
+
+    public function kiraUpahNotTawarruq($kodcaw,$norujukan){
+        $cawangan = Cawangan::on('mysql7')
+                    ->where('kodcaw','=',$kodcaw)
+                    ->first();
+
+        $gadai_data = Gadai::on($cawangan['mysql'])
+                    ->where('norujukan','=',$norujukan)
+                    ->first();
+
+        $upahtelahbayar = Advansur::on($cawangan['mysql'])
+                        ->where('norujukan','=',$norujukan)
+                        ->sum('upahdibayar');
+
         $upah_asal = $gadai_data['nilaimarhun'] / 100 * $gadai_data['kadarupah'];
         $margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
         $margin_kadarupah = 80;
         $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
         
         $upah_sebenar = $upah_asal - $rebet;
+        $upahsemasa = $upah_sebenar * $gadai_data['jbg'];
+        $upah_semasa = bcdiv(round($upahsemasa,2),1,1);
+        $upah_semasa = number_format($upah_semasa,2);
+        if(strpos($upah_semasa,',')){
+            $upah_semasa = str_replace(',','',$upah_semasa);
+        }
+        $upah_semasa = (float)$upah_semasa - $upahtelahbayar;
 
-        $upah_semasa = bcdiv(round($upah_sebenar * $gadai_data['jbg'],2),1,1);
-        $upah_semasa = (float)number_format($upah_semasa,2);
-
-        $harga_tebus = $upah_semasa + $gadai_data['pinjaman'];
-
-        return response()->json($harga_tebus);
+        return $upah_semasa;
     }
 
     public function upahNotTawarruq($kodcaw,$norujukan){
@@ -282,6 +304,8 @@ class TebusController extends Controller
             't_update' => $current->toDateString(),
         ));
 
+        $upah_rebet = $this->kiraUpahRebet($kodcaw,$norujukan);
+
         $create_tebus = Tebus::on($cawangan['mysql'])->create([
             'kodcaw'=> $kodcaw,
             'norujukan'=> $norujukan,
@@ -325,6 +349,8 @@ class TebusController extends Controller
         $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
             'norujukan' => $norujukan,
             'bayaran_keuntungan' => $request->bakiupah,
+            'bayaran_pembiayaan' => $gadai['bakipjm'],
+            'keuntungan_rebet' => $upah_rebet,
             'tarikh_bayaran'=> $current,
             'kodcaw'=> $kodcaw
         ]);