GWM : staff assign dropdown

app/Controllers/DashboardController.php

@@ -126,7 +126,7 @@ class DashboardController extends ResourceController
                                 ->select("
                                     ps.name AS staff_name,
                                     ps.id AS staff_id,
-                                    ph.name AS handler_name,
+                                    ps.handler_id,
                                     COUNT(pe.id) AS total_assigned,
                                     SUM(CASE WHEN pe.status = 'Awaiting Proposal' THEN 1 ELSE 0 END) AS awaiting_quotation,
                                     SUM(CASE WHEN pe.status = 'Proposal Created' THEN 1 ELSE 0 END) AS pending_quotation_approval,
@@ -134,8 +134,6 @@ class DashboardController extends ResourceController
                                     SUM(CASE WHEN pe.status = 'Policy Created' THEN 1 ELSE 0 END) AS policy_created
                                 ")
                                 ->join('partner_staff ps', 'ps.id = pe.assigned_to', 'left')
-                                ->join('partner_staff ph', 'JSON_CONTAINS(ps.handler_id, CAST(ph.id AS JSON))', 'left')
-                                // ->join('partner_staff ph', 'ph.id = ps.handler_id', 'left')
                                 ->where('pe.manager_id', $manager_id)
                                 ->where('pe.is_active', 1)
                                 ->groupBy('pe.assigned_to')
@@ -143,6 +141,24 @@ class DashboardController extends ResourceController
                                 ->get()
                                 ->getResultArray();
 
+        foreach ($staffLevelPendingSummary as &$row) {
+
+            $handlerIds = json_decode($row['handler_id'] ?? '[]', true);
+        
+            if (!empty($handlerIds)) {
+                $handlers = $this->db->table('partner_staff')
+                            ->select('name')
+                            ->whereIn('id', $handlerIds)
+                            ->get()
+                            ->getResultArray();
+        
+                $row['handlers'] = array_column($handlers, 'name');
+        
+            } else {
+                $row['handlers'] = [];
+            }
+        }
+                                
      
         $result = [
             'policies_issued' => [

app/Controllers/StaffController.php

@@ -54,6 +54,18 @@ class StaffController extends ResourceController
     {
         try{
             $handler_id = $this->request->getGet('handler_id');
+            $manager_id = $this->request->getGet('manager_id');
+
+            if(!empty($manager_id))
+            {
+                $data = $this->StaffModel->select('partner_staff.id, partner_staff.name , R.role')
+                                        ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
+                                        ->where('partner_staff.manager_id' , $manager_id )
+                                        ->where('partner_staff.role_id' , 3 )
+                                        ->where('partner_staff.is_active' , 1 )
+                                        ->findAll();
+
+            }else{
 
             $data = $this->StaffModel->select('partner_staff.id, partner_staff.name , R.role')
                                     ->join('partner_role_master R', 'R.id = partner_staff.role_id', 'left')
@@ -62,6 +74,7 @@ class StaffController extends ResourceController
                                     ->where('partner_staff.role_id' , 3 )
                                     ->where('partner_staff.is_active' , 1 )
                                     ->findAll();
+            }
 
             return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
 

app/Helpers/mail_helper.php

@@ -112,7 +112,7 @@ if (!function_exists('send_email')) {
     {
         try {
             // Set up ZeptoMail API request
-            $endpoint = "https://api.zeptomail.com/v1.1/email";
+            $endpoint = "https://api.zeptomail.in/v1.1/email";
             $apiKey = env('ZOHO_API_KEY');
             $sender = env('ZOHO_SENDER_MAIL');