improvement uat 1

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

@@ -380,7 +380,7 @@ class ClaimRequestController extends Controller
             ]);
 
         } catch (\Exception $e) {
-            return $e->getMessage();;
+            return $e->getMessage();
         }
 
         return $claimRequest;
@@ -643,20 +643,47 @@ class ClaimRequestController extends Controller
         $memberList = DB::table('members')
             ->select('id','member_id','name')
             ->where("name", "like", "%$keyword%")
+            ->orWhere("member_id", "like", "%$keyword%")
             ->orderBy('created_at', 'asc')
             ->offset($offset)
             ->limit($limit)
             ->get();
+        
+        $data = [];
+        if(count($memberList)>0){
+            $temp = [];
+            foreach($memberList as $d){
+                $serviceType = $this->getServiceMember($d->id);
+                $temp['id'] = $d->id;
+                $temp['member_id'] = $d->member_id;
+                $temp['name'] = $d->name;
+                $temp['service_type'] = $serviceType;
 
+
+                array_push($data, $temp);
+            }
+
+        }
         return response()->json([
             'error'   => false,
             'message' => "success",
             'data'    => [
-                'member_list'=> $memberList,
+                'member_list'=> $data,
             ]
         ],200);
     }
 
+    public function getServiceMember($id){
+        $service = DB::table('member_plans')
+            ->select('plans.service_code as code', 'services.name')
+            ->join('plans', 'member_plans.plan_id', '=', 'plans.id')
+            ->join('services', 'plans.service_code', '=', 'services.code')
+            ->where('member_id', $id)
+            ->get()
+            ->toArray();
+        return $service;
+    }
+
     public static function getNextCode()
     {
         // $last_number = ClaimRequest::max('code');