Merge remote-tracking branch 'origin/staging' into origin/production

Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php

@@ -546,12 +546,16 @@ class RequestLogController extends Controller
         $data['request_logs'] = $dataRequestLog;
 
         $dataClaimLog =  DB::table('request_log_benefits')
-        ->where('request_log_benefits.request_log_id', '=', 2)
+        ->where('request_log_benefits.request_log_id', '=', $request_log_id)
         ->select(
             '*',
             DB::raw('
                 (Select benefits.description FROM benefits
                     WHERE benefits.id = request_log_benefits.benefit_id LIMIT 1) AS benfit
+            '),
+            DB::raw('
+                (Select benefits.code FROM benefits
+                    WHERE benefits.id = request_log_benefits.benefit_id LIMIT 1) AS code
             ')
         )
         ->get();

resources/views/pdf/final_log_page_1.blade.php

@@ -352,7 +352,7 @@
                     @endphp
                     <tr>
                         <td>{{ $No++ }}</td>
-                        <td>{{ $claimLog->benfit}}</td>
+                        <td>{{ $claimLog->code . '-' . $claimLog->benfit }}</td>
                         <td>{{ number_format($claimLog->amount_incurred, 2, ',', '.') }}</td>
                         <td>{{ number_format($claimLog->amount_approved, 2, ',', '.') }}</td>
                         <td>{{ number_format($claimLog->excess_paid, 2, ',', '.') }}</td>

resources/views/pdf/final_log_page_2.blade.php

@@ -259,7 +259,7 @@
            Customer Service Team 
         </div>
         <div class="corner-text-<?php echo now()->timestamp; ?>  bottom-left1-ttd-<?php echo now()->timestamp; ?> ">
-            (Nama Petugas)  
+        (.......................................)
         </div>
         <div class="corner-text-<?php echo now()->timestamp; ?>  bottom-right1-ttd-<?php echo now()->timestamp; ?> ">
             {{ $dataMember->name }}