diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index b21a7b7..022a918 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -149,12 +149,13 @@ class GadaianController extends Controller
         $total_nilai_marhun = $request->total_nilai_marhun;
         $total_nilai_marhun = str_replace(',','',$total_nilai_marhun);
         
-
+        $keuntungan_sebln = $request->keuntungan_sebulan;
+        $keuntungan_sebln = str_replace(',','',$keuntungan_sebln);
         
         $margin_pinjaman = $request->pinjaman / $total_nilai_marhun;
         $kadarupah = $request->kadarkeuntungan * 100;
-        $keuntungan6bulan = $request->keuntungan_6bln;
-        $keuntungan12bulan = $request->keuntungan_sebulan*12;
+        $keuntungan6bulan = $keuntungan_sebln * 6;
+        $keuntungan12bulan = $keuntungan_sebln * 12;
         $hargajualan = $request->pinjaman + $keuntungan12bulan;
         $gadai = Http::put(config('api.url').'/api/gadai/norujukan/'. $auth_user['cawangan'] .'/' . $request->norujukan_gadai,[
             'kodcaw' => $auth_user['cawangan'],
@@ -171,6 +172,13 @@ class GadaianController extends Controller
             'kuantiti_marhun' => $request->kuantiti_marhun
         ])->json();
 
+        $komuditi = Http::put(config('api.url').'/api/komuditi/transaksi',[
+            'unit_komuditi' => round($request->pinjaman, 2),
+            'norujukan' => $request->norujukan_gadai,
+            'kodcaw' => $auth_user['cawangan'],
+            'teller' => $auth_user['name']
+        ]);
+
         $request->session()->forget('page_reload');
         $request->session()->forget('norujukan');
         return redirect()->route('customer_info');
diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php
index 264d12d..941db0c 100644
--- a/app/Http/Controllers/KhazanahController.php
+++ b/app/Http/Controllers/KhazanahController.php
@@ -444,17 +444,9 @@ class KhazanahController extends Controller
     }
 
     public function barcodescanned(Request $request){
-        // dd($request->all());
         $auth_user = Auth::user();
-        $gadai_detail = Http::get(config('api.url'). '/api/gadai/norujukan/'.$auth_user['cawangan'].'/'.$request->norujukan_barcode)->json();
-        // dd($gadai_detail[0]);
         $gadai = Http::put(config('api.url').'/api/gadai/serah_marhun/khazanah/'. $auth_user['cawangan'] .'/' . $request->norujukan_barcode)->json();
-        $komuditi = Http::put(config('api.url').'/api/komuditi/transaksi',[
-            'unit_komuditi' => $gadai_detail[0]['pinjaman'],
-            'norujukan' => $request->norujukan_barcode,
-            'kodcaw' => $gadai_detail[0]['kodcaw'],
-            'teller' => $gadai_detail[0]['teller']
-        ]);
+        
         event(new NotifikasiPembayaran('TellerkepadaKhazanah'));
 
         return redirect()->route('khazanah.gadaian');
diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php
index 30c813d..444b531 100644
--- a/resources/views/homepage/penilai/home.blade.php
+++ b/resources/views/homepage/penilai/home.blade.php
@@ -29,7 +29,7 @@
                 </table>
                 <div class="row form-group">
                     <div class="col-md-12 text-center">
-                        <form target="_blank" action="{{ route('printsag') }}" id="print_submit" onsubmit="return verifyKomuditi(this)" method="post">
+                        <form target="_blank" action="{{ route('printsag') }}" id="print_submit" method="post">
                             @csrf
                             <input type="text" hidden name="norujukan_modal" id="norujukan_modal">
                             <input type="text" hidden name="pinjaman_modal" id="pinjaman_modal">
@@ -289,46 +289,6 @@
 
     });
 
-    function verifyKomuditi(func){
-        event.preventDefault();
-        var norujukan = $('#norujukan_modal').val();
-        var pinjaman = $('#pinjaman_modal').val();
-
-        $.ajax({
-            method:'get',
-            url: api_url + '/api/komuditi/check',
-            success:function(data){
-                var check_komuditi = Object.keys(data).length;
-                if(check_komuditi == 0){
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Unit Komuditi Berbaki Minumum',
-                        text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komuditi'
-                    });
-                    event.preventDefault();
-                    return false;
-                }else{
-                    if(Number(data['unit_komuditi']) < pinjaman){
-                        Swal.fire({
-                            icon: 'error',
-                            title: 'Baki Unit Komuditi Tidak Mencukupi',
-                            text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komuditi'
-                        });
-                        event.preventDefault();
-                        return false;
-                    }
-                    else{
-                        console.log('in');
-                        $(func).attr("onSubmit","return true;");
-                        $(func).submit();
-                        location.reload();
-                        return true;
-                    }
-                }
-            }
-        });
-    }
-
     var total_marhun_pilih = 0;
     $(document).on('click', '#checkgadai', function(e) {
         if ($(this).is(':checked')) {
diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php
index d520c2c..88bd206 100644
--- a/resources/views/khazanah/gadaian.blade.php
+++ b/resources/views/khazanah/gadaian.blade.php
@@ -62,7 +62,7 @@
                         <a href="{{ url('menu') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a>
                         </div>
                         <div class="col-8 justify-content-center">
-                            <form action="{{ route('barcode.scanned') }}" onsubmit="return verifyKomuditi(this)" method="post">
+                            <form action="{{ route('barcode.scanned') }}" method="post">
                                 @csrf
                                 <label>Scan Barcode Kemasukan Marhun Ke Peti Besi</label>
                                 <input type="text" class="form-control col-4 mx-auto" name="norujukan_barcode" autocomplete="off" id="norujukan_barcode"/>
@@ -220,84 +220,7 @@
             });
         });
 
-    });
-
-    function verifyKomuditi(func){
-        event.preventDefault();
-        var norujukan =$('#norujukan_barcode').val();
-
-        $.ajax({
-            method:'get',
-            url: api_url + '/api/gadai/norujukan/' + norujukan,
-            success:function(data){
-                var pinjaman = data[0][0]['pinjaman'];
-                $.ajax({
-                    method:'get',
-                    url: api_url + '/api/komuditi/check',
-                    success:function(data){
-                        var check_komuditi = Object.keys(data).length;
-                        if(check_komuditi == 0){
-                            Swal.fire({
-                                icon: 'error',
-                                title: 'Unit Komuditi Berbaki Minumum',
-                                text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komuditi'
-                            });
-                            event.preventDefault();
-                            return false;
-                        }else{
-                            if(Number(data['unit_komuditi']) < pinjaman){
-                                Swal.fire({
-                                    icon: 'error',
-                                    title: 'Baki Unit Komuditi Tidak Mencukupi',
-                                    text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komuditi'
-                                });
-                                event.preventDefault();
-                                return false;
-                            }
-                            else{
-                                console.log('in');
-                                $(func).attr("onSubmit","return true;");
-                                $(func).submit();
-                                return true;
-                            }
-                        }
-                    }
-                });
-            }
-        })
-        $.ajax({
-            method:'get',
-            url: api_url + '/api/komuditi/check',
-            success:function(data){
-                var check_komuditi = Object.keys(data).length;
-                if(check_komuditi == 0){
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Unit Komuditi Berbaki Minumum',
-                        text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komuditi'
-                    });
-                    event.preventDefault();
-                    return false;
-                }else{
-                    if(Number(data['unit_komuditi']) < pinjaman){
-                        Swal.fire({
-                            icon: 'error',
-                            title: 'Baki Unit Komuditi Tidak Mencukupi',
-                            text: 'Sila Hubungi Operasi Untuk Membuat Pembelian Komuditi'
-                        });
-                        event.preventDefault();
-                        return false;
-                    }
-                    else{
-                        console.log('in');
-                        $(func).attr("onSubmit","return true;");
-                        $(func).submit();
-                        return true;
-                    }
-                }
-            }
-        });
-    }
+    })
 
     $('#norujukan_barcode').keyup(function(){
         if(this.value.length >= 14){