diff --git a/resources/views/akaun/laporan_ansuran.blade.php b/resources/views/akaun/laporan_ansuran.blade.php
index 3fe8880..47f3c59 100644
--- a/resources/views/akaun/laporan_ansuran.blade.php
+++ b/resources/views/akaun/laporan_ansuran.blade.php
@@ -1,301 +1,346 @@
 <style>
-#header {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#header td, #customers th {
- 
-  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;
-}
-</style>
-
-
-
-
-<style>
-#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;
-}
-</style>
-
-
-<style>
-#scan {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#scan td, #scan th {
-  border-collapse: collapse;
-  padding: 8px;
-  font-size:11px;
-}
-
-#scan tr:nth-child(even){background-color: #ffffff;}
-
-#scan tr:hover {background-color: #ddd;}
-
-#scan th {
-  border-collapse: collapse;
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-
-
-<style>
-#details {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#details td, #details th {
- 
-  padding: 8px;
-  font-size:11px;
-}
-
-#details tr:nth-child(even){background-color: #ffffff;}
-
-#details tr:hover {background-color: #ddd;}
-
-#details th {
-  padding-top: 12px;
- font-style:bold;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-<style>
-#sign {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#sign td, #sign th {
-
-  padding: 8px;
-  font-size:11px;
-  text-align: center;
-}
-
-#sign tr:nth-child(even){background-color: #ffffff;}
-
-#sign tr:hover {background-color: #ddd;}
-
-#sign th {
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-
-
-
-
-
-
-
-<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>
-  <tr>
-    <td>{{ $cawangan_detail['namacaw'] }}</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>{{ $cawangan_detail['alamat1'] }}</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
-    <td></td>
-  </tr>
-</table>
-<br>
-
-<table id="scan">
-  <tr>
-    <th colspan ="5"><b>LAPORAN ANSURAN</b></th>
-    <th> </th>
-    <th> </th>
-    <th><b> Tarikh Cetak:</b>
+  #header {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #header td, #customers th {
+   
+    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;
+  }
+  </style>
+  
+  
+  
+  
+  <style>
+  #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;
+  }
+  </style>
+  
+  
+  <style>
+  #scan {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #scan td, #scan th {
+    border-collapse: collapse;
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #scan tr:nth-child(even){background-color: #ffffff;}
+  
+  #scan tr:hover {background-color: #ddd;}
+  
+  #scan th {
+    border-collapse: collapse;
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+  
+  
+  
+  <style>
+  #details {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #details td, #details th {
+   
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #details tr:nth-child(even){background-color: #ffffff;}
+  
+  #details tr:hover {background-color: #ddd;}
+  
+  #details th {
+    padding-top: 12px;
+   font-style:bold;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+  
+  <style>
+  #sign {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #sign td, #sign th {
+  
+    padding: 8px;
+    font-size:11px;
+    text-align: center;
+  }
+  
+  #sign tr:nth-child(even){background-color: #ffffff;}
+  
+  #sign tr:hover {background-color: #ddd;}
+  
+  #sign th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+  
+  
+  
+  
+  
+  
+  
+  
+  <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>
+    <tr>
+      <td>{{ $cawangan_detail['namacaw'] }}</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>{{ $cawangan_detail['alamat1'] }}</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+      <td></td>
+    </tr>
+  </table>
+  <br>
+  
+  <table id="scan">
+    <tr>
+      <th colspan ="5"><b>LAPORAN ANSURAN</b></th>        
+    </tr>
+    <tr>
+      <td style="white-space: nowrap" colspan="2"><b>Tarikh Bayaran: </b>
+      
         @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp
-    </th>
-    <th></th>
-  </tr>
-  <tr>
-    <td style="width:10px"> <b>TARIKH</b></td>
-    <td>@php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo($formattedweddingdate)
+      @endphp
+      
+      </td>
+     
+      
+      <td style="white-space: nowrap" colspan="2"><b>Tarikh Cetak: </b>
+      
+        @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo($formattedweddingdate)
+      @endphp</td>
+     
+    </tr>
+  </table>
+  
+  <br>
+  <table id="details">
+    <tr>
+      <th>Bil</th>
+      <th>No Rujukan</th>
+      <th width="30%">Nama</th>
+      <th>No K/P</th>
+      <th>Tarikh Bayaran</th>
+      <th>Tempoh</th>
+      <th>Baki Pembiayaan (RM)</th>
+      <th>Bayaran Pemb. (RM)</th>
+      <th>Ujrah(RM)</th>
+      <th>Keuntungan 1% (RM)</th>
+      <th>Keuntungan (RM)</th>
+      <th>Bayaran (RM)</th>
+    </tr>
+    @php 
+          $counter = 1;
+          $totalduitmasuk = 0;
+          $totalkeuntungan = 0; 
+          $totalpendahuluan = 0;
+          $totalujrah = 0;
+          $totalonepercent = 0;
+      @endphp
+    @foreach($tebus as $index=>$item)
+    @php 
+          $totalduitmasuk += $item['duit_masuk'];
+          $totalkeuntungan += $item['bayaran_keuntungan'];
+          $totalpendahuluan += $item['bayaran_pembiayaan']; 
+          $totalujrah += bcdiv(round($item['ansuranujrah'],2),1,1);
+          $totalonepercent += bcdiv(round($item['ansuranonepercent'],2),1,1); 
+    @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; 
+              $totalujrahteller = 0;
+              $totalonepercentteller = 0;                
+          @endphp
+      @endif
+    @else
+      <tr>
+          <td colspan="11">Teller : <b>{{ $item['teller'] }}</b></td>
+      </tr>
+          @php 
+              $totaldmteller = 0;
+              $totalupahteller = 0;
+              $totalpendhteller = 0; 
+              $totalujrahteller = 0;
+              $totalonepercentteller = 0;
+          @endphp
+    @endif
+      <tr>
+        <td>{{ $counter }}</td>
+        <td>{{$item['norujukan']}}</td>
+        <td>{{ $item['nama'] }}</td>
+        <td>{{ $item['nokp'] }}</td>
+        <td> @php 
+          $myDateTime = DateTime::createFromFormat('Y-m-d H:i:s', $item['tarikh_bayaran']);
           $formattedweddingdate = $myDateTime->format('d-m-Y');
           echo($formattedweddingdate)
         @endphp</td>
-    <td style="width:50px">   
-    </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-    <td> </td>
-  </tr>
-</table>
+        <td>{{ $item['tempoh'] }}</td>
+        <td>{{ number_format($item['bakipjm'],2) }}</td>
+        <td>{{ number_format($item['bayaran_pembiayaan'],2) }}</td>    
+        <td>{{ number_format(bcdiv(round($item['ansuranujrah'],2),1,1),2) }}</td> 
+        <td>{{  number_format(bcdiv(round($item['ansuranonepercent'],2),1,1),2) }}</td>           
+        <td>{{ number_format($item['bayaran_keuntungan'],2) }}</td>
+        <td>{{ number_format($item['duit_masuk'],2) }}</td>
+      </tr>
+      @php $counter++; @endphp
+      @php 
+          $totaldmteller += $item['duit_masuk'];
+          $totalupahteller += $item['bayaran_keuntungan'];
+          $totalpendhteller += $item['bayaran_pembiayaan']; 
+          $totalujrahteller += bcdiv(round($item['ansuranujrah'],2),1,1);
+          $totalonepercentteller += bcdiv(round($item['ansuranonepercent'],2),1,1); 
+      @endphp
 
-<br>
-<table id="details">
-  <tr>
-    <th>Bil</th>
-    <th>No Rujukan</th>
-    <th width="30%">Nama</th>
-    <th>No K/P</th>
-    <th>Tempoh</th>
-    <th>Baki Pembiayaan (RM)</th>
-    <th>Bayaran Pemb. (RM)</th>
-    <th>Keuntungan (RM)</th>
-    <th>Bayaran (RM)</th>
-  </tr>
-  @php $counter = 1;$totalduitmasuk = 0;$totalkeuntungan = 0; $totalpendahuluan = 0;@endphp
-  @foreach($tebus as $index=>$item)
-  @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
+      @if($index+1 < sizeof($tebus))
+          @if($item['teller'] != $tebus[$index + 1]['teller'])
+              <tr>
+                  <td colspan="7">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+                  <td><b>{{ number_format($totalpendhteller,2) }} </b></td>
+                  <td><b>{{ number_format($totalujrahteller,2) }} </b></td>
+                  <td><b>{{ number_format($totalonepercentteller,2) }} </b></td>
+                  <td><b>{{ number_format($totalupahteller,2) }} </b></td>
+                  <td><b>{{ number_format($totaldmteller,2) }} </b></td>
+              </tr>
+              @php 
+                  $counter = 1;
+                  $totaldmteller = 0;
+                  $totalupahteller = 0;
+                  $totalpendhteller = 0;
+              @endphp
+          @endif
+      @else
+          <tr>
+              <td colspan="7">{{ $counter-1 }} Jumlah Bagi Teller : {{ $item['teller'] }}</td>
+              <td><b>{{ number_format($totalpendhteller,2) }} </b></td>
+              <td><b>{{ number_format($totalujrahteller,2) }} </b></td>
+              <td><b>{{ number_format($totalonepercentteller,2) }} </b></td>
+              <td><b>{{ number_format($totalupahteller,2) }} </b></td>
+          <td><b>{{ number_format($totaldmteller,2) }} </b></td>
+          </tr>
+      @endif
+    @endforeach
+  </table>
+  
+  <br><br>
+  <table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
     <tr>
-        <td colspan="11">Teller : <b>{{ $item['teller'] }}</b></td>
+      <th colspan="9"></th>
+      <th style="text-align:center;">Bayaran Pemb. (RM)</th>
+      <th style="text-align:center;">Ujrah (RM)</th>
+      <th style="text-align:center;">Keuntungan 1% (RM)</th>
+      <th style="text-align:center;">Keuntungan (RM)</th>
+      <th style="text-align:center;">Bayaran (RM)</th>
     </tr>
-    @php $totaldmteller = 0;$totalupahteller = 0;$totalpendhteller = 0; @endphp
-  @endif
     <tr>
-      <td>{{ $counter }}</td>
-      <td>{{$item['norujukan']}}</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['bayaran_keuntungan'],2) }}</td>
-      <td>{{ number_format($item['duit_masuk'],2) }}</td>
+      <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+      <td>{{ number_format($totalpendahuluan,2) }}</td>
+      <td>{{ number_format($totalujrah,2) }}</td>
+      <td>{{ number_format($totalonepercent,2) }}</td>
+      <td>{{ number_format($totalkeuntungan,2) }}</td>
+      <td>{{ number_format($totalduitmasuk,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($totalpendhteller,2) }} </b></td>
-                <td><b>{{ number_format($totalupahteller,2) }} </b></td>
-		<td><b>{{ number_format($totaldmteller,2) }} </b></td>
-            </tr>
-            @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($totalpendhteller,2) }} </b></td>
-            <td><b>{{ number_format($totalupahteller,2) }} </b></td>
-	    <td><b>{{ number_format($totaldmteller,2) }} </b></td>
-        </tr>
-    @endif
-  @endforeach
-</table>
-
-<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;">Keuntungan (RM)</th>
-    <th style="text-align:center;">Bayaran (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($totalkeuntungan,2) }}</td>
-    <td>{{ number_format($totalduitmasuk,2) }}</td>
-  </tr>
-</table>
-
-<br><br>
-<br><br>
-<table id="sign">
-  <tr>
-    <td></td>
-    <td colspan="2"> .................................................................. </td>
-    <td> </td>
-    <td colspan="2">.................................................................. </td>
-    <td> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td colspan="2"><B> DI SEMAK</B> </td>
-    <td> </td>
-    <td colspan="2"><B>DI SAHKAN </B></td>
-    <td> </td>
-  </tr>
-</table>
-
-
-
-
-
-
+  </table>
+  
+  <br><br>
+  <br><br>
+  <table id="sign">
+    <tr>
+      <td></td>
+      <td colspan="2"> .................................................................. </td>
+      <td> </td>
+      <td colspan="2">.................................................................. </td>
+      <td> </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td colspan="2"><B> DI SEMAK</B> </td>
+      <td> </td>
+      <td colspan="2"><B>DI SAHKAN </B></td>
+      <td> </td>
+    </tr>
+  </table>
\ No newline at end of file
diff --git a/resources/views/akaun/laporan_gadaian.blade.php b/resources/views/akaun/laporan_gadaian.blade.php
index 1943478..5527150 100644
--- a/resources/views/akaun/laporan_gadaian.blade.php
+++ b/resources/views/akaun/laporan_gadaian.blade.php
@@ -219,24 +219,55 @@
     <th>Berat</th>
     <th>N Marhun</th>
     <th>Pembiayaan</th>
+    <th>Ujrah</th>
+    <th>Keuntungan 1%</th>
     <th>Keuntungan</th>
     <th>Peratus (%)</th>
   </tr>
-  @php $counter = 1; $totalpinjaman = 0; $totalberat = 0; $totalnm = 0; $totalupah = 0; $bil = 0;@endphp
+  @php 
+      $counter = 1; 
+      $totalpinjaman = 0; 
+      $totalberat = 0; 
+      $totalnm = 0; 
+      $totalupah = 0; 
+      $bil = 0;  
+      $full_total_ujrah = 0; 
+      $full_total_onepercent = 0;
+  @endphp
   @foreach($gadai as $index=>$item)
-  @php $totalpinjaman += $item['pinjaman']; $totalberat += $item['berat']; $totalnm += $item['nilaimarhun']; $totalupah += $item['upah12']; @endphp
+  @php 
+      $totalpinjaman += $item['pinjaman']; 
+      $totalberat += $item['berat']; 
+      $totalnm += $item['nilaimarhun']; 
+      $totalupah += $item['upah12']; 
+      $full_total_ujrah += $item['ujrah']*12;
+      $full_total_onepercent += $item['onepercent']*12;
+  @endphp
     @if($index > 0)
         @if($item['teller'] != $gadai[$index - 1]['teller'])
             <tr>
                 <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
             </tr>
-           @php $totalpinjamanteller = 0;$totalnmteller = 0;$totalberatteller = 0; @endphp
+           @php 
+                $totalpinjamanteller = 0;
+                $totalnmteller = 0;
+                $totalberatteller = 0;
+                $totalujrah = 0;
+                $totalonepercent = 0;
+            @endphp
         @endif
     @else
         <tr>
             <td colspan=10>Teller : <b>{{ $item['teller'] }}</b></td>
         </tr>
-        @php $totalpinjamanteller = 0;$totalnmteller = 0;$totalberatteller = 0;$totalupah12 = 0; @endphp
+        @php 
+            $totalpinjamanteller = 0;
+            $totalnmteller = 0;
+            $totalberatteller = 0;
+            $totalupah12 = 0; 
+            $totalujrah = 0;
+            $totalonepercent= 0;
+        @endphp
 
     @endif
     <tr>
@@ -252,11 +283,20 @@
       <td>{{ number_format($item['berat'],2) }}</td>
       <td>{{ number_format($item['nilaimarhun'],2) }}</td>
       <td>{{ number_format($item['pinjaman'],2) }}</td>
+      <td>{{ number_format($item['ujrah']*12,2) }}</td>
+      <td>{{ number_format($item['onepercent']*12,2) }}</td>     
       <td>{{ number_format($item['upah12'],2) }}</td>
       <td>{{ $item['percentpinj'] }}</td>
     </tr>
     @php $counter++; @endphp
-    @php $totalpinjamanteller += $item['pinjaman'];$totalnmteller += $item['nilaimarhun'];$totalberatteller += $item['berat'];$totalupah12 += $item['upah12']; @endphp
+    @php 
+          $totalpinjamanteller += $item['pinjaman'];
+          $totalnmteller += $item['nilaimarhun'];
+          $totalberatteller += $item['berat'];
+          $totalupah12 += $item['upah12']; 
+          $totalujrah += $item['ujrah']*12; 
+          $totalonepercent += $item['onepercent']*12; 
+    @endphp
     @if($index+1 < sizeof($gadai))
         @if($item['teller'] != $gadai[$index + 1]['teller'])
           @php if($item['teller'] != '')$bil += ($counter-1); @endphp
@@ -265,10 +305,19 @@
                 <td><b>{{ number_format($totalberatteller,2) }} </b></td>
                 <td><b>{{ number_format($totalnmteller,2) }} </b></td>
                 <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
+                <td><b>{{ number_format($totalujrah,2) }}</b></td>
+                <td><b>{{ number_format($totalonepercent,2) }}</b></td>
                 <td><b>{{ number_format($totalupah12,2) }} </b></td>
 
             </tr>
-            @php $counter = 1;$totalupah12 = 0;$totalpinjamanteller = 0;$totalnmteller = 0; @endphp
+            @php 
+                  $counter = 1;
+                  $totalupah12 = 0;
+                  $totalpinjamanteller = 0;
+                  $totalnmteller = 0; 
+                  $totalujrah = 0;
+                  $totalonepercent = 0; 
+            @endphp
         @endif
     @else
         @php $bil += ($counter-1); @endphp
@@ -277,6 +326,8 @@
             <td><b>{{ number_format($totalberatteller,2) }} </b></td>
             <td><b>{{ number_format($totalnmteller,2) }} </b></td>
             <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
+            <td><b>{{ number_format($totalujrah,2) }}</b></td>
+            <td><b>{{ number_format($totalonepercent,2) }}</b></td>
             <td><b>{{ number_format($totalupah12,2) }} </b></td>
 
         </tr>
@@ -290,6 +341,8 @@
     <th style="text-align:center;">Berat (g/m)</th>
     <th style="text-align:center;">Nilai Marhun (RM)</th>
     <th style="text-align:center;">Pembiayaan (RM)</th>
+    <th style="text-align:center;">Ujrah (RM)</th>
+    <th style="text-align:center;">Keuntungan 1% (RM)</th>
     <th style="text-align:center;">Upah/Keuntungan (RM)</th>
   </tr>
   <tr>
@@ -297,6 +350,8 @@
     <td>{{ number_format($totalberat,2) }}</td>
     <td>{{ number_format($totalnm,2) }}</td>
     <td>{{ number_format($totalpinjaman,2) }}</td>
+    <td>{{ number_format($full_total_ujrah,2) }}</td>
+    <td>{{ number_format($full_total_onepercent,2) }}</td>
     <td>{{ number_format($totalupah,2) }}</td>
   </tr>
 </table>
diff --git a/resources/views/akaun/laporan_penebusan.blade.php b/resources/views/akaun/laporan_penebusan.blade.php
index 5082370..8591342 100644
--- a/resources/views/akaun/laporan_penebusan.blade.php
+++ b/resources/views/akaun/laporan_penebusan.blade.php
@@ -1,397 +1,495 @@
 <style>
-#header {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#header td, #customers th {
- 
-  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;
-}
-</style>
-
-
-
-
-<style>
-#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;
-}
-</style>
-
-
-<style>
-#scan {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#scan td, #scan th {
-  border-collapse: collapse;
-  padding: 8px;
-  font-size:11px;
-}
-
-#scan tr:nth-child(even){background-color: #ffffff;}
-
-#scan tr:hover {background-color: #ddd;}
-
-#scan th {
-  border-collapse: collapse;
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-
-
-<style>
-#details {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#details td, #details th {
- 
-  padding: 8px;
-  font-size:8px;
-}
-
-#details tr:nth-child(even){background-color: #ffffff;}
-
-#details tr:hover {background-color: #ddd;}
-
-#details th {
-  padding-top: 12px;
- font-style:bold;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-</style>
-
-<style>
-#sign {
-  font-family: Arial, Helvetica, sans-serif;
-  border-collapse: collapse;
-  width: 100%;
-}
-
-#sign td, #sign th {
-
-  padding: 8px;
-  font-size:11px;
-  text-align: center;
-}
-
-#sign tr:nth-child(even){background-color: #ffffff;}
-
-#sign tr:hover {background-color: #ddd;}
-
-#sign th {
-  padding-top: 12px;
-  padding-bottom: 12px;
-  text-align: left;
-  padding:4px;
-  color:black;
-}
-
-@media print {
-  .new-page {
-    page-break-before: always;
+  #header {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 100%;
   }
-}
-
-</style>
-
-
-<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>
-  <tr>
-    <td style="font-size:20px;font-weight:bold;">{{ $cawangan_detail['namacaw'] }}</td>
-    <td></td>
-  </tr>
-  {{-- <tr>
-    <td>{{ $cawangan_detail['alamat1'] }}</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
-    <td></td>
-  </tr> --}}
-</table>
-<br>
-
-<table id="scan">
-  <tr>
-    <th colspan ="5"><b>LAPORAN PENEBUSAN</b></th>
-    <th> </th>
-    <th> </th>
-    <th><b> Tarikh Cetak:</b>
-        @php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp
-    </th>
-    <th></th>
-  </tr>
-  <tr>
-    <td style="width:10px"> <b>Tarikh:</b></td>
-    <td>@php 
-          $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
-          $formattedweddingdate = $myDateTime->format('d-m-Y');
-          echo($formattedweddingdate)
-        @endphp</td>
-    <td style="width:50px">   
-    </td>
-  </tr>
-</table>
-
-<br>
-<table id="details">
-  <tr>
-    <th>Bil</th>
-    <th>Norujukan</th>
-    <th>Nama</th>
-    <th>No KP</th>
-    <th>Masa</th>
-    <th>JBG</th>
-    <th>J Tebus</th>
-    <th width="6%;">Nilai Marhun(RM)</th>
-    <th width="6%;">P. Asal(RM)</th>
-    <th width="6%;">B.Pembiayaan(RM)</th>
-    {{-- <th width="6%;">Baki Pembiayaan(RM)</th> --}}
-    <th width="6%;">Keuntungan(RM)</th>
-    <th width="6%;">Bayaran(RM)</th>
-    <th width="6%;">Jumlah(RM)</th>
-  </tr>
-  @php $counter = 1;$totalnm = 0; $totalbayaran = 0;$totalpinjamanasal = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
-  @foreach($tebus as $index=>$item)
-  @php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['gadaibakipjm']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman']; $totalupah += $item['bakiupah'];$totalpinjamanasal += $item['pinjaman']; $totalnm += $item['nilaimarhun'];@endphp
-    @if($index > 0)
-        @if($item['teller'] != $tebus[$index - 1]['teller'])
-            <tr>
-                <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
-            </tr>
-            @php $totalnmteller = 0;$totalpinjamanasalteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; @endphp
-        @endif
-    @else
-        <tr>
-            <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
-        </tr>
-        @php $totalnmteller = 0;$totalpinjamanasalteller = 0; $totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0; $totaljumlahteller = 0;@endphp
-    @endif
+  
+  #header td, #customers th {
+   
+    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;
+  }
+  </style>
+  
+  
+  
+  
+  <style>
+  #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;
+  }
+  </style>
+  
+  
+  <style>
+  #scan {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #scan td, #scan th {
+    border-collapse: collapse;
+    padding: 8px;
+    font-size:11px;
+  }
+  
+  #scan tr:nth-child(even){background-color: #ffffff;}
+  
+  #scan tr:hover {background-color: #ddd;}
+  
+  #scan th {
+    border-collapse: collapse;
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+  
+  
+  
+  <style>
+  #details {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #details td, #details th {
+   
+    padding: 8px;
+    font-size:8px;
+  }
+  
+  #details tr:nth-child(even){background-color: #ffffff;}
+  
+  #details tr:hover {background-color: #ddd;}
+  
+  #details th {
+    padding-top: 12px;
+   font-style:bold;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  </style>
+  
+  <style>
+  #sign {
+    font-family: Arial, Helvetica, sans-serif;
+    border-collapse: collapse;
+    width: 100%;
+  }
+  
+  #sign td, #sign th {
+  
+    padding: 8px;
+    font-size:11px;
+    text-align: center;
+  }
+  
+  #sign tr:nth-child(even){background-color: #ffffff;}
+  
+  #sign tr:hover {background-color: #ddd;}
+  
+  #sign th {
+    padding-top: 12px;
+    padding-bottom: 12px;
+    text-align: left;
+    padding:4px;
+    color:black;
+  }
+  
+  @media print {
+    .new-page {
+      page-break-before: always;
+    }
+  }
+  
+  </style>
+  
+  
+  <table id="header">
     <tr>
-      <td>{{ $counter }}</td>
-      <td>{{ $item['norujukan'] }}</td>
-      <td>{{ $item['nama'] }}</td>
-      <td>{{ $item['nokp'] }}</td>
-      <td>
-        @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>@php 
-      
-      if($item['hargajualan'] !== $item['bakihargajualan'])
-        echo number_format($item['gadaibakipjm'],2);
-      else  
-        echo number_format($item['pinjaman'],2);
-      @endphp</td>
-      {{-- <td>{{ number_format($item['gadaibakipjm'],2) }}</td> --}}
-      <td>{{ number_format($item['bakiupah'],2) }}</td>
-      <td>{{ number_format($item['bakipjm'],2) }}</td>
-      <td>@php if($item['jenistebus'] == 'S'){ $total=($item['gadaibakipjm']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp</td>
+      <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>
-    @php $counter++; @endphp
-    @php $totalnmteller += $item['nilaimarhun'];$totalpinjamanasalteller += $item['pinjaman']; $totalpinjamanteller += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
-    @php $totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['gadaibakipjm']+$item['bakiupah']) : $item['bakipjm']; @endphp
-    @if($index+1 < sizeof($tebus))
-        @if($item['teller'] != $tebus[$index + 1]['teller'])
-            <tr class="new-page">
-                <td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
-                <td><b>{{ number_format($totalnmteller,2) }} </b></td>
-		<td><b>{{ number_format($totalpinjamanasalteller,2) }} </b></td>
-                <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
-                <td><b>{{ number_format($totalupahteller,2) }} </b></td>
-                <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
-                <td><b>{{ number_format($totaljumlahteller,2) }} </b></td>
-            </tr>
-            @php $counter = 1;$totalpinjamanasalteller = 0;$totalpinjamanteller = 0;$totalupahteller = 0;$totalbayaranteller = 0;$totaljumlahteller = 0; @endphp
-        @endif
-    @else
-        <tr class="new-page">
-            <td colspan="7"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
-            <td><b>{{ number_format($totalnmteller,2) }}</b></td>
-	    <td><b>{{ number_format($totalpinjamanasalteller,2) }} </b></td>
-            <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
-            <td><b>{{ number_format($totalupahteller,2) }} </b></td>
-            <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
-            <td><b>{{ number_format($totaljumlahteller,2) }} </b></td>
-        </tr>
-    @endif
-  @endforeach
-</table>
-
-<br><br>
-<table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
-  <tr>
-    <th colspan="9" style="text-align: center;"><b>JUMLAH BILANGAN = {{ $tebuspengasingan['biltawarruq'] + $tebuspengasingan['bilarrahn'] }}</b></th>
-    <th style="text-align:center;">Nilai Marhun (RM)</th>
-    <th style="text-align:center;">Pembiayaan Asal(RM)</th>
-    <th style="text-align:center;">B. Pembiayaan (RM)</th>
-    <th style="text-align:center;">Keuntungan Rebet(RM)</th>
-    <th style="text-align:center;">Upah/Keuntungan (RM)</th>
-    <th style="text-align:center;">Keuntungan Sebenar(RM)</th>
-    <th style="text-align:center;">Jumlah (RM)</th>
-  </tr>
-  <tr>
-    <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
-    <td>{{ number_format($totalnm,2) }}</td>
-    <td>{{ number_format($totalpinjamanasal,2) }}</td>
-    <td>{{ number_format($totalpinjaman,2) }}</td>
-    <td>@php $totalkeuntunganrebet = ($totalpinjaman + $totalupah) - $totalbayaran;echo number_format($totalkeuntunganrebet,2); @endphp</td>
-    <td>{{ number_format($totalupah,2) }}</td>
-    <td>{{ number_format($totalupah - $totalkeuntunganrebet,2) }}</td>
-    <td>{{ number_format($totalbayaran,2) }}</td>
-  </tr>
-</table>
-
-<h4>Laporan Transaksi Penebusan</h4>
-<br>
-
-<table id="details">
-  <thead>
-    <th>Bil</th>
-    <th>Jenis</th>
-    <th>Penebusan(RM)</th>
-    <th>Keuntungan(RM)</th>
-    <th>Rebate(RM)</th>
-  </thead>
-  <tr>
-    <td>{{ $tebuspengasingan['biltawarruq'] }}</td>
-    <td>Tawarruq</td>
-    <td>{{ number_format($tebuspengasingan['totaltawarruq'],2) }}</td>
-    <td>{{ number_format($tebuspengasingan['keuntungantawarruq'],2) }}</td>
-    <td>{{ number_format($tebuspengasingan['totalrebate'],2) }}</td>
-  </tr>
-  <tr>
-    <td>{{ $tebuspengasingan['bilarrahn'] }}</td>
-    <td>Ar-Rahn</td>
-    <td>{{ number_format($tebuspengasingan['totalarrahn'],2) }}</td>
-    <td>{{ number_format($tebuspengasingan['keuntunganarrahn'],2) }}</td>
-    <td> Not Applicable </td>
-  </tr>
-  <tr>
-    <td>{{ $upahlama['bilkaunter'] }}</td>
-    <td>Bayaran Upah</td>
-    <td> Not Applicable </td>
-    <td>{{ number_format($upahlama['totalkaunter'],2) }}</td>
-    <td> Not Applicable </td>
-  </tr>
-  <tr>
-    <td>{{ $upahlama['bilonline'] }}</td>
-    <td>Bayaran Upah Online</td>
-    <td> Not Applicable </td>
-    <td>{{ number_format($upahlama['totalonline'],2) }}</td>
-    <td> Not Applicable </td>
-  </tr>
-  <tr>
-    <td>{{ $ansuran['bilangankaunter'] }}</td>
-    <td>Ansuran Pembiayaan</td>
-    <td>{{ number_format($ansuran['totalpendahuluankaunter'],2) }}</td>
-    <td>{{ number_format($ansuran['totalkeuntungankaunter'],2) }}</td>
-    <td> Not Applicable </td>
-  </tr>
-  <tr>
-    <td>{{ $ansuran['bilanganonline'] }}</td>
-    <td>Ansuran Pembiayaan Online</td>
-    <td>{{ number_format($ansuran['totalpendahuluanonline'],2) }}</td>
-    <td>{{ number_format($ansuran['totalkeuntunganonline'],2) }}</td>
-    <td> Not Applicable </td>
-  </tr>
-</table>
-
-{{-- <h5 style="float:right;">JUMLAH KESELURUHAN BAYARAN : RM {{ number_format($totalbayaran,2) }}</h5> --}}
-
-
-<br>
-<br>
-<table id="sign">
-  <tr>
-    <td></td>
-    <td colspan="2"> .................................................................. </td>
-    <td> </td>
-    <td colspan="2">.................................................................. </td>
-    <td> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td colspan="2"><B> DI SEMAK</B> </td>
-    <td> </td>
-    <td colspan="2"><B>DI SAHKAN </B></td>
-    <td> </td>
-  </tr>
-</table>
+    <tr>
+      <td>{{ $cawangan_detail['namacaw'] }}</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>{{ $cawangan_detail['alamat1'] }}</td>
+      <td></td>
+    </tr>
+    <tr>
+      <td>{{ $cawangan_detail['alamat2'].' No Tel : '. $cawangan_detail['notel'].' No Faks : '. $cawangan_detail['nofaks'] }}</td>
+      <td></td>
+    </tr>
+  </table>
+  <br>
+  
+  <table id="scan">
+    <tr>
+      <th colspan ="5"><b>LAPORAN PENEBUSAN</b></th>
+      
+    </tr>
+    <tr>
+      <td style="white-space: nowrap" colspan="2"><b>Tarikh Mula: </b>
+      
+        @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $tebus_date);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo($formattedweddingdate)
+      @endphp
+      
+      </td>
+      
+      <td style="white-space: nowrap" colspan="2"><b>Tarikh Cetak: </b>
+      
+        @php 
+        $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak);
+        $formattedweddingdate = $myDateTime->format('d-m-Y');
+        echo($formattedweddingdate)
+      @endphp</td>
+     
+    </tr>
+  </table>
+  
+  <br>
+  <table id="details">
+    <tr>
+      <th>Bil</th>
+      <th>Norujukan</th>
+      <th>Nama</th>
+      <th>No KP</th>
+      <th>Tarikh Tebus</th>
+      <th>Masa</th>
+      <th>JBG</th>
+      <th>J Tebus</th>
+      <th>Nilai Marhun(RM)</th>
+      <th>P. Asal(RM)</th>
+      <th>B.Pembiayaan(RM)</th>
+      <th>Ujrah(RM)</th>
+      <th>Untung 1%(RM)</th>
+      <th>Pendapatan(RM)</th>
+      <th>Bayaran(RM)</th>
+      <th>Jumlah(RM)</th>
+    </tr>
+    @php 
+          $counter = 1;
+          $totalnm = 0; 
+          $totalbayaran = 0;
+          $totalpinjamanasal = 0; 
+          $totalpinjaman = 0; 
+          $totalupah = 0;
+          $totalujrah = 0;
+          $totalonepercent = 0;
+    @endphp
 
+    @foreach($tebus as $index=>$item)
+    @php 
+          $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['gadaibakipjm']+$item['bakiupah']) : $item['bakipjm']; 
+          $totalpinjaman += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman']; 
+          $totalupah += $item['bakiupah'];
+          $totalpinjamanasal += $item['pinjaman']; 
+          $totalnm += $item['nilaimarhun'];
+          $totalujrah += $item['ujrah'];
+          $totalonepercent += $item['onepercent'];
 
+    @endphp
 
+      @if($index > 0)
+          @if($item['teller'] != $tebus[$index - 1]['teller'])
+              <tr>
+                  <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
+              </tr>
+              @php 
+                  $totalnmteller = 0;
+                  $totalpinjamanasalteller = 0; 
+                  $totalpinjamanteller = 0;
+                  $totalupahteller = 0;
+                  $totalbayaranteller = 0; 
+                  $totalujrahteller = 0;
+                  $totalonepercentteller = 0;
+              @endphp
+          @endif
+      @else
+          <tr>
+              <td colspan="12">Teller : <b>{{ $item['teller'] }}</b></td>
+          </tr>
+          @php 
+              $totalnmteller = 0;
+              $totalpinjamanasalteller = 0; 
+              $totalpinjamanteller = 0;
+              $totalupahteller = 0;
+              $totalbayaranteller = 0; 
+              $totaljumlahteller = 0;
+              $totalujrahteller = 0;
+              $totalonepercentteller = 0;
+          @endphp
+      @endif
 
+      <tr>
+        <td>{{ $counter }}</td>
+        <td>{{ $item['norujukan'] }}</td>
+        <td>{{ $item['nama'] }}</td>
+        <td>{{ $item['nokp'] }}</td>
+        <td>
+          @php
+              $dt = new DateTime($item['tarikh_bayaran']);
+              $time = $dt->format('d-m-Y');
+              echo date($time);
+          @endphp
+        </td>
+        <td>
+          @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>
+            @php 
+              if($item['hargajualan'] !== $item['bakihargajualan'])
+                echo number_format($item['gadaibakipjm'],2);
+              else  
+                echo number_format($item['pinjaman'],2);
+            @endphp
+        </td>
+        <td>{{ number_format($item['ujrah'],2) }}</td>
+        <td>{{ number_format($item['onepercent'],2) }}</td>
+        <td>{{ number_format($item['bakiupah'],2) }}</td>
+        <td>{{ number_format($item['bakipjm'],2) }}</td>
+        <td>@php if($item['jenistebus'] == 'S'){ $total=($item['gadaibakipjm']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp</td>
+      </tr>
 
 
+      @php $counter++; @endphp
+      @php 
+          $totalnmteller += $item['nilaimarhun'];
+          $totalpinjamanasalteller += $item['pinjaman']; 
+          $totalpinjamanteller += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman'];
+          $totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; 
+          $totalujrahteller += $item['ujrah'];
+          $totalonepercentteller += $item['onepercent'];
+      @endphp
 
+      @php 
+          $totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['gadaibakipjm']+$item['bakiupah']) : $item['bakipjm'];
+      @endphp
 
+      @if($index+1 < sizeof($tebus))
+          @if($item['teller'] != $tebus[$index + 1]['teller'])
+              <tr class="new-page">
+                  <td colspan="8"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
+                  <td><b>{{ number_format($totalnmteller,2) }} </b></td>
+                  <td><b>{{ number_format($totalpinjamanasalteller,2) }} </b></td>
+                  <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
+                  <td><b>{{ number_format($totalujrahteller,2) }} </b></td>
+                  <td><b>{{ number_format($totalonepercentteller,2) }} </b></td>
+                  <td><b>{{ number_format($totalupahteller,2) }} </b></td>
+                  <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
+                  <td><b>{{ number_format($totaljumlahteller,2) }} </b></td>
 
+              </tr>
+              @php 
+                    $counter = 1;
+                    $totalpinjamanasalteller = 0;
+                    $totalpinjamanteller = 0;
+                    $totalupahteller = 0;
+                    $totalbayaranteller = 0;
+                    $totaljumlahteller = 0;
+                    $totalujrahteller = 0;
+                    $totalonepercentteller = 0;
+              @endphp
+          @endif
+      @else
+          <tr>
+              <td colspan="8"><b>{{ $counter-1 }}</b> Jumlah Bagi Teller : <b>{{ $item['teller'] }}</b></td>
+              <td><b>{{ number_format($totalnmteller,2) }}</b></td>
+              <td><b>{{ number_format($totalpinjamanasalteller,2) }} </b></td>
+              <td><b>{{ number_format($totalpinjamanteller,2) }} </b></td>
+              <td><b>{{ number_format($totalujrahteller,2) }} </b></td>
+              <td><b>{{ number_format($totalonepercentteller,2) }} </b></td>
+              <td><b>{{ number_format($totalupahteller,2) }} </b></td>
+              <td><b>{{ number_format($totalbayaranteller,2) }} </b></td>
+              <td><b>{{ number_format($totaljumlahteller,2) }} </b></td>
+          </tr>
+      @endif
+    @endforeach
+  </table>
+  
+  <br><br>
+  <table id="details" style="border-top:1px solid black;border-bottom:1px solid black;text-align:center;">
+    <tr>
+      <th colspan="9" style="text-align: center;"><b>JUMLAH BILANGAN = {{ $tebuspengasingan['biltawarruq'] + $tebuspengasingan['bilarrahn'] }}</b></th>
+      <th style="text-align:center;">Nilai Marhun (RM)</th>
+      <th style="text-align:center;">Pembiayaan Asal(RM)</th>
+      <th style="text-align:center;">B. Pembiayaan (RM)</th>
+      <th style="text-align:center;">Keuntungan Rebet(RM)</th>
+      <th style="text-align:center;">Ujrah (RM)</th>
+      <th style="text-align:center;">Untung 1% (RM)</th>
+      <th style="text-align:center;">Pendapatan Kasar (RM)</th>
+      <th style="text-align:center;">Pendapatan Sebenar(RM)</th>
+      <th style="text-align:center;">Jumlah (RM)</th>
+    </tr>
+    <tr>
+      <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
+      <td>{{ number_format($totalnm,2) }}</td>
+      <td>{{ number_format($totalpinjamanasal,2) }}</td>
+      <td>{{ number_format($totalpinjaman,2) }}</td>
+      <td>@php $totalkeuntunganrebet = ($totalpinjaman + $totalupah) - $totalbayaran;
+          echo number_format($totalkeuntunganrebet,2); 
+          @endphp</td>
+      <td>{{ number_format($totalujrah,2) }}</td>
+      <td>{{ number_format($totalonepercent,2) }}</td>
+      <td>{{ number_format($totalupah,2) }}</td>
+      <td>{{ number_format($totalupah - $totalkeuntunganrebet,2) }}</td>
+      <td>{{ number_format($totalbayaran,2) }}</td>
 
+    </tr>
+  </table>
+  
+  <h4>Laporan Transaksi Penebusan</h4>
+  <br>
+  
+  <table id="details">
+    <thead>
+      <th>Bil</th>
+      <th>Jenis</th>
+      <th>Penebusan(RM)</th>
+      <th>Ujrah(RM)</th>
+      <th>Untung 1% (RM)</th>
+      <th>Pendapatan(RM)</th>
+      <th>Rebate(RM)</th>
+    </thead>
+    <tr>
+      <td>{{ $tebuspengasingan['biltawarruq'] }}</td>
+      <td>Tawarruq</td>
+      <td>{{ number_format($tebuspengasingan['totaltawarruq'],2) }}</td>
+      <td>{{ number_format($tebuspengasingan['ujrahtawarruq'],2) }}</td>
+      <td>{{ number_format($tebuspengasingan['onepercenttawarruq'],2) }}</td>
+      <td>{{ number_format($tebuspengasingan['keuntungantawarruq'],2) }}</td>
+      <td>{{ number_format($tebuspengasingan['totalrebate'],2) }}</td>
+    </tr>
+    <tr>
+      <td>{{ $tebuspengasingan['bilarrahn'] }}</td>
+      <td>Ar-Rahn</td>
+      <td>{{ number_format($tebuspengasingan['totalarrahn'],2) }}</td>
+      <td>{{ number_format($tebuspengasingan['ujraharrahn'],2) }}</td>
+      <td>{{ number_format($tebuspengasingan['onepercentarrahn'],2) }}</td>
+      <td>{{ number_format($tebuspengasingan['keuntunganarrahn'],2) }}</td>
+      <td> Not Applicable </td>
+    </tr>
+    <tr>
+      <td>{{ $upahlama['bilkaunter'] }}</td>
+      <td>Bayaran Upah</td>
+      <td> Not Applicable </td>
+      <td> Not Applicable</td>
+      <td> Not Applicable</td>
+      <td>{{ number_format($upahlama['totalkaunter'],2) }}</td>
+      <td> Not Applicable </td>
+    </tr>
+    <tr>
+      <td>{{ $upahlama['bilonline'] }}</td>
+      <td>Bayaran Upah Online</td>
+      <td> Not Applicable </td>
+      <td> Not Applicable</td>
+      <td> Not Applicable</td>
+      <td>{{ number_format($upahlama['totalonline'],2) }}</td>
+      <td> Not Applicable </td>
+    </tr>
+    <tr>
+      <td>{{ $ansuran['bilangankaunter'] }}</td>
+      <td>Ansuran Pembiayaan</td>
+      <td>{{ number_format($ansuran['totalpendahuluankaunter'],2) }}</td>
+      <td>{{ number_format($ansuran['totalujrahkaunter'],2) }}</td>
+      <td>{{ number_format($ansuran['totalonepercentkaunter'],2) }}</td>
+      <td>{{ number_format($ansuran['totalkeuntungankaunter'],2) }}</td>
+      <td> Not Applicable </td>
+    </tr>
+    <tr>
+      <td>{{ $ansuran['bilanganonline'] }}</td>
+      <td>Ansuran Pembiayaan Online</td>
+      <td>{{ number_format($ansuran['totalpendahuluanonline'],2) }}</td>
+      <td>{{ number_format($ansuran['totalujrahonline'],2) }}</td>
+      <td>{{ number_format($ansuran['totalonepercentonline'],2) }}</td>
+      <td>{{ number_format($ansuran['totalkeuntunganonline'],2) }}</td>
+      <td> Not Applicable </td>
+    </tr>
+  </table>
+  
+  
+  
+  <br>
+  <br>
+  <table id="sign">
+    <tr>
+      <td></td>
+      <td colspan="2"> .................................................................. </td>
+      <td> </td>
+      <td colspan="2">.................................................................. </td>
+      <td> </td>
+    </tr>
+    <tr>
+      <td></td>
+      <td colspan="2"><B> DI SEMAK</B> </td>
+      <td> </td>
+      <td colspan="2"><B>DI SAHKAN </B></td>
+      <td> </td>
+    </tr>
+  </table>
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 923d351..d6455f8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -151,9 +151,9 @@ Route::get('/audit/cetakan', ['as'=>'audit.cetak','uses'=>'App\Http\Controllers\
 
 
 //Tetapan Server
-Route::get('/tetapan',['as'=>'tetapan','uses'=>'App\Http\Controllers\TetapanController@index'])->middleware(['roleChecker:null,null,operasi,null']);
-Route::get('/tetapanhome',['as'=>'tetapan.home','uses'=>'App\Http\Controllers\TetapanController@home'])->middleware(['roleChecker:null,null,operasi,null']);
-Route::get('/tetapanmargin',['as'=>'tetapan.margin','uses'=>'App\Http\Controllers\TetapanController@margin'])->middleware(['roleChecker:null,null,operasi,null']);
+Route::get('/tetapan',['as'=>'tetapan','uses'=>'App\Http\Controllers\TetapanController@index'])->middleware(['roleChecker:null,null,operasi,null,null']);
+Route::get('/tetapanhome',['as'=>'tetapan.home','uses'=>'App\Http\Controllers\TetapanController@home'])->middleware(['roleChecker:null,null,operasi,null,null']);
+Route::get('/tetapanmargin',['as'=>'tetapan.margin','uses'=>'App\Http\Controllers\TetapanController@margin'])->middleware(['roleChecker:null,null,operasi,null,null']);
 
 
 //Pengguna