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

2024-01-30 14:10:06 +07:00
parent 55ff788dd6 f34498ced5
commit 217d793a7b
5 changed files with 25 additions and 26 deletions
--- a/resources/views/pdf/final_log_page_2.blade.php
+++ b/resources/views/pdf/final_log_page_2.blade.php
@@ -292,7 +292,7 @@
           <br><b>Offsite Medical Treatment</b>
        </div>
        <div class="corner-text-<?php echo now()->timestamp; ?>  bottom-right-ttd-1-<?php echo now()->timestamp; ?> ">
-                {{ \Carbon\Carbon::parse(now())->format('d M Y') }},<br>
+                {{ \Carbon\Carbon::parse($request_logs->approved_final_log_at)->format('d M Y') }},<br>
                Petugas Alarm Center
        </div>
        <div class="corner-text-<?php echo now()->timestamp; ?>  bottom-right-ttd-2-<?php echo now()->timestamp; ?> ">