diff --git a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
index f6b7f71d..e4af1901 100644
--- a/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
+++ b/Modules/HospitalPortal/Http/Controllers/Api/RequestLogController.php
@@ -386,6 +386,11 @@ class RequestLogController extends Controller
(Select corporates.name FROM corporates
LEFT JOIN corporate_employees ON corporate_employees.corporate_id = corporates.id
WHERE corporate_employees.member_id = members.id LIMIT 1) AS nama_perusahaan
+ '),
+ DB::raw('
+ (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 services.name FROM services
@@ -451,6 +456,27 @@ class RequestLogController extends Controller
$data['logoPerusahaan'] = $logoPerusahaan;
+ $signatureDr = DB::table('signatures')
+ ->leftJoin('corporate_manager', 'corporate_manager.user_id', '=', 'signatures.user_id')
+ ->leftJoin('files', 'files.fileable_id', '=', 'signatures.id')
+ ->where('files.fileable_type', '=', 'App\Models\Signature')
+ ->where('signatures.type', '=', 1)
+ ->where('corporate_manager.corporate_id', '=', $dataMember->id_perusahaan)
+ ->select('files.path')
+ ->first();
+
+ $data['signatureDr'] = $signatureDr;
+
+ $signatureAd = DB::table('signatures')
+ ->leftJoin('files', 'files.fileable_id', '=', 'signatures.id')
+ ->where('files.fileable_type', '=', 'App\Models\Signature')
+ ->where('signatures.type', '=', 2)
+ ->where('signatures.user_id', '=', $dataRequestLog->approved_by)
+ ->select('files.path')
+ ->first();
+
+ $data['signatureAd'] = $signatureAd;
+
$pdf = new Dompdf();
$options = new Options();
@@ -508,6 +534,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 nama_perusahaan
'),
+ DB::raw('
+ (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 services.name FROM services
WHERE services.code = "'.$dataRequestLog->service_code.'" LIMIT 1) AS jenis_perwatan
@@ -591,6 +622,27 @@ class RequestLogController extends Controller
$data['logoPerusahaan'] = $logoPerusahaan;
+ $signatureDr = DB::table('signatures')
+ ->leftJoin('corporate_manager', 'corporate_manager.user_id', '=', 'signatures.user_id')
+ ->leftJoin('files', 'files.fileable_id', '=', 'signatures.id')
+ ->where('files.fileable_type', '=', 'App\Models\Signature')
+ ->where('signatures.type', '=', 1)
+ ->where('corporate_manager.corporate_id', '=', $dataMember->id_perusahaan)
+ ->select('files.path')
+ ->first();
+
+ $data['signatureDr'] = $signatureDr;
+
+ $signatureAd = DB::table('signatures')
+ ->leftJoin('files', 'files.fileable_id', '=', 'signatures.id')
+ ->where('files.fileable_type', '=', 'App\Models\Signature')
+ ->where('signatures.type', '=', 2)
+ ->where('signatures.user_id', '=', $dataRequestLog->approved_by)
+ ->select('files.path')
+ ->first();
+
+ $data['signatureAd'] = $signatureAd;
+
$pdf = new Dompdf();
$options = new Options();
diff --git a/database/migrations/2024_01_09_103003_create_signatures_table.php b/database/migrations/2024_01_09_103003_create_signatures_table.php
new file mode 100644
index 00000000..4fd21521
--- /dev/null
+++ b/database/migrations/2024_01_09_103003_create_signatures_table.php
@@ -0,0 +1,35 @@
+id();
+ $table->bigInteger('user_id');
+ $table->integer('type')->nullable()->comment('1=Offsite Medical Treatment, 2=Customer Service Team');
+ $table->bigInteger('created_by')->nullable();
+ $table->bigInteger('updated_by')->nullable();
+ $table->timestamps();
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('signatures');
+ }
+};
diff --git a/resources/views/pdf/final_log_page_2.blade.php b/resources/views/pdf/final_log_page_2.blade.php
index 04130a62..20f60bf2 100644
--- a/resources/views/pdf/final_log_page_2.blade.php
+++ b/resources/views/pdf/final_log_page_2.blade.php
@@ -158,6 +158,12 @@
left: 10px;
text-align: left;
}
+ .bottom-left-ttd-2-timestamp; ?> {
+ color: #000000;
+ bottom: 225px;
+ left: 30px;
+ text-align: left;
+ }
.bottom-right-ttd-timestamp; ?> {
color: #000000;
bottom: 200px;
@@ -171,6 +177,12 @@
right: 10px;
text-align: left;
}
+ .bottom-right-ttd-2-timestamp; ?> {
+ color: #000000;
+ bottom: 225px;
+ right: 30px;
+ text-align: left;
+ }
.bottom-left1-ttd-timestamp; ?> {
color: #000000;
bottom: 100px;
@@ -251,6 +263,14 @@
Hormat Kami,
{{ $dataMember->nama_perusahaan }}
+