From 2ac2176f2ee539834efbc3dfce88683181b9b7e3 Mon Sep 17 00:00:00 2001
From: nishaMuhd <nurulnisha84@gmail.com>
Date: Mon, 1 Apr 2024 10:34:12 +0800
Subject: [PATCH] updateformula010424

---
 .../TransactionOnlineController.php           | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php
index 8126ed0..ec39060 100644
--- a/app/Http/Controllers/TransactionOnlineController.php
+++ b/app/Http/Controllers/TransactionOnlineController.php
@@ -364,7 +364,7 @@ class TransactionOnlineController extends Controller
   
                     $onepercent = new OnePercentServices();
                     $keuntungan = $onepercent->kiraanKeuntunganSebenar($gadai['bakipjm'],$gadai['nilaimarhun'],$gadai['kadarupah'],$margin_semasa);
-                    $ujrahasal = $onepercent->kiraanUjrahSebenar($gadai['nilaimarhun'],$gadai['kadarupah'],$gadai['margin_semasa']);
+                    $ujrahasal = $onepercent->kiraanUjrahSebenar($gadai['nilaimarhun'],$gadai['kadarupah'],$gadai['percentpinj']);
                     $onepercentasal = $gadai['pinjaman'] * (1/100);
 
                     $gadaionepercent = new Version2Gadai($kodcaw,$cawangan);
@@ -372,23 +372,28 @@ class TransactionOnlineController extends Controller
                     $upahsemasa = $gadaionepercent->kiraupahOnePercent($norujukan);
                     $upahrebet = $gadaionepercent->kiraUpahRebet($norujukan);
                     $baki_bayaran = $bayaran - $upahsemasa;
-   
-                    $onepercentservices = new Calculation();
-                    $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
-                        'norujukan' => $norujukan,
-                        'bayaran_keuntungan' => $upahsemasa,
-                        'bayaran_pembiayaan' => $baki_bayaran,
-                        'keuntungan_rebet'=> $upahrebet,
-                        'tarikh_bayaran'=> $current,
-                        'kodcaw'=> $kodcaw,
-                        'ujrah' => $onepercentservices->getRoundedMethod($keuntungan['ujrah'] * $bilang_bln),
-                        'ujrah_rebet' => $onepercentservices->getRoundedMethod($ujrahasal*$bilang_bln),
-                        'onepercent' => $onepercentservices->getRoundedMethod($onepercentasal * $bilang_bln),
-                        'onepercent_rebet' => $onepercentservices->getRoundedMethod($keuntungan['onepercent'] * $bilang_bln),
-                        'tempoh' => $gadai['tempoh'],
-                        'beza_tempoh' => $bilang_bln,
-                        'margin_semasa' => $margin_semasa,
-                        ]);
+                    
+                    $onepercent = new Calculation();
+                    $ujrah = $onepercent->getRoundedMethod($ujrahasal * $bilang_bln);
+                    $ujrah_rebate = $onepercent->getRoundedMethod($keuntungan['ujrah'] * $bilang_bln);
+                    $keun = $onepercent->getRoundedMethod($onepercentasal * $bilang_bln);
+                    $keuntungan_rebate = $onepercent->getRoundedMethod($keuntungan['onepercent'] * $bilang_bln);
+
+                        $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
+                            'norujukan' => $norujukan,
+                            'bayaran_keuntungan' => $upahsemasa,
+                            'bayaran_pembiayaan' => $baki_bayaran,
+                            'keuntungan_rebet'=> $upahrebet,
+                            'tarikh_bayaran'=> $current,
+                            'kodcaw'=> $kodcaw,
+                            'ujrah' => $ujrah,
+                            'ujrah_rebet' => $ujrah_rebate,
+                            'onepercent' => $keun,
+                            'onepercent_rebet' => $keuntungan_rebate,
+                            'tempoh' => $gadai['tempoh'],
+                            'beza_tempoh' => $bilang_bln,
+                            'margin_semasa' => $margin_semasa,
+                        ]);    
                 }
     
                 $baki_pinjaman = $gadai['bakipjm'] - $baki_bayaran;