diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
index 7d3bdb2f..355a770e 100644
--- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
+++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
@@ -447,6 +447,11 @@ class RequestLogController extends Controller
(Select corporates.id FROM corporates
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
@@ -596,6 +601,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
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 6a2f107a..fb8ee714 100644
--- a/resources/views/pdf/final_log_page_2.blade.php
+++ b/resources/views/pdf/final_log_page_2.blade.php
@@ -271,7 +271,7 @@
}
@endphp -->
@php
- if(!empty($logoPerusahaan->code) == 'VALEIND') {
+ 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
@@ -315,19 +315,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 +335,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 20d09fbe..743181c6 100644
--- a/resources/views/pdf/req_log_page_1.blade.php
+++ b/resources/views/pdf/req_log_page_1.blade.php
@@ -437,7 +437,7 @@
}
@endphp -->
@php
- if(!empty($logoPerusahaan->code) == 'VALEIND') {
+ if(!empty($dataMember->code_perusahaan) == 'VALEIND') {
$imgSrc = 'data:image/png;base64,' . base64_encode(file_get_contents(public_path('images/ttd_dr_vale.png')));
echo '

';
}
@@ -445,7 +445,7 @@
@php
- if (!empty($logoPerusahaan->code) == 'VALEIND') {
+ if (!empty($dataMember->code_perusahaan) == 'VALEIND') {
@endphp
Dr. Hery Hermas, M.Kes
@php
@@ -478,19 +478,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 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
@@ -498,7 +498,7 @@
@endphp
Alarm Center (LinkSehat) Office
- {{ !empty($logoPerusahaan->name) ? $logoPerusahaan->name : '' }}
+ {{ !empty($dataMember->nama_perusahaan) ? $dataMember->nama_perusahaan : '' }}
@php