diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 3f96867..511ad55 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -386,8 +386,11 @@ class GadaianController extends Controller
         if(sizeof($wakil) != 0)
             $wakil = $wakil[0];
 
-        // return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil'));
-        return view('print.resitansuran_ujrah',compact('transaction','gadai','customers_info','wakil'));
+        if($gadai['tagbaru'] == 1) {
+            return view('print.resitansuran_ujrah',compact('transaction','gadai','customers_info','wakil'));
+        } else {
+            return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
+        }
     }
 
     public function resitbelumansurans($id)
diff --git a/resources/views/print/resitansuran_ujrah.blade.php b/resources/views/print/resitansuran_ujrah.blade.php
index 64ba248..45d19e9 100644
--- a/resources/views/print/resitansuran_ujrah.blade.php
+++ b/resources/views/print/resitansuran_ujrah.blade.php
@@ -479,7 +479,11 @@
             <td> </td>
             <td> </td>
             <td>Masa Bayaran</td>
-            <td>: --:--:--</td>
+            @php
+            $masa_bayaran = strtotime($transaction['tarikh_bayaran']);
+            $masa = date('H:i:s', $masa_bayaran);
+            @endphp
+            <td>: {{ $masa }}</td>
         </tr>
     </table>
     <br>
@@ -496,14 +500,14 @@
         <tr>
             <td style="width:30%"></td>
             <td style="width:20%"></td>
-            <td style="width:30%">Untung</td>
-            <td style="width:20%">: RM XX.XX</td>
+            <td style="width:30%">Keuntungan</td>
+            <td style="width:20%">: RM {{ number_format($transaction['bayaran_keuntungan'], 2) }}</td>
         </tr>
         <tr>
             <td style="width:30%"></td>
             <td style="width:20%"></td>
             <td style="width:30%">Ujrah</td>
-            <td style="width:20%">: RM XX.XX</td>
+            <td style="width:20%">: RM {{ number_format($transaction['ujrah'], 2) }}</td>
         </tr>
         <tr>
             <td></td>
@@ -518,7 +522,10 @@
             <td></td>
             <td></td>
             <td><strong>Jumlah Perlu Dibayar</strong></td>
-            <td><strong>: RM XX.XX</strong></td>
+            @php
+            $jumlah_perlu_dibayar = $transaction['bayaran_pembiayaan'] + $transaction['bayaran_keuntungan'] + $transaction['ujrah'];
+            @endphp
+            <td><strong>: RM {{ number_format($jumlah_perlu_dibayar, 2) }}</strong></td>
         </tr>
     </table>
     <p style="float:left;position:absolute;margin-left:50px;">
@@ -622,7 +629,11 @@
             <td> </td>
             <td> </td>
             <td>Masa Bayaran</td>
-            <td>: --:--:--</td>
+            @php
+            $masa_bayaran = strtotime($transaction['tarikh_bayaran']);
+            $masa = date('H:i:s', $masa_bayaran);
+            @endphp
+            <td>: {{ $masa }}</td>
         </tr>
     </table>
     <br>
@@ -639,14 +650,14 @@
         <tr>
             <td style="width:30%"></td>
             <td style="width:20%"></td>
-            <td style="width:30%">Untung</td>
-            <td style="width:20%">: RM XX.XX</td>
+            <td style="width:30%">Keuntungan</td>
+            <td style="width:20%">: RM {{ number_format($transaction['bayaran_keuntungan'], 2) }}</td>
         </tr>
         <tr>
             <td style="width:30%"></td>
             <td style="width:20%"></td>
             <td style="width:30%">Ujrah</td>
-            <td style="width:20%">: RM XX.XX</td>
+            <td style="width:20%">: RM {{ number_format($transaction['ujrah'], 2) }}</td>
         </tr>
         <tr>
             <td></td>
@@ -661,7 +672,10 @@
             <td></td>
             <td></td>
             <td><strong>Jumlah Perlu Dibayar</strong></td>
-            <td><strong>: RM XX.XX</strong></td>
+            @php
+            $jumlah_perlu_dibayar = $transaction['bayaran_pembiayaan'] + $transaction['bayaran_keuntungan'] + $transaction['ujrah'];
+            @endphp
+            <td><strong>: RM {{ number_format($jumlah_perlu_dibayar, 2) }}</strong></td>
         </tr>
     </table>
     <p style="float:left;position:absolute;margin-left:50px;">