From 8265e28cf53b432f00a35edf60641371493236a6 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 3 Dec 2025 09:35:42 +0530 Subject: [PATCH 01/23] FIX_FILTER_CORS --- app/Config/Filters.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Config/Filters.php b/app/Config/Filters.php index 9badfb5c..2128f042 100755 --- a/app/Config/Filters.php +++ b/app/Config/Filters.php @@ -15,6 +15,7 @@ use App\Filters\CloseDbConnection; use App\Filters\AuthClientApi; use App\Filters\CommissionApiFilter; use App\Filters\VerifyAppSignature; +use App\Filters\Cors; use App\Filters\AuthJWT; @@ -41,6 +42,7 @@ class Filters extends BaseConfig 'CloseDbConnection' => CloseDbConnection::class, 'CommissionApiFilter'=> CommissionApiFilter::class, 'appSignature' => VerifyAppSignature::class, + 'Cors' => Cors::class, ]; /** From 4aeb2a101c1abdc871ad40a4cf345c0e8d6f0de2 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 3 Dec 2025 09:37:34 +0530 Subject: [PATCH 02/23] CHANGE_SAMPLE_EXCEL --- .../sample_bds_bulk_upload_excel.xlsx | Bin 7583 -> 7719 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/public/sample_excel/sample_bds_bulk_upload_excel.xlsx b/public/sample_excel/sample_bds_bulk_upload_excel.xlsx index 6606bc4ebbdfc86a80717aea91187adf3e96440e..c1f4d0e6c40c0f8f49057f019fe5b4c0322623da 100644 GIT binary patch delta 3855 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 From b2b2fea4b056005716abd000aa07f49de4fd53f5 Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 3 Dec 2025 09:54:12 +0530 Subject: [PATCH 03/23] FIX_GST_ISSUE --- app/Controllers/EmpDataServiceController.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php index 99829bf0..f4787b33 100755 --- a/app/Controllers/EmpDataServiceController.php +++ b/app/Controllers/EmpDataServiceController.php @@ -5366,6 +5366,12 @@ class EmpDataServiceController extends BaseController 'amount' => ($params['base_premium'] ?? 0) + ($params['gst'] ?? 0), ]; + if(isset($policy_data['gst']) && $policy_data['gst'] != null){ + $coShareData['bp_igst'] = $policy_data['gst']; + $coShareData['bp_sgst'] = 0; + $coShareData['bp_cgst'] = 0; + } + if(isset($lead_data['agreed_percentage']) && !empty($lead_data['agreed_percentage'])){ $coShareData['exp_amt'] = (($params['base_premium'] ?? 0) * ($lead_data['agreed_percentage'] ?? 0)) / 100; }else{ From 297688aa19eab27a416bfbd1fb06fb87a5e571ec Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Wed, 3 Dec 2025 11:26:03 +0530 Subject: [PATCH 04/23] FIX_COMMEMT_LOG --- app/Filters/Cors.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Filters/Cors.php b/app/Filters/Cors.php index c47f2762..6aae35d9 100644 --- a/app/Filters/Cors.php +++ b/app/Filters/Cors.php @@ -107,11 +107,11 @@ class Cors implements FilterInterface ); } - $this->log('CORS filter initialized', [ - 'allowed_origins' => $this->allowedOrigins, - 'allow_credentials' => $this->allowCredentials, - 'allowed_methods' => $this->allowedMethods, - ]); + // $this->log('CORS filter initialized', [ + // 'allowed_origins' => $this->allowedOrigins, + // 'allow_credentials' => $this->allowCredentials, + // 'allowed_methods' => $this->allowedMethods, + // ]); } /** From 9d27a276af48ede712e08b02f659daf43b738cb6 Mon Sep 17 00:00:00 2001 From: venba-Inspriron-3558 Date: Wed, 3 Dec 2025 11:38:28 +0530 Subject: [PATCH 05/23] FIX_Policy 2 Becareful --- app/Config/Routes.php | 2 + .../PolicyTransactionController.php | 428 +- app/Views/layout/header.php | 3 + .../policy_transaction_inception_form_2.php | 6498 +++++++++++++++++ .../policy_transaction_inception_list.php | 13 + .../policy_transaction_inception_list_2.php | 1784 +++++ app/Views/pt_form_file_upload_tab.php | 2 +- app/Views/pt_form_file_upload_tab_2.php | 90 + 8 files changed, 8818 insertions(+), 2 deletions(-) create mode 100644 app/Views/policy_transaction_inception_form_2.php create mode 100644 app/Views/policy_transaction_inception_list_2.php create mode 100644 app/Views/pt_form_file_upload_tab_2.php diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 92552865..6331fc7f 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -432,6 +432,8 @@ $routes->group("policy_tranction", ["filter" => "authMVC"], function ($routes) { $routes->get("list/(:any)", "PolicyTransactionController::getInceptionDataForEdit/$1"); $routes->get("remove/(:any)", "PolicyTransactionController::removeCDMaster/$1"); $routes->get("removePolicyTransaction/(:any)", "PolicyTransactionController::removePolicyTransaction/$1"); + $routes->match(['get', 'post'], 'list2', 'PolicyTransactionController::viewInception2'); + $routes->get("list2/(:any)", "PolicyTransactionController::getInceptionDataForEdit2/$1"); }); $routes->group("endorsement", ["filter" => "authMVC"], function ($routes) { diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php index 97a24a24..3233a1dd 100644 --- a/app/Controllers/PolicyTransactionController.php +++ b/app/Controllers/PolicyTransactionController.php @@ -671,8 +671,9 @@ // Fetch Sales Team $data['salse_team'] = $this->userModel - ->select('user_profiles.*') + ->select('user_profiles.*,nhance_branch.id as nhance_branch_id, nhance_branch.branch_name as nhance_branch_name') ->join('user_teams', 'user_profiles.id = user_teams.user_id') + ->join('nhance_branch', 'user_profiles.nhance_branch_id = nhance_branch.id','left') ->where('user_teams.team_id', 5) ->where('user_teams.is_active', 1) ->where('user_profiles.is_active', 1) @@ -690,6 +691,7 @@ ->where('is_active', 1) ->findAll(); // echo '
';
+            
             // print_r($data['ppTeamsData']); die;
 
             // dd($data);
@@ -698,6 +700,160 @@
             $this->loadLayout('policy_transaction_inception_list', $data);
         }
 
+        public function viewInception2()
+        {   
+            $bds_edit_pt_id = $this->request->getGet('pt_id') ?? null;
+            $data['tab_name']  = 'Policies';
+            $data['page_name'] = 'Policies';
+
+            // Static arrays for dropdowns
+            $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
+            $data['issuer_branch'] = $this->nhanceBranchModel->where('is_active', 1)->findAll();
+            $data['client_type'] = [1 => 'Group', 2 => 'Individual'];
+            $data['issuing_type'] = [1 => 'Fresh', 2 => 'Renewal', 3 => 'Roll Over'];
+            $data['policy_status'] = [
+                'under_process' => 'Under Process',
+                'client_pending' => 'Client Pending',
+                'insurer_pending' => 'Insurer Pending',
+                'co_insurer_pending' => 'Co-Insurer Pending',
+                'tpa_pending' => 'TPA Pending',
+                'validated' => 'Validated',
+                'cancelled' => 'Cancelled',
+                'instalment_pending' => 'Instalment Pending',
+                'completed' => 'Completed',
+                'lost' => 'Lost',
+            ];
+            $data['invoice_status_array'] = [
+                'yet_to_generate' => 'Pending',
+                'generated' => 'Generated',
+                'send' => 'Sent',
+                'recived' => 'Payment Received',
+            ];
+            // $data['vehicle_type'] = [
+            //     'two_wheeler' => 'Two Wheeler',
+            //     'four_wheeler' => 'Four Wheeler',
+            //     'truck' => 'Truck',
+            //     'bus' => 'Bus',
+            //     'van' => 'Van',
+            //     'suv' => 'SUV',
+            //     'motorcycle' => 'Motorcycle',
+            //     'bicycle' => 'Bicycle'
+            // ];
+            $data['vehicle_type'] = db_connect()->table('vehicle_type')->where('is_active', 1)->get()->getResultArray();
+            $data['rto_details'] = db_connect()->table('rto_master')->where('is_active', 1)->get()->getResultArray();
+
+            $data['vehicle_des'] = [
+                'commercial' => 'Commercial',
+                'private' => 'Private',
+            ];
+            $data['date_type'] = [
+                'policy_issue_date' => 'Policy Issue Date',
+                'policy_start_date' => 'Policy Start Date',
+                'policy_end_date' => 'Policy End Date',
+            ];
+
+            // Filter data
+            $start_date = $this->request->getGet('start_date');
+            $end_date = $this->request->getGet('end_date');
+            $client_id = $this->request->getGet('client_id');
+            $insurer_id = $this->request->getGet('insurer_id');
+            $policy_type_id = $this->request->getGet('policy_type_id');
+            $date_type = $this->request->getGet('date_type');
+            $issuer = $this->request->getGet('issuer');
+            $status = $this->request->getGet('status');
+
+            // Handle null or empty values
+            $start_date = empty($start_date) ? 0 : $start_date;
+            $end_date = empty($end_date) ? 0 : $end_date;
+            $client_id = empty($client_id) ? 0 : $client_id;
+            $insurer_id = empty($insurer_id) ? 0 : $insurer_id;
+            $policy_type_id = empty($policy_type_id) ? 0 : $policy_type_id;
+            $date_type = empty($date_type) ? 0 : $date_type;
+            $issuer = empty($issuer) ? 0 : $issuer;
+            $status = empty($status) ? 0 : $status;  // Corrected from `$issuer`
+
+            if(empty($bds_edit_pt_id)){
+                if ($this->request->is('get')) {
+
+                    // Fetch inception data list
+                    $data['inception_data_list'] = $this->policyTransactionModel->getInceptionTranctionListData(
+                        $start_date,
+                        $end_date,
+                        $client_id,
+                        $insurer_id,
+                        $policy_type_id,
+                        $date_type,
+                        $issuer,
+                        $status
+                    );
+                } else {
+
+                    $ids = $this->request->getPost('ids');
+                    $ids = array_filter(explode(',', $ids));
+                    $data['inception_data_list'] = $this->policyTransactionModel->getInceptionTranctionListData(
+                        $start_date = 0,
+                        $end_date = 0,
+                        $client_id = 0,
+                        $insurer_id = 0,
+                        $policy_type_id = 0,
+                        $date_type = 0,
+                        $issuer = 0,
+                        $status = 0,
+                        $ids
+                    );
+                }
+            }else{
+                $data['inception_data_list'] = [];
+            }
+
+
+
+            // Fetch additional data
+            $data['client'] = $this->clientModel->where('is_active', 1)->findAll();
+            $data['client_branch'] = $this->clientBranchModel->where('is_active', 1)->findAll();
+            $data['policy_type'] = $this->policyTypeModel->where('is_active', 1)->findAll();
+            $data['insurer'] = $this->insurerModel->where('is_active', 1)->findAll();
+            $data['entity'] = $this->kycEntityTypeModel->where('is_active', 1)->findAll();
+            $data['policy_types'] = $this->policyTypeModel->where('is_active', 1)->findAll();
+            $data['insurer_branch'] = $this->insurerBranchModel->getInsurerBranchesWithInsurerNames();
+            $data['tpa'] = $this->tpaBranchModel->getTpaBranchesWithTpaNames();
+
+            // Fetch PP Teams Data
+            $data['ppTeamsData'] = $this->userModel
+                ->where('is_active', 1)
+                ->findAll();
+
+            // Fetch Sales Team
+            $data['salse_team'] = $this->userModel
+                ->select('user_profiles.*,nhance_branch.id as nhance_branch_id, nhance_branch.branch_name as nhance_branch_name')
+                ->join('user_teams', 'user_profiles.id = user_teams.user_id')
+                ->join('nhance_branch', 'user_profiles.nhance_branch_id = nhance_branch.id','left')
+                ->where('user_teams.team_id', 5)
+                ->where('user_teams.is_active', 1)
+                ->where('user_profiles.is_active', 1)
+                ->findAll();
+
+            // Fetch Partner Agent
+            $data['partner_agent'] = db_connect()->table('partner_agent')
+                                            ->where('is_active', 1)
+                                            ->get()
+                                            ->getResultArray();
+            
+            // Fetch ACM
+            $data['ACM'] = $this->userModel
+                ->where('role', 3)  // Assuming `role` is in `user_profiles`
+                ->where('is_active', 1)
+                ->findAll();
+                // echo '
';
+            
+            // print_r($data['ppTeamsData']); die;
+
+            // dd($data);
+
+            // Load view
+            $this->loadLayout('policy_transaction_inception_list_2', $data);
+        }
+
         // policy Transaction Create function start
         public function createInceptionPolicy()
         {   
@@ -1483,6 +1639,276 @@
             }
         }
 
+        // Get the Single Inception Tranction data for edit
+        public function getInceptionDataForEdit2($id)
+        {
+            $data = $this->policyTransactionModel
+                ->select('
+                            policy_transaction.*, 
+                            clients.short_name as client_short_name, 
+                            clients.client_type, 
+                            clients.entity_type_id, 
+                            policy_type.policy_type,
+                            client_policy.tpa_id as master_tpa_id,
+                            client_policy.tpa_branch_id as master_tpa_branch_id,
+                            client_policy.policy_type_id as master_policy_type_id,
+                            client_policy.is_addon,
+                            client_policy.base_policy,
+                            ( 
+                                select last_action_date
+                                from policy_transaction_status
+                                where policy_tran_id = policy_transaction.id
+                                and status = policy_transaction.status
+                                order by id desc
+                                limit 1
+
+                            ) as last_action_date
+                        ')
+                ->join('clients', 'clients.id = policy_transaction.client_id')
+                ->join('client_policy', 'policy_transaction.client_policy_id = client_policy.id', 'left')
+                ->join('policy_type', 'client_policy.policy_type_id = policy_type.id', 'left')
+                ->where('policy_transaction.id', $id)
+                ->where('policy_transaction.is_active', 1)
+                ->first();
+
+            $data['created_at'] = (isset($data['created_at']) && $data['created_at'] !== null && $data['created_at'] !== '')
+                ? date('d/m/Y h:i:s A', strtotime($data['created_at']))
+                : null;
+
+            $data['updated_at'] = (isset($data['updated_at']) && $data['updated_at'] !== null && $data['updated_at'] !== '')
+                ? date('d/m/Y h:i:s A', strtotime($data['updated_at']))
+                : null;
+
+
+            if (!empty($data['policy_issue_date'])) {
+                $data['policy_issue_date'] =  change_date_format($data['policy_issue_date'], 'Y-m-d', 'd/m/Y');
+            }
+
+            if (!empty($data['policy_start_date'])) {
+                $data['policy_start_date'] =  change_date_format($data['policy_start_date'], 'Y-m-d', 'd/m/Y');
+            }
+
+            if (!empty($data['policy_end_date'])) {
+                $data['policy_end_date'] =  change_date_format($data['policy_end_date'], 'Y-m-d', 'd/m/Y');
+            }
+
+            if (!empty($data['renewal_date'])) {
+                $data['renewal_date'] =  change_date_format($data['renewal_date'], 'Y-m-d', 'd/m/Y');
+            }
+
+            if (!empty($data['rollover_date'])) {
+                $data['rollover_date'] =  change_date_format($data['rollover_date'], 'Y-m-d', 'd/m/Y');
+            }
+
+            if (!empty($data['endorse_eff_date'])) {
+                $data['endorse_eff_date'] =  change_date_format($data['endorse_eff_date'], 'Y-m-d', 'd/m/Y');
+            }
+
+            if (!empty($data['last_action_date'])) {
+                $data['last_action_date'] =  change_date_format($data['last_action_date'], 'Y-m-d', 'd/m/Y');
+            }
+
+            if (!empty($data['month'])) {
+                $data['month'] =  change_date_format($data['month'], 'Y-m-d', 'M/Y');
+            } else {
+                $data['month'] = null;
+            }
+
+            // print_r($data); die;
+
+            $data['renewal_policy'] = $this->clientPolicyModel
+                ->select('client_policy.*, policy_type.policy_type')
+                ->join('policy_type', 'policy_type.id = client_policy.policy_type_id')
+                ->where('client_policy.client_id', $data['client_id'])
+                ->where('client_policy.client_branch_id', $data['client_branch_id'])
+                ->where('client_policy.is_active', 1)
+                ->findAll();
+
+            $data['base_policy_data'] = $this->clientPolicyModel
+                ->select('client_policy.*, policy_type.policy_type')
+                ->join('policy_type', 'policy_type.id = client_policy.policy_type_id')
+                ->where('client_policy.client_id', $data['client_id'])
+                ->where('client_policy.client_branch_id', $data['client_branch_id'])
+                ->whereIn('client_policy.policy_type_id', [2, 3])
+                ->where('client_policy.is_active', 1)
+                ->findAll();
+
+            $pt_bp_amt = $this->PTCOShareDetailsModel
+                ->select('bp_amt, amount')
+                ->where('pt_id', $id)
+                ->where('co_share_type', 1)
+                ->where('is_active', 1)
+                ->first();
+
+            // dd(db_connect()->getLastQuery() ,$pt_bp_amt);
+            $data['base_cd_amount'] = $pt_bp_amt['amount'] ?? null;
+
+
+            $ptFileQuery = $this->PTFileModel
+                ->join('policy_transaction', 'pt_files.pt_id = policy_transaction.id')
+                ->where('pt_files.pt_id', $id)
+                ->where('pt_files.is_active', 1);
+
+            if (!in_array(get_role_id(), [1, 5]) && empty(array_intersect(user_team(), [MANAGEMENT_TEAM_ID, FINANCE_TEAM_ID, BUSINESS_TEAM_ID]))) {
+
+                if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
+                    $ptFileQuery->where('pt_files.created_by', get_session_userid());
+                }
+            }
+
+            $data['pt_files'] = $ptFileQuery->findAll();
+
+
+
+            $data['pt_co_share_details'] = $this->PTCOShareDetailsModel
+                ->select("
+                        pt_co_share_details.*,
+                
+                        (
+                            SELECT
+                                COUNT(*)
+                            FROM
+                                co_share_stmt_details
+                            WHERE
+                                co_share_stmt_details.co_share_id = pt_co_share_details.id
+                                AND co_share_stmt_details.is_active = 1
+                        ) AS record_count,
+
+                            (
+                                SELECT 
+                                    SUM(actual_bp_amt) 
+                                FROM 
+                                    co_share_stmt_details 
+                                WHERE 
+                                    co_share_id = pt_co_share_details.id 
+                                    AND is_active = 1
+                                    
+                            ) AS actual_bp_amount,
+                            
+                            (
+                                SELECT 
+                                    SUM(actual_tp_amt) 
+                                FROM 
+                                    co_share_stmt_details 
+                                WHERE 
+                                    co_share_id = pt_co_share_details.id 
+                                    AND is_active = 1
+                                    
+                            ) AS actual_tp_amount,
+                            
+                            (
+                                SELECT 
+                                    SUM(actual_tep_amt) 
+                                FROM 
+                                    co_share_stmt_details 
+                                WHERE 
+                                    co_share_id = pt_co_share_details.id 
+                                    AND is_active = 1
+                                    
+                            ) AS actual_tep_amount,
+                            
+                            (
+                                SELECT 
+                                    SUM(actual_bp_per) 
+                                FROM 
+                                    co_share_stmt_details 
+                                WHERE 
+                                    co_share_id = pt_co_share_details.id 
+                                    AND is_active = 1
+                                    
+                            ) AS actual_bp_percentage,
+                            
+                            (
+                                SELECT 
+                                    SUM(actual_tp_per) 
+                                FROM 
+                                    co_share_stmt_details 
+                                WHERE 
+                                    co_share_id = pt_co_share_details.id 
+                                    AND is_active = 1
+                                    
+                            ) AS actual_tp_percentage,
+                            
+                            (
+                                SELECT 
+                                    SUM(actual_tep_per) 
+                                FROM 
+                                    co_share_stmt_details 
+                                WHERE 
+                                    co_share_id = pt_co_share_details.id 
+                                    AND is_active = 1
+                                    
+                            ) AS actual_tep_percentage,
+                            
+                            
+                            (
+                                SELECT 
+                                    SUM(actual_bp_brokerage_amt) 
+                                FROM 
+                                    co_share_stmt_details 
+                                WHERE 
+                                    co_share_id = pt_co_share_details.id 
+                                    AND is_active = 1
+                                    
+                            ) AS actual_bp_brokerage_amount,
+                            
+                            
+                            (
+                                SELECT 
+                                    SUM(actual_tp_brokerage_amt) 
+                                FROM 
+                                    co_share_stmt_details 
+                                WHERE 
+                                    co_share_id = pt_co_share_details.id 
+                                    AND is_active = 1
+                                    
+                            ) AS actual_tp_brokerage_amount,
+                            
+                            
+                            (
+                                SELECT 
+                                    SUM(actual_tep_brokerage_amt) 
+                                FROM 
+                                    co_share_stmt_details 
+                                WHERE 
+                                    co_share_id = pt_co_share_details.id 
+                                    AND is_active = 1
+                                    
+                            ) AS actual_tep_brokerage_amount,
+
+                            DATE_FORMAT(pt_policy_issue_date, '%d/%m/%Y') AS pt_policy_issue_date
+
+                    ")
+                ->where('pt_id', $id)
+                ->where('is_active', 1)
+                ->orderBy('id', 'asc')
+                ->findAll();
+
+            $data['emp_data'] = $this->employeeModel
+                ->select('employees.*, employee_polices.id as emp_policy_id')
+                ->join('employee_polices', 'employees.id = employee_polices.employee_id', 'left')
+                ->where('employees.client_id', $data['client_id'])
+                ->where('employees.is_active', 1)->findAll();
+            // $data['client_kyc']   = $this->clientKYCDocsModel->where('client_id',  $data['client_id'])->findAll();
+
+            $clientController = new ClientController();
+            $data['client_kyc_primary_table']  =  $clientController->generateKycPrimaryTable($data['client_id']);
+            $data['client_kyc_other_table']  =  $clientController->generateKycOthersTable($data['client_id']);
+
+            $data['vehicle_docs'] = $this->clientKYCDocsModel
+                ->where('client_id',  $data['client_id'])
+                ->where('vehicle_id', $data['vehicle_id'])
+                ->findAll();
+
+            // print_r( $data['pt_co_share_details']); die;
+            // return $data;
+            if ($data) {
+                return $this->respond(['status' => true, 'data' => $data], 200);
+            } else {
+                return $this->respond(['status' => false], 200);
+            }
+        }
+
         public function removePolicyTransaction($id, $type = 0)
         {   
             if ($id) {
diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php
index d55658d0..43ba28ee 100755
--- a/app/Views/layout/header.php
+++ b/app/Views/layout/header.php
@@ -1890,6 +1890,9 @@
                                                     
  • 
                                                         Policy
                                                     
    • 
+                                                    
  • 
+                                                        Policy 2
+                                                    
    • 
                                                     
  • 
                                                         Endorsement
                                                     
    • 
diff --git a/app/Views/policy_transaction_inception_form_2.php b/app/Views/policy_transaction_inception_form_2.php
new file mode 100644
index 00000000..d73ab07d
--- /dev/null
+++ b/app/Views/policy_transaction_inception_form_2.php
@@ -0,0 +1,6498 @@
+
+
+
+
+
+
+
    
+    
+    
    
+        
    
+            
    
+                
    
+                    
    
+
+                        
    
+                            
    Add Policy
    
+                        
    
+                        
    
+                            
+                        
    
+                        
    
+                            Back
+                        
    
+                    
    
+                    
    
+
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+                        
+
+                        
+                        
+                        
+                        
+                        
+
+                        
+                        
     
+                            
    
+                                
    
+                                    
    
+                                        
    
+                                        
    
+                                            
    
+                                                
    
+                                                    
+                                                    
+                                                
    
+                                                
+                                            
    
+                                            
    
+
+                                                
    
+                                                    
+                                                    
+                                                
    
+
+                                                
    
+                                                    
+                                                    
+                                                
    
+
+                                                
+
+                                                
+
+                                                
+
+                                                
    
+                                                    
+                                                    
+                                                
    
+
+                                                
    
+                                                    
+                                                                  
+                                                    
+                                                
    
+
+                                                
    
+                                                    
+                                                                                            
+                                                
    
+
+                                                
    
+                                                    
+                                                      
+                                                
    
+                                            
    
+                                            
+                                        
    
+                                        
    
+                                    
    
+                                
    
+                            
    
+                        
     
+
+                        
+                        
    
+                        
+                        
+                        
    
+                            
+                            
    
+                                
    
+                                    
+                                    
    
+                                        
    
+                                            
    
+                                                
+                                                
    
+
+                                                    
    
+                                                        
+                                                        
+                                                    
    
+
+                                                    
    
+                                                        
+                                                        
+                                                    
    
+
+                                                    
    
+                                                        
+                                                        
+                                                    
    
+
+                                                    
+
+                                                
    
+
+                                                
+                                                 
+                                            
    
+                                        
    
+                                    
    
+                                
    
+                            
    
+                        
    
+
+                        
+                        
    
+            
+                        
+                        
    
+            
    
+        
    
+    
    
+
    
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/Views/policy_transaction_inception_list.php b/app/Views/policy_transaction_inception_list.php
index 64c113fe..ae82bc2c 100644
--- a/app/Views/policy_transaction_inception_list.php
+++ b/app/Views/policy_transaction_inception_list.php
@@ -1768,4 +1768,17 @@ function removePolicyTransaction(input, pt_id, policy_type_id) {
     });
 }
 
+function showForm(form) {   
+
+    if (form == 1) {
+        $('#form1').show();
+        $('#form2').hide();
+    }
+
+    if (form == 2) {
+        $('#form1').hide();
+        $('#form2').show();
+    }
+}
+
 
\ No newline at end of file
diff --git a/app/Views/policy_transaction_inception_list_2.php b/app/Views/policy_transaction_inception_list_2.php
new file mode 100644
index 00000000..7df52f9e
--- /dev/null
+++ b/app/Views/policy_transaction_inception_list_2.php
@@ -0,0 +1,1784 @@
+
+
+
+
+
    
+    
    
+        
    
+            
    
+                
    
+                        Filter
+                        
+                            
+                        
+                    
    
+                
    
+                    
    
+                        
    
+                            
    
+
+                                
    
+                                    
+                                    
+                                
    
+
+                                
    
+                                    
+                                    
+                                
    
+
+                                
    
+                                    
+                                    
+                                
    
+
+                                
+
+                                
    
+                                    
+                                    
+                                
      
+
+                            
    
+
+                            
    
+
+
+
+                                
    
+                                    
+                                    
+                                
    
+
+                                
+
+                                
+                            
    
+                            
    
+
+                                
    
+                                    " class="btn btn-secondary" id="clear-filters">Clear
+                                    " class="btn btn-primary" id="get-emp-list" onclick="fetchEmpolyeeList(event);">Submit                            
+                                
    
+
+                            
    
+                        
    
+                    
    
+                
    
+            
    
+        
    
+    
    
+
    
+
+
    
+    
    
+        
    
+            
    
+                
    
+                    
    
+                        
    Policy List
    
+                    
    
+
+                    
    
+                        
+                    
    
+                
    
+                
    
+                    
+                        
+                            
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                            
+                        
+
+                        
+                             $row){ ?>
+                            
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                                
+                            
+                            
+                        
+                    
    S.No.
    Issuer
    Business Type
    Client Type
    Client / Branch
    Insurer
    Policy
    Policy No
    Policy Issue Date
    D.O.C
    D.O.E
    No of Insured
    No of Dependents
    Status
    User
    Action
    
+                                    
    
+                                        
+                                        
    
+                                            
+                                                Edit
+                                            
+                                            
+                                                Delete
+                                            
+                                        
    
+                                    
    
+                                
    
+                
    
+            
    
+        
    
+    
    
+
    
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/Views/pt_form_file_upload_tab.php b/app/Views/pt_form_file_upload_tab.php
index cb8968fe..f5f6f10a 100644
--- a/app/Views/pt_form_file_upload_tab.php
+++ b/app/Views/pt_form_file_upload_tab.php
@@ -7,7 +7,7 @@
                         
                     
                     
  • 
-                        
diff --git a/app/Views/pt_form_file_upload_tab_2.php b/app/Views/pt_form_file_upload_tab_2.php
new file mode 100644
index 00000000..3190bf8a
--- /dev/null
+++ b/app/Views/pt_form_file_upload_tab_2.php
@@ -0,0 +1,90 @@
+
+
+
+
\ No newline at end of file

From a8cd0b280dc79c7ea09c47f05dcda8778d2d9192 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Wed, 3 Dec 2025 12:09:18 +0530
Subject: [PATCH 06/23] FIX_APP_SIGNATURE_ROUTE

---
 app/Config/Routes.php | 81 +++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 41 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 92552865..6eb81acb 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -530,7 +530,45 @@ $routes->group("/api", ["filter" => "authJWT"], function ($routes) {
 
 
 $routes->get("getSSORedirectUrl", "ApiServiceController::getSSORedirectUrl");
-    $routes->get("getEmployeePolicy", "EmployeeRestController::getEmployeePolicy");
+$routes->get("getEmployeePolicy", "EmployeeRestController::getEmployeePolicy");
+
+$routes->group("employeeRest", ['filter' => ["appSignature"] ], function ($routes) {
+
+    //Employee login api's
+    $routes->post("verifyEmployeeNumber", "RestAuthenticationController::verifyEmployeeWithMobileNumber");
+    $routes->post("getVerifiedUserData", "RestAuthenticationController::getVerifiedUserData");
+    $routes->post("verifyEmployeeEmailId", "RestAuthenticationController::verifyEmployeeWithEmailId");
+    $routes->post("updateEmpOTP", "RestAuthenticationController::updateEmpOTP");
+
+    // MPIN api's
+    $routes->post("saveMpin", "RestAuthenticationController::saveMpin");
+    $routes->post("updateMpin", "RestAuthenticationController::updateMpin");
+    $routes->post("verifyMpin", "RestAuthenticationController::verifyMpin");
+    $routes->post("checkMpin", "RestAuthenticationController::checkMpin");
+    $routes->post("updateEmpMPIN", "RestAuthenticationController::updateEmpMPIN");
+    $routes->post("forgotMPIN", "RestAuthenticationController::forgotMPIN");
+    $routes->post("updateMobileNumber", "RestAuthenticationController::updateMobileNumber");
+
+    // PASSWORD api's
+    $routes->post("savePassword", "RestAuthenticationController::savePassword");
+    $routes->post("changePassword", "RestAuthenticationController::changePassword");
+    $routes->post("verifyPassword", "RestAuthenticationController::verifyPassword");
+    $routes->post("verifyOtp", "RestAuthenticationController::verifyOtp");
+    $routes->post("checkPassword", "RestAuthenticationController::checkPassword");
+
+    //HR login api's
+    $routes->post("verifyHrWithMobileNumber", "RestAuthenticationController::verifyHrWithMobileNumber");
+    $routes->post("verifyHrWithEmail", "RestAuthenticationController::verifyHrWithEmail");
+    $routes->post("getVerifiedHrData", "RestAuthenticationController::getVerifiedHrData");
+    $routes->post("updateHROTP", "RestAuthenticationController::updateHROTP");
+    $routes->get("getHRAccessData", "RestAuthenticationController::getHRAccessData");
+
+    $routes->post("getPostEmployeeDataForAuth", "RestAuthenticationController::getPostEmployeeDataForAuth");
+
+    $routes->get("getClientDetails", "EmployeeRestController::getClientDetails");
+    $routes->get("getAdvertisementImage", "EmployeeRestController::getAdvertisementImage");
+
+});
 
 $routes->group("employeeRest", ["filter" => ["authJWT" , "appSignature"]], function ($routes) {
 
@@ -539,7 +577,7 @@ $routes->group("employeeRest", ["filter" => ["authJWT" , "appSignature"]], funct
 
 
     $routes->post("logHrActivity", "RestAuthenticationController::logHrActivity");
-    $routes->post("getVerifiedUserData", "RestAuthenticationController::getVerifiedUserData");
+    // $routes->post("getVerifiedUserData", "RestAuthenticationController::getVerifiedUserData");
 
 
     $routes->post("getChatResponse", "ChatBotController::getChatResponse");
@@ -602,45 +640,6 @@ $routes->group("employeeRest", ["filter" => ["authJWT" , "appSignature"]], funct
 
 });
 
-$routes->group("employeeRest", ['filter' => ["appSignature"] ], function ($routes) {
-
-    //Employee login api's
-    $routes->post("verifyEmployeeNumber", "RestAuthenticationController::verifyEmployeeWithMobileNumber");
-    $routes->post("getVerifiedUserData", "RestAuthenticationController::getVerifiedUserData");
-    $routes->post("verifyEmployeeEmailId", "RestAuthenticationController::verifyEmployeeWithEmailId");
-    $routes->post("updateEmpOTP", "RestAuthenticationController::updateEmpOTP");
-
-    // MPIN api's
-    $routes->post("saveMpin", "RestAuthenticationController::saveMpin");
-    $routes->post("updateMpin", "RestAuthenticationController::updateMpin");
-    $routes->post("verifyMpin", "RestAuthenticationController::verifyMpin");
-    $routes->post("checkMpin", "RestAuthenticationController::checkMpin");
-    $routes->post("updateEmpMPIN", "RestAuthenticationController::updateEmpMPIN");
-    $routes->post("forgotMPIN", "RestAuthenticationController::forgotMPIN");
-    $routes->post("updateMobileNumber", "RestAuthenticationController::updateMobileNumber");
-
-    // PASSWORD api's
-    $routes->post("savePassword", "RestAuthenticationController::savePassword");
-    $routes->post("changePassword", "RestAuthenticationController::changePassword");
-    $routes->post("verifyPassword", "RestAuthenticationController::verifyPassword");
-    $routes->post("verifyOtp", "RestAuthenticationController::verifyOtp");
-    $routes->post("checkPassword", "RestAuthenticationController::checkPassword");
-
-    //HR login api's
-    $routes->post("verifyHrWithMobileNumber", "RestAuthenticationController::verifyHrWithMobileNumber");
-    $routes->post("verifyHrWithEmail", "RestAuthenticationController::verifyHrWithEmail");
-    $routes->post("getVerifiedHrData", "RestAuthenticationController::getVerifiedHrData");
-    $routes->post("updateHROTP", "RestAuthenticationController::updateHROTP");
-    $routes->get("getHRAccessData", "RestAuthenticationController::getHRAccessData");
-
-    $routes->post("getPostEmployeeDataForAuth", "RestAuthenticationController::getPostEmployeeDataForAuth");
-
-    $routes->get("getClientDetails", "EmployeeRestController::getClientDetails");
-    $routes->get("getAdvertisementImage", "EmployeeRestController::getAdvertisementImage");
-
-});
-
-
 $routes->get("hrFileDownload", "EmployeeRestController::hrFileDownload");
 $routes->post("hrFileList", "EmployeeRestController::hrFileList");
 $routes->get("getEmployeeActiveOrInactivePolicy", "EmployeeRestController::getEmployeeActiveOrInactivePolicy");

From 2275a56fc4ae10b800959df92f57f2ddc0754843 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Wed, 3 Dec 2025 12:30:54 +0530
Subject: [PATCH 07/23] CHANGE_REMOVE_REWARDS_COLUMN

---
 .../PolicyTransactionController.php           |  25 +++++++++---------
 .../sample_bds_bulk_upload_excel.xlsx         | Bin 7719 -> 7729 bytes
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index 3233a1dd..1b6385a4 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -529,17 +529,17 @@
                     'params' => null
                 ],
 
-                'rewards' => [
-                    'col_idx' => 34,
-                    'col_cell_name' => 'AI',
-                    'col_name' => 'Rewards',
-                    'is_mandatory' => false,
-                    'data_type' => '',
-                    'format' => null,
-                    'allowed_values' => null,
-                    'custom' => null,
-                    'params' => null
-                ],
+                // 'rewards' => [
+                //     'col_idx' => 34,
+                //     'col_cell_name' => 'AI',
+                //     'col_name' => 'Rewards',
+                //     'is_mandatory' => false,
+                //     'data_type' => '',
+                //     'format' => null,
+                //     'allowed_values' => null,
+                //     'custom' => null,
+                //     'params' => null
+                // ],
 
             ];
 
@@ -4577,7 +4577,8 @@
                     $actual_bp_brokerage_amount        = trim($row[31]);
                     $actual_tp_brokerage_amount        = trim($row[32]);
                     $expected_amount                   = trim($row[33]);
-                    $rewards                           = trim($row[34]);
+                    // $rewards                           = trim($row[34]);
+                    $rewards                           = 0;
 
                     $calculation = calculateMotorPolicyAmounts([
                         'base_premium' => trim($row[16]),
diff --git a/public/sample_excel/sample_bds_bulk_upload_excel.xlsx b/public/sample_excel/sample_bds_bulk_upload_excel.xlsx
index c1f4d0e6c40c0f8f49057f019fe5b4c0322623da..b17f79c507437edf70662526fac29637ccb47f6a 100644
GIT binary patch
delta 3459
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

delta 3458
zcmZ8k2T)Vn7EMA6QX~>;jPx41Aieh0JRskrouNAoWN7%pc#sGxx52)~tPJ&E99uoL#3>u0)44BqN6cz+f;y&pD!wjt@vi
z!g?8?BIrE0PbNin9#l}m&jU;!H3DsS|A`zlY|)|f+pQ#gPucC3Wqu#RHPoDaV
zqwIbF&&>f}Rr=$&UXK#hdZROm6Zd2Mc;RerojoHZ!K0*RUnxkH_0E9I`~fdNGjalbsd8!;r=cWPBmFb3YG(e?K!!_5Cd{zCQsa94cglrZ1#is{&qN@)
z&)(2Dm%4g-)Q1>m!BkJ0jTg|=^YM7&!qh7n
zbZ#QJF|BZtGO=@9n)X9CHhxs;lU0=U@kX4kOC+77**r^_gu0z_YRqG_J7ihjZZ*08
zBf9A>#BNQ*buplMi0AXlVbFfZ(|2keR;SnAJA=F6rdzxDae*bh=_7jBmG}of_!2$-
z=kA8_H^E2MRqk))7wyGQ^hUId>itejo8T!18p9_p?V_%g)$bRAmyXLXr~4b*lyTGO
zdlLp!UY3l=I3(@dU>oW}qYASd-DXv__3;g5PGjCjO=3f>*sCQoOpKAyM-qM0jG=er
z7DoK+H>IWHOY$W3o8xSgPMJ$9h7o%~{d@BBb$UgKu5-7$LUKMj4j(-bVI4|v==WR^
z$a#6o`9brLZ+m5z@K!y2RCrIteAkzEXELMO10EVeKIX#(iHG1awBc3!HCOfFLO+zH
znCM`sv)oi+0Log-bC6Fa=Bet}u}XUdtf7+}oMFpK?9-{6{7ZX!NcM!3&dP8L@7>k$
z?y(0+T*MB6%6W1kW3RX3w^
zV?^9<7GcG}LYs~kMs1k|g=z4$3Rn$X*ducbW{=ww6fF%R$Za8mA(MgTanQlpk3M)GIU{s#EtcY&Z~MXh%H-o5hL~r
z_f#<{UvHDvGllDyj_f|4eaa=P|H6-UNBqg4);upQH0A@tZ7$nK4pLpA%oA9gTs
z3I4R#-5!#YUeIT&fD!Mu*)8Mq`hZ{ea!a97WV;o8P{G}&LeSG53B}hX)c%AB2zM>$
z4q85{M?aRcgzTsgjI?QgL1>sH=X68NAqy&mt6i*|KQ2cAti&0>ML%djz}8#b3~Jlf
z?
zb9w3k-(GzQ0d`(}#w6qz7$g0ZLa=~~h;{|0xaeuxhOgL6rawytiVQP@*P_=VMuv2h
zP&EX7JD(n`bl5XtvZ6y>Fgf&$H6nbjkdpyL!IgP`$0o>dpLlE-ZR8NMi`t;yO8K5*ncr}=
zb8zljMTb}V{1PTy@gdXvUF~#d4e*0ZA8x?EMr%-(;8Xl!7UHC*4S#!Ov>(Qu`-0VQ
z*DqlTnyvW4y19OW03?0-FXFbr5#jBsI-HK}1)K~L@Gru6phY1!Ly?6Gn4Gt*7TSE@
z{-SU}G%AN0Niygim{P2SW?=}8(4t@2CY9LNKVGe4@GL=1O=NK*XSp)6JkrDRo5e_~
zFezFZ`%SWl{d!CLBTpT`tDPsULim)d|MF)3g$P8;V`026Q*(C(n~?9XU^RgnDrw#C
zATfcv<=~;8z=ryVmWpn?dX8kU!XHfj{3f*zePfRR
zEUla?1oAuSshaH<@Ov3$WE>5zhoB#r+yD-WFppI$ny4J7+&Dlmttuo;RdSjFKXINe
z5$Nm4a66WGY4MJ7#1ou+xLQ>bE16ke8@+N2*Qd`u-w$JdN2Y3$aB)0x
z1>dX|jSCe_33JZ4JZ3gllbWt+U~rgeUgEk@^kWF2-!1pnD50%mF88-D
zxEvky0Z!C
z7?TFR29^FGbETIYfnsuk^wT|AR@B~LHi(n?Khwi}Ilu7y!kT3
zDg2jz!x8SqFgN!W{ugw@ADHKvSDLt$F27q(|8nv6Jrx-z6=nHmNxIht4MgZONO)p^Alv@J-b|<9=sKk+B0o
z{UjGbZ7blspg>@-N4VBZrNJHD=f4}It77sz1C6hq#n$3!t?6lrk$(MO7KArl)cmGUW5?W35xGqQa?bI%?5OdL!#RE~9BW-LZY^2ekl{%}d|8=iFZ5MCpl=
zDpY1M@07z$n(;{$ceMZu=Bb<1=_1b*1!A`>)6>HxnXsu5S<`fOxU8&03mcOc`L!eA
z=?c8W!8nP4qN^EL7U_s#{6s!>Hp@C+H{1D?zcf2lERI;yn0Px8r{Jj0?2Wd`U>VK+
zN_S_<_)NLgCm&|ZmBGo!f>UnUp!#QmBjim<=OXkdfy!6gGDvngd)B?Q)o8S
z?tX4iDEDQBkWsk3^0pB#p3jQ<877y?7(n3YrNailZ_Sq^+L2t
z3-xAk8Eck6=0m_xnQV){cp%rhiK%@YaH8JIn(~g(w!N^RQuvmiP7R7Ct1ByyDDSDT
zD$um{-mF{NNRzqRT8motq3yI;Y0<`B#W!0uOK+uuW1jfOvW36Jk%llTa2w$pcM1pq
zkfr;-{aHT<xD(WVLN0QDB28d+?%HEW-t6z`;LYM-a27BjL+58N}a7Q82|w51dA
z8f3JT^sLz4+10(Ogca5votx7q^o&O~xjM(MQmoGD7?T-}kt{kz!c4D|fAGkT%odX!K
z=cGT#zVq@q<&C=o!Oo+djSD}Wl~H2Ixaw@`J$Lb_P_m@XPrDBFY4Lq|4X1?+J6X4
z9ZcaIcVH^#D1KRvj>Oyj?-0T~xGc~4hxxnfP{7~M8UzEm#Ed{10zpu~|Arj9=v?XC
z9g^+?$rsJvdcbQ8J)E86&rkpM4*8en6Gj)#d2Y!K4g)4&V&EL-8K0*B;n^hRF6m|b
aR|Xz~hjX82Y>+bYFceq#DUq;0lK%i%wkt^h


From 63dc8266050850137a784e2a6138a6989bd514a9 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Wed, 3 Dec 2025 13:06:30 +0530
Subject: [PATCH 08/23] CHANGE_REMOVE_COLUMNS_IN_BDS_BULK_UPLOAD

---
 .../PolicyTransactionController.php           | 221 +++++++++---------
 app/Helpers/excel_util_helper.php             |  11 -
 .../sample_bds_bulk_upload_excel.xlsx         | Bin 7729 -> 7482 bytes
 3 files changed, 113 insertions(+), 119 deletions(-)

diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index 1b6385a4..e8ad843e 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -397,21 +397,21 @@
                     'params' => null
                 ],
 
-                'total' => [
-                    'col_idx' => 23,
-                    'col_cell_name' => 'X',
-                    'col_name' => 'Total',
-                    'is_mandatory' => false,
-                    'data_type' => '',
-                    'format' => null,
-                    'allowed_values' => null,
-                    'custom' => null,
-                    'params' => null
-                ],
+                // 'total' => [
+                //     'col_idx' => 23,
+                //     'col_cell_name' => 'X',
+                //     'col_name' => 'Total',
+                //     'is_mandatory' => false,
+                //     'data_type' => '',
+                //     'format' => null,
+                //     'allowed_values' => null,
+                //     'custom' => null,
+                //     'params' => null
+                // ],
 
                 'agreed_amount' => [
-                    'col_idx' => 24,
-                    'col_cell_name' => 'Y',
+                    'col_idx' => 23,
+                    'col_cell_name' => 'X',
                     'col_name' => 'Agreed Amount',
                     'is_mandatory' => false,
                     'data_type' => '',
@@ -422,8 +422,8 @@
                 ],
 
                 'agreed_bp_percentage' => [
-                    'col_idx' => 25,
-                    'col_cell_name' => 'Z',
+                    'col_idx' => 24,
+                    'col_cell_name' => 'Y',
                     'col_name' => 'Agreed BP Percentage',
                     'is_mandatory' => false,
                     'data_type' => '',
@@ -434,8 +434,8 @@
                 ],
 
                 'agreed_tp_percentage' => [
-                    'col_idx' => 26,
-                    'col_cell_name' => 'AA',
+                    'col_idx' => 25,
+                    'col_cell_name' => 'Z',
                     'col_name' => 'Agreed TP Percentage',
                     'is_mandatory' => false,
                     'data_type' => '',
@@ -445,89 +445,89 @@
                     'params' => null
                 ],
 
-                'actual_bp_amount' => [
-                    'col_idx' => 27,
-                    'col_cell_name' => 'AB',
-                    'col_name' => 'Actual BP Amount',
-                    'is_mandatory' => false,
-                    'data_type' => '',
-                    'format' => null,
-                    'allowed_values' => null,
-                    'custom' => null,
-                    'params' => null
-                ],
+                // 'actual_bp_amount' => [
+                //     'col_idx' => 27,
+                //     'col_cell_name' => 'AB',
+                //     'col_name' => 'Actual BP Amount',
+                //     'is_mandatory' => false,
+                //     'data_type' => '',
+                //     'format' => null,
+                //     'allowed_values' => null,
+                //     'custom' => null,
+                //     'params' => null
+                // ],
 
-                'actual_tp_amount' => [
-                    'col_idx' => 28,
-                    'col_cell_name' => 'AC',
-                    'col_name' => 'Actual TP Amount',
-                    'is_mandatory' => false,
-                    'data_type' => '',
-                    'format' => null,
-                    'allowed_values' => null,
-                    'custom' => null,
-                    'params' => null
-                ],
+                // 'actual_tp_amount' => [
+                //     'col_idx' => 28,
+                //     'col_cell_name' => 'AC',
+                //     'col_name' => 'Actual TP Amount',
+                //     'is_mandatory' => false,
+                //     'data_type' => '',
+                //     'format' => null,
+                //     'allowed_values' => null,
+                //     'custom' => null,
+                //     'params' => null
+                // ],
 
-                'actual_bp_percentage' => [
-                    'col_idx' => 29,
-                    'col_cell_name' => 'AD',
-                    'col_name' => 'Actual BP Percentage',
-                    'is_mandatory' => false,
-                    'data_type' => '',
-                    'format' => null,
-                    'allowed_values' => null,
-                    'custom' => null,
-                    'params' => null
-                ],
+                // 'actual_bp_percentage' => [
+                //     'col_idx' => 29,
+                //     'col_cell_name' => 'AD',
+                //     'col_name' => 'Actual BP Percentage',
+                //     'is_mandatory' => false,
+                //     'data_type' => '',
+                //     'format' => null,
+                //     'allowed_values' => null,
+                //     'custom' => null,
+                //     'params' => null
+                // ],
 
-                'actual_tp_percentage' => [
-                    'col_idx' => 30,
-                    'col_cell_name' => 'AE',
-                    'col_name' => 'Actual TP Percentage',
-                    'is_mandatory' => false,
-                    'data_type' => '',
-                    'format' => null,
-                    'allowed_values' => null,
-                    'custom' => null,
-                    'params' => null
-                ],
+                // 'actual_tp_percentage' => [
+                //     'col_idx' => 30,
+                //     'col_cell_name' => 'AE',
+                //     'col_name' => 'Actual TP Percentage',
+                //     'is_mandatory' => false,
+                //     'data_type' => '',
+                //     'format' => null,
+                //     'allowed_values' => null,
+                //     'custom' => null,
+                //     'params' => null
+                // ],
 
-                'actual_bp_brokerage_amount' => [
-                    'col_idx' => 31,
-                    'col_cell_name' => 'AF',
-                    'col_name' => 'Actual BP Brokerage Amount',
-                    'is_mandatory' => false,
-                    'data_type' => '',
-                    'format' => null,
-                    'allowed_values' => null,
-                    'custom' => null,
-                    'params' => null
-                ],
+                // 'actual_bp_brokerage_amount' => [
+                //     'col_idx' => 31,
+                //     'col_cell_name' => 'AF',
+                //     'col_name' => 'Actual BP Brokerage Amount',
+                //     'is_mandatory' => false,
+                //     'data_type' => '',
+                //     'format' => null,
+                //     'allowed_values' => null,
+                //     'custom' => null,
+                //     'params' => null
+                // ],
 
-                'actual_tp_brokerage_amount' => [
-                    'col_idx' => 32,
-                    'col_cell_name' => 'AG',
-                    'col_name' => 'Actual TP Brokerage Amount',
-                    'is_mandatory' => false,
-                    'data_type' => '',
-                    'format' => null,
-                    'allowed_values' => null,
-                    'custom' => null,
-                    'params' => null
-                ],
+                // 'actual_tp_brokerage_amount' => [
+                //     'col_idx' => 32,
+                //     'col_cell_name' => 'AG',
+                //     'col_name' => 'Actual TP Brokerage Amount',
+                //     'is_mandatory' => false,
+                //     'data_type' => '',
+                //     'format' => null,
+                //     'allowed_values' => null,
+                //     'custom' => null,
+                //     'params' => null
+                // ],
 
-                'expected_amount' => [
-                    'col_idx' => 33,
-                    'col_cell_name' => 'AH',
-                    'col_name' => 'Expected Amount',
-                    'is_mandatory' => true,
-                    'data_type' => '',
-                    'format' => null,
-                    'allowed_values' => null,
-                    'custom' => null,
-                    'params' => null
-                ],
+                // 'expected_amount' => [
+                //     'col_idx' => 33,
+                //     'col_cell_name' => 'AH',
+                //     'col_name' => 'Expected Amount',
+                //     'is_mandatory' => true,
+                //     'data_type' => '',
+                //     'format' => null,
+                //     'allowed_values' => null,
+                //     'custom' => null,
+                //     'params' => null
+                // ],
 
                 // 'rewards' => [
                 //     'col_idx' => 34,
@@ -4566,18 +4566,25 @@
                     $cgst                              = trim($row[20]);
                     $sgst                              = trim($row[21]);
                     $stamp_duty                        = trim($row[22]);
-                    $total                             = trim($row[23]);
-                    $agreed_amount                     = trim($row[24]);
-                    $agreed_bp_percentage              = trim($row[25]);
-                    $agreed_tp_percentage              = trim($row[26]);
-                    $actual_bp_amount                  = trim($row[27]);
-                    $actual_tp_amount                  = trim($row[28]);
-                    $actual_bp_percentage              = trim($row[29]);
-                    $actual_tp_percentage              = trim($row[30]);
-                    $actual_bp_brokerage_amount        = trim($row[31]);
-                    $actual_tp_brokerage_amount        = trim($row[32]);
-                    $expected_amount                   = trim($row[33]);
+                    // $total                             = trim($row[23]);
+                    $agreed_amount                     = trim($row[23]);
+                    $agreed_bp_percentage              = trim($row[24]);
+                    $agreed_tp_percentage              = trim($row[25]);
+                    // $actual_bp_amount                  = trim($row[27]);
+                    // $actual_tp_amount                  = trim($row[28]);
+                    // $actual_bp_percentage              = trim($row[29]);
+                    // $actual_tp_percentage              = trim($row[30]);
+                    // $actual_bp_brokerage_amount        = trim($row[31]);
+                    // $actual_tp_brokerage_amount        = trim($row[32]);
+                    // $expected_amount                   = trim($row[33]);
                     // $rewards                           = trim($row[34]);
+                    $actual_bp_amount                  = 0;
+                    $actual_tp_amount                  = 0;
+                    $actual_bp_percentage              = 0;
+                    $actual_tp_percentage              = 0;
+                    $actual_bp_brokerage_amount        = 0;
+                    $actual_tp_brokerage_amount        = 0;
+                    $expected_amount                   = 0;
                     $rewards                           = 0;
 
                     $calculation = calculateMotorPolicyAmounts([
@@ -4591,8 +4598,6 @@
                         'agreed_amount' => trim($row[24]),
                         'agreed_bp_percentage' => trim($row[25]),
                         'agreed_tp_percentage' => trim($row[26]),
-                        'actual_bp_brokerage_amount' => trim($row[31]),
-                        'actual_tp_brokerage_amount' => trim($row[32]),
                         'standard_bp_percentage' => 15.00, 
                         'standard_tp_percentage' => 2.5 
                     ]);
@@ -4702,7 +4707,7 @@
                         'variance'                  => 0,
 
                         'remark'                    => null,
-                        'amount'                    => $calculation['total_amount'] ?? $total,
+                        'amount'                    => $calculation['total_amount'] ?? 0,
                         'stamp_duty'                => $stamp_duty,
 
                         'cop_amt'                   => $base_premium,
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index 28ec3083..1c163561 100755
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -3402,9 +3402,6 @@ if (!function_exists('calculateMotorPolicyAmounts')) {
             $std_bp_per = floatval($data['standard_bp_percentage'] ?? 0);
             $std_tp_per = floatval($data['standard_tp_percentage'] ?? 0);
 
-            $actual_bp_amt = floatval($data['actual_bp_brokerage_amount'] ?? 0);
-            $actual_tp_amt = floatval($data['actual_tp_brokerage_amount'] ?? 0);
-
             // Determine GST %
             $gst_per = ($igst > 0) ? $igst : ($cgst + $sgst);
 
@@ -3447,20 +3444,12 @@ if (!function_exists('calculateMotorPolicyAmounts')) {
                     (($tp * $std_tp_per) / 100);
             }
 
-            // Variance
-            $variance =
-                ($actual_bp_amt + $actual_tp_amt) - $expected_amount;
 
             // Final return array
             return [
-                'tp_total'        => round($tpTotal, 2),
-                'gst_per'         => round($gst_per, 2),
                 'gst_amount'      => round($gst_amount, 2),
                 'total_amount'    => round($total_amount, 2),
                 'expected_amount' => round($expected_amount, 2),
-                'variance'        => round($variance, 2),
-                'actual_bp_amount'=> $actual_bp_amt,
-                'actual_tp_amount'=> $actual_tp_amt,
             ];
 
         } catch (\Throwable $e) {
diff --git a/public/sample_excel/sample_bds_bulk_upload_excel.xlsx b/public/sample_excel/sample_bds_bulk_upload_excel.xlsx
index b17f79c507437edf70662526fac29637ccb47f6a..25d1d1bea30653f5dfeb38c1fba59e6cea02a80d 100644
GIT binary patch
delta 3477
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
aLu?TgJ>t0_C;)!ROJov~WV($ydi5Wv3u5m8

delta 3737
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
Ixh_}y7xb5}(f|Me


From 1fb3d057ec51b443cbe29f7b39c61ea7dc68f350 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Wed, 3 Dec 2025 14:22:10 +0530
Subject: [PATCH 09/23] FIX_DATE_ISSUE

---
 app/Controllers/EmployeeController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Controllers/EmployeeController.php b/app/Controllers/EmployeeController.php
index eee1b16f..74490129 100755
--- a/app/Controllers/EmployeeController.php
+++ b/app/Controllers/EmployeeController.php
@@ -549,8 +549,7 @@ class EmployeeController extends AdminController
         ];
 
         
-        $batch_data['policy_issue_date'] = (!empty($policy_issue_date) && strtotime($policy_issue_date) !== false) ? change_date_format($policy_issue_date) : null;
-
+        $batch_data['policy_issue_date'] = (!empty($policy_issue_date) && strtotime($policy_issue_date) !== false) ? change_date_format($policy_issue_date, 'd/m/Y', 'Y-m-d') : null;
 
         if ($actions == 'export') {
 

From 72954ffe5861d42eda98117930c1409635fafb8a Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Wed, 3 Dec 2025 14:30:46 +0530
Subject: [PATCH 10/23] FIX_BDS_BULK_UPLOAD

---
 app/Controllers/PolicyTransactionController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index e8ad843e..e60d0be1 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -4595,9 +4595,9 @@
                         'cgst' => trim($row[20]),
                         'sgst' => trim($row[21]),
                         'stamp_duty' => trim($row[22]),
-                        'agreed_amount' => trim($row[24]),
-                        'agreed_bp_percentage' => trim($row[25]),
-                        'agreed_tp_percentage' => trim($row[26]),
+                        'agreed_amount' => trim($row[23]),
+                        'agreed_bp_percentage' => trim($row[24]),
+                        'agreed_tp_percentage' => trim($row[25]),
                         'standard_bp_percentage' => 15.00, 
                         'standard_tp_percentage' => 2.5 
                     ]);

From 5a1570cadec644a2ea10ea0e450bd7d1d319e88f Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Wed, 3 Dec 2025 17:25:40 +0530
Subject: [PATCH 11/23] FIX_RATA_PREMIUM

---
 app/Controllers/EmployeeServiceController.php |  9 +-
 app/Helpers/excel_util_helper.php             | 87 +++++++++++--------
 2 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/app/Controllers/EmployeeServiceController.php b/app/Controllers/EmployeeServiceController.php
index fd2f4694..9942c87b 100755
--- a/app/Controllers/EmployeeServiceController.php
+++ b/app/Controllers/EmployeeServiceController.php
@@ -1372,7 +1372,7 @@ class EmployeeServiceController extends AdminController
                     $existing_units = $this->clientBranchModel->getExisitingUnits(client_id: $file['client_id'],client_branch_id: $file['client_branch_id']);
 
                     $employee_data_group_by_family = data_group_by_family($excel_data, 'excel', '', $current_column_action);
-                     // dd($employee_data_group_by_family);
+                    // dd($employee_data_group_by_family);
                     foreach ($employee_data_group_by_family as $emp_id => $family) 
                     {
 
@@ -1385,8 +1385,8 @@ class EmployeeServiceController extends AdminController
                             $existing_famility_details = transform_db_data_to_excel($existing_famility_details,$file);
                             // Kint::dump($existing_famility_details);
                             $family = array_merge($family,$existing_famility_details);
-                             $family = data_group_by_family($family, 'excel', 1)[ $emp_id ];// reason to call this again is bring self to first index of the array
-                            //  dd($family);
+                            $family = data_group_by_family($family, 'excel', 1)[ $emp_id ];// reason to call this again is bring self to first index of the array
+                            // dd($family);
                             $self = current(array_filter($family, fn($r) => strtolower($r[5] ?? '') === 'self'));
                             $premium = (int)($self['temp']['rata_premimum'] ?? 0);
                             foreach ($family as &$r) if (strtolower($r[5] ?? '') !== 'self') $r['self_rata_premium'] = $premium;
@@ -1394,9 +1394,6 @@ class EmployeeServiceController extends AdminController
 
                         // Kint::dump($family);
                         $data = calculate_premium_new(family_data:$family,policy_terms: $policy_terms,slab_details : $slab_details,fileArr: $file, existing_units:$existing_units);
-                        if($file['action'] == 'dependent_addition') {
-                           $data =  validatet_family_floter_rata_premium($data);
-                        }
                         // dd($data);
                         $employee_data_group_by_family[$emp_id] = $data;
                         $this->employeesOnboardProcess(['familiy_data' => $data,'file' => $file]);
diff --git a/app/Helpers/excel_util_helper.php b/app/Helpers/excel_util_helper.php
index 1c163561..918a04c3 100755
--- a/app/Helpers/excel_util_helper.php
+++ b/app/Helpers/excel_util_helper.php
@@ -945,6 +945,10 @@ if (!function_exists('calculate_premium_new')) {
             // $result[]     = $transformed_familiy_member_data;
         }
 
+        if($fileArr['action'] == 'dependent_addition') {
+            $result =  validatet_family_floter_rata_premium($result);
+        }
+
         // dd($result);
         return ($result);
         // 
@@ -1923,6 +1927,7 @@ if (!function_exists('transform_db_data_to_excel')) {
             $row['temp']['emp_status'] = $value['emp_status'];
             $row['temp']['policy_status'] = $value['status'];
             $row['temp']['rata_premimum'] = $value['rata_premimum'];
+            $row['temp']['premium'] = $value['premium'];
             $row['temp']['file_id'] = $value['file_id'];
 
             array_push($return_data, ($row));
@@ -2883,66 +2888,73 @@ if (!function_exists('is_valid_or_empty_email')) {
 }
 
 if (!function_exists('validatet_family_floter_rata_premium')) {
-    function validatet_family_floter_rata_premium($family){
-
-        // print_rr($family); die;
+    function validatet_family_floter_rata_premium($family)
+    {
+        // If only two members, skip
         if (count($family) === 2) {
-            return $family; // skip if only two members
+            return $family;
         }
 
-        $excelCount = count(array_filter($family, fn($r) => ($r['data_from'] ?? '') === 'excel') ?? []);
-        $reset_family_premium = false;
+        // Count excel rows
+        $excelCount = count(array_filter($family, fn($r) =>
+            ($r['data_from'] ?? '') === 'excel'
+        ));
+
+        // Extract self row
+        $selfDataArr = array_filter($family, fn($r) =>
+            strtolower($r['relationship'] ?? '') === 'self'
+        );
+        $selfData = reset($selfDataArr); 
+
         $dependentRataGiven = false;
 
-        if($excelCount == 1){
+        /**
+         * ---------------------------------------------------
+         * 1. RESET DEPENDENT PREMIUM IF SELF HAS SAME RATA
+         * ---------------------------------------------------
+         */
+        if (
+            !empty($selfData['temp']) &&
+            !empty($selfData['policy_details']) &&
+            ($selfData['temp']['premium'] ?? 0) == ($selfData['policy_details']['premium'] ?? 0)
+        ) {
+            foreach ($family as &$row) {
 
-            $selfPremium = 0;
-            $familyPremium = 0;
-
-            foreach ($family as $row) {
-
-                // Get self premium
-                if (isset($row['relationship']) && strtolower($row['relationship']) == 'self') {
-                    $selfPremium = (float) ($row['policy_details']['rata_premimum'] ?? 0);
+                if (strtolower($row['relationship'] ?? '') === 'self') {
+                    continue;
                 }
 
-                // Sum the dependents premium
-                if (isset($row['relationship']) && strtolower($row['relationship']) !== 'self') 
-                {
-                    $familyPremium += (float) ($row['policy_details']['rata_premimum'] ?? 0);
+                if (
+                    ($row['temp']['premium_type'] ?? null) == 1 &&
+                    ($row['data_from'] ?? '') === 'excel'
+                ) {
+                    $row['policy_details']['rata_premimum'] = 0;
+                    $row['policy_details']['gst'] = 0;
                 }
             }
-
-            if($selfPremium > $familyPremium || $selfPremium == $familyPremium){
-                $reset_family_premium = true;
-            }
         }
 
+        /**
+         * ---------------------------------------------------
+         * 2. APPLY FINAL PREMIUM ADJUSTMENT TO DEPENDENTS
+         * ---------------------------------------------------
+         */
         foreach ($family as &$row) {
 
-            // Skip if the member is self
-            if (isset($row['relationship']) && strtolower($row['relationship']) == 'self') {
+            if (strtolower($row['relationship'] ?? '') === 'self') {
                 continue;
             }
 
-            // For dependents
-            if (isset($row['temp']['premium_type']) && $row['temp']['premium_type'] == 1) {
+            if (($row['temp']['premium_type'] ?? null) == 1) {
 
-                if (!$dependentRataGiven && isset($row['data_from']) && $row['data_from'] === 'excel') {
-                    // First eligible dependent keeps premium
+                // FIRST excel dependent keeps premium
+                if (!$dependentRataGiven && ($row['data_from'] ?? '') === 'excel') {
                     $dependentRataGiven = true;
-                } else if(isset($row['data_from']) && $row['data_from'] === 'excel'){
+                } else if (($row['data_from'] ?? '') === 'excel') {
                     $row['policy_details']['rata_premimum'] = 0;
                     $row['policy_details']['gst'] = 0;
                 }
-
-                if($reset_family_premium == true && isset($row['data_from']) && $row['data_from'] === 'excel'){
-                    $row['policy_details']['rata_premimum'] = 0;
-                    $row['policy_details']['gst'] = 0;
-                }
-
             }
-
         }
 
         return $family;
@@ -2950,6 +2962,7 @@ if (!function_exists('validatet_family_floter_rata_premium')) {
 }
 
 
+
 if (!function_exists('validate_excel_value')) {
     function validate_excel_value($value, $data_type, $format = null, $allowed_values = null)
     {

From 0690c9868e72a9a23e3021773dfe85f5b2edd47d Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Thu, 4 Dec 2025 10:23:38 +0530
Subject: [PATCH 12/23] FEAT_RETAIL_POLICY

---
 app/Config/Routes.php                      |   1 +
 app/Controllers/EmployeeRestController.php | 131 ++++++++++++++++++++-
 app/Models/EmployeeRetailPolicy.php        |  57 +++++++++
 3 files changed, 188 insertions(+), 1 deletion(-)
 create mode 100644 app/Models/EmployeeRetailPolicy.php

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 0e0c59e7..dd373780 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -651,6 +651,7 @@ $routes->get("getPolicyLevelEmployeeSummaryData", "EmployeeRestController::getPo
 $routes->get("cdTransactionData", "EmployeeRestController::cdTransactionData");
 $routes->match( ['get', 'post'], 'claimsSearch','EmployeeRestController::claimsSearch');
 $routes->get("getBackToEnrolledDetails", "EmployeeRestController::getBackToEnrolledDetails");
+$routes->post("addEmpRetailPolicy", "EmployeeRestController::addEmpRetailPolicy");
 
 // Ticketing System
 
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 6c655880..42706028 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -39,6 +39,7 @@ use App\Models\TicketMessageModel;
 use App\Models\HRAccessControlModel;
 use App\Models\InsurerModel;
 use App\Models\HrFileUploadModel;
+use App\Models\EmployeeRetailPolicy;
 
 
 
@@ -97,6 +98,7 @@ class EmployeeRestController extends AdminController
     protected $insurerModel;
     protected $hrFileUploadModel;
     protected $ticketMailTemplateModel;
+    protected $employeeRetailPolicy;
 
 
     public function __construct()
@@ -124,6 +126,7 @@ class EmployeeRestController extends AdminController
         $this->claimStatusModel = new TicketClaimStatusModel();
         $this->ticketMaster = new TicketMasterModel();
         $this->ticketMessage = new TicketMessageModel();
+        $this->employeeRetailPolicy = new EmployeeRetailPolicy();
 
         $this->ticketController = new TicketController();
         $this->hrAccessControlModel    = new HRAccessControlModel();
@@ -2993,7 +2996,9 @@ class EmployeeRestController extends AdminController
 
             }
 
-            return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result, 'emp_name' => $employeeName, 'pre_policy_count' => $prePolicyCount], 200);
+            $emp_reatail_policy_data = $this->getEmpRetailPolicy($employeeSelfData);
+
+            return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result, 'emp_name' => $employeeName, 'pre_policy_count' => $prePolicyCount, 'retail_policy_data' => $emp_reatail_policy_data], 200);
         } else {
             return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
         }
@@ -4586,4 +4591,128 @@ class EmployeeRestController extends AdminController
         } catch (\Exception $e) {
         }
     }
+
+    public function addEmpRetailPolicy()
+    {
+        $this->myLogger->logme("error", "EMPLOYEE-RETAIL-POLICY-CONTROLLER - addEmpRetailPolicy: Received payload = " . json_encode($this->request->getJSON() ?? []));
+
+        try {
+
+            $payload = $this->request->getJSON(true);
+            $emp_id = $payload['emp_id'] ?? null;
+
+            if (empty($emp_id)) {
+                $this->myLogger->logme("error", "addEmpRetailPolicy: emp_id is missing");
+                return $this->respond(['status'  => 'failed','code' => 400,'message' => 'emp_id is required' ], 200);
+            }
+
+            $payload['created_by'] = $emp_id;
+            $emp_retail_policy_id = $this->employeeRetailPolicy->insert($payload);
+
+            if ($emp_retail_policy_id) {
+
+                $this->myLogger->logme("error", "addEmpRetailPolicy: Employee Retail Policy created successfully. Policy ID = " . $emp_retail_policy_id);
+
+                return $this->respond([
+                    'status'  => 'success',
+                    'code'    => 200,
+                    'message' => 'Employee Retail Policy created successfully',
+                    'data'    => [
+                        'emp_retail_policy_id' => $emp_retail_policy_id
+                    ]
+                ], 200);
+            } else {
+                $this->myLogger->logme( "error", "addEmpRetailPolicy: Failed to create Employee Retail Policy. Insert returned false" );
+                return $this->respond(['status'  => 'failed','code' => 500,'message' => 'Failed to create Employee Retail Policy'], 500);
+            }
+
+        } catch (\Throwable $th) {
+
+            $this->myLogger->logme("error", "addEmpRetailPolicy: Exception occurred - " . $th->getMessage());
+            return $this->respond(['status'  => 'failed','code'    => 500,'message' => 'Internal server error: ' . $th->getMessage()], 500);
+        }
+    }
+
+    public function getEmpRetailPolicy($employeeData)
+    {   
+        $this->myLogger->logme("error", "EMPLOYEE-REST-CONTROLLER - getEmpRetailPolicy: Given params: " . json_encode($employeeData ?? []));
+
+        try {
+
+            $emp_id = $employeeData['id'];
+            $mobile_number = $employeeData['mobile'] ?? null;
+
+            $emp_retail_policy_data = [];
+            if (!empty($emp_id)) {
+
+                $emp_retail_policy_data = $this->employeeRetailPolicy
+                    ->select('
+                        employee_retail_policies.emp_id, 
+                        employee_retail_policies.insurer_id, 
+                        employee_retail_policies.policy_type_id, 
+                        employee_retail_policies.policy_no, 
+                        employee_retail_policies.policy_start_date, 
+                        employee_retail_policies.policy_end_date, 
+                        policy_type.policy_type, 
+                        policy_type.long_name as policy_type_name, 
+                        insurers.name as insurer_name
+                    ')
+                    ->join('insurers', 'employee_retail_policies.insurer_id = insurers.id')
+                    ->join('policy_type', 'employee_retail_policies.policy_type_id = policy_type.id')
+                    ->where('is_active', 1)
+                    ->where('emp_id', $emp_id)
+                    ->findAll();
+            }
+
+            $emp_retail_client_data = [];
+
+            if (!empty($mobile_number)) {
+                $emp_retail_client_data = $this->clientModel
+                    ->select("
+                        $emp_id as emp_id
+                        policy_transaction.insurer_id
+                        policy_transaction.policy_type_id
+                        policy_transaction.policy_no
+                        policy_transaction.policy_start_date
+                        policy_transaction.policy_end_date
+                        policy_type.policy_type, 
+                        policy_type.long_name as policy_type_name, 
+                        insurers.name as insurer_name
+                    ")
+                    ->join('policy_transaction', 'policy_transaction.client_id = clients.id')
+                    ->join('insurers', 'policy_transaction.insurer_id = insurers.id')
+                    ->join('policy_type', 'policy_transaction.policy_type_id = policy_type.id')
+                    ->where('policy_transaction.is_active', 1)
+                    ->where('clients.is_active', 1)
+                    ->where('clients.phone', $mobile_number)
+                    ->findAll();
+            }
+
+            $complete_emp_retail_policy_data = array_values(
+                array_column(
+                    array_merge($emp_retail_policy_data ?: [], $emp_retail_client_data ?: []),
+                    null,
+                    'policy_no'
+                )
+            );
+
+            return $complete_emp_retail_policy_data;
+        } catch (\Throwable $th) {
+
+            $errorData = [
+                'message' => $th->getMessage(),
+                'file'    => $th->getFile(),
+                'line'    => $th->getLine(),
+                'code'    => $th->getCode(),
+                'trace'   => $th->getTraceAsString(),
+                'trace_array' => $th->getTrace(), // full array version (optional)
+                'function' => $th->getTrace()[0]['function'] ?? null,
+                'class' => $th->getTrace()[0]['class'] ?? null,
+            ];
+
+            $this->myLogger->logme("error", "EMPLOYEE-REST-CONTROLLER - getEmpRetailPolicy: Exception: " . json_encode($errorData ?? []));
+
+            return [];
+        }
+    }
 }
diff --git a/app/Models/EmployeeRetailPolicy.php b/app/Models/EmployeeRetailPolicy.php
new file mode 100644
index 00000000..0b56e726
--- /dev/null
+++ b/app/Models/EmployeeRetailPolicy.php
@@ -0,0 +1,57 @@
+
Date: Thu, 4 Dec 2025 10:30:23 +0530
Subject: [PATCH 13/23] FEAT_WELLNESS_CARD

---
 app/Controllers/EmployeeRestController.php | 79 +++++++++++++++++++++-
 1 file changed, 78 insertions(+), 1 deletion(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 42706028..4fb1aeda 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -2997,8 +2997,9 @@ class EmployeeRestController extends AdminController
             }
 
             $emp_reatail_policy_data = $this->getEmpRetailPolicy($employeeSelfData);
+            $emp_wellness_data = $this->getWellnessUrl($employeeSelfData['id'] ?? null);
 
-            return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result, 'emp_name' => $employeeName, 'pre_policy_count' => $prePolicyCount, 'retail_policy_data' => $emp_reatail_policy_data], 200);
+            return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result, 'emp_name' => $employeeName, 'pre_policy_count' => $prePolicyCount, 'retail_policy_data' => $emp_reatail_policy_data, 'wellness_data' => $emp_wellness_data], 200);
         } else {
             return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
         }
@@ -4715,4 +4716,80 @@ class EmployeeRestController extends AdminController
             return [];
         }
     }
+
+    public function getWellnessUrl($emp_id)
+    {
+        // $emp_id  = $this->request->getGet('emp_id');
+ 
+        $db = \Config\Database::connect();
+        $data =  $db->table('employees e')
+                    ->select('pt.policy_type, 
+                            e.name, e.email_corporate as email, e.mobile as phone, e.emp_code as memberId, e.gender, e.dob, e.relationship as relation,
+                            cp.policy_no as policyNumber, cp.policy_no as employeeId, cp.policy_start_date as policyStartDate, cp.policy_end_date as policyEndDate , cp.wellness_plan_id as planId')
+                    ->join('employee_polices ep', 'e.id = ep.employee_id')
+                    ->join('client_policy cp', 'ep.client_policy_id = cp.id')
+                    ->join('policy_type pt', 'cp.policy_type_id = pt.id')
+                    ->where('e.id', $emp_id)
+                    ->where('e.emp_status', 'active')
+                    ->where('ep.status', 'active')
+                    ->where('e.is_active', 1)
+                    ->where('ep.is_active', 1)
+                    ->get()
+                    ->getResultArray();
+ 
+
+        $userParams = [];
+        foreach ($data as $row) {
+            if ($row['planId'] != null) {
+                $userParams['name']           = $row['name'];
+                $userParams['email']          = $row['email'];
+                $userParams['phone']          = $row['phone'];
+                $userParams['memberId']       = $row['employeeId']; // memberId is unique primary key.
+                $userParams['gender']         = $row['gender'];
+                $userParams['dob']            = $row['dob'];
+                $userParams['relation']       = $row['relation'];
+                $userParams['policyNumber']   = $row['policyNumber'];
+                $userParams['employeeId']     = $row['memberId'];
+                $userParams['policyStartDate']= $row['policyStartDate'];
+                $userParams['policyEndDate']  = $row['policyEndDate'];
+                $userParams['policyName'] =  $row['policy_type']; 
+                $userParams['planId']     = $row['planId']; 
+                $userParams['moduleName']     = 'home'; 
+                break; // stop after first GMC match
+            }
+        }
+ 
+        if (empty($userParams)) {
+            return ['status' => 'failed','message' => 'Coming soon........!'];
+        } 
+ 
+        // echo 'coming';die();
+        // Derive 32-byte key from SHA256
+        $derivedKey = hash('sha256', env('VISIT_SECRET_KEY'), true);
+ 
+        // Build query string like Node.js
+        $plainText = '';
+        foreach ($userParams as $k => $v) {
+            $plainText .= "&{$k}={$v}";
+        }
+        $plainText = ltrim($plainText, '&');
+    
+        // Encrypt
+        $algorithm = "aes-256-cbc";
+        $encrypted = openssl_encrypt($plainText, $algorithm, $derivedKey, OPENSSL_RAW_DATA, env('VISIT_IV'));
+    
+        // Base64URL encode (same as Node.js output)
+        $output = rtrim(strtr(base64_encode($encrypted), '+/', '-_'), '=');
+ 
+        $baseURL = env('VISIT_BASE_URL');
+        $clientId = env('VISIT_CLIENT_ID');
+        $finalUrl = $baseURL . '/sso?userParams=' . $output . '&clientId=' . $clientId;
+    
+        if (!empty($finalUrl)) {
+            log_message('error', 'VISIT SSO | emp_id: '.$emp_id.' | URL: '.$finalUrl);
+            return ['status' => 'success','data' =>  $finalUrl];
+        } else {
+            return ['status' => 'failed','message' => 'Coming soon........!'];
+        }
+    }
 }

From 9541dc40778df8975a8e5f3323c30b0fad8ade59 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Thu, 4 Dec 2025 10:38:28 +0530
Subject: [PATCH 14/23] FIX_ROUTE

---
 app/Config/Routes.php                      |  2 +-
 app/Controllers/EmployeeRestController.php | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index dd373780..deff1f0c 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -572,7 +572,7 @@ $routes->group("employeeRest", ['filter' => ["appSignature"] ], function ($route
 
 });
 
-$routes->group("employeeRest", ["filter" => ["authJWT" , "appSignature"]], function ($routes) {
+$routes->group("employeeRest", ["filter" => ["authJWT"]], function ($routes) {
 
     $routes->post("ecardRequest", "ApiServiceController::ecardRequest");
     $routes->get("getWellnessURL", "ApiServiceController::getWellnessURL");
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 4fb1aeda..91e14598 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -4647,17 +4647,17 @@ class EmployeeRestController extends AdminController
             if (!empty($emp_id)) {
 
                 $emp_retail_policy_data = $this->employeeRetailPolicy
-                    ->select('
+                    ->select("
                         employee_retail_policies.emp_id, 
                         employee_retail_policies.insurer_id, 
                         employee_retail_policies.policy_type_id, 
                         employee_retail_policies.policy_no, 
-                        employee_retail_policies.policy_start_date, 
-                        employee_retail_policies.policy_end_date, 
+                        DATE_FORMAT(employee_retail_policies.policy_start_date, '%d-%b-%Y') as policy_start_date,
+                        DATE_FORMAT(employee_retail_policies.policy_end_date, '%d-%b-%Y') as policy_end_date,
                         policy_type.policy_type, 
                         policy_type.long_name as policy_type_name, 
                         insurers.name as insurer_name
-                    ')
+                    ")
                     ->join('insurers', 'employee_retail_policies.insurer_id = insurers.id')
                     ->join('policy_type', 'employee_retail_policies.policy_type_id = policy_type.id')
                     ->where('is_active', 1)
@@ -4674,8 +4674,8 @@ class EmployeeRestController extends AdminController
                         policy_transaction.insurer_id
                         policy_transaction.policy_type_id
                         policy_transaction.policy_no
-                        policy_transaction.policy_start_date
-                        policy_transaction.policy_end_date
+                        DATE_FORMAT(policy_transaction.policy_start_date, '%d-%b-%Y') as policy_start_date,
+                        DATE_FORMAT(policy_transaction.policy_end_date, '%d-%b-%Y') as policy_end_date,
                         policy_type.policy_type, 
                         policy_type.long_name as policy_type_name, 
                         insurers.name as insurer_name

From 5c11ce0fa3202ba980e590d17e88b0aeba486e42 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Thu, 4 Dec 2025 10:49:00 +0530
Subject: [PATCH 15/23] FIX_ISSUE

---
 app/Controllers/EmployeeRestController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 91e14598..cdb8e783 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -2997,7 +2997,7 @@ class EmployeeRestController extends AdminController
             }
 
             $emp_reatail_policy_data = $this->getEmpRetailPolicy($employeeSelfData);
-            $emp_wellness_data = $this->getWellnessUrl($employeeSelfData['id'] ?? null);
+            $emp_wellness_data = $this->getWellnessUrl($employeeSelfData->id ?? null);
 
             return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result, 'emp_name' => $employeeName, 'pre_policy_count' => $prePolicyCount, 'retail_policy_data' => $emp_reatail_policy_data, 'wellness_data' => $emp_wellness_data], 200);
         } else {
@@ -4640,8 +4640,8 @@ class EmployeeRestController extends AdminController
 
         try {
 
-            $emp_id = $employeeData['id'];
-            $mobile_number = $employeeData['mobile'] ?? null;
+            $emp_id = $employeeData->id ?? null;
+            $mobile_number = $employeeData->mobile ?? null;
 
             $emp_retail_policy_data = [];
             if (!empty($emp_id)) {

From 7809c16d4a7b9ac856f22d7df510b2b360644ad3 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Thu, 4 Dec 2025 11:04:35 +0530
Subject: [PATCH 16/23] FIX_ISSUE

---
 app/Config/Routes.php                      |  2 ++
 app/Controllers/EmployeeRestController.php | 25 +++++++++++++---------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index deff1f0c..e25359b0 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -639,6 +639,8 @@ $routes->group("employeeRest", ["filter" => ["authJWT"]], function ($routes) {
     $routes->get('get_ticket_type',"EmployeeRestController::get_ticket_type");
     $routes->get('get_ticket_data',"EmployeeRestController::get_ticket_data");
 
+    // add retail policy
+    $routes->post("addEmpRetailPolicy", "EmployeeRestController::addEmpRetailPolicy");
 
 });
 
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index cdb8e783..785b7a4c 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -4644,7 +4644,7 @@ class EmployeeRestController extends AdminController
             $mobile_number = $employeeData->mobile ?? null;
 
             $emp_retail_policy_data = [];
-            if (!empty($emp_id)) {
+            if ($emp_id != null) {
 
                 $emp_retail_policy_data = $this->employeeRetailPolicy
                     ->select("
@@ -4655,14 +4655,16 @@ class EmployeeRestController extends AdminController
                         DATE_FORMAT(employee_retail_policies.policy_start_date, '%d-%b-%Y') as policy_start_date,
                         DATE_FORMAT(employee_retail_policies.policy_end_date, '%d-%b-%Y') as policy_end_date,
                         policy_type.policy_type, 
-                        policy_type.long_name as policy_type_name, 
-                        insurers.name as insurer_name
+                        policy_type.long_name as policy_type_long_name, 
+                        insurers.name as insurer_name,
+                        insurers.short_name as insurer_short_name
                     ")
                     ->join('insurers', 'employee_retail_policies.insurer_id = insurers.id')
                     ->join('policy_type', 'employee_retail_policies.policy_type_id = policy_type.id')
-                    ->where('is_active', 1)
+                    ->where('employee_retail_policies.is_active', 1)
                     ->where('emp_id', $emp_id)
                     ->findAll();
+
             }
 
             $emp_retail_client_data = [];
@@ -4670,15 +4672,16 @@ class EmployeeRestController extends AdminController
             if (!empty($mobile_number)) {
                 $emp_retail_client_data = $this->clientModel
                     ->select("
-                        $emp_id as emp_id
-                        policy_transaction.insurer_id
-                        policy_transaction.policy_type_id
-                        policy_transaction.policy_no
+                        $emp_id as emp_id,
+                        policy_transaction.insurer_id,
+                        policy_transaction.policy_type_id,
+                        policy_transaction.policy_no,
                         DATE_FORMAT(policy_transaction.policy_start_date, '%d-%b-%Y') as policy_start_date,
                         DATE_FORMAT(policy_transaction.policy_end_date, '%d-%b-%Y') as policy_end_date,
                         policy_type.policy_type, 
-                        policy_type.long_name as policy_type_name, 
-                        insurers.name as insurer_name
+                        policy_type.long_name as policy_type_long_name, 
+                        insurers.name as insurer_name,
+                        insurers.short_name as insurer_short_name
                     ")
                     ->join('policy_transaction', 'policy_transaction.client_id = clients.id')
                     ->join('insurers', 'policy_transaction.insurer_id = insurers.id')
@@ -4689,6 +4692,8 @@ class EmployeeRestController extends AdminController
                     ->findAll();
             }
 
+            // print_r($emp_retail_policy_data); die;
+
             $complete_emp_retail_policy_data = array_values(
                 array_column(
                     array_merge($emp_retail_policy_data ?: [], $emp_retail_client_data ?: []),

From 071700de5a44987ee10d37c5563a9325009850dd Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Thu, 4 Dec 2025 11:37:25 +0530
Subject: [PATCH 17/23] FIX_EDIT

---
 app/Controllers/EmployeeRestController.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 785b7a4c..2d13d6b5 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -4600,6 +4600,7 @@ class EmployeeRestController extends AdminController
         try {
 
             $payload = $this->request->getJSON(true);
+            $pk = $payload['retail_policy_id'] ?? null;
             $emp_id = $payload['emp_id'] ?? null;
 
             if (empty($emp_id)) {
@@ -4607,8 +4608,13 @@ class EmployeeRestController extends AdminController
                 return $this->respond(['status'  => 'failed','code' => 400,'message' => 'emp_id is required' ], 200);
             }
 
-            $payload['created_by'] = $emp_id;
-            $emp_retail_policy_id = $this->employeeRetailPolicy->insert($payload);
+            if(empty($pk)){
+                $payload['created_by'] = $emp_id;
+                $emp_retail_policy_id = $this->employeeRetailPolicy->insert($payload);
+            }else{
+                $payload['updated_by'] = $emp_id;
+                $emp_retail_policy_id = $this->employeeRetailPolicy->where('id', $pk)->set($payload)->update();
+            }
 
             if ($emp_retail_policy_id) {
 

From 50d22dd74c16bdffee9fc9bd35adddaadb79be21 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Thu, 4 Dec 2025 12:09:20 +0530
Subject: [PATCH 18/23] FEAT_MASTER

---
 app/Config/Routes.php                      |  6 ++++-
 app/Controllers/EmployeeRestController.php | 27 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index e25359b0..c48956ee 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -642,6 +642,9 @@ $routes->group("employeeRest", ["filter" => ["authJWT"]], function ($routes) {
     // add retail policy
     $routes->post("addEmpRetailPolicy", "EmployeeRestController::addEmpRetailPolicy");
 
+    // get insurer and policy type
+    $routes->post("getPolicyTypeAndInsurer", "EmployeeRestController::getPolicyTypeAndInsurer");
+
 });
 
 $routes->get("hrFileDownload", "EmployeeRestController::hrFileDownload");
@@ -654,6 +657,8 @@ $routes->get("cdTransactionData", "EmployeeRestController::cdTransactionData");
 $routes->match( ['get', 'post'], 'claimsSearch','EmployeeRestController::claimsSearch');
 $routes->get("getBackToEnrolledDetails", "EmployeeRestController::getBackToEnrolledDetails");
 $routes->post("addEmpRetailPolicy", "EmployeeRestController::addEmpRetailPolicy");
+$routes->post("getPolicyTypeAndInsurer", "EmployeeRestController::getPolicyTypeAndInsurer");
+
 
 // Ticketing System
 
@@ -813,7 +818,6 @@ $routes->group('commission', function($routes) {
 });
 
 //BDS BULK UPLOAD
-
 $routes->group('bds_upload', function($routes) {
     $routes->match (['get','post'],'list',"PolicyTransactionController::policyBulkUpload");
     $routes->get('downloadBDSDumpFile/(:any)',"PolicyTransactionController::downloadBDSDumpFile/$1");
diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 2d13d6b5..1eb8583b 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -4803,4 +4803,31 @@ class EmployeeRestController extends AdminController
             return ['status' => 'failed','message' => 'Coming soon........!'];
         }
     }
+
+    public function getPolicyTypeAndInsurer()
+    {
+        $policy_type_ids = [8, 37, 38, 39, 62];
+        $policy_type = $this->policyTypeModel
+            ->select('id as policy_type_id, policy_type, long_name as policy_type_long_name')
+            ->where('is_active', 1)
+            ->whereIn('id', $policy_type_ids)
+            ->findAll();
+
+        $insurer_category = ['general'];
+        $insurers = $this->insurerModel
+            ->select('id as insurer_id, name as insurer_name, short_name as insurer_short_name')
+            ->where('is_active', 1)
+            ->where('category', $insurer_category)
+            ->findAll();
+
+        return $this->respond([
+            'status' => 'success',
+            'code'   => 200,
+            'data'   => [
+                'insurer'     => $insurers,
+                'policy_type' => $policy_type
+            ]
+        ], 200);
+    }
+
 }

From 2811f9c6cb4722f63e2e11c3c9244c883d3416a0 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Thu, 4 Dec 2025 12:09:59 +0530
Subject: [PATCH 19/23] FIX_ROUTE

---
 app/Config/Routes.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index c48956ee..b10dedb0 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -643,7 +643,7 @@ $routes->group("employeeRest", ["filter" => ["authJWT"]], function ($routes) {
     $routes->post("addEmpRetailPolicy", "EmployeeRestController::addEmpRetailPolicy");
 
     // get insurer and policy type
-    $routes->post("getPolicyTypeAndInsurer", "EmployeeRestController::getPolicyTypeAndInsurer");
+    $routes->get("getPolicyTypeAndInsurer", "EmployeeRestController::getPolicyTypeAndInsurer");
 
 });
 

From 8032ab5ebd5ef655f5eb723a5786e469d13c2952 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Thu, 4 Dec 2025 12:13:32 +0530
Subject: [PATCH 20/23] FIX_ROUTE

---
 app/Config/Routes.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index b10dedb0..86e47622 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -656,8 +656,8 @@ $routes->get("getPolicyLevelEmployeeSummaryData", "EmployeeRestController::getPo
 $routes->get("cdTransactionData", "EmployeeRestController::cdTransactionData");
 $routes->match( ['get', 'post'], 'claimsSearch','EmployeeRestController::claimsSearch');
 $routes->get("getBackToEnrolledDetails", "EmployeeRestController::getBackToEnrolledDetails");
-$routes->post("addEmpRetailPolicy", "EmployeeRestController::addEmpRetailPolicy");
-$routes->post("getPolicyTypeAndInsurer", "EmployeeRestController::getPolicyTypeAndInsurer");
+// $routes->post("addEmpRetailPolicy", "EmployeeRestController::addEmpRetailPolicy");
+// $routes->get("getPolicyTypeAndInsurer", "EmployeeRestController::getPolicyTypeAndInsurer");
 
 
 // Ticketing System

From a1c14cd86559e12d2887385de4fb9317aadc6112 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Thu, 4 Dec 2025 12:29:00 +0530
Subject: [PATCH 21/23] FIX_ISSUE

---
 app/Controllers/EmployeeRestController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php
index 1eb8583b..8aa30d71 100755
--- a/app/Controllers/EmployeeRestController.php
+++ b/app/Controllers/EmployeeRestController.php
@@ -4702,7 +4702,7 @@ class EmployeeRestController extends AdminController
 
             $complete_emp_retail_policy_data = array_values(
                 array_column(
-                    array_merge($emp_retail_policy_data ?: [], $emp_retail_client_data ?: []),
+                    array_merge($emp_retail_client_data ?: [], $emp_retail_policy_data ?: []),
                     null,
                     'policy_no'
                 )

From 172e4b026ef0e31e22b88decea049e1eb28f6074 Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Thu, 4 Dec 2025 15:36:40 +0530
Subject: [PATCH 22/23] FIX_CD_AC_CD_AMT_SHOW

---
 app/Views/policy_transaction_endorsement_form.php | 5 +++++
 app/Views/policy_transaction_inception_form.php   | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/app/Views/policy_transaction_endorsement_form.php b/app/Views/policy_transaction_endorsement_form.php
index 3fa3b251..0f2d65b6 100644
--- a/app/Views/policy_transaction_endorsement_form.php
+++ b/app/Views/policy_transaction_endorsement_form.php
@@ -1105,6 +1105,11 @@
                         $('#table_tr_37').show(); 
                     }
 
+                    if (res.data.policy_type_id == 1 || res.data.policy_type_id == 2 || res.data.policy_type_id == 3 || res.data.policy_type_id == 4 || res.data.policy_type_id == 5 || res.data.policy_type_id == 6 || res.data.policy_type_id == 7 || res.data.client_type == 2) {
+                        $('#table_tr_34').hide();
+                        $('#table_tr_37').hide();
+                    } 
+
                     // if(res.data.policy_type_id == 1 || res.data.policy_type_id == 2 || res.data.policy_type_id == 3 || res.data.policy_type_id == 4 || res.data.policy_type_id == 5 || res.data.policy_type_id == 6 || res.data.policy_type_id == 7){
                     //     $('#is_cd_reduce_from_bds').prop('disabled',true).prop('checked', false);
                     // }else{
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index 13b516ed..80ae3e0b 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -2160,6 +2160,12 @@
                                 $('.loader-mask').delay(350).fadeOut('slow');
                             }
                         });
+
+                        if (res.data.policy_type_id == 1 || res.data.policy_type_id == 2 || res.data.policy_type_id == 3 || res.data.policy_type_id == 4 || res.data.policy_type_id == 5 || res.data.policy_type_id == 6 || res.data.policy_type_id == 7 || res.data.client_type == 2) {
+                            $('#table_tr_34').hide();
+                            $('#table_tr_37').hide();
+                        } 
+
                     }, 4000)
 
                     // Set additional fields

From 983255baa45e6e8fa73a2488d0ea9ed50a3e7f0c Mon Sep 17 00:00:00 2001
From: "venkatesh.r" 
Date: Thu, 4 Dec 2025 15:55:19 +0530
Subject: [PATCH 23/23] CHANGE_ADD_ACM_ID_FTO_SERVICE_PERSON_ID

---
 app/Controllers/EmpDataServiceController.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php
index f4787b33..c5581519 100755
--- a/app/Controllers/EmpDataServiceController.php
+++ b/app/Controllers/EmpDataServiceController.php
@@ -5282,8 +5282,17 @@ class EmpDataServiceController extends BaseController
             $action_type_string = "addition";
         }
 
-        $user_data = db_connect()->table('user_profiles')->where('is_active', 1)->where('id', $lead_data['created_by'] ?? null)->get()->getRowArray();
+        // get the acm data for service person id
+        $acm_data = db_connect()->table('client_rm')->where('is_active', 1)->where('client_id', $policy_data['client_id'] ?? null)->where('level', 3) ->get() ->getRowArray();
+        $service_person_id = null;
+        if(!empty($acm_data)){
+            $service_person_id = $acm_data['user_id'] ?? null;
+        }else{
+            $service_person_id = $params['created_by'] ?? null;
+        }
 
+        // get the user data  for salse person id
+        $user_data = db_connect()->table('user_profiles')->where('is_active', 1)->where('id', $lead_data['created_by'] ?? null)->get()->getRowArray();
         $salse_person_id = null;
         if(isset($lead_data['salse_person_id']) && !empty($lead_data['salse_person_id'])){
             $salse_person_array = json_decode($lead_data['salse_person_id'] ?? '{}', true) ?? [];
@@ -5337,7 +5346,7 @@ class EmpDataServiceController extends BaseController
             'entry_from' => 2,
 
             'sales_generated_by' => $salse_person_id,
-            'serviced_by' => $params['created_by'] ?? null,
+            'serviced_by' => $service_person_id,
         ];
 
         $this->myLogger->logme("error", "Constructed policy transaction data: " . json_encode($policyTransactionData));