diff --git a/resources/views/print/sag_ujrah.blade.php b/resources/views/print/sag_ujrah.blade.php
index 2a32468..df11c00 100644
--- a/resources/views/print/sag_ujrah.blade.php
+++ b/resources/views/print/sag_ujrah.blade.php
@@ -637,19 +637,19 @@
             <td>NILAI MARHUN</td>
             <td>RM {{ number_format($gadai_detail['nilaimarhun'], 2) }} </td>
             <td>UJRAH</td>
-            <td>RM XX-XX</td>
+            <td>RM {{ number_format($gadai_detail['ujrah'], 2) }} </td>
         </tr>
         <tr>
             <td>NILAI PEMBIAYAAN</td>
             <td>RM {{ number_format($gadai_detail['pinjaman'], 2) }} </td>
             <td>KEUNTUNGAN</td>
-            <td>RM XX-XX</td>
+            <td>RM {{ number_format($gadai_detail['onepercent'], 2) }} </td>
         </tr>
         <tr>
             <td>HARGA JUALAN</td>
             <td>RM {{ number_format($gadai_detail['hargajualan'], 2) }}</td>
             <td>JUMLAH BAYARAN SEBULAN</td>
-            <td><strong>RM XX-XX</strong></td>
+            <td><strong>RM {{ number_format($gadai_detail['bakiupah'] / 6, 2) }}</strong></td>
         </tr>
     </table>
 
@@ -1096,33 +1096,40 @@
                 <table id="marhun">
                     <tr>
                         <th>BAYARAN</th>
-                        <th>Tempoh Matang (6 bulan)</th>
-                        <th>Tempoh Lanjutan (6 Bulan)</th>
+                        <th>Tempoh Matang <span style="text-wrap: nowrap;">(6 bulan)</span></th>
+                        <th>Tempoh Lanjutan <span style="text-wrap: nowrap;">(6 Bulan)</span></th>
                     </tr>
                     <tr>
                         <td>TARIKH AKHIR BAYARAN</td>
-                        <td>Sebelum/pada xx-xx-xx</td>
-                        <td>Sebelum/pada xx-xx-xx</td>
+                        <td>Sebelum/pada
+                            <span style="text-wrap: nowrap;">{{ date('d-m-Y', strtotime($gadai_detail['t_matang'])) }}
+                            </span>
+                        </td>
+                        <td>Sebelum/pada
+                            <span
+                                style="text-wrap: nowrap;">{{ date('d-m-Y', strtotime($gadai_detail['t_matang1'])) }}
+                            </span>
+                        </td>
                     </tr>
                     <tr>
                         <td>KADAR KEUNTUNGAN (1%)</td>
-                        <td></td>
-                        <td></td>
+                        <td>RM {{ number_format($gadai_detail['onepercent'] * 6, 2) }}</td>
+                        <td>RM {{ number_format($gadai_detail['onepercent'] * 6, 2) }}</td>
                     </tr>
                     <tr>
                         <td>UJRAH (PENYIMPANAN MARHUN)</td>
-                        <td></td>
-                        <td></td>
+                        <td>RM {{ number_format($gadai_detail['ujrah'] * 6, 2) }}</td>
+                        <td>RM {{ number_format($gadai_detail['ujrah'] * 6, 2) }}</td>
                     </tr>
                     <tr>
                         <td>JUMLAH YANG PERLU DIBAYAR</td>
-                        <td></td>
-                        <td></td>
+                        <td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>
+                        <td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>
                     </tr>
                     <tr>
                         <td>JUMLAH KEUNTUNGAN DAN UJRAH TERKUMPUL</td>
-                        <td></td>
-                        <td></td>
+                        <td>RM {{ number_format($gadai_detail['bakiupah'], 2) }}</td>
+                        <td>RM {{ number_format($gadai_detail['upah12'], 2) }}</td>
                     </tr>
                 </table>
                 <table id="akad_pembiayaan">
@@ -1405,19 +1412,19 @@
             <td>NILAI MARHUN</td>
             <td>RM {{ number_format($gadai_detail['nilaimarhun'], 2) }} </td>
             <td>UJRAH</td>
-            <td>RM XX-XX</td>
+            <td>RM {{ number_format($gadai_detail['ujrah'], 2) }} </td>
         </tr>
         <tr>
             <td>NILAI PEMBIAYAAN</td>
             <td>RM {{ number_format($gadai_detail['pinjaman'], 2) }} </td>
             <td>KEUNTUNGAN</td>
-            <td>RM XX-XX</td>
+            <td>RM {{ number_format($gadai_detail['onepercent'], 2) }} </td>
         </tr>
         <tr>
             <td>HARGA JUALAN</td>
             <td>RM {{ number_format($gadai_detail['hargajualan'], 2) }}</td>
             <td>JUMLAH BAYARAN SEBULAN</td>
-            <td><strong>RM XX-XX</strong></td>
+            <td><strong>RM {{ number_format($gadai_detail['bakiupah'] / 6, 2) }}</strong></td>
         </tr>
     </table>
     <table style="margin-bottom:10px;" id="keuntungan">