diff --git a/app/Support/v1/Penebusan.php b/app/Support/v1/Penebusan.php
index 88033cb..9738527 100644
--- a/app/Support/v1/Penebusan.php
+++ b/app/Support/v1/Penebusan.php
@@ -793,9 +793,9 @@ class Penebusan
         }
 
         $array_tebus = $request->only(['jeniskeuntungan', 'nopelanggan','jenistebus','addpinjaman','nowakil','marhun','teller','bakipinjaman','bakiupah']);
-        $array_trans = $request->only(['nopelanggan', 'noic','jenisAT','pinjaman','marhun','teller','jenistebus']);
+        $array_trans = $request->only(['nopelanggan', 'noic','jenisAT','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{
             DB::connection($cawangan['mysql'])->beginTransaction();
@@ -978,7 +978,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
                 ];
@@ -1022,12 +1022,12 @@ class Penebusan
             ->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(),
@@ -1051,12 +1051,12 @@ class Penebusan
                 'tagbaru' => 1,
                 'tunggakanujrah' => $akrual_ujrah,
                 'tunggakanonepercent' => $akrual_onepercent,
+                'historygadaian' => $norujukan,
             ));
 
             Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
                 'sttebus' => "T",
                 't_update' => $current->toDateString(),
-                'historygadaian' => $new_sag_number,
                 'tag_tebus' => $array_trans['jenistebus'],
             ));
 
@@ -1074,7 +1074,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