diff --git a/resources/views/print/laporan_ansuran.blade.php b/resources/views/print/laporan_ansuran.blade.php
index 223b3a6..99403f3 100644
--- a/resources/views/print/laporan_ansuran.blade.php
+++ b/resources/views/print/laporan_ansuran.blade.php
@@ -205,52 +205,78 @@
     <th>No K/P</th>
     <th>Tempoh</th>
     <th>Baki Pembiayaan (RM)</th>
+    <th>Bayaran Pemb. (RM)</th>
     <th>Bayaran (RM)</th>
     <th>Keuntungan (RM)</th>
   </tr>
-  @php $counter = 1;$totalduitmasuk = 0;$totalkeuntungan = 0; @endphp
+  @php $counter = 1;$totalduitmasuk = 0;$totalkeuntungan = 0; $totalpendahuluan = 0;@endphp
   @foreach($tebus as $index=>$item)
-  @php $totalduitmasuk += $item['duit_masuk'];$totalkeuntungan += $item['bayaran_keuntungan']; @endphp
+  @php $totalduitmasuk += $item['duit_masuk'];$totalkeuntungan += $item['bayaran_keuntungan'];$totalpendahuluan += $item['bayaran_pembiayaan']; @endphp
+  @if($index > 0)
+    @if($item['teller'] != $tebus[$index - 1]['teller'])
+        <tr>
+            <td colspan="11">Teller : <b>{{ $item['teller'] }}</b></td>
+        </tr>
+        @php $totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0; @endphp
+    @endif
+  @else
+    <tr>
+        <td colspan="11">Teller : <b>{{ $item['teller'] }}</b></td>
+    </tr>
+    @php $totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0; @endphp
+  @endif
     <tr>
       <td>{{ $counter }}</td>
       <td>{{$item['norujukan']}}</td>
-      <td>
-        @php
-            $gadai_detail = Http::get($api_url . '/api/gadai/norujukan/'. $item['norujukan'])->json();
-            $customer_detail = Http::get($api_url . '/api/customers/' . $gadai_detail[0][0]['nokp'])->json();
-            
-            echo $customer_detail['nama'];
-        @endphp
-      </td>
-      <td>{{ $gadai_detail[0][0]['nokp'] }}</td>
-        <td>{{ $gadai_detail[0][0]['tempoh'] }}</td>
-      <td>{{ number_format($gadai_detail[0][0]['bakipjm'],2) }}</td>
+      <td>{{ $item['nama'] }}</td>
+      <td>{{ $item['nokp'] }}</td>
+      <td>{{ $item['tempoh'] }}</td>
+      <td>{{ number_format($item['bakipjm'],2) }}</td>
+      <td>{{ number_format($item['bayaran_pembiayaan'],2) }}</td>
       <td>{{ number_format($item['duit_masuk'],2) }}</td>
       <td>{{ number_format($item['bayaran_keuntungan'],2) }}</td>
-
     </tr>
     @php $counter++; @endphp
+    @php $totaldmteller += $item['duit_masuk'];$totalupahteller += $item['bayaran_keuntungan'];$totalpendhteller += $item['bayaran_pembiayaan']; @endphp
     @if($index+1 < sizeof($tebus))
         @if($item['teller'] != $tebus[$index + 1]['teller'])
             <tr>
                 <td colspan="6">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
-                <td><b>{{ number_format($totalduitmasuk,2) }} </b></td>
-                <td><b>{{ number_format($totalkeuntungan,2) }} </b></td>
+                <td><b>{{ number_format($totalpendhteller,2) }} </b></td>
+                <td><b>{{ number_format($totaldmteller,2) }} </b></td>
+                <td><b>{{ number_format($totalupahteller,2) }} </b></td>
             </tr>
-            @php $counter = 0; @endphp
+            @php $counter = 1;$totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0;@endphp
         @endif
     @else
         <tr>
             <td colspan="6">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
-            <td><b>{{ number_format($totalduitmasuk,2) }} </b></td>
-            <td><b>{{ number_format($totalkeuntungan,2) }} </b></td>
+            <td><b>{{ number_format($totalpendhteller,2) }} </b></td>
+            <td><b>{{ number_format($totaldmteller,2) }} </b></td>
+            <td><b>{{ number_format($totalupahteller,2) }} </b></td>
         </tr>
     @endif
   @endforeach
 </table>
 
-<br>
-<br>
+<br><br>
+<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
+  <tr>
+    <th colspan="9"></th>
+    <th style="text-align:center;">Bayaran Pemb. (RM)</th>
+    <th style="text-align:center;">Bayaran (RM)</th>
+    <th style="text-align:center;">Keuntungan (RM)</th>
+  </tr>
+  <tr>
+    <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+    <td>{{ number_format($totalpendahuluan,2) }}</td>
+    <td>{{ number_format($totalduitmasuk,2) }}</td>
+    <td>{{ number_format($totalkeuntungan,2) }}</td>
+  </tr>
+</table>
+
+<br><br>
+<br><br>
 <table id="sign">
   <tr>
     <td></td>
diff --git a/resources/views/print/laporan_penebusan.blade.php b/resources/views/print/laporan_penebusan.blade.php
index ef7621e..2901ae9 100644
--- a/resources/views/print/laporan_penebusan.blade.php
+++ b/resources/views/print/laporan_penebusan.blade.php
@@ -198,10 +198,10 @@
     <th>Norujukan</th>
     <th>Nama</th>
     <th>No KP</th>
-    <th>T Gadai</th>
-    <th>T Tebus</th>
+    <th>Masa</th>
     <th>JBG</th>
     <th>J Tebus</th>
+    <th width="6%;">Nilai Marhun(RM)</th>
     <th width="6%;">Pembiayaan(RM)</th>
     <th width="6%;">Upah/Keuntungan(RM)</th>
     <th width="6%;">Bayaran(RM)</th>
@@ -229,21 +229,17 @@
       <td>{{ $item['nama'] }}</td>
       <td>{{ $item['nokp'] }}</td>
       <td>
-        @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_gadai']);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate);
-        @endphp
-      </td>
-      <td>
-        @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $item['t_tebus']);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate);
+        @php
+            $dt = new DateTime($item['tarikh_bayaran']);
+            $time = $dt->format('h:i:s');
+            echo date($time);
         @endphp
       </td>
       <td>{{ $item['jbg'] }}</td>
       <td>{{$item['jenistebus']}}</td>
+      <td>
+        {{ number_format($item['nilaimarhun'],2) }}
+      </td>
       <td>{{ number_format($item['pinjaman'],2) }}</td>
       <td>{{ number_format($item['bakiupah'],2) }}</td>
       <td>{{ number_format($item['bakipjm'],2) }}</td>
@@ -334,8 +330,6 @@
   </tr>
 </table>
 
-{{-- <h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5> --}}
-
 <br>
 <br>
 <table id="sign">
diff --git a/resources/views/print/laporan_upah.blade.php b/resources/views/print/laporan_upah.blade.php
index cfb975b..4c6316b 100644
--- a/resources/views/print/laporan_upah.blade.php
+++ b/resources/views/print/laporan_upah.blade.php
@@ -221,13 +221,13 @@
     <th>Tarikh</th>
     <th>No Rujukan</th>
     <th>Teller</th>
-    <th>Pinjaman</th>
-    <th>JBG</th>
-    <th>Upah Dibayar</th>
+    <th>Tempoh</th>
+    <th>Pembiayaan (RM)</th>
+    <th>Upah Dibayar (RM)</th>
   </tr>
   @php $counter = 1; $totalbayaran = 0; $totalpembiayaan = 0; $totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
   @foreach($advansur as $index=>$item)
-  @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman'];$totalbayaranteller += $item['upahDibayar']; $totalpembiayaanteller += $item['pinjaman']; @endphp
+  @php $totalbayaran += $item['upahDibayar']; $totalpembiayaan += $item['pinjaman']; @endphp
     @if($index > 0)
       @if($item['teller'] != $advansur[$index - 1]['teller'])
             <tr>
@@ -242,32 +242,30 @@
         @php $counter = 1;$totalpembiayaanteller = 0; $totalbayaranteller = 0; @endphp
 
     @endif
-  
     <tr>
       <td>{{ $counter }}</td>
       <td>{{ $item['tarikh'] }}</td>
       <td><b>{{ $item['norujukan'] }}</b></td>
       <td>{{ $item['teller'] }}</td>
-      <td>{{ number_format($item['pinjaman'],2) }}</td>
       <td>{{ $item['jbg'] }}</td>
+      <td>{{ number_format($item['pinjaman'],2) }}</td>
       <td>{{ number_format($item['upahDibayar'],2) }}</td>
     </tr>
     @php $counter++; @endphp
+    @php $totalbayaranteller += $item['upahDibayar']; $totalpembiayaanteller += $item['pinjaman']; @endphp
     @if($index+1 < sizeof($advansur))
     @if($item['teller'] != $advansur[$index + 1]['teller'])
         <tr>
-            <td colspan="4">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+            <td colspan="5">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
             <td><b>{{ number_format($totalpembiayaanteller,2) }} </b></td>
-            <td></td>
             <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
         </tr>
         @php  @endphp
     @endif
 @else
     <tr>
-        <td colspan="4">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+        <td colspan="5">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
         <td><b>{{ number_format($totalpembiayaanteller,2) }} </b></td>
-        <td></td>
         <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
     </tr>
 @endif