From 7f031e3a48d30aa9ea1c24f95cdb1f54f7840137 Mon Sep 17 00:00:00 2001
From: ivan-sim <ivan@sismedika.com>
Date: Mon, 15 Jan 2024 13:38:00 +0700
Subject: [PATCH] Update TTD

---
 .../Controllers/Api/RequestLogController.php   | 18 ++++++++++++++++--
 resources/views/pdf/final_log_page_2.blade.php | 14 ++++++++++++--
 resources/views/pdf/req_log_page_1.blade.php   | 14 ++++++++++++--
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
index 355a770e..6c7e6155 100644
--- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
+++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
@@ -533,7 +533,14 @@ class RequestLogController extends Controller
         ->where('files.fileable_type', '=', 'App\Models\Signature')
         ->where('signatures.type', '=', 2)
         ->where('signatures.user_id', '=', $dataRequestLog->approved_by)
-        ->select('files.path')
+        ->select(
+            'files.path',
+            DB::raw('
+                (Select persons.name FROM users 
+                    LEFT JOIN persons ON users.person_id = persons.id
+                    WHERE users.id = "'.$dataRequestLog->approved_by.'" LIMIT 1) AS name_approve
+            ')
+        )
         ->first();
 
         $data['signatureAd'] = $signatureAd;
@@ -705,7 +712,14 @@ class RequestLogController extends Controller
         ->where('files.fileable_type', '=', 'App\Models\Signature')
         ->where('signatures.type', '=', 2)
         ->where('signatures.user_id', '=', $dataRequestLog->approved_by)
-        ->select('files.path')
+        ->select(
+            'files.path',
+            DB::raw('
+                (Select persons.name FROM users 
+                    LEFT JOIN persons ON users.person_id = persons.id
+                    WHERE users.id = "'.$dataRequestLog->approved_by.'" LIMIT 1) AS name_approve
+            ')
+        )
         ->first();
 
         $data['signatureAd'] = $signatureAd;
diff --git a/resources/views/pdf/final_log_page_2.blade.php b/resources/views/pdf/final_log_page_2.blade.php
index fb8ee714..f2a154dc 100644
--- a/resources/views/pdf/final_log_page_2.blade.php
+++ b/resources/views/pdf/final_log_page_2.blade.php
@@ -304,8 +304,18 @@
             @endphp
         </div>
         <div class="corner-text-<?php echo now()->timestamp; ?>  bottom-right-ttd-<?php echo now()->timestamp; ?> ">
-        (.......................................)<br>
-        <b>Customer Service Team</b>
+        @php
+            if (!empty($signatureAd->name_approve)) {
+        @endphp
+            <u><b>{{ $signatureAd->name_approve }}</b></u>
+        @php
+            } else {
+        @endphp
+        (.......................................)
+        @php
+            }
+        @endphp
+        <br><b>Customer Service Team</b>
         </div>
         <div class="corner-text-<?php echo now()->timestamp; ?>  bottom-left1-ttd-<?php echo now()->timestamp; ?> ">
         (.......................................)
diff --git a/resources/views/pdf/req_log_page_1.blade.php b/resources/views/pdf/req_log_page_1.blade.php
index 743181c6..3d043828 100644
--- a/resources/views/pdf/req_log_page_1.blade.php
+++ b/resources/views/pdf/req_log_page_1.blade.php
@@ -470,8 +470,18 @@
             @endphp
         </div>
         <div class="corner-text-<?php echo now()->timestamp; ?>  bottom-right-ttd-<?php echo now()->timestamp; ?> ">
-        (.......................................)<br>
-           <b>Customer Service Team</b>
+        @php
+            if (!empty($signatureAd->name_approve)) {
+        @endphp
+            <u><b>{{ $signatureAd->name_approve }}</b></u>
+        @php
+            } else {
+        @endphp
+        (.......................................)
+        @php
+            }
+        @endphp
+            <br><b>Customer Service Team</b>
         </div>
         <div class="corner-text-<?php echo now()->timestamp; ?>  bottom-right1-ttd-<?php echo now()->timestamp; ?> ">
             <b>{{ $dataMember->name }}</b>