Merge remote-tracking branch 'origin/dev' into dev

app/Config/Routes.php

@@ -353,12 +353,11 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) {
 
 
 
-
 $routes->group("employeeRest", ["filter" => "authJWT"], function ($routes) {
     $routes->post("storeFireBase", "EmployeeRestController::storeFireBase");
     $routes->post("saveMpin", "RestAuthenticationController::saveMpin");
     $routes->post("updateMpin", "RestAuthenticationController::updateMpin");
-    $routes->get("getChatResponse", "ChatBotController::getChatResponse");
+    $routes->post("getChatResponse", "ChatBotController::getChatResponse");
     $routes->get("getEmployeeProfile", "EmployeeRestController::getEmployeeProfile");
     $routes->post("employeeUpload", "EmployeeRestController::employeeUpload");
     $routes->get("relationshipList", "EmployeeRestController::relationshipList");

app/Controllers/ChatBotController.php

@@ -74,39 +74,61 @@ class ChatBotController extends AdminController
     public function getChatResponse()
     {
     //    try {
-            $request_for = $this->request->getGet('request_for');
+            $emp_code = $this->request->getVar('emp_code');
-            $option = $this->request->getGet('option');
+            $client_id = $this->request->getVar('client_id');
-            $is_option = $this->request->getGet('is_option');
+            $client_branch_id = $this->request->getVar('client_branch_id');
+            $request_for = $this->request->getVar('request_for');
+            $option = $this->request->getVar('option');
+            $is_option = $this->request->getVar('is_option');
 
             $responseData = $this->ChatBotModel->where('request', $request_for)
                                               ->where('is_active', 1 )
                                               ->first();
             
+                                                            
             if ($responseData) {
 
                
-               if(isset($option) && $option != 0){
+               if(isset($option) && $option != 0)
+               {
 
                     $decodedData = json_decode($responseData['options'],true);
                    
-                    
                     if (isset($decodedData[$option]) && $decodedData[$option] !== null) {
                         
+
                         $requestFor = $decodedData[$option];
                         $responseData = $this->ChatBotModel->where('request', $requestFor)
                                                       ->where('is_active', 1 )
                                                       ->first();
 
+                        if($responseData['request'] == 'Call' || $responseData['request'] == 'Mail'){
+
+                            $AccountManagerDetails =  $this->clientRMModel->select('client_rm.* , user_profiles.*')
+                                                    ->join('user_profiles', 'client_rm.user_id = user_profiles.id', 'left')
+                                                    ->where('client_rm.client_id', $client_id )
+                                                    ->where('client_rm.level', 3 )
+                                                    ->findAll();
+                                                
+                            if(isset($AccountManagerDetails) && $responseData['request'] == 'Call'){ 
+                                $responseData['options'] = $AccountManagerDetails[0]['mobile']; 
+                            }else if(isset($AccountManagerDetails) && $responseData['request'] == 'Mail'){
+                                $responseData['options'] = $AccountManagerDetails[0]['email']; 
+                            }
+                        }                          
+
                     }else{
 
-                        if( $request_for == 'Create claim'){
+                        if( $request_for == 'Initiate claim'){
                             $result = [
                                 'request_for' => $request_for,
                                 'options' => json_decode($responseData['options'], true),
                                 'text' => "Enter Message",
                                 'is_option' => "0",
                                 'policy_id' => $option,
-                                'mobile_no' => $this->request->getGet('mobile_no')
+                                'mobile_no' => $this->request->getVar('mobile_no'),
+                                'navigation' => $responseData['navigation'],
+                                'navigation_type' => $responseData['navigation_type']
                             ];
                             
                             return $this->respond(['status' => 'success','code' => 200,'data' => $result ],200);
@@ -123,8 +145,8 @@ class ChatBotController extends AdminController
 
                 if(isset($is_option) && $is_option == 0){
 
-                    $text = $this->request->getGet('text');
+                    $text = $this->request->getVar('text');
-                    $value = $this->request->getGet('value');
+                    $value = $this->request->getVar('value');
                     $Data = $this->ChatBotModel->where('options', $text)->where('is_active', 1 )->first();
                     if($Data){
 
@@ -132,7 +154,7 @@ class ChatBotController extends AdminController
                        {
                         $result = $this->getAllPolicyByMobileNumber($value,'text');
                         return $this->respond(['status' => 'success','code' => 200,'data' => $result ],200);
-                       }else if($Data['options'] == 'Please Enter Your Mobile Number To Raise Ticket'){
+                       }else if($Data['options'] == 'Please Enter Your Mobile Number To Raise Claim'){
                         $result = $this->getAllPolicyByMobileNumber($value,'options');
                         return $this->respond(['status' => 'success','code' => 200,'data' => $result ],200);
                        }
@@ -151,8 +173,10 @@ class ChatBotController extends AdminController
                                 $result = [
                                     'request_for' => $request_for,
                                     'options' => null,
-                                    'text' => $ticket['message'].', Your Ticket id is '.$ticket['ticket_id'],
+                                    'text' => $ticket['message'].', Your Claim id is '.$ticket['ticket_id'],
-                                    'is_option' => "0"
+                                    'is_option' => "0",
+                                    'navigation' => "0",
+                                    'navigation_type' => null
                                 ];
                             }else{
                                 
@@ -160,7 +184,9 @@ class ChatBotController extends AdminController
                                     'request_for' => $request_for,
                                     'options' => null,
                                     'text' => $ticket['message'],
-                                    'is_option' => "0"
+                                    'is_option' => "0",
+                                    'navigation' => "0",
+                                    'navigation_type' => null
                                 ];
                             }
                            
@@ -178,11 +204,15 @@ class ChatBotController extends AdminController
 
 
 
+
+
                 $result = [
                     'request_for' => $responseData['request'],
                     'options' => json_decode($responseData['options'], true),
                     'text' => $responseData['is_option'] != 1 ? $responseData['options'] : null,
-                    'is_option' => $responseData['is_option']
+                    'is_option' => $responseData['is_option'],
+                    'navigation' => $responseData['navigation'],
+                    'navigation_type' => $responseData['navigation_type']
                 ];
                 
                 return $this->respond(['status' => 'success','code' => 200,'data' => $result ],200);
@@ -207,7 +237,9 @@ public function sendDefaultMessage()
             'request_for' => $responseData['request'],
             'options' => json_decode($responseData['options'], true),
             'text' => $responseData['is_option'] != 1 ? $responseData['options'] : null,
-        'is_option' => $responseData['is_option']
+            'is_option' => $responseData['is_option'],
+            'navigation' => $responseData['navigation'],
+            'navigation_type' => $responseData['navigation_type']
         ];
         
         
@@ -226,8 +258,7 @@ public function getAllPolicyByMobileNumber($mobileNo,$action)
             $whereArrayForId = [];
             foreach ( $employeeData as $key => $value) { array_push($whereArrayForId, $value['id']); }
 
-        $ClientPolicyData =  $this->clientPolicyModel->select('client_policy.* , policies.name as policy_name , policy_type.policy_type as policy_type')
+            $ClientPolicyData =  $this->clientPolicyModel->select('client_policy.* ,  policy_type.long_name as policy_name , policy_type.policy_type as policy_type')
-                                                        ->join('policies', 'client_policy.policy_id = policies.id', 'left')
                                                             ->join('policy_type', 'client_policy.policy_type_id = policy_type.id', 'left')
                                                             ->where('client_policy.client_id', $employee['client_id'] )
                                                             ->where('client_policy.client_branch_id', $employee['client_branch_id'] )
@@ -257,7 +288,7 @@ public function getAllPolicyByMobileNumber($mobileNo,$action)
                     {
                         $policy[$ClientPolicyValue['id']] = $ClientPolicyValue['policy_name']."(".$ClientPolicyValue['policy_type'].")";
                         array_push($options, $policy);
-                    $text .= $ClientPolicyValue['policy_name']."(".$ClientPolicyValue['policy_type'].") % ";
+                        $text .= $ClientPolicyValue['policy_name']." % ";
                     }else{
                         $text .= "There is no any active policies ";
                     }
@@ -265,7 +296,7 @@ public function getAllPolicyByMobileNumber($mobileNo,$action)
                 }
                 if($action == 'options'){
                     return [
-                    'request_for' => $this->request->getGet('request_for'),
+                        'request_for' => $this->request->getVar('request_for'),
                         'options' => $options[count($options) - 1],
                         'text' => null,
                         'is_option' => "1",
@@ -273,7 +304,7 @@ public function getAllPolicyByMobileNumber($mobileNo,$action)
                     ];
                 }else{
                     return [
-                    'request_for' => $this->request->getGet('request_for'),
+                        'request_for' => $this->request->getVar('request_for'),
                         'options' => null,
                         'text' => $text,
                         'is_option' => "0",
@@ -285,9 +316,9 @@ public function getAllPolicyByMobileNumber($mobileNo,$action)
         
             }else{
                 return [
-                'request_for' => $this->request->getGet('request_for'),
+                    'request_for' => $this->request->getVar('request_for'),
                     'options' => null,
-                'text' => "Dear ".$employee['name'].", % Policy not yet bound for you.",
+                    'text' => "Dear ".$employee['name']." Policy not yet bound for you.",
                     'is_option' => "0"
                 ];
 
@@ -297,7 +328,7 @@ public function getAllPolicyByMobileNumber($mobileNo,$action)
         
         }else{
             return [
-            'request_for' => $this->request->getGet('request_for'),
+                'request_for' => $this->request->getVar('request_for'),
                 'options' => null,
                 'text' => "Invalid Mobile Number",
                 'is_option' => "0"
@@ -312,7 +343,7 @@ public function claimTicket()
     {
     
 
-    $employee = $this->employeeModel->where('mobile', $this->request->getGet('mobile_no'))->where('is_active', 1 )->first();
+        $employee = $this->employeeModel->where('mobile', $this->request->getVar('mobile_no'))->where('is_active', 1 )->first();
         if($employee){
 
             $url = 'https://venbait.in/nhance/helpdesk/dev/api/tickets/create';
@@ -328,10 +359,10 @@ public function claimTicket()
                 'opener' => 'user',
                 'department_id' => 2,
                 'subject' => 'Claim Raised by Chat Bot',
-            'body' => $this->request->getGet('value'),
+                'body' => $this->request->getVar('value'),
-            'policy_id' => $this->request->getGet('policy_id'),
+                'policy_id' => $this->request->getVar('policy_id'),
                 'emp_code' => $employee['emp_code'],
-            'mobile_number' => $this->request->getGet('mobile_no'),
+                'mobile_number' => $this->request->getVar('mobile_no'),
                 'email' => 'adhavanvalli@gmail.com',
                 'fullname' => $employee['name'],
             ];

app/Controllers/EmployeeRestController.php

@@ -27,6 +27,7 @@ use App\Models\NotificationModel;
 use App\Models\UserModel;
 use App\Models\FEContentModel;
 use App\Models\AddImgModel;
+use App\Models\ClientBranchModel;
 
 
 use App\Controllers\Jobs ;
@@ -69,6 +70,8 @@ class EmployeeRestController extends AdminController
     protected $userModel;
     protected $feContentModel;
     protected $addImgModel;
+    protected $clientBranchModel;
+    
     
     public function __construct()
     {
@@ -90,6 +93,7 @@ class EmployeeRestController extends AdminController
         $this->userModel = new UserModel();
         $this->feContentModel = new FEContentModel();
         $this->addImgModel = new AddImgModel();
+        $this->clientBranchModel = new ClientBranchModel();
         
     }
 
@@ -208,7 +212,7 @@ class EmployeeRestController extends AdminController
     
     public function addEmployeeAndDependence()
     {
-        try {
+        // try {
             $data = $this->request->getJSON();
 
             
@@ -216,6 +220,7 @@ class EmployeeRestController extends AdminController
 
                 $Count = 0;
                 foreach ($data as $item) {
+                   
                     if (isset($item->id)) {
                         //update old data
                         $id = $item->id;
@@ -233,6 +238,8 @@ class EmployeeRestController extends AdminController
                         $item->gender = $this->GenderMap($item->relationship , $item->emp_code);
                         $item->dob = $this->convertDateFormatYMD($item->dob);
                         $item->emp_status = 'draft';
+                        
+                        
                         $employee = $this->employeeModel->insert($item);
                    
                         if ($employee) {
@@ -266,7 +273,7 @@ class EmployeeRestController extends AdminController
                     
 
 
-                    $this->updatePremiumAmount($data[0]->client_policy_id , $data[0]->emp_code);
+                    $this->updatePremiumAmount($data[0]->client_policy_id , $data[0]->emp_code , $data[0]->client_branch_id);
 
                     
                     $result = [];
@@ -276,9 +283,9 @@ class EmployeeRestController extends AdminController
                     return $this->respond(['status' => 'failed','code' => 404,'data' => $result], 404);
                 }
             }
-        } catch (\Exception $e) {
+        // } catch (\Exception $e) {
-            return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()], 500);
+        //     return $this->respond(['status' => 'failed','code' => 500,'data' => $e->getMessage()], 500);
-        }
+        // }
         
     }
 
@@ -317,9 +324,9 @@ class EmployeeRestController extends AdminController
             return true;             
     }
 
-    public function updatePremiumAmount($client_policy_id , $emp_code)
+    public function updatePremiumAmount($client_policy_id , $emp_code , $client_branch_id)
     {
-        $response = $this->calculatePremium($client_policy_id , $emp_code);
+        $response = $this->calculatePremium($client_policy_id , $emp_code , null , $client_branch_id);
 
         if(count($response[$emp_code]))
         {
@@ -1935,12 +1942,13 @@ class EmployeeRestController extends AdminController
     //Post method  - which receives client_policy id and empcode of the family.
     //Pull records againest emp code and calculate premium 
     // retun array
-    public function calculatePremium($clientPolicyId = null , $empCode = null, $default_si = null)//family level
+    public function calculatePremium($clientPolicyId = null , $empCode = null, $default_si = null ,  $client_branch_id = null)//family level
     { 
         helper('excel_util_helper');
         $client_policy_id = $this->request->getVar('client_policy_id') ?? $clientPolicyId;
         $emp_code = $this->request->getVar('emp_code') ?? $empCode;
         $default_si = $this->request->getVar('si') ?? $default_si;// si amt which choosed in add on policy
+        
         // dd($client_policy_id);
 
 
@@ -1969,13 +1977,17 @@ class EmployeeRestController extends AdminController
         // dd($this->employeeModel->getLastQuery());
         // print_r($existing_famility_details);die();
         $employee_data_group_by_family = data_group_by_family($existing_famility_details,$data_source = 'db');
-        // print_r(($employee_data_group_by_family));die();
+        // print_r(($employee_data_group_by_family));//die();
+
+
+        $existing_units = $this->clientBranchModel->getExisitingUnits(client_id: $client_id,client_branch_id: $client_branch_id);
+
         foreach ($employee_data_group_by_family as $emp_id => $family) 
         {
             $transformed_famility_details = transform_db_data_to_excel($family);
-            // print_r($transformed_famility_details);die();
+
-            $data = calculate_premium($transformed_famility_details,$policy_terms,$slab_details,$file,$default_si);
+            $data = calculate_premium_new(family_data: $transformed_famility_details,policy_terms:$policy_terms,slab_details:$slab_details,fileArr: $file,existing_units: $existing_units,default_si : $default_si);
-            // dd($data);
+            
             $employee_data_group_by_family[$emp_id] = $data;
             
         }

app/Helpers/excel_util_helper.php

@@ -924,7 +924,19 @@ if (!function_exists('calculate_premium_new'))
                         $is_self_acting_self_set = true;
                     }
                     
-                    $family_data[$val]['temp'] = ['max_age' => max($applicable_members_from_familiy['max_age']),'max_count' => $applicable_members_from_familiy['max_count'],'grid_name' => $key,'grid_master' => $slab['grid_master'],'acting_self' => $acting_self,'premium_type' => $slab['slab_rates'][0]['premium_type']];
+                    //$family_data[$val]['temp'] = ['max_age' => max($applicable_members_from_familiy['max_age']),'max_count' => $applicable_members_from_familiy['max_count'],'grid_name' => $key,'grid_master' => $slab['grid_master'],'acting_self' => $acting_self,'premium_type' => $slab['slab_rates'][0]['premium_type']];
+                    $family_data[$val]['temp'] = array_merge(
+                        $family_data[$val]['temp'] ?? [], // existing 'temp' data or an empty array if it doesn't exist
+                        [
+                            'max_age' => max($applicable_members_from_familiy['max_age']),
+                            'max_count' => $applicable_members_from_familiy['max_count'],
+                            'grid_name' => $key,
+                            'grid_master' => $slab['grid_master'],
+                            'acting_self' => $acting_self,
+                            'premium_type' => $slab['slab_rates'][0]['premium_type']
+                        ]
+                    );
+                    
                 }
             }
             else
@@ -999,7 +1011,6 @@ if (!function_exists('transform_excel_data_to_db'))
 {
     function transform_excel_data_to_db($memArr,$actionArr)
     {
-
          $current_column_action = null;
             if($actionArr['action'] == 'inception'){ $current_column_action = 'I'; }
             else if($actionArr['action'] == 'addition'){ $current_column_action = 'A'; }