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

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();

Modules/Internal/Http/Controllers/Api/RequestLogController.php

@@ -116,7 +116,8 @@ class RequestLogController extends Controller
                             paymentType: 'cashless',
                             serviceCode: $request->service_code,
                             submissionDate: null,
-                            status: 'approved',
+                            // status: 'approved',
+                            status: 'requested', // di nonaktifkan dulu auto approved
                             organization_id: $request->organization_id,
                             source: $request->source
                         );

Modules/Internal/Services/MemberEnrollmentService.php

@@ -943,6 +943,8 @@ class MemberEnrollmentService
 
                         // Hapus Member plan terkait
                         $member->memberPlans()->delete();
+
+                        
                         //Update plan
                         $plans = explode(",",$row['plan_id']);
                         if (count($plans) > 0) {