diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php index 82acb9cb..2b3ac399 100644 --- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php +++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php @@ -448,6 +448,11 @@ class RequestLogController extends Controller LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id WHERE corporate_employees.member_id = members.id LIMIT 1) AS id_perusahaan '), + DB::raw(' + (Select corporates.code FROM corporates + LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id + WHERE corporate_employees.member_id = members.id LIMIT 1) AS code_perusahaan + '), DB::raw(' (Select services.name FROM services WHERE services.code = "'.$dataRequestLog->service_code.'" LIMIT 1) AS jenis_perwatan @@ -528,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; @@ -596,6 +608,11 @@ class RequestLogController extends Controller LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id WHERE corporate_employees.member_id = members.id LIMIT 1) AS id_perusahaan '), + DB::raw(' + (Select corporates.code FROM corporates + LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id + WHERE corporate_employees.member_id = members.id LIMIT 1) AS code_perusahaan + '), DB::raw(' (Select services.name FROM services WHERE services.code = "'.$dataRequestLog->service_code.'" LIMIT 1) AS jenis_perwatan @@ -695,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/public/images/ttd_dr_vale.png b/public/images/ttd_dr_vale.png index e45fb007..ca13edc3 100644 Binary files a/public/images/ttd_dr_vale.png and b/public/images/ttd_dr_vale.png differ diff --git a/resources/views/pdf/final_log_page_1.blade.php b/resources/views/pdf/final_log_page_1.blade.php index 56490502..636c1536 100644 --- a/resources/views/pdf/final_log_page_1.blade.php +++ b/resources/views/pdf/final_log_page_1.blade.php @@ -427,19 +427,19 @@
@php - if (!empty($logoPerusahaan->code) == 'VALEIND') { + if (!empty($dataMember->code_perusahaan) == 'VALEIND') { @endphp Alarm Center Vale MKS (LinkSehat) Office
- {{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}
+ {{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '' }}
Lt. 1, Jalan Somba Opu 281, Ujung Pandang, Losari,
Kec. Makassar, Kota Makassar, Sulawesi Selatan 90113 @php - } else if(!empty($logoPerusahaan->code) == 'PETROLAB') { + } else if(!empty($dataMember->code_perusahaan) == 'PETROLAB') { @endphp Alarm Center Vale MKS (LinkSehat) Office
- {{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}
+ {{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '' }}
Jalan Pisangan Lama 3 Nomor 28 Jatinegara, RT.9/RW.3,
Pisangan Tim., Kec. Pulo Gadung, Kota Jakarta Timur, Daerah Khusus Ibukota Jakarta 13230 @php @@ -447,7 +447,7 @@ @endphp Alarm Center Vale MKS (LinkSehat) Office
- {{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}
+ {{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '' }}
@php diff --git a/resources/views/pdf/final_log_page_2.blade.php b/resources/views/pdf/final_log_page_2.blade.php index ecfddf05..04a0b405 100644 --- a/resources/views/pdf/final_log_page_2.blade.php +++ b/resources/views/pdf/final_log_page_2.blade.php @@ -264,14 +264,14 @@ {{ $dataMember->nama_perusahaan }}
- - @php - if(!empty($logoPerusahaan->code) == 'VALEIND') { + @php + if(!empty($dataMember->code_perusahaan) == 'VALEIND') { $imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(public_path('images/ttd_dr_vale.png'))); echo ''; } @@ -279,7 +279,7 @@
@php - if (!empty($logoPerusahaan->code) == 'VALEIND') { + if (!empty($dataMember->code_perusahaan) == 'VALEIND') { @endphp Dr. Hery Hermas, M.Kes @php @@ -296,7 +296,7 @@ Petugas Alarm Center
- @php + @php if(!empty($signatureAd->path)) { $imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(storage_path('app/public/' . $signatureAd->path))); echo ''; @@ -304,8 +304,18 @@ @endphp
- (.......................................)
- Customer Service Team + @php + if (!empty($signatureAd->name_approve)) { + @endphp + {{ $signatureAd->name_approve }} + @php + } else { + @endphp + (.......................................) + @php + } + @endphp +
Customer Service Team
(.......................................) @@ -315,19 +325,19 @@
@php - if (!empty($logoPerusahaan->code) == 'VALEIND') { + if (!empty($dataMember->code_perusahaan) == 'VALEIND') { @endphp Alarm Center Vale MKS (LinkSehat) Office
- {{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}
+ {{ !empty($dataMember->name_perusahaan) ? $dataMember->name_perusahaan : '' }}
Lt. 1, Jalan Somba Opu 281, Ujung Pandang, Losari,
Kec. Makassar, Kota Makassar, Sulawesi Selatan 90113 @php - } else if(!empty($logoPerusahaan->code) == 'PETROLAB') { + } else if(!empty($dataMember->code_perusahaan) == 'PETROLAB') { @endphp Alarm Center Petrolab (LinkSehat) Office
- {{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}
+ {{ !empty($dataMember->name_perusahaan) ? $dataMember->name_perusahaan : '' }}
Jalan Pisangan Lama 3 Nomor 28 Jatinegara, RT.9/RW.3,
Pisangan Tim., Kec. Pulo Gadung, Kota Jakarta Timur, Daerah Khusus Ibukota Jakarta 13230 @php @@ -335,7 +345,7 @@ @endphp Alarm Center (LinkSehat) Office
- {{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}
+ {{ !empty($dataMember->name_perusahaan) ? $dataMember->name_perusahaan : '' }}
@php diff --git a/resources/views/pdf/req_log_page_1.blade.php b/resources/views/pdf/req_log_page_1.blade.php index 20ff8ed7..57013dff 100644 --- a/resources/views/pdf/req_log_page_1.blade.php +++ b/resources/views/pdf/req_log_page_1.blade.php @@ -437,14 +437,14 @@ {{ $dataMember->nama_perusahaan }}
- - @php - if(!empty($logoPerusahaan->code) == 'VALEIND') { + @php + if(!empty($dataMember->code_perusahaan) == 'VALEIND') { $imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(public_path('images/ttd_dr_vale.png'))); echo ''; } @@ -452,7 +452,7 @@
@php - if (!empty($logoPerusahaan->code) == 'VALEIND') { + if (!empty($dataMember->code_perusahaan) == 'VALEIND') { @endphp Dr. Hery Hermas, M.Kes @php @@ -469,7 +469,7 @@ Petugas Alarm Center
- @php + @php if(!empty($signatureAd->path)) { $imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(storage_path('app/public/' . $signatureAd->path))); echo ''; @@ -477,27 +477,37 @@ @endphp
- (.......................................)
- Customer Service Team + @php + if (!empty($signatureAd->name_approve)) { + @endphp + {{ $signatureAd->name_approve }} + @php + } else { + @endphp + (.......................................) + @php + } + @endphp +
Customer Service Team
{{ $dataMember->name }}
@php - if (!empty($logoPerusahaan->code) == 'VALEIND') { + if (!empty($dataMember->code_perusahaan) == 'VALEIND') { @endphp Alarm Center Vale MKS (LinkSehat) Office
- {{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}
+ {{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '' }}
Lt. 1, Jalan Somba Opu 281, Ujung Pandang, Losari,
Kec. Makassar, Kota Makassar, Sulawesi Selatan 90113 @php - } else if(!empty($logoPerusahaan->code) == 'PETROLAB') { + } else if(!empty($dataMember->code_perusahaan) == 'PETROLAB') { @endphp Alarm Center Petrolab (LinkSehat) Office
- {{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : ''}}
+ {{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : ''}}
Jalan Pisangan Lama 3 Nomor 28 Jatinegara, RT.9/RW.3,
Pisangan Tim., Kec. Pulo Gadung, Kota Jakarta Timur, Daerah Khusus Ibukota Jakarta 13230 @php @@ -505,7 +515,7 @@ @endphp Alarm Center (LinkSehat) Office
- {{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}
+ {{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '' }}
@php