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

app/Models/ClaimRequest.php

@@ -8,6 +8,7 @@ use App\Traits\Blameable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
+use Altek\Accountant\Contracts\Recordable;
 use Str;
 
 class ClaimRequest extends Model
@@ -28,7 +29,8 @@ class ClaimRequest extends Model
         'claim_id',
         'organization_id',
         'code',
-        'request_log_id'
+        'request_log_id',
+        'reason'
     ];
 
     protected $hidden = [
@@ -207,6 +209,11 @@ class ClaimRequest extends Model
         return $this->hasMany(Claim::class, 'claim_request_id');
     }
 
+    public function requestLog()
+    {
+        return $this->hasOne(RequestLog::class, 'id', 'request_log_id');
+    }
+    
     public function files()
     {
         return $this->morphMany(File::class, 'fileable');

app/Models/RequestDailyMonitoring.php

@@ -4,12 +4,14 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Support\Facades\Auth;
 use DB;
 
 class RequestDailyMonitoring extends Model
 {
     use HasFactory;
-
+    use SoftDeletes; 
     protected $table    = "request_log_daily_monitorings";
 
     protected $fillable = [
@@ -28,6 +30,8 @@ class RequestDailyMonitoring extends Model
         'created_by',
         'updated_by',
         'deleted_by',
+        'reason',
+        'deleted_at'
     ];
 
     protected $appends    = ['medical_plan', 'non_medikamentosa_plan', 'document', 'discharge_date'];
@@ -52,6 +56,18 @@ class RequestDailyMonitoring extends Model
     //     return round($this->attributes['respiration_rate'], 0);
     // }
 
+    protected static function boot()
+    {
+        parent::boot();
+
+        // Event handling untuk deleting
+        static::deleting(function ($model) {
+            // Set nilai deleted_by dengan ID pengguna yang melakukan penghapusan (jika ada)
+            $model->deleted_by = Auth::id();
+            $model->save();
+        });
+    }
+
     public function getMedicalPlanAttribute()
     {
         $arr_medical_plan = [];

app/Models/RequestLog.php

@@ -270,7 +270,7 @@ class RequestLog extends Model
 
     public function requestLogDailyMonitorings()
     {
-        return $this->hasMany(RequestLogDailyMonitoring::class, 'request_log_id');
+        return $this->hasMany(RequestLogDailyMonitoring::class, 'request_log_id')->whereNull('deleted_at');
     }
 
     public function getPaymentTypeNameAttribute()

app/Providers/AppServiceProvider.php

@@ -14,6 +14,7 @@ use App\Models\CorporateBenefit;
 use App\Models\Member;
 use App\Models\MemberPlan;
 use App\Models\CorporateHospital;
+use App\Models\ClaimRequest;
 use App\Models\ExclusionRules;
 use App\Models\ExclusionImport;
 use App\Models\Icd;
@@ -147,6 +148,15 @@ class AppServiceProvider extends ServiceProvider
             $this->logAuditTrail($model, 'deleted');
         });
 
+        ClaimRequest::updated(function ($model) {
+
+            $this->logAuditTrail($model, 'updated');
+        });
+
+        ClaimRequest::deleted(function ($model) {
+            $this->logAuditTrail($model, 'deleted');
+        });
+
         // ICD or exlusion
         Icd::updated(function ($model) {
             $this->logAuditTrail($model, 'updated');

app/Services/ClaimRequestService.php

@@ -110,19 +110,23 @@ class ClaimRequestService{
         }
     }
 
-    public static function updateClaimRequest($organization_id, $claim_request_id){
+    public static function updateClaimRequest($reason, $submission_date, $claim_request_id){
         try {
-            $data = [
-                'organization_id' => $organization_id
-            ];
-            DB::commit();
-            $update = ClaimRequest::where('id', $claim_request_id)->update($data);
-            return ClaimRequest::find($claim_request_id);
-
+            $claimRequest = ClaimRequest::find($claim_request_id);
+    
+            if (!$claimRequest) {
+                throw new \Exception("Claim request not found");
+            }
+    
+            $claimRequest->submission_date = $submission_date;
+            $claimRequest->reason = $reason;
+            
+            $claimRequest->save();
+    
+            return $claimRequest;
+    
         } catch (\Exception $error) {
-            DB::rollBack();
-
-            throw new \Exception($error);
+            throw new \Exception($error->getMessage());
         }
     }