Merge branch 'staging' of https://dev.sismedika.online/febio/aso into staging

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
         ];

Modules/Internal/Services/MemberEnrollmentService.php

@@ -23,6 +23,8 @@ use Box\Spout\Common\Entity\Row;
 use Carbon\Carbon;
 use DateTime;
 use DB;
+use Ramsey\Uuid\Uuid;
+use Str;
 
 class MemberEnrollmentService
 {
@@ -816,11 +818,13 @@ class MemberEnrollmentService
                     UserInsurance::updateOrCreate(
                         ['nIDUser' => $nIDUser],
                         [
+                            'nIDInsurance' => 106,
                             'sNamaPeserta' => $row['name'],
                             'dStartDate'   => $row['member_effective_date'],
                             'dExpireDate' =>  $row['member_expiry_date'],
                             'dTanggalLahir' =>  $row['date_of_birth'] ? $this->dateParser($row['date_of_birth']) : null,
-                            'sNoPolis' => $row['member_id']
+                            'sNoPolis' => $row['member_id'],
+                            'sVerificationCode' => (string) Uuid::uuid5(Uuid::NAMESPACE_DNS, $row['member_id'])
                         ]
                     );
 
@@ -1109,11 +1113,13 @@ class MemberEnrollmentService
                             UserInsurance::updateOrCreate(
                                 ['nIDUser' => $nIDUser],
                                 [
+                                    'nIDInsurance' => 106,
                                     'sNamaPeserta' => $row['name'],
                                     'dStartDate'   => $row['member_effective_date'],
                                     'dExpireDate' =>  $row['member_expiry_date'],
                                     'dTanggalLahir' =>  $row['date_of_birth'] ? $this->dateParser($row['date_of_birth']) : null,
-                                    'sNoPolis' => $row['member_id']
+                                    'sNoPolis' => $row['member_id'],
+                                    'sVerificationCode' => (string) Uuid::uuid5(Uuid::NAMESPACE_DNS, $row['member_id'])
                                 ]
                             );
                             /* Lihat ID Marital status di table tm_status_pernikahan Linksehat */

app/Models/OLDLMS/UserInsurance.php

@@ -26,6 +26,7 @@ class UserInsurance extends Model
         'dTanggalLahir',
         'nNoKTP',
         'sNoPolis',
+        'sVerificationCode',
         'nIDInsurance',
         'sLayanan',
     ];

composer.json

@@ -26,6 +26,7 @@
         "phpmailer/phpmailer": "^6.9",
         "psr/simple-cache": "^1.0",
         "pusher/pusher-php-server": "^7.2",
+        "ramsey/uuid": "^4.7",
         "spatie/browsershot": "^3.61",
         "spatie/laravel-permission": "^5.9"
     },

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "376b19f2ad42a940a917ec375fdd6c9d",
+    "content-hash": "15904ea4b6523bc5ea58867fe9c90f5a",
     "packages": [
         {
             "name": "barryvdh/laravel-dompdf",
@@ -6358,20 +6358,20 @@
         },
         {
             "name": "ramsey/uuid",
-            "version": "4.7.5",
+            "version": "4.7.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ramsey/uuid.git",
-                "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e"
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ramsey/uuid/zipball/5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e",
+                "url": "https://api.github.com/repos/ramsey/uuid/zipball/91039bc1faa45ba123c4328958e620d382ec7088",
-                "reference": "5f0df49ae5ad6efb7afa69e6bfab4e5b1e080d8e",
+                "reference": "91039bc1faa45ba123c4328958e620d382ec7088",
                 "shasum": ""
             },
             "require": {
-                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11",
+                "brick/math": "^0.8.8 || ^0.9 || ^0.10 || ^0.11 || ^0.12",
                 "ext-json": "*",
                 "php": "^8.0",
                 "ramsey/collection": "^1.2 || ^2.0"
@@ -6434,7 +6434,7 @@
             ],
             "support": {
                 "issues": "https://github.com/ramsey/uuid/issues",
-                "source": "https://github.com/ramsey/uuid/tree/4.7.5"
+                "source": "https://github.com/ramsey/uuid/tree/4.7.6"
             },
             "funding": [
                 {
@@ -6446,7 +6446,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2023-11-08T05:53:05+00:00"
+            "time": "2024-04-27T21:32:50+00:00"
         },
         {
             "name": "riverline/multipart-parser",

frontend/client-portal/src/pages/AlarmCenter/ServiceMonitoring.tsx

@@ -432,12 +432,12 @@ export default function ServiceMonitoring() {
                 </Grid>
                 <Grid item container xs={12} md={6} spacing={1.5}>
                     {doesNameExist ? (
-                        <Stack direction="column">
+                        <Stack direction="column" style={{width:'100%'}}>
-                            <Box display="flex" flexWrap="wrap" justifyContent="left">
+                            <Box  flexWrap="wrap" justifyContent="left">
                                 <Card variant="outlined" sx={{ minWidth: 200, marginBottom: 1, borderRadius: 2, padding: 0 }}>
                                     <CardContent>
                                         <Typography variant="h6" component="div">
-                                        Limit
+                                        Total Limit
                                         </Typography>
                                         <Typography variant="subtitle2" color="text.secondary">
                                         Yearly Limits