From e33af1a75eb5bcb4a5922bcd8ac2cf3fa43fba14 Mon Sep 17 00:00:00 2001
From: Hafifie PKB <muhdhafifie97@gmail.com>
Date: Sun, 15 Dec 2024 12:14:22 +0800
Subject: [PATCH] fix add api

---
 app/Support/v2/Penebusan.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/Support/v2/Penebusan.php b/app/Support/v2/Penebusan.php
index 6e9bcb2..ee306ce 100644
--- a/app/Support/v2/Penebusan.php
+++ b/app/Support/v2/Penebusan.php
@@ -994,9 +994,9 @@ class Penebusan
         $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
 
         $array_tebus = $request->only(['jeniskeuntungan', 'nopelanggan','jenistebus','addpinjaman','nowakil','marhun','teller']);
-        $array_trans = $request->only(['nopelanggan', 'noic','pinjaman','marhun','teller','jenistebus']);
+        $array_trans = $request->only(['nopelanggan', 'noic','pinjaman','pinjamanbaru','marhun','teller','jenistebus']);
         $array_tebus_base = $request->only(['totalbayaran', 'bakiupah','jeniskeuntungan','bakipinjaman','jenistebus','teller','nowakil','duitpelanggan']);
-        $array_trans_base = $request->only(['pinjaman','teller']);
+        $array_trans_base = $request->only(['pinjaman','teller','pinjamanbaru']);
 
         try{
             //check duplicate
@@ -1226,7 +1226,7 @@ class Penebusan
                     'tag_permata' => $marhunloop['tag_permata'] != null ? $marhunloop['tag_permata'] : 0,
                     'berat_batu_permata' => $marhunloop['berat_batu_permata'] != null ? $marhunloop['berat_batu_permata'] : '',
                     'karat' => $marhunloop['karat'],
-                    'berat' => $marhunloop['berat_emas'],
+                    'berat' => $marhunloop['berat'],
                     'harga' => $harga,
                     'n_marhun' => $nilai_marhun
                 ];
@@ -1242,7 +1242,7 @@ class Penebusan
             $total_bil_marhun = Marhun::on($cawangan['mysql'])->where('norujukan',$new_sag_number)->sum('bil');
             $total_berat_marhun = Marhun::on($cawangan['mysql'])->where('norujukan',$new_sag_number)->sum('berat');
 
-            $margin_pinjaman = ($array_trans['pinjaman'] / $total_nilai_marhun);
+            $margin_pinjaman = ($array_trans['pinjamanbaru'] / $total_nilai_marhun);
 
             $t_matang = Carbon::now();
             $t_matang = $t_matang->addMonths(6)->subDays(1);
@@ -1253,7 +1253,7 @@ class Penebusan
             $kadar_raw = KadarUpah::where('min','<=',$total_nilai_marhun)->where('max','>=',$total_nilai_marhun)->where('group_id',$cawangan['group_id'])->first();
 
             $onepercentservices = new Calculation();
-            $keuntungan = $onepercentservices->kiraanKeuntunganSebenar($array_trans['pinjaman'],$total_nilai_marhun,$kadar_raw['kadarujrah'],$margin_pinjaman);
+            $keuntungan = $onepercentservices->kiraanKeuntunganSebenar($array_trans['pinjamanbaru'],$total_nilai_marhun,$kadar_raw['kadarujrah'],$margin_pinjaman);
 
             $upah1 = $onepercentservices->getRoundedMethod($keuntungan['keuntungan']);
             $upah6 = $onepercentservices->getRoundedMethod($upah1 * 6);
@@ -1263,19 +1263,19 @@ class Penebusan
             $akrual_ujrah = $onepercentservices->getRoundedMethod($keuntungan['ujrah'] * 0.5);
             $akrual_onepercent = $onepercentservices->getRoundedMethod($keuntungan['onepercent'] * 0.5);
 
-            $hargajualan = $array_trans['pinjaman'] + $upah12;
+            $hargajualan = $array_trans['pinjamanbaru'] + $upah12;
 
             Gadai::on($cawangan['mysql'])
             ->where('norujukan','=',$new_sag_number)
             ->update(array(
                 'nilaimarhun' => $total_nilai_marhun,
                 'berat'=> $total_berat_marhun,
-                'pinjaman' => $array_trans['pinjaman'],
+                'pinjaman' => $array_trans['pinjamanbaru'],
                 'kadarupah' => $kadar_raw['kadarujrah'],
                 'marhun' => $array_trans['marhun'],
                 'percentpinj' => $margin_pinjaman,
                 'teller' => $array_trans['teller'],
-                'bakipjm' => $array_trans['pinjaman'],
+                'bakipjm' => $array_trans['pinjamanbaru'],
                 'bakiupah' => $upah6,
                 'jbg' => 0.5,
                 't_update' => $current->toDateString(),
@@ -1322,7 +1322,7 @@ class Penebusan
         $unit_current = isset($komuditi_current['unit_komuditi']) ? $komuditi_current['unit_komuditi']: 0;
 
         try{
-            $update_unit = $unit_current - $array_trans_base['pinjaman'];
+            $update_unit = $unit_current - $array_trans_base['pinjamanbaru'];
 
             KomuditiPurchase::on('mysql7')->where('id','=',$komuditi_current['id'])->update([
                 'unit_komuditi' => $update_unit