From 9ec9215b97805cbf7e74b6de996c967f5b28254a Mon Sep 17 00:00:00 2001
From: Amir <amirhassan.hamzan@gmail.com>
Date: Sun, 3 Dec 2023 11:10:04 +0800
Subject: [PATCH] Append data to resit tebus

---
 app/Http/Controllers/GadaianController.php    |  9 +++-
 .../views/print/resittebus_ujrah.blade.php    | 47 ++++++++++++-------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/app/Http/Controllers/GadaianController.php b/app/Http/Controllers/GadaianController.php
index 01164f8..3f96867 100644
--- a/app/Http/Controllers/GadaianController.php
+++ b/app/Http/Controllers/GadaianController.php
@@ -515,6 +515,8 @@ class GadaianController extends Controller
 
         $transaction = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/'. $id)->json();
 
+        $transaction_tebus = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/transaction/one/'. $id)->json();
+
         foreach($transaction as $trans)
         {
                 $totaltransaction += $trans['duit_masuk'];
@@ -543,8 +545,11 @@ class GadaianController extends Controller
         if(sizeof($wakil) != 0)
             $wakil = $wakil[0];
 
-        // return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
-        return view('print.resittebus_ujrah',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
+        if($gadai['tagbaru'] == 1) {
+            return view('print.resittebus_ujrah',compact('transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
+        } else {
+            return view('print.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
+        }
     }
 
     public function resitbelumtebus($id)
diff --git a/resources/views/print/resittebus_ujrah.blade.php b/resources/views/print/resittebus_ujrah.blade.php
index e338cd4..d8e756a 100644
--- a/resources/views/print/resittebus_ujrah.blade.php
+++ b/resources/views/print/resittebus_ujrah.blade.php
@@ -492,33 +492,36 @@
             <td> </td>
             <td> </td>
             <td>Masa Bayaran</td>
-            <td>: --:--:--</td>
+            @php
+            $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']);
+            $masa = date('H:i:s', $masa_bayaran);
+            @endphp
+            <td>: {{ $masa }}</td>
         </tr>
     </table>
     <br>
 
     <h1 style="float:left;position:absolute;margin-left:100px;">T</h1>
-
     <table id="payment">
         <tr>
             <td style="width:10px">Baki Pembiayaan</td>
-            <td style="width:10px">: RM {{ number_format($gadai['hargajualan'], 2) }} </td>
+            <td style="width:10px">: RM {{ number_format($penebusan['bakipjm'], 2) }} </td>
         </tr>
         <tr>
-            <td style="width:10px">Untung</td>
-            <td style="width:10px">: RM {{ number_format($totalBayaranAnsuran, 2) }}</td>
+            <td style="width:10px">Keuntungan</td>
+            <td style="width:10px">: RM {{ number_format($penebusan['onepercent'], 2) }}</td>
         </tr>
         <tr>
             <td style="width:10px">(-) Rebat Untung</td>
-            <td style="width:10px">: RM {{ number_format($gadai['bakihargajualan'], 2) }} </td>
+            <td style="width:10px">: RM {{ number_format($transaction_tebus['onepercent_rebet'], 2) }} </td>
         </tr>
         <tr>
             <td style="width:10px">Ujrah</td>
-            <td style="width:10px">: RM {{ number_format($penebusan['rebate'], 2) }} </td>
+            <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
         </tr>
         <tr>
             <td style="width:10px">(-) Rebat Ujrah</td>
-            <td style="width:10px">: RM {{ number_format($gadai['bakihargajualan'] - $penebusan['rebate'], 2) }}</td>
+            <td style="width:10px">: RM {{ number_format($transaction_tebus['ujrah_rebet'], 2) }} </td>
         </tr>
         <tr>
             <td></td>
@@ -530,8 +533,11 @@
             <td></td>
         </tr>
         <tr>
+            @php
+            $jumlah_perlu_dibayar = $penebusan['bakipjm'] + $penebusan['onepercent'] - $transaction_tebus['onepercent_rebet'] + $penebusan['ujrah'] - $transaction_tebus['ujrah_rebet'];
+            @endphp
             <td><strong>Jumlah Perlu Dibayar</strong></td>
-            <td><strong>: RM XX.XX</strong></td>
+            <td><strong>: RM {{ number_format($jumlah_perlu_dibayar, 2) }}</strong></td>
         </tr>
     </table>
 
@@ -637,7 +643,11 @@
             <td> </td>
             <td> </td>
             <td>Masa Bayaran</td>
-            <td>: --:--:--</td>
+            @php
+            $masa_bayaran = strtotime($transaction_tebus['tarikh_bayaran']);
+            $masa = date('H:i:s', $masa_bayaran);
+            @endphp
+            <td>: {{ $masa }}</td>
         </tr>
     </table>
     <br>
@@ -647,23 +657,23 @@
     <table id="payment">
         <tr>
             <td style="width:10px">Baki Pembiayaan</td>
-            <td style="width:10px">: RM {{ number_format($gadai['hargajualan'], 2) }} </td>
+            <td style="width:10px">: RM {{ number_format($penebusan['bakipjm'], 2) }} </td>
         </tr>
         <tr>
-            <td style="width:10px">Untung</td>
-            <td style="width:10px">: RM {{ number_format($totalBayaranAnsuran, 2) }}</td>
+            <td style="width:10px">Keuntungan</td>
+            <td style="width:10px">: RM {{ number_format($penebusan['onepercent'], 2) }}</td>
         </tr>
         <tr>
             <td style="width:10px">(-) Rebat Untung</td>
-            <td style="width:10px">: RM {{ number_format($gadai['bakihargajualan'], 2) }} </td>
+            <td style="width:10px">: RM {{ number_format($transaction_tebus['onepercent_rebet'], 2) }} </td>
         </tr>
         <tr>
             <td style="width:10px">Ujrah</td>
-            <td style="width:10px">: RM {{ number_format($penebusan['rebate'], 2) }} </td>
+            <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
         </tr>
         <tr>
             <td style="width:10px">(-) Rebat Ujrah</td>
-            <td style="width:10px">: RM {{ number_format($gadai['bakihargajualan'] - $penebusan['rebate'], 2) }}</td>
+            <td style="width:10px">: RM {{ number_format($transaction_tebus['ujrah_rebet'], 2) }} </td>
         </tr>
         <tr>
             <td></td>
@@ -675,8 +685,11 @@
             <td></td>
         </tr>
         <tr>
+            @php
+            $jumlah_perlu_dibayar = $penebusan['bakipjm'] + $penebusan['onepercent'] - $transaction_tebus['onepercent_rebet'] + $penebusan['ujrah'] - $transaction_tebus['ujrah_rebet'];
+            @endphp
             <td><strong>Jumlah Perlu Dibayar</strong></td>
-            <td><strong>: RM XX.XX</strong></td>
+            <td><strong>: RM {{ number_format($jumlah_perlu_dibayar, 2) }}</strong></td>
         </tr>
     </table>