diff --git a/app/Http/Controllers/KomuditiController.php b/app/Http/Controllers/KomuditiController.php
index 3a0395f..490f192 100644
--- a/app/Http/Controllers/KomuditiController.php
+++ b/app/Http/Controllers/KomuditiController.php
@@ -25,10 +25,21 @@ class KomuditiController extends Controller
         $rekod = Http::get(config('api.url') . '/api/komuditi/rekodkomuditi')->json();
 
         return view('print.laporan_komoditi',compact('rekod'));
+    }
 
-        // $pdf=PDF::loadView('print.laporan_komoditi',compact('rekod'))->setPaper('A4','landscape');
-        // $today_date=date('Y-m-d');
-        // $filename="laporan_komoditi_";
-        // return $pdf->download($filename.$today_date.'.pdf');
+    public function rekodKomoditi(Request $request){
+        $auth_user = Auth::user();
+        $api_url = config('api.url');
+        $user_name = $auth_user['name'];
+        return view('operasi.komuditi.rekod_transaksi',compact('user_name','api_url'));
+    }
+
+    public function printRekodTransaksi(Request $request){
+        $tarikh_rekod = $request->tarikh_print;
+        $rekod_print = Http::get(config('api.url') . '/api/komoditi/rekod/transaksi',[
+            'tarikh' => $request->tarikh_print
+        ])->json();
+
+        return view('print.laporan_transaksi_komoditi',compact('rekod_print','tarikh_rekod'));
     }
 }
diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index 382b9d0..7ad9316 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -146,8 +146,6 @@ var tableaddtunai = $('#tableaddtunai').DataTable({
         var kodcaw = "{{ $auth_user['cawangan'] }}";
         var tele = "{{ $auth_user['name'] }}";
 
-        console.log(tele + ' ' + kodcaw);
-
         function getData(){
             $.ajax({
                 type: 'get',
diff --git a/resources/views/customers/index.blade.php b/resources/views/customers/index.blade.php
index 026a38d..cce618d 100644
--- a/resources/views/customers/index.blade.php
+++ b/resources/views/customers/index.blade.php
@@ -65,14 +65,6 @@
                                             <div class="col-md-8"><input class="form-control" type="text" name="negeri_lahir" id="negeri_lahir" readonly></div>
                                             <div class="col-md-4">Jantina</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="jantina" id="jantina" readonly></div>
-                                            <div class="col-md-4">Alamat</div>
-                                            <div class="col-md-8"><textarea class="form-control" style="resize:none" name="alamat" id="alamat" cols="30" rows="3" placeholder="Alamat Pelanggan"></textarea></div>
-                                            <div class="col-md-4">Poskod</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="poskod" id="poskod" autocomplete="off" placeholder="Poskod"></div>
-                                            <div class="col-md-4">Daerah</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="daerah" id="daerah" readonly autocomplete="off"></div>
-                                            <div class="col-md-4">Negeri</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="negeri" id="negeri" readonly autocomplete="off"></div>
                                             <div class="col-md-4">No Telefon 1</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="main_phone" id="main_phone" autocomplete="off" placeholder="No Telefon"></div>
                                             <div class="col-md-4">No Telefon 2</div>
@@ -111,19 +103,14 @@
                                     </div>
                                     <div class="col-md-6">
                                         <div class="row form-group">
-                                            <div class="col-md-12" style="margin-left:auto;margin-right:auto">
-                                                <img src="" id="preview" style="width:250px;height:250px" class="img-thumbnail">
-                                            </div>
-                                            <div class="col-md-12">
-                                                <input type="file" name="customer_image" id="customer_image" accept="image/*">
-                                                <!-- <input type="file" name="customer_image" id="customer_image" class="file" accept="image/*">
-                                                <div class="input-group my-3">
-                                                    <input type="text" class="form-control" readonly placeholder="Upload File" id="file" name="file">
-                                                    <div class="input-group-append">
-                                                        <button type="button" class="browse btn btn-primary">Browse...</button>
-                                                    </div>
-                                                </div> -->
-                                            </div>
+                                            <div class="col-md-4">Alamat</div>
+                                            <div class="col-md-8"><textarea class="form-control" style="resize:none" name="alamat" id="alamat" cols="30" rows="3" placeholder="Alamat Pelanggan"></textarea></div>
+                                            <div class="col-md-4">Poskod</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="poskod" id="poskod" autocomplete="off" placeholder="Poskod"></div>
+                                            <div class="col-md-4">Daerah</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="daerah" id="daerah" readonly autocomplete="off"></div>
+                                            <div class="col-md-4">Negeri</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="negeri" id="negeri" readonly autocomplete="off"></div>
                                             <div class="col-md-4">Umur</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="age" id="age" readonly></div>
                                             <div class="col-md-4">Bangsa</div>
@@ -201,7 +188,7 @@
                                         <div class="row form-group">
                                             <div class="col-md-4">Nama</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="name" id="passport_name" autocomplete="off" placeholder="Nama"></div>
-                                            <div class="col-md-4">No KP</div>
+                                            <div class="col-md-4">No Passport</div>
                                             <div class="col-md-8"><input class="form-control" readonly type="text" name="noic" id="passport_noic" value="{{$noic ?? ''}}"></div>
                                             <div class="col-md-4">Tarikh Lahir</div>
                                             <div class="col-md-8"><input class="form-control" type="text" placeholder="Tarikh Lahir" onchange="calculatePassportAge()" name="tarikh_lahir" id="passport_tarikh_lahir"></div>
@@ -212,14 +199,6 @@
                                                     <option value="Perempuan">Perempuan</option>
                                                 </select>
                                             </div>
-                                            <div class="col-md-4">Alamat</div>
-                                            <div class="col-md-8"><textarea class="form-control" style="resize:none" name="alamat" id="passport_alamat" cols="30" rows="3" placeholder="Alamat Pelanggan"></textarea></div>
-                                            <div class="col-md-4">Poskod</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="poskod" id="passport_poskod" autocomplete="off" placeholder="Poskod"></div>
-                                            <div class="col-md-4">Daerah</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="daerah" id="passport_daerah" readonly autocomplete="off"></div>
-                                            <div class="col-md-4">Negeri</div>
-                                            <div class="col-md-8"><input class="form-control" type="text" name="negeri" id="passport_negeri" readonly autocomplete="off"></div>
                                             <div class="col-md-4">No Telefon 1</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="main_phone" id="passport_main_phone" autocomplete="off" placeholder="No Telefon"></div>
                                             <div class="col-md-4">No Telefon 2</div>
@@ -246,19 +225,14 @@
                                     </div>
                                     <div class="col-md-6">
                                         <div class="row form-group">
-                                            <div class="col-md-12" style="margin-left:auto;margin-right:auto">
-                                                <img src="" id="passport_preview" style="width:250px;height:250px" class="img-thumbnail">
-                                            </div>
-                                            <div class="col-md-12">
-                                                <input type="file" name="customer_image" id="passport_customer_image" accept="image/*">
-                                                <!-- <input type="file" name="customer_image" id="passport_customer_image" class="file" accept="image/*">
-                                                <div class="input-group my-3">
-                                                    <input type="text" class="form-control" readonly placeholder="Upload File" id="passport_file" name="file">
-                                                    <div class="input-group-append">
-                                                        <button type="button" class="browse btn btn-primary">Browse...</button>
-                                                    </div>
-                                                </div> -->
-                                            </div>
+                                            <div class="col-md-4">Alamat</div>
+                                            <div class="col-md-8"><textarea class="form-control" style="resize:none" name="alamat" id="passport_alamat" cols="30" rows="3" placeholder="Alamat Pelanggan"></textarea></div>
+                                            <div class="col-md-4">Poskod</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="poskod" id="passport_poskod" autocomplete="off" placeholder="Poskod"></div>
+                                            <div class="col-md-4">Daerah</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="daerah" id="passport_daerah" readonly autocomplete="off"></div>
+                                            <div class="col-md-4">Negeri</div>
+                                            <div class="col-md-8"><input class="form-control" type="text" name="negeri" id="passport_negeri" readonly autocomplete="off"></div>
                                             <div class="col-md-4">Umur</div>
                                             <div class="col-md-8"><input class="form-control" type="text" name="age" id="passport_age" readonly></div>
                                             <div class="col-md-4">Bangsa</div>
diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index b885e0a..282b993 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -417,12 +417,11 @@
         tablegadai.clear().draw();
         tabledahtebus.clear().draw();
         tablelelong.clear().draw();
-
         $.each(data,function(index,gadai_detail){
+            var upah_semasa = (Number(gadai_detail['kadarupah'])/100) * Number(gadai_detail['bakipjm']) * Number(gadai_detail['jbg']);
             if(jenistebus == "belum_tebus"){  
                 var urlroute = '{{ route("penebusan", ":id") }}';
                 urlroute = urlroute.replace(':id', gadai_detail["norujukan"]);
-
                 tablegadai.row.add([
                     '<input type="radio" value='+ gadai_detail["norujukan"] +' name="belum"/>',
                     '<a href=' + urlroute +'>' + gadai_detail['norujukan'] + '</a>',
@@ -432,7 +431,7 @@
                     'RM '+formatter.format(gadai_detail['bakipjm']),
                     (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
                     gadai_detail['jbg'],
-                    'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg']))
+                    'RM '+ formatter.format(upah_semasa.toFixed(2))
                 ]).draw();
             }else if(jenistebus == "sudah_tebus"){
                 
@@ -445,7 +444,7 @@
                     'RM '+formatter.format(gadai_detail['bakipjm']),
                     (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
                     gadai_detail['jbg'],
-                    'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg']))
+                    'RM '+ formatter.format(upah_semasa.toFixed(2))
                 ]).draw();
             }else if(jenistebus == "lelong"){
                 
@@ -458,7 +457,7 @@
                     'RM '+formatter.format(gadai_detail['bakipjm']),
                     (((Number(gadai_detail['pinjaman'])/Number(gadai_detail['nilaimarhun']))*100).toFixed(2)).toLocaleString("en-GB") + '%',
                     gadai_detail['jbg'],
-                    'RM '+ formatter.format((Number(gadai_detail['kadarupah'])/100)*Number(gadai_detail['bakipjm'])*Number(gadai_detail['jbg']))
+                    'RM '+ formatter.format(upah_semasa.toFixed(2))
                 ]).draw();
             }
             counter = counter + 1;
@@ -587,8 +586,6 @@
 
             var urlroute = '{{ route("resit.ansuran", ":id") }}';
             urlroute = urlroute.replace(':id', bayaran['id']);
-
-            console.log(bayaran['']);
             historybayarandatatable.row.add([
                     counter,
                     bayaran['created_at'], 
@@ -714,8 +711,7 @@
                             "norujukan" : ubahid,
                             "mohon" : mohon
                         },
-                        success:function(data){            
-                            console.log(data);
+                        success:function(data){
 
                         },error: function(xhr, status, error) {
                             var err = eval("(" + xhr.responseText + ")");
@@ -734,10 +730,7 @@
                             "norujukan" : ubahid
                         },
                         success:function(data){
-                            console.log(data);
-                            
                             if(data != 0){
-                                console.log('berjaya');
                                 clearInterval(timerInterval);
                                 Swal.fire({
                                     icon: 'success',
@@ -776,7 +769,6 @@
         let hapusid = $('input[name="belum"]:checked').val();
         let hapusidsudah = $('input[name="sudahtebus"]:checked').val();
         let harini = new Date();harini.setHours(0, 0, 0, 0);
-        console.log(hapusid);
         if(hapusid == null && $("input[name='options']:checked").val() == 'belum_tebus'){
             Swal.fire({
                 icon: 'error',
@@ -868,7 +860,6 @@
                         "mohon" : mohon
                     },
                     success:function(data){
-                        console.log(data);
                     },error: function(xhr, status, error) {
                         var err = eval("(" + xhr.responseText + ")");
                         alert(xhr.responseText);
@@ -887,7 +878,6 @@
                         },
                         success:function(data){
                             if(data != 0){
-                                console.log('berjaya');
                                 clearInterval(timerInterval);
                                 Swal.fire({
                                     icon: 'success',
@@ -925,7 +915,6 @@
                                             method:'put',
                                             url:api_url + '/api/tebus/hapus/' + kodcaw + '/' + hapusidsudah,
                                             success:function(data){
-                                                console.log(data);
                                                 if(data != "Bukan-Tebus"){
                                                     swalWithBootstrapButtons.fire(
                                                         'Hapus!',
@@ -1155,7 +1144,6 @@
             },
             dataType:'json',
             success: function(otp_token){
-                console.log(otp_token['error']);
                 if(otp_token['error']){
                     Swal.fire({
                         icon: 'error',
diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php
index 6debb91..4ec5468 100644
--- a/resources/views/gadaian/edit.blade.php
+++ b/resources/views/gadaian/edit.blade.php
@@ -63,16 +63,16 @@
                                 </diV>
                             </div>
                             @php
-                            if($gadaiannorujukan['nilaimarhun'] > 0 && $gadaiannorujukan['nilaimarhun'] < 401){
-                                $kadarupah = 1.25/100;
-                            }else if($gadaiannorujukan['nilaimarhun'] >= 401 && $gadaiannorujukan['nilaimarhun'] < 2001){
-                                $kadarupah = 1.5/100;
-                            }else if($gadaiannorujukan['nilaimarhun'] >= 2001 ){
-                                $kadarupah = 1.7/100;
-                            }
+                                if($gadaiannorujukan['nilaimarhun'] > 0 && $gadaiannorujukan['nilaimarhun'] < 401){
+                                    $kadarupah = 1.25/100;
+                                }else if($gadaiannorujukan['nilaimarhun'] >= 401 && $gadaiannorujukan['nilaimarhun'] < 2001){
+                                    $kadarupah = 1.5/100;
+                                }else if($gadaiannorujukan['nilaimarhun'] >= 2001 ){
+                                    $kadarupah = 1.7/100;
+                                }
 
-                            $keuntungan_sebulan = $gadaiannorujukan['pinjaman'] * $kadarupah;
-                            $keuntungan_6bln = $keuntungan_sebulan * 6;    
+                                $keuntungan_sebulan = $gadaiannorujukan['pinjaman'] * $kadarupah;
+                                $keuntungan_6bln = $keuntungan_sebulan * 6;    
                             
                             @endphp 
                             <div class="col-3">
@@ -689,7 +689,6 @@
         var bilangan_marhun_daftar = Number($('#bilangan_marhun').val());
         var nilai_marhun = Number(nilaimarhun.replace(/[^0-9.-]+/g,""));
         var nota_array = $('#nota').val();
-        console.log($.isNumeric(berat_emas));
         if(nota_array != null){
             var nota = nota_array.toString();
         }else{
@@ -911,8 +910,6 @@
 
                                 },
                                 success:function(data){
-                                
-                                console.log(data);
 
                                 },error: function(xhr, status, error) {
                                 var err = eval("(" + xhr.responseText + ")");
@@ -1013,8 +1010,6 @@
                                     // "teller" : teller
                                 },
                                 success:function(data){
-                                    
-                                    console.log(data);
 
                                 },error: function(xhr, status, error) {
                                 var err = eval("(" + xhr.responseText + ")");
@@ -1081,9 +1076,6 @@
             
 
         }
-
-        
-
     }
 </script>
 @endsection
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index 0bd089b..4168232 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/resources/views/gadaian/index.blade.php
@@ -776,7 +776,6 @@
                                                     "teller" : teller
                                                 },
                                                 success:function(data){
-                                                    console.log(data);
                                                     siricreated = data;
                                                 },
                                                 error: function(xhr, status, error) {
@@ -890,7 +889,6 @@
                                                     "teller" : teller
                                                 },
                                                 success:function(data){
-                                                    console.log(data);
                                                     siricreated = data;
                                                 },
                                                 error: function(xhr, status, error) {
diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php
index 834a3be..09e8c6f 100644
--- a/resources/views/homepage/penilai/home.blade.php
+++ b/resources/views/homepage/penilai/home.blade.php
@@ -272,7 +272,6 @@
                         marhun:marhun_detail['marhun']
                     },
                     success:function(marhun_ajax){
-                        console.log(index2);
                         bil_count++;
                         $("#tablemarhun").append("<tr><td>" + bil_count + "</td><td>" + marhun_ajax['descpt'] +"</td><td>" + marhun_detail['berat'] +"</td><td>" + marhun_detail['karat'] +"</td><td>RM " + marhun_detail['n_marhun'].toLocaleString(undefined,{minimumFractionDigits:2}) +"</td><td>"+ marhun_detail['nota'] +"</td></tr>");
                     }
@@ -404,7 +403,6 @@
                         "mohon" : mohon
                     },
                     success:function(data){
-                        console.log("created");
 
                     },error: function(xhr, status, error) {
                         var err = eval("(" + xhr.responseText + ")");
@@ -425,9 +423,7 @@
                         "norujukan" : norujukan
                         },
                         success:function(data){
-                            console.log(data);
                             if(data != 0){
-                                console.log('berjaya');
                                 clearInterval(timerInterval);
                                 Swal.fire({
                                     icon: 'success',
diff --git a/resources/views/homepage/teller/home.blade.php b/resources/views/homepage/teller/home.blade.php
index f2db23e..f662a41 100644
--- a/resources/views/homepage/teller/home.blade.php
+++ b/resources/views/homepage/teller/home.blade.php
@@ -38,7 +38,6 @@
 
                 if(jQuery.isEmptyObject(data))
                 {
-                    console.log('empty');
                     Swal.fire({
                     icon: 'error',
                     title: 'Amaran!',
diff --git a/resources/views/khazanah/agingbulanan.blade.php b/resources/views/khazanah/agingbulanan.blade.php
index 227dddd..c39e884 100644
--- a/resources/views/khazanah/agingbulanan.blade.php
+++ b/resources/views/khazanah/agingbulanan.blade.php
@@ -83,7 +83,6 @@
         "ordering": false
     });
     $(document).ready( function () {
-        console.log('dsasa');
         $('#datetimepicker1').datepicker({
             format: 'dd-mm-yyyy'
         });
diff --git a/resources/views/khazanah/index.blade.php b/resources/views/khazanah/index.blade.php
index 8d9c9e2..78fc091 100644
--- a/resources/views/khazanah/index.blade.php
+++ b/resources/views/khazanah/index.blade.php
@@ -191,7 +191,6 @@
             method:'GET',
             url:api_url+'/api/poskod/'+poskod,
             success:function(poskod_detail){
-                // console.log(poskod_detail);
                 var koddaerah = poskod_detail['koddaerah'];
                 var kodnegeri = poskod_detail['kodnegeri'];
                 $.ajax({
diff --git a/resources/views/khazanah/kakitangan.blade.php b/resources/views/khazanah/kakitangan.blade.php
index 2481b74..a9655fb 100644
--- a/resources/views/khazanah/kakitangan.blade.php
+++ b/resources/views/khazanah/kakitangan.blade.php
@@ -33,7 +33,7 @@
                                     <label class="col-6">Khazanah Cawangan:</label>
                                     <select name="khazanah" id="khazanah" class="form-control col-6">
                                         @foreach ($khazanah as $index=>$k)
-                                        <option value="{{ $k['id'] }}">{{ $k['name'] }}</option>
+                                            <option value="{{ $k['id'] }}" {{ $k['role_harian'] == 'khazanah' ? 'selected' : ''}}>{{ $k['name'] }}</option>
                                         @endforeach
                                     </select>
                                 </div>
@@ -52,7 +52,7 @@
                                     <label class="col-6">Penilai Cawangan:</label>
                                     <select name="penilai" id="penilai" class="form-control col-6">
                                         @foreach ($teller as $index=>$t)
-                                        <option value="{{ $t['id'] }}">{{ $t['name'] }}</option>
+                                            <option value="{{ $t['id'] }}" {{ $t['role_harian'] == 'penilai' ? 'selected' : ''}}>{{ $t['name'] }}</option>
                                         @endforeach
                                     </select>
                                 </div>
diff --git a/resources/views/khazanah/kelulusan.blade.php b/resources/views/khazanah/kelulusan.blade.php
index 5f1ddd6..6521c43 100644
--- a/resources/views/khazanah/kelulusan.blade.php
+++ b/resources/views/khazanah/kelulusan.blade.php
@@ -324,7 +324,6 @@
                 'komen' : komen
             },
             success:function(data){
-
                 Swal.fire({
                     icon: 'success',
                     title: 'Pengesahan Berjaya'
@@ -403,8 +402,6 @@
                 "pembatalan" : "batal"
             },
             success:function(data){
-
-                console.log(data);
                 Swal.fire({
                     icon: 'success',
                     title: 'Pengesahan Berjaya'
diff --git a/resources/views/khazanah/laporan/agingbulanan.blade.php b/resources/views/khazanah/laporan/agingbulanan.blade.php
index 227dddd..c39e884 100644
--- a/resources/views/khazanah/laporan/agingbulanan.blade.php
+++ b/resources/views/khazanah/laporan/agingbulanan.blade.php
@@ -83,7 +83,6 @@
         "ordering": false
     });
     $(document).ready( function () {
-        console.log('dsasa');
         $('#datetimepicker1').datepicker({
             format: 'dd-mm-yyyy'
         });
diff --git a/resources/views/khazanah/laporan/ansuran.blade.php b/resources/views/khazanah/laporan/ansuran.blade.php
index 2b6234d..85b62b2 100644
--- a/resources/views/khazanah/laporan/ansuran.blade.php
+++ b/resources/views/khazanah/laporan/ansuran.blade.php
@@ -100,20 +100,16 @@
     function tebustable(data){
         var counter = 1;
         var total_pinjaman = 0;
-        // console.log(data);
         tabletebus.clear().draw();
         $.each(data,function(index,tebus){
-            // console.log(tebus['norujukan']);
             $.ajax({
                 url:api_url + '/api/gadai/norujukan/' + tebus['norujukan'],
                 method:'get',
                 success:function(gadai){
-                    // console.log(gadai[0][0]);
                     $.ajax({
                         url:api_url + '/api/customers/' + gadai[0][0]['nokp'],
                         method:'get',
                         success: function(customer){
-                            // console.log(customer[0]['nama']);
                             tabletebus.row.add([
                                 counter,
                                 tebus['norujukan'],
diff --git a/resources/views/khazanah/laporan/batalsuratgadai.blade.php b/resources/views/khazanah/laporan/batalsuratgadai.blade.php
index 44156d1..b62fcdb 100644
--- a/resources/views/khazanah/laporan/batalsuratgadai.blade.php
+++ b/resources/views/khazanah/laporan/batalsuratgadai.blade.php
@@ -64,7 +64,6 @@
         "ordering": false
     });
     $(document).ready( function () {
-        console.log('dsasa');
         $('#datetimepicker1').datepicker({
             format: 'dd-mm-yyyy'
         });
@@ -101,7 +100,6 @@
         var counter = 1;
         tablebatalgadai.clear().draw();
         $.each(data,function(index,batalgadai){
-            console.log(batalgadai);
             tablebatalgadai.row.add([
                 counter,
                 batalgadai['norujukan'],
diff --git a/resources/views/khazanah/laporan/lelongan.blade.php b/resources/views/khazanah/laporan/lelongan.blade.php
index bb4a97d..11ab05a 100644
--- a/resources/views/khazanah/laporan/lelongan.blade.php
+++ b/resources/views/khazanah/laporan/lelongan.blade.php
@@ -103,20 +103,16 @@
     function tebustable(data){
         var counter = 1;
         var total_pinjaman = 0;
-        // console.log(data);
         tabletebus.clear().draw();
         $.each(data,function(index,tebus){
-            // console.log(tebus['norujukan']);
             $.ajax({
                 url:api_url + '/api/gadai/norujukan/' + tebus['norujukan'],
                 method:'get',
                 success:function(gadai){
-                    // console.log(gadai[0][0]);
                     $.ajax({
                         url:api_url + '/api/customers/' + gadai[0][0]['nokp'],
                         method:'get',
                         success: function(customer){
-                            // console.log(customer[0]['nama']);
                             tabletebus.row.add([
                                 counter,
                                 tebus['norujukan'],
diff --git a/resources/views/khazanah/laporan/marhunharian.blade.php b/resources/views/khazanah/laporan/marhunharian.blade.php
index eabbb68..7454c24 100644
--- a/resources/views/khazanah/laporan/marhunharian.blade.php
+++ b/resources/views/khazanah/laporan/marhunharian.blade.php
@@ -69,7 +69,6 @@
         "ordering": false
     });
     $(document).ready( function () {
-        console.log('dsasa');
         $('#datetimepicker1').datepicker({
             format: 'dd-mm-yyyy'
         });
diff --git a/resources/views/khazanah/laporan/marhunterkumpul.blade.php b/resources/views/khazanah/laporan/marhunterkumpul.blade.php
index de6caf2..f196364 100644
--- a/resources/views/khazanah/laporan/marhunterkumpul.blade.php
+++ b/resources/views/khazanah/laporan/marhunterkumpul.blade.php
@@ -45,7 +45,6 @@
         "ordering": false
     });
     $(document).ready( function () {
-        console.log('dsasa');
         $('#datetimepicker1').datepicker({
             format: 'dd-mm-yyyy'
         });
diff --git a/resources/views/khazanah/laporan/pelangganbaru.blade.php b/resources/views/khazanah/laporan/pelangganbaru.blade.php
index 113ab74..9caf7e4 100644
--- a/resources/views/khazanah/laporan/pelangganbaru.blade.php
+++ b/resources/views/khazanah/laporan/pelangganbaru.blade.php
@@ -64,7 +64,6 @@
         "ordering": false
     });
     $(document).ready( function () {
-        console.log('dsasa');
         $('#datetimepicker1').datepicker({
             format: 'dd-mm-yyyy'
         });
@@ -78,7 +77,6 @@
             url: api_url + '/api/customers/laporan/'+kodcaw+'/' + today_date,
             success: function(customers){
                 customertable(customers);
-                console.log('berjaya customers');
             },error: function(XMLHttpRequest, textStatus, errorThrown) {
                 console.log(textStatus);
             }
@@ -102,7 +100,6 @@
         var counter = 1;
         tablecustomers.clear().draw();
         $.each(data,function(index,customers){
-            console.log(customers);
             tablecustomers.row.add([
                 counter,
                 customers['nopelanggan'],
diff --git a/resources/views/khazanah/laporan/penebusan.blade.php b/resources/views/khazanah/laporan/penebusan.blade.php
index 97898e3..2c2d150 100644
--- a/resources/views/khazanah/laporan/penebusan.blade.php
+++ b/resources/views/khazanah/laporan/penebusan.blade.php
@@ -99,20 +99,16 @@
     function tebustable(data){
         var counter = 1;
         var total_pinjaman = 0;
-        // console.log(data);
         tabletebus.clear().draw();
         $.each(data,function(index,tebus){
-            // console.log(tebus['norujukan']);
             $.ajax({
                 url:api_url + '/api/gadai/norujukan/' + tebus['norujukan'],
                 method:'get',
                 success:function(gadai){
-                    // console.log(gadai[0][0]);
                     $.ajax({
                         url:api_url + '/api/customers/' + gadai[0][0]['nokp'],
                         method:'get',
                         success: function(customer){
-                            // console.log(customer[0]['nama']);
                             tabletebus.row.add([
                                 counter,
                                 customer[0]['nama'],
diff --git a/resources/views/onetimepassword/home.blade.php b/resources/views/onetimepassword/home.blade.php
index cecd7e6..a6290f9 100644
--- a/resources/views/onetimepassword/home.blade.php
+++ b/resources/views/onetimepassword/home.blade.php
@@ -130,10 +130,7 @@ function carila()
                 });
 
                 $( "#form-display" ).fadeIn( "slow", function() {
-                
-                // console.log(customerdata[0]);
                     $('#form-display').show();
-                    console.log(customerdata[0]);
                     $('#nama').val(customerdata[0]['nama']);
                     $('#noic1').val(customerdata[0]['kpbaru']);
                     $('#alamat').val(customerdata[0]['alamat1']);
@@ -151,8 +148,6 @@ function carila()
                         url: api_url + "/api/poskod/" + poskod,
                         success: function(poskoddetail)
                         {
-                            //console.log(poskoddetail);
-                            // alert(poskoddetail);
                             var koddaerah = poskoddetail['koddaerah'];
                             var kodnegeri = poskoddetail['kodnegeri'];
                             
diff --git a/resources/views/operasi/hargaemas.blade.php b/resources/views/operasi/hargaemas.blade.php
index a82b013..1623b8e 100644
--- a/resources/views/operasi/hargaemas.blade.php
+++ b/resources/views/operasi/hargaemas.blade.php
@@ -176,7 +176,6 @@
                 'karat':karat
             },
             success:function(rekodsandaran){
-                console.log(rekodsandaran);
                 var bilcount = 0;
                 $.each(rekodsandaran,function(index,emassandaran){
                     bilcount ++
diff --git a/resources/views/operasi/kelulusan.blade.php b/resources/views/operasi/kelulusan.blade.php
index 1a33976..5595a20 100644
--- a/resources/views/operasi/kelulusan.blade.php
+++ b/resources/views/operasi/kelulusan.blade.php
@@ -387,8 +387,6 @@
                 "pembatalan" : "batal"
             },
             success:function(data){
-
-                console.log(data);
                 Swal.fire({
                     icon: 'success',
                     title: 'Pengesahan Berjaya'
diff --git a/resources/views/operasi/komuditi/index.blade.php b/resources/views/operasi/komuditi/index.blade.php
index 56d72a8..b5ccab0 100644
--- a/resources/views/operasi/komuditi/index.blade.php
+++ b/resources/views/operasi/komuditi/index.blade.php
@@ -46,7 +46,8 @@
                     <div class="row form-group justify-content-center">
                         <input type="hidden" value="{{ $user_name }}" id="user_name" name="user_name">
                         <button class="btn btn-primary mr-2" id="pembelian">Pembelian Komoditi</button>
-                        <button class="btn btn-danger" id="penjualan">Penjualan Komoditi</button>
+                        <button class="btn btn-danger mr-2" id="penjualan">Penjualan Komoditi</button>
+                        <a class="btn btn-primary" href="{{ route('rekod.komoditi') }}">Rekod Transaksi Komoditi</a>
                     </div>
                 </div>
             </div>
@@ -190,31 +191,45 @@
 
     $('#penjualan').on('click',function(){
         var nosijil = $('#nosijil_span').text();
-        console.log(nosijil);
-        $.ajax({
-            method:'post',
-            url: api_url + '/api/komuditi/jual',
-            datatype:'json',
-            data:{
-                'purchased_by': "{{ $user_name }}",
-                'nosijil': nosijil
-            },
-            success:function(data){
-                if(data == 1){
-                    checkKomuditi();
-                    Swal.fire({
-                        icon: 'success',
-                        title: 'Berjaya!',
-                        text: 'Penjualan Unit Komuditi Berjaya'
-                    });
-                }else{
-                    checkKomuditi();
-                    Swal.fire({
-                        icon: 'error',
-                        title: 'Amaran!',
-                        text: 'Penjualan Unit Komuditi Tidak Berjaya'
-                    });
-                }
+        var baki_komoditi = $('#nilai_span').text();
+        Swal.fire({
+            title: 'Adakah anda setuju penjualan baki komoditi?',
+            showCancelButton: true,
+            confirmButtonText: `Setuju`,
+            cancelButtonText: `Batal`,
+        }).then((result) => {
+            /* Read more about isConfirmed, isDenied below */
+            console.log(result);
+            if (result.isConfirmed) {
+                $.ajax({
+                    method:'post',
+                    url: api_url + '/api/komuditi/jual',
+                    datatype:'json',
+                    data:{
+                        'purchased_by': "{{ $user_name }}",
+                        'nosijil': nosijil
+                    },
+                    success:function(data){
+                        console.log(data);
+                        if(data == 'berjaya'){
+                            checkKomuditi();
+                            Swal.fire({
+                                icon: 'success',
+                                title: 'Berjaya!',
+                                text: 'Penjualan Unit Komuditi Berjaya'
+                            });
+                        }else{
+                            checkKomuditi();
+                            Swal.fire({
+                                icon: 'error',
+                                title: 'Amaran!',
+                                text: 'Penjualan Unit Komuditi Tidak Berjaya'
+                            });
+                        }
+                    }
+                })
+            } else if (result.isDismissed) {
+                Swal.fire('Baki Komoditi Tidak Dijual', '', 'info')
             }
         })
     });
diff --git a/resources/views/operasi/komuditi/rekod_transaksi.blade.php b/resources/views/operasi/komuditi/rekod_transaksi.blade.php
new file mode 100644
index 0000000..1d2779b
--- /dev/null
+++ b/resources/views/operasi/komuditi/rekod_transaksi.blade.php
@@ -0,0 +1,100 @@
+@extends('layouts.app_operasi')
+
+@section('content')
+<div class="container">
+    <div class="row justify-content-center">
+        <div class="col-md-12">
+            <div class="card">
+                <div class="card-header">{{ __('Komoditi') }}</div>
+                <div class="card-body text-center">
+                    <div class="row">
+                        <div class="col-2 justify-content-start">
+                            <a href="{{ route('komuditi') }}" class="ion-backspace" style="font-size:50px;color:blue;"></a>
+                        </div>
+                    </div>
+                    <div class="row justify-content-center">
+                        <div class="col-12">
+                            <h3>Rekod Transaksi Komoditi</h3>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-2">Tarikh</div>
+                        <div class="col-3"><input class="form-control" autocomplete="off" type="text" placeholder="Tarikh" onchange="fetchRekodKomoditi()" name="tarikh_rekod" id="tarikh_rekod"></div>
+                        <div class="col-7 text-right mb-3">
+                            <form target="_blank" action="{{ route('komoditi.rekod.print') }}" method="get">
+                                <input type="text" hidden name="tarikh_print" id="tarikh_print">
+                                <button class="btn btn-primary"><i class="fa fa-print" aria-hidden="true"></i></button>
+                            </form>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col-12">
+                            <table id="rekod_komoditi">
+                                <thead>
+                                    <tr>
+                                        <td>Bil</td>
+                                        <td>Cawangan</td>
+                                        <td>Jumlah Nilai Komoditi</td>
+                                    </tr>
+                                </thead>
+                            </table>
+                        </div> 
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    let api_url = "{{ $api_url }}";
+    var tablerekod = $('#rekod_komoditi').DataTable();
+    $('#tarikh_rekod').datepicker({
+        format: 'dd/mm/yyyy',
+        endDate: new Date()
+    });
+
+    $(document).ready( function () {
+        fetchRekodKomoditi();
+    });
+
+    const formatter = new Intl.NumberFormat('en-US', {
+        minimumFractionDigits: 2
+    });
+
+    function fetchRekodKomoditi(){
+        var tarikh_rekod = $('#tarikh_rekod').val();
+        if(tarikh_rekod == ''){
+            var current = new Date();
+            var current_date = current.getDate();
+            var current_month = current.getMonth()+1;
+            var current_year = current.getFullYear();
+            var tarikh = current_year + '-' +current_month+'-'+current_date;
+            $('#tarikh_print').val(tarikh);
+        }else{
+            var split_date = tarikh_rekod.split('/');
+            var tarikh = split_date[2] + '-' + split_date[1] + '-' + split_date[0];
+            $('#tarikh_print').val(tarikh);
+        }
+        tablerekod.clear().draw();
+        $.ajax({
+            method:'get',
+            url: api_url + '/api/komoditi/rekod/transaksi',
+            data:{
+                'tarikh':tarikh
+            },
+            success:function(data){
+                var count = 0;
+                $.each(data,function(index,rekodkomoditi){
+                    count++;
+                    tablerekod.row.add([
+                        count,
+                        rekodkomoditi['cawangan'],
+                        formatter.format(rekodkomoditi['totalkomoditi'])
+                    ]).draw();
+                })
+            }
+        })
+    }
+</script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index cdacce2..9e74604 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -266,7 +266,7 @@
                            
                             <div class="col-12">
                                 <input type="button" class="float-right btn btn-danger mr-2" value="BATAL" onclick="window.location.replace('{{ url()->previous() }}')">
-                                <input type="button" class="float-right btn btn-primary mr-2" value="TERIMA" onclick="bayaransemua()">
+                                <input type="button" id="terima_transaksi" class="float-right btn btn-primary mr-2" value="TERIMA" onclick="bayaransemua()">
                             </div>
                         </div>
                     </form>
@@ -366,7 +366,6 @@
                 url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
                 dataType: 'json',
                 success:function(data){
-                    console.log(data);
                     $('#jumlahupah').val(formatter.format(data));
                     $('#bayaranditerima').val(data);
                 }
@@ -682,10 +681,6 @@
             let pdbyr = 0;
             let totalseparuh = 0;
 
-            console.log(byr);
-
-            console.log(bayaranseparuhasal);
-
             if(byr < (bayaranseparuhasal + parseFloat($('#jumlahupah').val()))){
                 $('#bayaran').val(bayaranseparuhasal.toFixed(2));
             }else{
@@ -750,7 +745,7 @@
 
     function bayaransemua()
     {
-        
+        $("#terima_transaksi").prop('disabled', true);
         if($('#sltjenistebus').find(":selected").val() == 'T'){
             let jenisbayarantebus = '';
             if(tarikhgadai < tarikhtawarruq)
@@ -824,22 +819,18 @@
             let jenisbayarantebus = '';
             let hadbayaransuran = (parseFloat("{{ $gadai['nilaimarhun']}}") * 0.1);
 
-            if(tarikhgadai < tarikhtawarruq)
-            {
+            if(tarikhgadai < tarikhtawarruq){
                 jenisbayarantebus = "nottawarruq";
-            }
-            else if (tarikhgadai >= tarikhtawarruq){
+            }else if (tarikhgadai >= tarikhtawarruq){
                 jenisbayarantebus = "tawarruq";
             }
 
-
-            if(tarikhgadai >= tarikhtawarruq)
-            {
+            if(tarikhgadai >= tarikhtawarruq){
                 var bayar = $('#bayaran').val(); 
                 var bakipinjam = parseFloat("{{ $gadai['bakipjm'] }}") - hadbayaransuran;                
 
-                if(bayar >  bakipinjam)
-                {
+                if(bayar >  bakipinjam){   
+                    $("#terima_transaksi").prop('disabled', false);
                     Swal.fire(
                         'Amaran!',
                         'Bayaran tidak boleh melebihi 10% nilai marhun!',
@@ -849,128 +840,154 @@
                 }
 
                 $.ajax({
-                method:'get',
-                url: "{{ route('bayaran.ansuranstawarruq') }}",
-                data:{
-                    "bayaran" : bayar,
-                    "kodcaw" : kodcaw,
-                    "norujukan" : norujukan,
-                    "teller" : teller
-                },
-                success:function(success_data){
+                    method:'get',
+                    url: "{{ route('bayaran.ansuranstawarruq') }}",
+                    data:{
+                        "bayaran" : bayar,
+                        "kodcaw" : kodcaw,
+                        "norujukan" : norujukan,
+                        "teller" : teller
+                    },
+                    success:function(success_data){
 
-                    var urlroute = '{{ route("resit.ansurans", ":id") }}';
-                    urlroute = urlroute.replace(':id', norujukan);
+                        var urlroute = '{{ route("resit.ansurans", ":id") }}';
+                        urlroute = urlroute.replace(':id', norujukan);
 
+                        Swal.fire(
+                            'Berjaya!',
+                            'Bayaran Ansuran Berjaya',
+                            'success'
+                        ).then(function() {
+                            window.open(urlroute, '_blank');
+                            window.location.replace("{{ url()->previous() }}");
+                        })
+                    }
+                });
+
+            }
+            else if(tarikhgadai < tarikhtawarruq){
+                // if($('#bayaran').val() > 0 && $('#bayaran').val() <= parseFloat($('#jumlahupah').val())){
+                //     Swal.fire(
+                //         'Amaran!',
+                //         'Masukkan jumlah melebihi jumlah upah!',
+                //         'error'
+                //     )
+                //     return false;
+                // }
+
+                var bakpin = parseFloat("{{ $gadai['pinjaman'] }}") - hadbayaransuran;
+
+                var bayar = $('#bayaran').val();
+                
+                if(bayar >  bakpin){
+                    $("#terima_transaksi").prop('disabled', false);
                     Swal.fire(
-                        'Berjaya!',
-                        'Bayaran Ansuran Berjaya',
-                        'success'
-                    ).then(function() {
-                        window.open(urlroute, '_blank');
-                        window.location.replace("{{ url()->previous() }}");
-                    })
+                        'Amaran!',
+                        'Bayaran tidak boleh melebihi 10% nilai marhun!',
+                        'error'
+                    )
+                    return false;
                 }
-            });
-
-            }
-            else if(tarikhgadai < tarikhtawarruq)
-            {
-            // if($('#bayaran').val() > 0 && $('#bayaran').val() <= parseFloat($('#jumlahupah').val()))
-            // {
-            //     Swal.fire(
-            //     'Amaran!',
-            //     'Masukkan jumlah melebihi jumlah upah!',
-            //     'error'
-            //     )
-            //     return false;
-            // }
-
-            var bakpin = parseFloat("{{ $gadai['pinjaman'] }}") - hadbayaransuran;
-
-            var bayar = $('#bayaran').val();
-            
-            if(bayar >  bakpin)
-            {
-                Swal.fire(
-                    'Amaran!',
-                    'Bayaran tidak boleh melebihi 10% nilai marhun!',
-                    'error'
-                )
-                return false;
-            }
 
 
-            var lebihan = parseFloat($('#perludibayar').val()) - parseFloat($('#jumlahupah').val());
-    
-            var nopelanggan = "{{ $gadai['nopelanggan'] }}";
-            var jenistebus = $('#sltjenistebus').find(":selected").val();
-            var jbg = "{{ $gadai['tempoh'] }}";
-            var kadarupah = "{{ $gadai['kadarupah'] }} ";
-            var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
-            var pinjaman = parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#bayaran').val());
-            var ansuran = $('#bayaran').val();
-            var addpinjaman = $('#bayaran').val();
-            var bakipinjaman = parseFloat($('#bayaran').val()) - parseFloat($('#jumlahupah').val());
-            var bakiupah = 0;
-            var historygadaian = norujukan;
-            var marhun = "{{ $gadai['marhun'] }}";
-            var noic = "{{ $gadai['nokp'] }}";
-            var total_berat = parseFloat("{{ $gadai['berat'] }}");
-            var kuantiti_marhun = Number("{{ sizeof($marhun) }}");
+                var lebihan = parseFloat($('#perludibayar').val()) - parseFloat($('#jumlahupah').val());
+        
+                var nopelanggan = "{{ $gadai['nopelanggan'] }}";
+                var jenistebus = $('#sltjenistebus').find(":selected").val();
+                var jbg = "{{ $gadai['tempoh'] }}";
+                var kadarupah = "{{ $gadai['kadarupah'] }} ";
+                var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
+                var pinjaman = parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#bayaran').val());
+                var ansuran = $('#bayaran').val();
+                var addpinjaman = $('#bayaran').val();
+                var bakipinjaman = parseFloat($('#bayaran').val()) - parseFloat($('#jumlahupah').val());
+                var bakiupah = 0;
+                var historygadaian = norujukan;
+                var marhun = "{{ $gadai['marhun'] }}";
+                var noic = "{{ $gadai['nokp'] }}";
+                var total_berat = parseFloat("{{ $gadai['berat'] }}");
+                var kuantiti_marhun = Number("{{sizeof($marhun)}}");
 
-            var kadarupahbaru = 0;
+                var kadarupahbaru = 0;
 
-            if(nilai_marhun > 0 && nilai_marhun < 401.99){
-                kadarupahbaru = 1.2/100;
-            }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
-                kadarupahbaru = 1.50/100;
-            }else if(nilai_marhun >= 2002 ){
-                kadarupahbaru = 1.70/100;
-            }
+                if(nilai_marhun > 0 && nilai_marhun < 401.99){
+                    kadarupahbaru = 1.2/100;
+                }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
+                    kadarupahbaru = 1.50/100;
+                }else if(nilai_marhun >= 2002 ){
+                    kadarupahbaru = 1.70/100;
+                }
 
-            var keuntungan_sebulan = pinjaman * kadarupahbaru;
-            var keuntungan_6bln = keuntungan_sebulan * 6;
+                var lebihan = parseFloat($('#perludibayar').val()) - parseFloat($('#jumlahupah').val());
+        
+                var nopelanggan = "{{ $gadai['nopelanggan'] }}";
+                var jenistebus = $('#sltjenistebus').find(":selected").val();
+                var jbg = "{{ $gadai['tempoh'] }}";
+                var kadarupah = "{{ $gadai['kadarupah'] }} ";
+                var nilai_marhun = "{{ $gadai['nilaimarhun']}}";
+                var pinjaman = parseFloat("{{ $gadai['pinjaman'] }}") - parseFloat($('#bayaran').val());
+                var ansuran = $('#bayaran').val();
+                var addpinjaman = $('#bayaran').val();
+                var bakipinjaman = parseFloat($('#bayaran').val()) - parseFloat($('#jumlahupah').val());
+                var bakiupah = 0;
+                var historygadaian = norujukan;
+                var marhun = "{{ $gadai['marhun'] }}";
+                var noic = "{{ $gadai['nokp'] }}";
+                var total_berat = parseFloat("{{ $gadai['berat'] }}");
+                var kuantiti_marhun = Number("{{ sizeof($marhun) }}");
 
-            $.ajax({
-                method:'get',
-                url: "{{ route('bayaran.ansurans') }}",
-                data:{
-                    "nopelanggan" : nopelanggan,
-                    "jenistebus" : jenistebus,
-                    "jbg" : jbg,
-                    "kadarupah" : kadarupah,
-                    "nilai_marhun" : nilai_marhun,
-                    "pinjaman" : pinjaman,
-                    "ansuran" : ansuran,
-                    "addpinjaman" : addpinjaman,
-                    "bakipinjaman" : bakipinjaman,
-                    "bakiupah" : bakiupah,
-                    "historygadaian" : historygadaian,
-                    "marhun" : marhun,
-                    "norujukan" : norujukan,
-                    "noic" : noic,
-                    "kadarkeuntungan" : kadarupahbaru,
-                    "keuntungan_6bln" : keuntungan_6bln,
-                    "keuntungan_sebulan" : keuntungan_sebulan,
-                    "kuantiti_marhun" : kuantiti_marhun,
-                    "lebihan" : lebihan,
-                    "jenisbayarantebus" : jenisbayarantebus,
-                    "teller" : teller
-                    
-                },
-                success:function(success_data){
-                    Swal.fire(
-                        'Berjaya!',
-                        'Bayaran Ansuran Berjaya',
-                        'success'
-                    ).then(function() {
-                        window.location.replace("{{ url('customer_info') }}");
-                    })
-                },error: function (request, status, error) {
-                console.log(request.responseText);
-            }
-            });
+                var kadarupahbaru = 0;
+
+                if(nilai_marhun > 0 && nilai_marhun < 401.99){
+                    kadarupahbaru = 1.2/100;
+                }else if(nilai_marhun >= 402 && nilai_marhun < 2001.99){
+                    kadarupahbaru = 1.50/100;
+                }else if(nilai_marhun >= 2002 ){
+                    kadarupahbaru = 1.70/100;
+                }
+
+                var keuntungan_sebulan = pinjaman * kadarupahbaru;
+                var keuntungan_6bln = keuntungan_sebulan * 6;
+
+                $.ajax({
+                    method:'get',
+                    url: "{{ route('bayaran.ansurans') }}",
+                    data:{
+                        "nopelanggan" : nopelanggan,
+                        "jenistebus" : jenistebus,
+                        "jbg" : jbg,
+                        "kadarupah" : kadarupah,
+                        "nilai_marhun" : nilai_marhun,
+                        "pinjaman" : pinjaman,
+                        "ansuran" : ansuran,
+                        "addpinjaman" : addpinjaman,
+                        "bakipinjaman" : bakipinjaman,
+                        "bakiupah" : bakiupah,
+                        "historygadaian" : historygadaian,
+                        "marhun" : marhun,
+                        "norujukan" : norujukan,
+                        "noic" : noic,
+                        "kadarkeuntungan" : kadarupahbaru,
+                        "keuntungan_6bln" : keuntungan_6bln,
+                        "keuntungan_sebulan" : keuntungan_sebulan,
+                        "kuantiti_marhun" : kuantiti_marhun,
+                        "lebihan" : lebihan,
+                        "jenisbayarantebus" : jenisbayarantebus,
+                        "teller" : teller
+                        
+                    },
+                    success:function(success_data){
+                        Swal.fire(
+                            'Berjaya!',
+                            'Bayaran Ansuran Berjaya',
+                            'success'
+                        ).then(function() {
+                            window.location.replace("{{ url('customer_info') }}");
+                        })
+                    },error: function (request, status, error) {
+                        console.log(request.responseText);
+                    }
+                });
 
             }
             /////////////
@@ -989,6 +1006,7 @@
 
             if($('#perludibayar').val() < (parseFloat($('#bayaran').val()) + parseFloat($('#jumlahupah').val())))
             {
+                $("#terima_transaksi").prop('disabled', false);
                 Swal.fire('Amaran!','Jumlah bayaran kurang daripada jumlah yang perlu dibayar!','error');
                 return false;
             }
@@ -996,12 +1014,12 @@
 
             let maxbayaran = totalmarhun * 0.1;
 
-            if($('#bakipinjaman').val() < maxbayaran || $('#bakipinjaman').val() < 50)
-            {
+            if($('#bakipinjaman').val() < maxbayaran || $('#bakipinjaman').val() < 50){   
+                $("#terima_transaksi").prop('disabled', false);
                 Swal.fire(
-                'Amaran!',
-                `Baki margin pinjaman tidak boleh kurang 10% daripada nilai marhun \n [ RM ${totalmarhun.toFixed(2)} x 10% = RM ${maxbayaran.toFixed(2)} ]`,
-                'error'
+                    'Amaran!',
+                    `Baki margin pinjaman tidak boleh kurang 10% daripada nilai marhun \n [ RM ${totalmarhun.toFixed(2)} x 10% = RM ${maxbayaran.toFixed(2)} ]`,
+                    'error'
                 )
                 return false;
             }
@@ -1009,13 +1027,12 @@
             //checked box
             var checkboxes = document.querySelectorAll('input[type="checkbox"]');
             var checkedOne = Array.prototype.slice.call(checkboxes).some(x => x.checked);
-
-            console.log(checkboxes.length);
             if (checkedOne == false) {
+                $("#terima_transaksi").prop('disabled', false);
                 Swal.fire(
-                'Amaran!',
-                'Sila tick salah satu marhun!',
-                'error'
+                    'Amaran!',
+                    'Sila tick salah satu marhun!',
+                    'error'
                 )
                 return false;
             }
@@ -1025,22 +1042,17 @@
             var marhun = "{{ $gadai['marhun'] }}";
 
             var test = marhun.split(",");
-            // var marhunlama = marhun.split(",");
         
             $.each( array_nm, function( index, value ) {
                 sumnilaimarhun += parseFloat(value);
             });
 
-
-            console.log(test);
-            console.log(array_marhun);
             var countarrayerror = 0;
             $.each( test, function( index, value ) {
 
                 for(var i=0; i<array_marhun.length; i++)
                 {
                     if (value.match(array_marhun[i])) {
-                    console.log("value: " + value + " index :" + index +" marhun : " + array_marhun[i]);
                     test.splice(index,1);
                     countarrayerror++;
 
@@ -1093,68 +1105,62 @@
             var keuntungan_6bln = keuntungan_sebulan * 6;
 
             $.ajax({
-            method:"GET",
-            url: "{{ route('tebus.separuh') }}",
-            data:{
-                //yang lama
-                "norujukan" : norujukan,
-                "nopelanggan" : nopelanggan,
-                "jenistebus" : jenistebus,
-                "jbg" : jbg,
-                "kadarupah" : kadarupah,
-                "nilai_marhun" : nilai_marhun_lama,
-                "pinjaman_lama" : pinjaman,
-                "ansuran" : ansuran,
-                "addpinjaman" : addpinjaman,
-                "bakipinjaman" : bakipinjaman,
-                "bakiupah" : bakiupah,
-                "historygadaian" : historygadaian,
-                "marhun" : marhun,
-                "nowakil" : nowakil,
-                "arrayrecno" : array_recno,
-                "jenisbayarantebus" : jenisbayarantebus,
-                "teller" : teller,
-
-
-                //yang baru
-                "noic" : noic,
-                "total_nilai_marhun" : nilai_marhun,
-                "pinjaman" : pinjamanbaru,
-                "kadarkeuntungan" : kadarupahbaru,
-                "keuntungan_6bln" : keuntungan_6bln,
-                "keuntungan_sebulan" : keuntungan_sebulan,
-                "total_berat" : total_berat,
-                "marhun_detail" : marhun_detail,
-                "kuantiti_marhun" : kuantiti_marhun
-    
-            },
-            success:function(success_data){
-                var urlroute = '{{ route("resit.tebus", ":id") }}';
-                urlroute = urlroute.replace(':id', norujukan);
-
-                console.log(success_data);
-                Swal.fire(
-                'Berjaya!',
-                'Tebus Separuh Berjaya',
-                'success'
-            ) .then(function() {
-                window.open(urlroute, '_blank');
-                window.location.replace("{{ url()->previous() }}");
-            })
-            },error: function (request, status, error) {
-                console.log(request.responseText);
-            }
-
+                method:"GET",
+                url: "{{ route('tebus.separuh') }}",
+                data:{
+                    //yang lama
+                    "norujukan" : norujukan,
+                    "nopelanggan" : nopelanggan,
+                    "jenistebus" : jenistebus,
+                    "jbg" : jbg,
+                    "kadarupah" : kadarupah,
+                    "nilai_marhun" : nilai_marhun_lama,
+                    "pinjaman_lama" : pinjaman,
+                    "ansuran" : ansuran,
+                    "addpinjaman" : addpinjaman,
+                    "bakipinjaman" : bakipinjaman,
+                    "bakiupah" : bakiupah,
+                    "historygadaian" : historygadaian,
+                    "marhun" : marhun,
+                    "nowakil" : nowakil,
+                    "arrayrecno" : array_recno,
+                    "jenisbayarantebus" : jenisbayarantebus,
+                    "teller" : teller,
 
 
+                    //yang baru
+                    "noic" : noic,
+                    "total_nilai_marhun" : nilai_marhun,
+                    "pinjaman" : pinjamanbaru,
+                    "kadarkeuntungan" : kadarupahbaru,
+                    "keuntungan_6bln" : keuntungan_6bln,
+                    "keuntungan_sebulan" : keuntungan_sebulan,
+                    "total_berat" : total_berat,
+                    "marhun_detail" : marhun_detail,
+                    "kuantiti_marhun" : kuantiti_marhun
+        
+                },
+                success:function(success_data){
+                    var urlroute = '{{ route("resit.tebus", ":id") }}';
+                    urlroute = urlroute.replace(':id', norujukan);
+                    Swal.fire(
+                    'Berjaya!',
+                    'Tebus Separuh Berjaya',
+                    'success'
+                ) .then(function() {
+                    window.open(urlroute, '_blank');
+                    window.location.replace("{{ url()->previous() }}");
+                })
+                },error: function (request, status, error) {
+                    console.log(request.responseText);
+                }
             });
 
             /////////////
             //End File//
             ///////////
         
-        }
-        else if($('#sltjenistebus').find(":selected").val() == 'P'){
+        }else if($('#sltjenistebus').find(":selected").val() == 'P'){
             let pinjamanbaru = $('#pinjamanbaru').val();
             let jenisbayarantebus = '';
             if(tarikhgadai < tarikhtawarruq){
@@ -1164,6 +1170,7 @@
             }
 
             if( $('#tambahpinjam').val() <=  0 && $('#tambahpinjam').val() === ''){
+                $("#terima_transaksi").prop('disabled', false);
                 Swal.fire(
                     'Amaran!',
                     'Amaun hendaklah melebihi daripada 0',
@@ -1221,7 +1228,6 @@
                                 "teller" : teller
                             },
                             success:function(data){
-                                console.log(data);
                             },
                             error: function(xhr, status, error) {
                                 var err = eval("(" + xhr.responseText + ")");
@@ -1261,6 +1267,7 @@
                             });   
                         }, 3000);
                     } else if (result.dismiss === Swal.DismissReason.cancel) {
+                        $("#terima_transaksi").prop('disabled', false);
                         swalWithBootstrapButtons.fire(
                             'Gagal',
                             'Gagal mendapatkan kelulusan khazanah',
@@ -1321,7 +1328,6 @@
                                 "teller" : teller
                             },
                             success:function(data){
-                                console.log(data);
                             },
                             error: function(xhr, status, error) {
                                 var err = eval("(" + xhr.responseText + ")");
@@ -1360,6 +1366,7 @@
                             });
                         }, 3000);
                     }else if (result.dismiss === Swal.DismissReason.cancel){
+                        $("#terima_transaksi").prop('disabled', false);
                         swalWithBootstrapButtons.fire(
                             'Gagal',
                             'Gagal mendapatkan kelulusan operasi',
@@ -1371,7 +1378,7 @@
                 return false;
 
             }else if(parseFloat($('#basic-addon2').text()) > 80){
-
+                $("#terima_transaksi").prop('disabled', false);
                 Swal.fire(
                     'Amaran!',
                     'Pinjaman Haruslah Dalam Lingkungan 80%!',
@@ -1507,8 +1514,6 @@
                         icon: 'success',
                         title: 'Maklumat Anda Berjaya Direkodkan!'
                         });
-
-                        console.log(data.nowakil);
                         nw = data.nowakil;
 
                         $('#wakiltxt').prop( "disabled", true );
diff --git a/resources/views/print/laporan_komoditi.blade.php b/resources/views/print/laporan_komoditi.blade.php
index fe7d619..2491254 100644
--- a/resources/views/print/laporan_komoditi.blade.php
+++ b/resources/views/print/laporan_komoditi.blade.php
@@ -96,7 +96,7 @@
                 <td>{{ $komoditi['nosijil'] }}</td>
                 <td>{{ $komoditi['date_purchase'] }}</td>
                 <td>{{ $komoditi['time_purchase'] }}</td>
-                <td>{{ $komoditi['unit_komuditi'] }}</td>
+                <td>{{ number_format($komoditi['unit_komuditi'],2) }}</td>
                 <td>{{ $komoditi['transaction_by'] }}</td>
                 <td>{{ $komoditi['transaction_type'] }}</td>
             </tr>
diff --git a/resources/views/print/laporan_transaksi_komoditi.blade.php b/resources/views/print/laporan_transaksi_komoditi.blade.php
new file mode 100644
index 0000000..657c233
--- /dev/null
+++ b/resources/views/print/laporan_transaksi_komoditi.blade.php
@@ -0,0 +1,97 @@
+<style>
+    #header {
+        font-family: Arial, Helvetica, sans-serif;
+        border-collapse: collapse;
+        width: 100%;
+    }
+
+    #header td{
+        padding:4px;
+        font-size:10px;
+    }
+
+    #header tr:nth-child(even){background-color: #ffffff;}
+
+    #header tr:hover {background-color: #ddd;}
+
+    #header th {
+        padding-top: 12px;
+        padding-bottom: 12px;
+        text-align: left;
+        padding:4px;
+        color:black;
+    }
+
+    #scan {
+        font-family: Arial, Helvetica, sans-serif;
+        border-collapse: collapse;
+        width: 100%;
+    }
+
+    #scan td, #scan th {
+        padding: 8px;
+        font-size:11px;
+    }
+
+    #scan tr:nth-child(even){background-color: #ffffff;}
+
+    #scan tr:hover {background-color: #ddd;}
+
+    #scan th {
+        padding-top: 12px;
+        padding-bottom: 12px;
+        text-align: left;
+        padding:4px;
+        color:black;
+    }
+
+    #sign {
+        font-family: Arial, Helvetica, sans-serif;
+        border-collapse: collapse;
+        width: 100%;
+    }
+
+    #sign td, #sign th {
+        padding: 8px;
+        font-size:11px;
+        text-align: center;
+    }
+</style>
+
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+<script>
+  $(document).ready(function () {
+    window.print();
+    window.onfocus=function(){ window.close();}
+  });
+</script>
+
+<table id="header">
+  <tr>
+    <th rowspan="4"  style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
+    <th colspan="1">KOPERASI PERMODALAN KELANTAN BERHAD</th>
+  </tr>
+</table>
+
+<table id="scan">
+    <tr>
+        <th colspan ="5"><b>LAPORAN TRANSAKSI KOMODITI</b></th>
+    </tr>
+</table>
+
+<table id="sign">
+    <thead>
+        <th>Bil</th>
+        <th>Cawangan</th>
+        <th>Jumlah Nilai Komoditi</th>
+    </thead>
+    <tbody>
+        @foreach($rekod_print as $index=>$komoditi)
+            <tr>
+                <td>{{ $loop->iteration }}</td>
+                <td>{{ $komoditi['cawangan'] }}</td>
+                <td>{{ number_format($komoditi['totalkomoditi'],2) }}</td>
+            </tr>
+        @endforeach
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index d227b5c..769ab55 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -112,7 +112,7 @@ Route::post('laporan/tebus/cetak',['as'=>'tebus.laporancetak','uses'=>'KhazanahC
 Route::get('/khazanah/pelanggan',['as'=>'khazanah.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','khazanah');
 Route::get('/khazanah/customer_info',['as'=>'khazanah.customer_info','uses'=>'KhazanahController@info'])->middleware('auth','khazanah');
 
-Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian']);
+Route::post('/kakitangan/harian',['as'=>'kakitangan.harian','uses'=>'KakitanganController@kakitanganHarian'])->middleware('auth','khazanah');
 Route::get('/lelong',['as'=>'lelong','uses'=>'LelongController@lelong']);
 
 //Added Yang Baru 
@@ -189,4 +189,6 @@ Route::get('/operasi/hargaemas',['as'=>'operasi.hargaemas','uses'=>'OperasiContr
 Route::post('/operasi/hargaemas/update',['as'=>'hargaemas.update','uses'=>'OperasiController@updatehargaemas'])->middleware('auth','operasi');
 Route::post('/operasi/hargaemas',['as'=>'hargaemas.create','uses'=>'OperasiController@createhargaemas'])->middleware('auth','operasi');
 
-Route::get('/komuditi',['as'=>'komuditi','uses'=>'KomuditiController@index']);
\ No newline at end of file
+Route::get('/komoditi',['as'=>'komuditi','uses'=>'KomuditiController@index']);
+Route::get('/komoditi/rekod',['as'=>'rekod.komoditi','uses'=>'KomuditiController@rekodKomoditi']);
+Route::get('/komoditi/rekod/print',['as'=>'komoditi.rekod.print','uses'=>'KomuditiController@printRekodTransaksi']);
\ No newline at end of file