From 32b91e9e61e2563dab4361e182b426c5f94f6e14 Mon Sep 17 00:00:00 2001
From: Afiq Zakwan <afiqzakwanhamdan@gmail.com>
Date: Sun, 17 Dec 2023 11:11:46 +0800
Subject: [PATCH] fix ujrah

---
 app/Http/Controllers/TransactionOnlineController.php |  7 ++++++-
 app/Support/Onepercent.php                           |  2 +-
 app/Support/v2/Penebusan.php                         | 12 +++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/TransactionOnlineController.php b/app/Http/Controllers/TransactionOnlineController.php
index 60224df..7f87d0c 100644
--- a/app/Http/Controllers/TransactionOnlineController.php
+++ b/app/Http/Controllers/TransactionOnlineController.php
@@ -360,7 +360,12 @@ class TransactionOnlineController extends Controller
             if(sizeof($gadai) != 0){
                 foreach($gadai as $gad)
                 {
-                    $result = (new TebusController)->kiraupahTawarruq($gad['kodcaw'],$gad['norujukan']);
+                    if($gad['tagbaru'] == 1){
+                        $jenis = 'onepercent';
+                    }else{
+                        $jenis = 'asal';
+                    }
+                    $result = (new TebusController)->kiraupahTawarruq($gad['kodcaw'],$gad['norujukan'],$jenis);
 
                     $gad['keuntungan'] = $result;
                     array_push($gadai_all,$gad);
diff --git a/app/Support/Onepercent.php b/app/Support/Onepercent.php
index 83c7014..9709a36 100644
--- a/app/Support/Onepercent.php
+++ b/app/Support/Onepercent.php
@@ -37,7 +37,7 @@ class OnePercent extends MasterServices
 
     public function getUpahSebenar($norujukan){
         $gadai = new Version2Gadai($this->kodcaw,$this->cawangan_info);
-        $response = $gadai->kiraupahOnePercent($this->kodcaw,$norujukan);
+        $response = $gadai->kiraupahOnePercent($norujukan);
 
         return $response;
     }
diff --git a/app/Support/v2/Penebusan.php b/app/Support/v2/Penebusan.php
index 481fa39..802550f 100644
--- a/app/Support/v2/Penebusan.php
+++ b/app/Support/v2/Penebusan.php
@@ -149,10 +149,16 @@ class Penebusan
         $keuntungan_semasa = $onepercentservices->getRoundedMethod($bilang_bln * $upah['onepercent']);
         $ujrah_semasa = $onepercentservices->getRoundedMethod($bilang_bln * $upah['ujrah']);
         $upahsemasa_raw = $onepercentservices->getRoundedMethod($upahsemasa_raw);
+        $keuntungan_1bln = $onepercentservices->getRoundedMethod((1 * $upah['keuntungan'])+(1 * $upah['ujrah']));
 
-        $array_upah = ['pendapatan' => $upahsemasa_raw,
-                        'keuntungan' => $keuntungan_semasa,
-                        'ujrah' => $ujrah_semasa];
+
+        $array_upah = 
+        [
+            'keuntungan_1bln' => $keuntungan_1bln,
+            'pendapatan' => $upahsemasa_raw,
+            'keuntungan' => $keuntungan_semasa,
+            'ujrah' => $ujrah_semasa
+        ];
 
         return $array_upah;
     }