Change Permission & WIP Dashboard Client Portal

app/Models/Corporate.php

@@ -30,7 +30,7 @@ class Corporate extends Model
     protected $appends = [
         'avatar_url',
     ];
-    
+
     protected $hidden = [
         'created_at',
         'updated_at',
@@ -73,8 +73,6 @@ class Corporate extends Model
     public function currentPolicy()
     {
         return $this->hasOne(CorporatePolicy::class)
-            // ->where('start', '<=', now())
-            // ->where('end', '>=', now())
             ->where('active', true)
             ->latestOfMany();
     }
@@ -106,7 +104,10 @@ class Corporate extends Model
         ]);
     }
 
-    // public function 
+    public function claims()
+    {
+        return $this->hasManyThrough(Claim::class, CorporateEmployee::class, 'corporate_id', 'member_id', 'id', 'member_id');
+    }
 
     public function importLogs()
     {
@@ -123,11 +124,6 @@ class Corporate extends Model
         return $this->hasManyThrough(CorporateService::class, Service::class, 'corporate_id', 'service_code', 'id', 'service_code');
     }
 
-    // public function claims()
-    // {
-    //     return $this->hasManyThrough()
-    // }
-
     public function corporateServices()
     {
         return $this->hasMany(CorporateService::class, 'corporate_id');

app/Models/CorporatePolicy.php

@@ -28,7 +28,7 @@ class CorporatePolicy extends Model
         'end',
         'active',
     ];
-    
+
     protected $hidden = [
         'created_at',
         'updated_at',
@@ -66,11 +66,6 @@ class CorporatePolicy extends Model
         $this->attributes['code'] = !empty($value) ? $value : Str::upper(Str::random('6'));
     }
 
-    // public function setPolicyIdAttribute($value)
-    // {
-    //     $this->attributes['policy_id'] = !empty($value) ? $value : Str::upper(Str::random('6'));
-    // }
-
     public function setStartAttribute($value)
     {
         $this->attributes['start'] = !empty($value) ? Carbon::parse($value)->format('Y-m-d') : null;

app/Services/CorporateMemberService.php

@@ -16,7 +16,6 @@ class CorporateMemberService
             ->joinCorporateEmployees('left')
             ->joinCorporateDivisions('left')
             ->with(['currentPlan', 'person'])
-            ->withSum('claims', 'total_claim')
             ->where('corporate_employees.corporate_id', $corporateId)
             ->when($request->input('search'), function (Builder $query, $search) {
                 $query->where(function (Builder $query) use ($search) {
@@ -39,6 +38,7 @@ class CorporateMemberService
                 $query->getQuery()->orderBy($orderBy, $request->order);
             })
             ->select(['members.id', 'members.person_id', 'members.member_id', 'members.name', 'corporate_divisions.name AS division_name', 'members.active'])
+            ->selectRaw("(select sum(`claims`.`total_claim`) from `claims` where `members`.`id` = `claims`.`member_id` AND `claims`.`deleted_at` IS NULL) AS `claims_sum_total_claim`")
             ->paginate($limit);
     }