From fa5c01e1fd770f5bb991c4ca9e0b912520926a33 Mon Sep 17 00:00:00 2001
From: unknown <ain55645@gmail.com>
Date: Mon, 23 Sep 2024 09:20:15 +0800
Subject: [PATCH] adjust term  tebus keseluruhan diresit

---
 resources/views/penebusan/v2/index.blade.php           | 2 +-
 resources/views/print/laporan_upah.blade.php           | 4 ++--
 resources/views/print/resittebus.blade.php             | 4 ++--
 resources/views/print/resittebussebelum.blade.php      | 8 ++++----
 resources/views/print/resittebusseparuhbelum.blade.php | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/resources/views/penebusan/v2/index.blade.php b/resources/views/penebusan/v2/index.blade.php
index f80e15f..dd53715 100644
--- a/resources/views/penebusan/v2/index.blade.php
+++ b/resources/views/penebusan/v2/index.blade.php
@@ -91,7 +91,7 @@
                             <select class="form-control" id="sltjenistebus">
                                 <option value="T">T = Penyelesaian Pembiayaan</option>
                                     @if($gadai['tagbaru'] == 1)
-                                        <option value="A" {{ $gadai['tempoh'] >= 12 ? 'disabled' : '' }}>A = Ansuran</option>
+                                        <option value="A" {{ $gadai['tempoh'] >= 12 ? 'disabled' : '' }}>A = Ansuran Pembiayaan</option>
                                         @if(config('redeemoption.enable_separuh') == 1)
                                             <option value="S">S = Sebahagian</option>
                                         @endif
diff --git a/resources/views/print/laporan_upah.blade.php b/resources/views/print/laporan_upah.blade.php
index ac3808d..9b2e990 100644
--- a/resources/views/print/laporan_upah.blade.php
+++ b/resources/views/print/laporan_upah.blade.php
@@ -280,8 +280,8 @@
   <tr>
     <th colspan="9"></th>
     <th style="text-align:center;">Pembiayaan (RM)</th>
-    <th style="text-align:center;">Upah Sebenar (RM)</th>
-    <th style="text-align:center;">Upah Dibayar (RM)</th>
+    <th style="text-align:center;">Keuntungan Sebenar (RM)</th>
+    <th style="text-align:center;">Keuntungan Dibayar (RM)</th>
   </tr>
   <tr>
     <td colspan="9" style="text-align: center;"><b>JUMLAH KESELURUHAN</b></td>
diff --git a/resources/views/print/resittebus.blade.php b/resources/views/print/resittebus.blade.php
index e80ee53..d81d0e0 100644
--- a/resources/views/print/resittebus.blade.php
+++ b/resources/views/print/resittebus.blade.php
@@ -598,7 +598,7 @@ hr.new5 {
           <td></td>
       </tr>
       <tr>
-          <td style="width:10px; font-size:17px"><b>Tebus Keseluruhan</b></td>
+          <td style="width:10px; font-size:17px"><b>Jumlah Keseluruhan</b></td>
           <td style="width:10px; font-size:17px">:<b> RM
             {{ number_format($transaction_tebus['duit_masuk'], 2) }} </b>
           </td>
@@ -819,7 +819,7 @@ hr.new5 {
           <td></td>
       </tr>
       <tr>
-          <td style="width:10px; font-size:17px"><b>Tebus Keseluruhan</b></td>
+          <td style="width:10px; font-size:17px"><b>Jumlah Keseluruhan</b></td>
           <td style="width:10px; font-size:17px">:<b> RM
             {{ number_format($transaction_tebus['duit_masuk'], 2) }} </b>
           </td>
diff --git a/resources/views/print/resittebussebelum.blade.php b/resources/views/print/resittebussebelum.blade.php
index 9ab7531..c729a19 100644
--- a/resources/views/print/resittebussebelum.blade.php
+++ b/resources/views/print/resittebussebelum.blade.php
@@ -438,10 +438,10 @@ hr.new5 {
 <td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>
 </tr>
 <tr>
-  <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
+  <td style="width:10px">Jumlah Keuntungan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }} </b></td>
+  <td style="width:10px"><b>Jumlah Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }} </b></td>
   </tr>
 
 
@@ -534,10 +534,10 @@ hr.new5 {
 <td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>
 </tr>
 <tr>
-  <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
+  <td style="width:10px">Jumlah Keuntungan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</b></td>
+  <td style="width:10px"><b>Jumlah Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">:<b> RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</b></td>
   </tr>
 
 </table>
diff --git a/resources/views/print/resittebusseparuhbelum.blade.php b/resources/views/print/resittebusseparuhbelum.blade.php
index b8cd997..693c38c 100644
--- a/resources/views/print/resittebusseparuhbelum.blade.php
+++ b/resources/views/print/resittebusseparuhbelum.blade.php
@@ -427,10 +427,10 @@ hr.new5 {
 <td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>
 </tr>
 <tr>
-  <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
+  <td style="width:10px">Jumlah Keuntungan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
+  <td style="width:10px"><b>Jumlah Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
   </tr>
 
 
@@ -525,10 +525,10 @@ hr.new5 {
 <td style="width:10px">Pembiayaan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman']),2) }} </td>
 </tr>
 <tr>
-  <td style="width:10px">Jumlah Upah</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
+  <td style="width:10px">Jumlah Keuntungan</td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format($penebusan['bakiupah'],2) }} </td>
   </tr>
 <tr>
-  <td style="width:10px"><b>Tebus Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
+  <td style="width:10px"><b>Jumlah Keseluruhan</b></td><td style="width:5px"> </td><td style="width:10px">: RM {{ number_format(($gadai['pinjaman'] + $penebusan['bakiupah']),2) }}</td>
   </tr>
 
 </table>