diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php
index b1eb289..1db168c 100644
--- a/resources/views/aliran_tunai/index.blade.php
+++ b/resources/views/aliran_tunai/index.blade.php
@@ -295,6 +295,15 @@
     function serahankemaskini(data)
     {
         
+        Swal.fire({
+            title: 'Memuatkan...',
+            allowEscapeKey : false,
+            allowOutsideClick: false,
+            didOpen: function () {
+                Swal.showLoading();
+            }
+        });
+
         $.ajax({
                 type: 'get',
                 url: "{{ route('periksa.alirantunai') }}",
@@ -323,6 +332,15 @@
                                         closeOnClickOutside: false
                                     }).then(function() {
                                         location.reload();
+
+                                        Swal.fire({
+                                            title: 'Memuatkan...',
+                                            allowEscapeKey : false,
+                                            allowOutsideClick: false,
+                                            didOpen: function () {
+                                                Swal.showLoading();
+                                            }
+                                        });
                                     });
 
                                 }else{
@@ -333,6 +351,15 @@
                                         closeOnClickOutside: false
                                     }).then(function() {
                                         location.reload();
+
+                                        Swal.fire({
+                                            title: 'Memuatkan...',
+                                            allowEscapeKey : false,
+                                            allowOutsideClick: false,
+                                            didOpen: function () {
+                                                Swal.showLoading();
+                                            }
+                                        });
                                     });
                                 }
                             }
@@ -345,6 +372,15 @@
     function periksaalirantunai()
     {
       
+        Swal.fire({
+            title: 'Memuatkan...',
+            allowEscapeKey : false,
+            allowOutsideClick: false,
+            didOpen: function () {
+                Swal.showLoading();
+            }
+        });
+
         $.ajax({
                 type: 'get',
                 url: "{{ route('periksa.alirantunai') }}",
@@ -357,6 +393,15 @@
                             text: 'Aliran tunai selari dengan sistem!'
                         }).then(function() {
                             location.reload();
+
+                            Swal.fire({
+                                title: 'Memuatkan...',
+                                allowEscapeKey : false,
+                                allowOutsideClick: false,
+                                didOpen: function () {
+                                    Swal.showLoading();
+                                }
+                            });
                         });
 
                     }else{
@@ -371,6 +416,7 @@
                                     "penebusan" : balasbalik['penebusan']
                             },
                             success: function(balas){
+
                                 if(balas == 'berjaya')
                                 {
                                     Swal.fire({
@@ -380,6 +426,15 @@
                                         closeOnClickOutside: false
                                     }).then(function() {
                                         location.reload();
+
+                                        Swal.fire({
+                                            title: 'Memuatkan...',
+                                            allowEscapeKey : false,
+                                            allowOutsideClick: false,
+                                            didOpen: function () {
+                                                Swal.showLoading();
+                                            }
+                                        });
                                     });
 
                                 }else{
@@ -390,6 +445,15 @@
                                         closeOnClickOutside: false
                                     }).then(function() {
                                         location.reload();
+
+                                        Swal.fire({
+                                            title: 'Memuatkan...',
+                                            allowEscapeKey : false,
+                                            allowOutsideClick: false,
+                                            didOpen: function () {
+                                                Swal.showLoading();
+                                            }
+                                        });
                                     });
                                 }
 
diff --git a/resources/views/khazanah/alirantunai.blade.php b/resources/views/khazanah/alirantunai.blade.php
index 09f54bf..26e754b 100644
--- a/resources/views/khazanah/alirantunai.blade.php
+++ b/resources/views/khazanah/alirantunai.blade.php
@@ -272,12 +272,12 @@
                                     </div>
                                     <div class="tab-pane fade" id="nav-{{ $ls->id }}-addtunai" role="tabpanel" aria-labelledby="addtunai-tab">
                                     
-                                      <div class="input-group mb-3 col-4" style="margin-left:-15px;">
+                                      {{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
                                         <div class="input-group-prepend">
                                             <span class="input-group-text" id="basic-addon1">Tarikh</span>
                                         </div>
                                         <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
-                                      </div>
+                                      </div> --}}
 
                                       <table class="table table-striped table-hover text-center" id="tableaddtunai-{{ $ls->id }}">
                                         <thead class="thead-dark">
@@ -307,12 +307,12 @@
                                     </div>
                                     <div class="tab-pane fade" id="nav-{{ $ls->id }}-gt" role="tabpanel" aria-labelledby="gt-tab">
                                     
-                                      <div class="input-group mb-3 col-4" style="margin-left:-15px;">
+                                      {{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
                                         <div class="input-group-prepend">
                                             <span class="input-group-text" id="basic-addon1">Tarikh</span>
                                         </div>
                                         <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
-                                      </div>
+                                      </div> --}}
 
                                       <table class="table text-center table-striped table-hover" id="tablegadaitebus-{{ $ls->id }}">
                                         <thead class="thead-dark">
@@ -347,12 +347,12 @@
                                     </div>
                                     <div class="tab-pane fade" id="nav-{{ $ls->id }}-tuntutbaki" role="tabpanel" aria-labelledby="tuntutbaki-tab">
                                     
-                                      <div class="input-group mb-3 col-4" style="margin-left:-15px;">
+                                      {{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
                                         <div class="input-group-prepend">
                                             <span class="input-group-text" id="basic-addon1">Tarikh</span>
                                         </div>
                                         <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
-                                      </div>
+                                      </div> --}}
                                       
                                       <table class="table text-center table-striped table-hover" id="tabletuntutbaki-{{ $ls->id }}">
                                         <thead class="thead-dark">
@@ -539,12 +539,12 @@
                                     <div class="tab-pane fade" id="nav-{{ $ls->id }}-addtunai" role="tabpanel" aria-labelledby="addtunai-tab">
                                     
                                      
-                                        <div class="input-group mb-3 col-4" style="margin-left:-15px;">
+                                        {{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
                                             <div class="input-group-prepend">
                                                 <span class="input-group-text" id="basic-addon1">Tarikh</span>
                                             </div>
                                             <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
-                                        </div>
+                                        </div> --}}
                                    
 
                                       <table class="table text-center table-striped table-hover" id="tableaddtunai-{{ $ls->id }}">
@@ -576,12 +576,12 @@
                                     </div>
                                     <div class="tab-pane fade" id="nav-{{ $ls->id }}-gt" role="tabpanel" aria-labelledby="gt-tab">
                                     
-                                      <div class="input-group mb-3 col-4" style="margin-left:-15px;">
+                                      {{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
                                         <div class="input-group-prepend">
                                             <span class="input-group-text" id="basic-addon1">Tarikh</span>
                                         </div>
                                         <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
-                                      </div>
+                                      </div> --}}
 
 
                                       <table class="table text-center table-striped table-hover" id="tablegadaitebus-{{ $ls->id }}">
@@ -617,12 +617,12 @@
                                     </div>
                                     <div class="tab-pane fade" id="nav-{{ $ls->id }}-tuntutbaki" role="tabpanel" aria-labelledby="tuntutbaki-tab">
                                     
-                                      <div class="input-group mb-3 col-4" style="margin-left:-15px;">
+                                      {{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
                                         <div class="input-group-prepend">
                                             <span class="input-group-text" id="basic-addon1">Tarikh</span>
                                         </div>
                                         <input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
-                                      </div>
+                                      </div> --}}
 
 
                                       <table class="table text-center table-striped table-hover" id="tabletuntutbaki-{{ $ls->id }}">
diff --git a/resources/views/khazanah/laporan/tuntutbaki.blade.php b/resources/views/khazanah/laporan/tuntutbaki.blade.php
index fae7641..cc0e28f 100644
--- a/resources/views/khazanah/laporan/tuntutbaki.blade.php
+++ b/resources/views/khazanah/laporan/tuntutbaki.blade.php
@@ -49,11 +49,9 @@
                                     </tr>
                                 </thead>
                                 <tfoot class="thead-dark">
-                                    <th colspan="3">TOTAL</th>
-                                    <th id="pinjamantotal"></th>
-                                    <th id="upah12total"></th>
-                                    <th id="nmtotal"></th>
-                                    <th id="berattotal"></th>
+                                    <th colspan="5">TOTAL</th>
+                                    <th id="totalcajlelong"></th>
+                                    <th id="totaljumlah"></th>
                                 </tfoot>
                             </table>
                         </div>
@@ -116,15 +114,14 @@
     
     function gadaitable(data){
         var counter = 1;
-        var total_pinjaman = 0;
-        var total_upah12 = 0;
-        var total_nm = 0;
-        var total_berat = 0;
+        var totaljumlah = 0;
+        var totalcajlelong = 0;
 
         tabletuntutbaki.clear().draw();
 
         $.each(data,function(index,tb){
-
+            totaljumlah += tb['jumlah'];
+            totalcajlelong += tb['cajlelong'];
             $.ajax({
                 method:'get',
                 url: api_url + '/api/gadai/norujukan/' + tb['norujukan'],
@@ -136,14 +133,16 @@
 
                             tabletuntutbaki.row.add([
                                 counter,
-                                customer[0]['nama'],
+                                customer['nama'],
                                 gadai[0][0]['nokp'],
                                 tb['norujukan'],
                                 tb['teller'],
                                 tb['cajlelong'],
                                 tb['jumlah']
                             ]).draw();
-
+                            counter = counter + 1;
+                            $('#totalcajlelong').text(formatter.format(totalcajlelong));
+                            $('#totaljumlah').text(formatter.format(totaljumlah));
                         }
                     });
                 }
diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 773e3c3..21a7b93 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -2677,20 +2677,24 @@
 
     function daftarfunction(id)
     {
+        let kodcaw = "{{ Auth::user()->cawangan }}";
+        
         $('#nokpwakil').val(id);
 
-
             $.ajax({
             method:'GET',
-            url: "{{ route('wakil.caricustomer') }}",
-            data:{ "icno" : id },
+            // url: "{{ route('wakil.caricustomer') }}",
+            url: api + '/api/customers/' + id,
+            // data:{ "icno" : id },
             success:function(data){
 
                 $('#namawakil').val('');
-                $('#alamatwakil').val(data['']);
-                $('#notelwakil').val(data['']);
+                $('#alamatwakil').val('');
+                $('#notelwakil').val('');
 
-                if(data != 'no-data')
+                var size =  Object.keys(data).length;
+                
+                if(size > 0)
                 {
                     $('#namawakil').val(data['nama']);
                     $('#alamatwakil').val(data['alamat1']);
@@ -2701,7 +2705,8 @@
                 //get first wakil
                 $.ajax({
                     method:'GET',
-                    url: "{{ route('wakil.first') }}",
+                    // url: "{{ route('wakil.first') }}",
+                    url: api + '/api/firstwakil/' + kodcaw,
                     success:function(getfirstwakil)
                     {
                         let firstwakil = parseInt(getfirstwakil);
diff --git a/resources/views/print/laporan_ringkasanharian.blade.php b/resources/views/print/laporan_ringkasanharian.blade.php
index 01b23c6..959667b 100644
--- a/resources/views/print/laporan_ringkasanharian.blade.php
+++ b/resources/views/print/laporan_ringkasanharian.blade.php
@@ -114,7 +114,7 @@
       <div class="col-6">{{ 'RM '. number_format($laporan['panjar_harian'],2) }}</div>
       <div class="col-6">2. BULANAN</div>
       <div class="col-6">{{ 'RM '. number_format($laporan['panjar_bulanan'],2) }}</div>
-      <div class="col-6">3. TERKUMPUL</div>
+      <div class="col-6">3. TERKUMPUL (TAHUNAN)</div>
       <div class="col-6">{{ 'RM '. number_format($laporan['panjar_tahunan'],2) }}</div>
     </div>
   </div>
diff --git a/resources/views/print/laporan_tuntutbaki.blade.php b/resources/views/print/laporan_tuntutbaki.blade.php
index d034fc5..cfc1e65 100644
--- a/resources/views/print/laporan_tuntutbaki.blade.php
+++ b/resources/views/print/laporan_tuntutbaki.blade.php
@@ -233,7 +233,7 @@
             
             $gadaidetail = Http::get($api_url . '/api/gadai/norujukan/' . $item['norujukan'])->json();
             $customer_detail = Http::get($api_url . '/api/customers/' . $gadaidetail[0][0]['nokp'])->json();
-            echo $customer_detail[0]['nama'];
+            echo $customer_detail['nama'];
         @endphp
       </td>
       <td style="width:100px">{{$gadaidetail[0][0]['nokp']}}</td>