From 1baaf80b2b63db8bc50bff10ff8e5420c5f41c50 Mon Sep 17 00:00:00 2001 From: R Date: Wed, 14 Dec 2022 13:16:01 +0700 Subject: [PATCH] Calc Limit --- .../Api/CorporateMemberController.php | 20 ++++++++++++------- .../Client/Transformers/MemberResources.php | 6 +++--- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php index 6153bf4d..524efd58 100755 --- a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php @@ -34,14 +34,20 @@ class CorporateMemberController extends Controller }); })->when($request->has('orderBy'), function ($query) use ($request) { $query->orderBy($request->orderBy, $request->order); - })->paginate($limit); - - return response()->json(Helper::paginateResources(MemberResources::collection($members))); - } else { - $members = $members->get(); - - return response()->json(MemberResources::collection($members)); + }); } + // else { + // $members = $members->get(); + + // return response()->json(MemberResources::collection($members)); + // } + $members->with('currentPlan'); + $members->withSum('claims', 'total_claim'); + + $members = $members->paginate($limit); + // return $members; + + return response()->json(Helper::paginateResources(MemberResources::collection($members))); } /** diff --git a/Modules/Client/Transformers/MemberResources.php b/Modules/Client/Transformers/MemberResources.php index 9cfa741d..fd91aa10 100644 --- a/Modules/Client/Transformers/MemberResources.php +++ b/Modules/Client/Transformers/MemberResources.php @@ -23,9 +23,9 @@ class MemberResources extends JsonResource 'status' => $this->active ]), 'limit' => [ - 'current' => 2000000, - 'total' => 4000000, - 'percentage' => (2000000 / 4000000) * 100 + 'current' => $this->claims_sum_total_claim, + 'total' => $this->currentPlan->limit_rules ?? 0, + 'percentage' => (!empty($this->currentPlan->limit_rules ?? 0)) ? (($this->claims_sum_total_claim / $this->currentPlan->limit_rules) * 100) : 0 ], ]; }