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

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

@@ -323,6 +323,7 @@ class RequestLogController extends Controller
 
     public function requestFinalLog(Request $request)
     {
+        Helper::setCustomPHPIniSettings();
         $data = [
             'request_logs_id' => $request->request_logs_id,
             'discharge_date' => $request->discharge_date,

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

@@ -863,6 +863,7 @@ class RequestLogController extends Controller
 
     public function requestFiles(Request $request, $id)
     {
+        Helper::setCustomPHPIniSettings();
         $requestLog = RequestLog::findOrFail($id);
         if ($request->hasFile('result_files')) {
             foreach ($request->result_files as $file) {

Modules/Internal/Services/RequestLogService.php

@@ -168,6 +168,10 @@ class RequestLogService
                 throw new ImportRowException(__('Provider Required'), 0, null, $row);
             }
 
+            if (!$row['record_mode']){
+                throw new ImportRowException(__('Record Mode Required'), 0, null, $row);
+            }
+
             // Membuat singkatan dari nama rumah sakit
             // $singkatan = "";
             // $words = explode(' ', $row['organization_id']);
@@ -278,7 +282,14 @@ class RequestLogService
             }
 
             if ($row['record_mode'] == 1){
-                $requestLog = RequestLog::updateOrCreate(["code" => $code], $data);
+                $requestLog = RequestLog::updateOrCreate(
+                    [
+                        'member_id' => $member->id,
+                        'submission_date' => $row['submission_date'],
+                        'organization_id' => $organization_id,
+                    ],
+                    $data
+                );
             } else if ($row['record_mode'] == 2) {
                 $requestLog = RequestLog::updateOrCreate(
                     [

app/Helpers/Helper.php

@@ -103,7 +103,7 @@ class Helper
         } else {
             return 'User not found.';
         }
-        
+
     }
 
     public static function serviceName($code)