Merge remote-tracking branch 'origin/staging'

.env.example

@@ -1,59 +0,0 @@
-APP_NAME=Laravel
-APP_ENV=local
-APP_KEY=
-APP_DEBUG=true
-APP_URL=http://localhost
-
-LOG_CHANNEL=stack
-LOG_DEPRECATIONS_CHANNEL=null
-LOG_LEVEL=debug
-
-DB_CONNECTION=mysql
-DB_HOST=127.0.0.1
-DB_PORT=3306
-DB_DATABASE=laravel
-DB_USERNAME=root
-DB_PASSWORD=
-
-OLDLMS_DB_CONNECTION=mysql
-OLDLMS_DB_HOST=127.0.0.1
-OLDLMS_DB_PORT=3306
-OLDLMS_DB_DATABASE=linksehat
-OLDLMS_DB_USERNAME=mysql
-OLDLMS_DB_PASSWORD=password
-
-BROADCAST_DRIVER=log
-CACHE_DRIVER=file
-FILESYSTEM_DISK=local
-QUEUE_CONNECTION=sync
-SESSION_DRIVER=file
-SESSION_LIFETIME=120
-
-MEMCACHED_HOST=127.0.0.1
-
-REDIS_HOST=127.0.0.1
-REDIS_PASSWORD=null
-REDIS_PORT=6379
-
-MAIL_MAILER=smtp
-MAIL_HOST=mailhog
-MAIL_PORT=1025
-MAIL_USERNAME=null
-MAIL_PASSWORD=null
-MAIL_ENCRYPTION=null
-MAIL_FROM_ADDRESS="hello@example.com"
-MAIL_FROM_NAME="${APP_NAME}"
-
-AWS_ACCESS_KEY_ID=
-AWS_SECRET_ACCESS_KEY=
-AWS_DEFAULT_REGION=us-east-1
-AWS_BUCKET=
-AWS_USE_PATH_STYLE_ENDPOINT=false
-
-PUSHER_APP_ID=
-PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
-PUSHER_APP_CLUSTER=mt1
-
-MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
-MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

Modules/Client/Http/Controllers/Api/CorporateMemberController.php

@@ -33,6 +33,9 @@ class CorporateMemberController extends Controller
             case 'alarm-center':
                 $members = $this->corporateMemberService->getAllMemberAlarmCenter($corporate_id, $request);
                 return response()->json(Helper::paginateResources(DashboardMemberAlarmResources::collection($members)));
+            case 'service-monitoring':
+                $members = $this->corporateMemberService->getAllEncounter($corporate_id, $request);
+                return response()->json(Helper::paginateResources(DashboardMemberAlarmResources::collection($members)));
             default:
                 $members = $this->corporateMemberService->getAllMemberDashboards($corporate_id, $request);
                 return response()->json(Helper::paginateResources(DashboardMemberResources::collection($members)));

Modules/Client/Http/Controllers/Api/DataController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Modules\Client\Http\Controllers\Api;
+
+use App\Models\Person;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+
+class DataController extends Controller
+{
+    public function show($id)
+    {
+        try {
+            $data = Person::findOrFail($id);
+            return response()->json($data);
+        } catch (\Exception $e) {
+            return response()->json(['error' => 'Member not found'], 404);
+        }
+    }
+
+    public function update(Request $request, $id)
+    {
+        try {
+            $data = Person::findOrFail($id);
+            $data->update($request->all());
+
+            return response()->json(['message' => 'Data updated successfully']);
+        } catch (\Exception $e) {
+            return response()->json(['error' => 'Failed to update data'], 500);
+        }
+    }
+}

Modules/Client/Http/Controllers/Api/TopUpController.php

@@ -3,6 +3,7 @@
 namespace Modules\Client\Http\Controllers\Api;
 
 use App\Helpers\Helper;
+use App\Models\CorporatePolicy;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
@@ -33,9 +34,22 @@ class TopUpController extends Controller
      * @param Request $request
      * @return Renderable
      */
-    public function store(Request $request)
+    public function store(Request $request, $corporate_id)
     {
-        //
+        
+        $data = $request->validate([
+            'topup' => 'required|numeric',
+        ]);
+
+        $corporatePolicy = CorporatePolicy::query()->where('corporate_id',$corporate_id)->firstOrFail();     
+        if (!$corporatePolicy) {
+            return response() -> json (['message' => 'Corporate policy not found'],404);
+        }
+
+        $corporatePolicy -> total_premi += $data ['topup'];
+        $corporatePolicy -> save();
+
+        return response () -> json (['message' => 'Amount added to total_premi successfully'], 200);
     }
 
     /**
@@ -48,6 +62,23 @@ class TopUpController extends Controller
         return view('client::show');
     }
 
+    public function get($corporate_id)
+    {
+        $data = CorporatePolicy::query()
+            ->where('corporate_id', $corporate_id)
+            ->with(['currentPolicy', 'employees'])
+            ->withCount(['employees', 'claims' => function ($query) {
+                $query->where('claims.status', 'paid');
+            }])
+            ->first();
+
+        if (!$data) {
+            return response()->json(['message' => 'Corporate policy not found'], 404);
+        }
+
+        return Helper::responseJson(TopUpLimitResources::make($data));
+    }
+
     /**
      * Update the specified resource in storage.
      * @param Request $request

Modules/Client/Routes/api.php

@@ -8,6 +8,9 @@ use Modules\Client\Http\Controllers\Api\CorporatePolicyController;
 use Modules\Client\Http\Controllers\Api\UserController;
 use Modules\Client\Http\Controllers\Api\ClaimController;
 use Modules\Client\Http\Controllers\Api\TopUpController;
+use Modules\Internal\Http\Controllers\ClaimEncounterController;
+use App\Models\Encounter;
+use Modules\Internal\Transformers\EncounterResource;
 
 /*
 |--------------------------------------------------------------------------
@@ -38,11 +41,16 @@ Route::prefix('client')->group(function () {
             Route::get('members', [CorporateMemberController::class, 'index']);
             Route::get('claims/status', [ClaimController::class, 'status']);
             Route::get('claims', [ClaimController::class, 'index']);
-
+            Route::get('claims/{claim_id}/encounters', [ClaimEncounterController::class, 'getEncounterData']);
             Route::get('topup', [TopUpController::class, 'index']);
+            // Route::get('topup', [TopUpController::class, 'get']);
             Route::post('topup', [TopUpController::class, 'store']);
         });
-
         Route::get('claims/{id}', [ClaimController::class, 'show']);
+        
+        
+        
+
+
     });
 });

Modules/Client/Transformers/Dashboard/MemberAlarmCenterResources.php

@@ -15,6 +15,7 @@ class MemberAlarmCenterResources extends JsonResource
     {
         return [
             'id' => $this->id,
+            'personId' => $this->person_id,
             'memberId' => $this->member_id,
             'fullName' => $this->full_name,
             'service' => $this->service_code,