From 533f63c6e77b367043808be399e6a77ac5994fe4 Mon Sep 17 00:00:00 2001 From: ivan-sim Date: Wed, 19 Jun 2024 10:55:20 +0700 Subject: [PATCH] Update client Portal --- .../Controllers/Api/CorporateMemberController.php | 15 ++++++++++++++- .../src/pages/AlarmCenter/ServiceMonitoring.tsx | 6 +++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php index 6032891e..01d40529 100644 --- a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php +++ b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php @@ -313,9 +313,22 @@ class CorporateMemberController extends Controller ) ->get(); + $total_premi = 0; + foreach ($services as $value) + { + if($value->total > 0 && $value->total != 999999999) + { + $total_premi += $value->total; + } + else if($value->total == 999999999) + { + $total_premi = 999999999; + } + + } // Ganti dengan logika Anda untuk mendapatkan data deposit $deposit = [ - 'deposit' => $deposit->total_premi, + 'deposit' => $total_premi, 'usage' => $usage, 'services' => $services ]; diff --git a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx index cb6cdb21..c13850d5 100644 --- a/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx +++ b/frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx @@ -432,12 +432,12 @@ export default function ServiceMonitoring() { {doesNameExist ? ( - - + + - Limit + Total Limit Yearly Limits