Bug fixes were applied to receipt A and T for both non-ujrah and ujrah

app/Http/Controllers/ResitController.php

@@ -23,8 +23,6 @@ class ResitController extends Controller
 
         $transaction = Http::get(config('api.url') . '/api/transaction/id/'. $id)->json();
 
-        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json();
-
         if(sizeof($transaction) != 0)
             $transaction = $transaction[0];
 
@@ -35,13 +33,15 @@ class ResitController extends Controller
 
         $customers_info = Http::get(config('api.url') . '/api/customers/'. $gadai['nokp'])->json();
 
+        $cawangan_info = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/cawangan/' . $gadai['kodcaw'])->json();
+
         $wakil = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $transaction['nowakil'])->json();
 
         if($gadai['tagbaru'] == 1){
-            return view('resit.resitansuran_ujrah',compact('transaction','gadai','customers_info'));
+            return view('resit.resitansuran_ujrah',compact('transaction','gadai','customers_info','cawangan_info','wakil'));
 
         }else{
-            return view('resit.resitansuran',compact('transaction','gadai','customers_info'));
+            return view('resit.resitansuran',compact('transaction','gadai','customers_info','cawangan_info','wakil'));
         }
     }
 
@@ -136,6 +136,8 @@ class ResitController extends Controller
 
         $transaction = Http::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'];
@@ -152,6 +154,7 @@ class ResitController extends Controller
 
         $totalBayaranAnsuran = Http::get(config('api.url') . '/api/transaction/norujukan/total/ansuran',['norujukan'=>$id])->json();
 
+        $totalrebate = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/reports/totalrebate',['norujukan'=>$id])->json();
         $surat_wakil = [];
         if(sizeof($wakil) != 0) {
             $wakil = $wakil[0];
@@ -163,10 +166,10 @@ class ResitController extends Controller
         $khazanah_user = User::where('role_harian', 'khazanah')->where('cawangan', $auth_user['cawangan'])->select('name')->first();
 
         if($gadai['tagbaru'] == 1){
-            return view('resit.resittebus_ujrah',compact('surat_wakil','transaction_tebus', 'transaction','gadai','cawangan_info','customers_info','wakil','totaltransaction','totalBayaranAnsuran', 'khazanah_user'));
+            return view('resit.resittebus_ujrah',compact('transaction','transaction_tebus','totalrebate','khazanah_user','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
 
         }else{
-            return view('resit.resittebus',compact('transaction','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
+            return view('resit.resittebus',compact('transaction','transaction_tebus','totalrebate','khazanah_user','gadai','cawangan_info','customers_info','penebusan','wakil','totaltransaction','totalBayaranAnsuran'));
         }
     }
 

resources/views/resit/resitansuran.blade.php

@@ -440,14 +440,13 @@ hr.new5 {
 </tr>
 <tr>
 
-<td colspan="3">DiSemak </td> 
-      <td></td>    
-      <td colspan="3"> Cagaran Di Keluarkan</td>
-      <td></td> 
-      <td colspan="3">Cagaran Diterima </td>
-      <td></td> 
-      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
-
+  <td colspan="3">DiSemak </td> 
+  <td></td>    
+  <td colspan="3"> Cagaran Di Keluarkan</td>
+  <td></td> 
+  <td colspan="3">Cagaran Diterima </td>
+  <td></td> 
+  <td colspan="3"> Ar-Rahn <br> <b>{{ optional(Auth::user())->name ?? '' }}</b></td>
 
 </tr>
   </table>
@@ -549,7 +548,7 @@ hr.new5 {
     <td></td> 
     <td colspan="3">Cagaran Diterima </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+    <td colspan="3"> Ar-Rahn <br> <b>{{ optional(Auth::user())->name ?? '' }}</b></td>
 
 
 </tr>

resources/views/resit/resitansuran_ujrah.blade.php

@@ -546,12 +546,11 @@
             <td colspan="9"></td>
             <td colspan="3">Teller</td>
         </tr>
-        <tr>
-
+        {{-- <tr>
             <td colspan="3">{{ $customers_info['nama'] }}</td>
             <td colspan="9"></td>
             <td colspan="3">{{ Auth::user()->name }}</td>
-        </tr>
+        </tr> --}}
     </table>
     <hr class="new2">
     </hr>
@@ -670,12 +669,11 @@
             <td colspan="9"></td>
             <td colspan="3">Teller</td>
         </tr>
-        <tr>
-
+        {{-- <tr>
             <td colspan="3">{{ $customers_info['nama'] }}</td>
             <td colspan="9"></td>
             <td colspan="3">{{ Auth::user()->name }}</td>
-        </tr>
+        </tr> --}}
     </table>
     <table id="inside" style="width: 45%; margin-top:20px">
         <tr>

resources/views/resit/resittebus.blade.php

@@ -473,7 +473,7 @@ hr.new5 {
       <td></td> 
       <td colspan="3">Cagaran Diterima </td>
       <td></td> 
-      <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+      <td colspan="3">Ar-Rahn <br> <b>{{ optional(Auth::user())->name ?? '' }}</b></td>
 
 
 </tr>
@@ -575,7 +575,7 @@ hr.new5 {
     <td></td> 
     <td colspan="3">Cagaran Diterima </td>
     <td></td> 
-    <td colspan="3"> Ar-Rahn <br> <b>{{ Auth::user()->name }}</b></td>
+    <td colspan="3"> Ar-Rahn <br> <b>{{ optional(Auth::user())->name ?? '' }}</b></td>
 
 
 </tr>

resources/views/resit/resittebus_ujrah.blade.php

@@ -629,22 +629,22 @@
             </tr>
             <tr>
                 <td style="width:10px">Keuntungan</td>
-                <td style="width:10px">: RM {{ number_format($transaction_tebus['onepercent'], 2) }}</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(($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet']), 2) }}
+                    {{ number_format($totalrebate['onepercent'], 2) }}
                 </td>
             </tr>
             <tr>
                 <td style="width:10px">Lain-Lain Caj</td>
-                <td style="width:10px">: RM {{ number_format($transaction_tebus['ujrah'], 2) }} </td>
+                <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
             </tr>
             <tr>
                 <td style="width:10px">(-) Rebat Lain-Lain Caj</td>
                 <td style="width:10px">: RM
-                    {{ number_format(($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet']), 2) }} </td>
+                    {{ number_format($totalrebate['ujrah'], 2) }} </td>
             </tr>
             <tr>
                 <td></td>
@@ -683,17 +683,14 @@
             <td colspan="3">Khazanah</td>
 
         </tr>
-        <tr>
-            <td colspan="3">{{ Auth::user()->name }}</td>
+        {{-- <tr> --}}
+            {{-- <td colspan="3">{{ Auth::user()->name }}</td> --}}
 
-            <td></td>
-            <td colspan="3">{{ sizeof($wakil) != 0 ? $wakil['nama'] : $customers_info['nama'] }}</td>
-            <td></td>
-            <td colspan="3"> {{ $khazanah_user->name }}</td>
-
-
-
-        </tr>
+            {{-- <td></td> --}}
+            {{-- <td colspan="3">{{ sizeof($wakil) != 0 ? $wakil['nama'] : $customers_info['nama'] }}</td> --}}
+            {{-- <td></td> --}}
+            {{-- <td colspan="3"> {{ $khazanah_user->name }}</td> --}}            {{-- <td colspan="3">{{ $khazanah_user->name ?? '' }}</td> --}}
+        {{-- </tr> --}}
     </table>
     <hr class="new2">
 
@@ -859,22 +856,22 @@
             </tr>
             <tr>
                 <td style="width:10px">Keuntungan</td>
-                <td style="width:10px">: RM {{ number_format($transaction_tebus['onepercent'], 2) }}</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(($transaction_tebus['onepercent'] - $transaction_tebus['onepercent_rebet']), 2) }}
+                    {{ number_format($totalrebate['onepercent'], 2) }}
                 </td>
             </tr>
             <tr>
                 <td style="width:10px">Lain-Lain Caj</td>
-                <td style="width:10px">: RM {{ number_format($transaction_tebus['ujrah'], 2) }} </td>
+                <td style="width:10px">: RM {{ number_format($penebusan['ujrah'], 2) }} </td>
             </tr>
             <tr>
                 <td style="width:10px">(-) Rebat Lain-Lain Caj</td>
                 <td style="width:10px">: RM
-                    {{ number_format($($transaction_tebus['ujrah'] - $transaction_tebus['ujrah_rebet']), 2) }} </td>
+                    {{ number_format($totalrebate['ujrah'], 2) }} </td>
             </tr>
             <tr>
                 <td></td>
@@ -914,16 +911,14 @@
             <td colspan="3">Khazanah</td>
 
         </tr>
-        <tr>
+        {{-- <tr>
             <td colspan="3"> {{ Auth::user()->name }}</td>
             <td></td>
             <td colspan="3">{{ sizeof($wakil) != 0 ? $wakil['nama'] : $customers_info['nama'] }}</td>
-            <td></td>
-            <td colspan="3">{{ $khazanah_user->name }}</td>
-
-
-
-        </tr>
+            <td></td> --}}
+            {{-- <td colspan="3">{{ $khazanah_user->name }}</td> --}}
+            {{-- <td colspan="3">{{ $khazanah_user->name ?? '-' }}</td>
+        </tr> --}}
     </table>
     <table id="inside" style="width: 45%; margin-top:20px">
         <tr>