Merge remote-tracking branch 'refs/remotes/origin/staging' into staging

Modules/Internal/Http/Controllers/Api/CorporateController.php

@@ -80,7 +80,7 @@ class CorporateController extends Controller
     {
        
         $request->validate([
-            'code' => 'required|regex:/^[a-zA-Z0-9]+$/',
+            'code' => 'required|regex:/^[a-zA-Z0-9_]+$/',
             'name' => 'required',
             'payor_id' => 'required',
             // 'logo' => 'required',
@@ -303,7 +303,7 @@ class CorporateController extends Controller
     public function update(Request $request, $id)
     {
         $request->validate([
-            'code' => 'required|regex:/^[a-zA-Z0-9]+$/',
+            'code' => 'required|regex:/^[a-zA-Z0-9_]+$/',
             'payor_id' => 'required',
             'name' => 'required',
             'policy_code' => 'required_with:policy_id',
@@ -673,6 +673,7 @@ class CorporateController extends Controller
                 $row['prorate_lookup'], // "Prorate Lookup",
                 $row['max_days_for_disability'], // "Max Days for Disability",
                 $row['max_period_for_disability'], // "Max Periode of Disability",
+                $row['limit_free_tc'], // "Currency",
                 $row['currency'], // "Currency",
                 $row['show_benefit_item'], // "Show Benefit Item",
                 $row['show_benefit_value'], // "Show Benefit Value",

Modules/Internal/Http/Controllers/Api/MemberController.php

@@ -13,10 +13,14 @@ class MemberController extends Controller
      * Display a listing of the resource.
      * @return Renderable
      */
-    public function index()
+    public function index(Request $request)
     {
         return Member::query()
-                    ->with('currentPlan')
+                    ->when($request->search, function ($query, $search) {
+                        return $query->where('name', 'LIKE', '%' . $search . '%')
+                        ->orWhere('member_id', 'LIKE', '%' . $search . '%');
+                    })
+                    ->with('currentPlan', 'currentCorporate')
                     ->paginate();
     }
 

Modules/Internal/Services/CorporateService.php

@@ -218,19 +218,24 @@ class CorporateService
         if (!empty($row['budget']) && !in_array($budget_aso)) { 
             throw new ImportRowException(__('plan.MAX_FREQUENCY'), 0, null, $row);
         }
+
+        // if (empty($row['limit_free_tc'])){
+        //     throw new ImportRowException(__('plan.REQUIRED', [
+        //         'attribute' => 'Limit Free TC'
+        //     ]), 0, null, $row);
+        // }
     }
 
     public function handleBenefitRow(Corporate $corporate, $row)
     {
         try {
+            // $row['limit_free_tc'] = 0;
             $benefit_data = $row;
             $this->validateBenefitRow($benefit_data, $corporate->id);
             $benefit_data["corporate_id"] = $corporate->id;
             $plan = $corporate->plans()
                             ->where('corporate_plan_id', $benefit_data['plan_code'])
                             ->first();
-
-            // $corporate->plans->where('corporate_plan_id', $benefit_data['plan_code'])->first();
             $benefit_data['plan_code'] = $plan->id;
 
             $benefit = Benefit::updateOrCreate([
@@ -241,10 +246,10 @@ class CorporateService
                 'service_code' => $plan->service_code,
                 'description' => $benefit_data['description'],
             ]);
-
             $corporateBenefit = $corporate->corporateBenefits()->updateOrCreate([
                 'benefit_id' => $benefit->id,
-                'plan_id' => $plan->id
+                'plan_id' => $plan->id,
+                'corporate_id' => $corporate->id,
             ], $benefit_data);
 
             return $corporateBenefit;