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

app/Config/Routes.php

@@ -428,6 +428,7 @@ $routes->group("policy_tranction", ["filter" => "authMVC"], function ($routes) {
 
     $routes->group("report", ["filter" => "authMVC"], function ($routes) {
         $routes->match(['get', 'post'],"list", "PolicyTransactionController::reportBDS");
+        $routes->match(['get', 'post'],"listNew", "PolicyTransactionController::reportBDSNew");
         $routes->get("report-varience-list", "PolicyTransactionController::reportVarience");
         $routes->get("report-business-list", "PolicyTransactionController::reportBusinessList");
         $routes->get("report-finance-list", "PolicyTransactionController::reportFinanceList");

app/Controllers/ClientController.php

@@ -518,8 +518,8 @@ class ClientController extends AdminController
 
     public function updateEmpAndPolicyStatus()
     {
-
         $return =  $this->clientPolicyModel->updateStatus();
+        return $return;
         $this->myLogger->logme('error', 'Client Policy Status Update Count: {data}', ['data' => $return['client']]);
         $this->myLogger->logme('error', 'Employee Policy Status Update Count: {data}', ['data' => $return['emp']]);
     }
@@ -1613,7 +1613,7 @@ class ClientController extends AdminController
 
             if ($update) {
 
-                $policy_transaction_update = $this->deactivatePolicyTransactionsPolicy($id);
+                // $policy_transaction_update = $this->deactivatePolicyTransactionsPolicy($id);
 
                 return $this->respond(['status' => true, 'code' => 200], 200);
             } else {
@@ -4816,6 +4816,7 @@ class ClientController extends AdminController
                 'vehicle_no' => $data['vehicle_no'],
                 'type' => $data['type'],
                 'rc' => $data['rc'],
+                'rto_id' => $data['rto_id'],
                 'branch_id' => $branch_insert,
                 'owner' => $client_insert,
             ];
@@ -4861,6 +4862,7 @@ class ClientController extends AdminController
                 'vehicle_no' => $data['vehicle_no'],
                 'type' => $data['type'],
                 'rc' => $data['rc'],
+                'rto_id' => $data['rto_id'],
                 'branch_id' => $data['branch_id'] ?? null,
                 'owner' => $data['owner'],
             ];
@@ -5064,10 +5066,12 @@ class ClientController extends AdminController
             ->where('policy_no', $policy_no)
             ->countAllResults();
 
+        $client_policy_data = $this->clientPolicyModel->where('is_active', 1)->where('policy_status', 1)->where('policy_no', trim($policy_no))->first();
+
         if ($data > 0) {
-            return $this->respond(['status' => true, 'message' => 'This policy number is already linked to another client', 'data' => $data, 'code' => 409, 'received_data' => $received_data], 200);
+            return $this->respond(['status' => true, 'message' => 'This policy number is already linked to another client', 'data' => $data, 'code' => 409, 'received_data' => $received_data, 'client_policy_id' => $client_policy_data['id'] ?? null], 200);
         } else {
-            return $this->respond(['status' => false, 'message' => 'No Data Found', 'code' => 404, 'received_data' => $received_data], 200);
+            return $this->respond(['status' => false, 'message' => 'No Data Found', 'code' => 404, 'received_data' => $received_data, 'client_policy_id' => $client_policy_data['id'] ?? null], 200);
         }
     }
 

app/Controllers/DashboardController.php

@@ -225,20 +225,23 @@ class DashboardController extends AdminController
 
             $pendingActionsController = new PendingActionsController;
             $pendingActionsData = $pendingActionsController->getPendingActionsForDashBoard();
-            $businessTeamData = $this->policyTransactionModel->getBusinessReportList();
-            $financeTeamData = $this->policyTransactionModel->getFinanceReportList();
-            $businessTeamStatusData = $this->data_construct_for_bds($businessTeamData);
-            $financeTeamStatusData = $this->data_construct_for_bds($financeTeamData);
 
+            //BDS dashboard data
+            // $businessTeamData = $this->policyTransactionModel->getBusinessReportList();
+            // $financeTeamData = $this->policyTransactionModel->getFinanceReportList();
+            // $businessTeamStatusData = $this->data_construct_for_bds($businessTeamData);
+            // $financeTeamStatusData = $this->data_construct_for_bds($financeTeamData);
+            $businessTeamData = [];
+            $financeTeamData = [];
+            $businessTeamStatusData = [];
+            $financeTeamStatusData = [];
 
             $data['client_branch_emp_list'] = $results;
             $session = \Config\Services::session();
             $session->set('enrollment_data', json_encode($data));
 
-            // echo "<pre>";
             $data['pendingActionsData'] = $pendingActionsData;
             $data['businessTeamCount'] = count($businessTeamData) ?? 0;
-            // dd($businessTeamData);
             $data['financeTeamCount'] = count($financeTeamData) ?? 0;
             $data['businessTeamStatusData'] = $businessTeamStatusData;
             $data['financeTeamStatusData'] = $financeTeamStatusData;

app/Controllers/EmployeeController.php

@@ -35,7 +35,7 @@ use App\Controllers\JobWorker;
 use App\Controllers\Jobs\SubJob;
 use App\Controllers\EmployeeServiceController;
 use App\Controllers\EmpDataServiceController;
-
+use App\Models\ThzMasterModel;
 use CodeIgniter\API\ResponseTrait;
 
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
@@ -1471,6 +1471,7 @@ class EmployeeController extends AdminController
             $template_data_path = WRITEPATH . 'e_card_template/';
             // $tpa_short_name = strtolower(str_replace(' ', '_', $get_emp_code_and_client_policy_id['short_name'])) . '.html';
             $tpa_short_name = 'common.html';
+            // $tpa_short_name = 'new_ecard.html';
             $final_path = $template_data_path . $tpa_short_name;
         
             $this->myLogger->logme('error', 'Checking if template file exists at: ' . $final_path);
@@ -1523,10 +1524,12 @@ class EmployeeController extends AdminController
                     '{QR_IOS}' => base_url() . 'public/e_card_imgs/ios.png',
                     '{QR_ANDROID_2}' => base_url() . 'public/e_card_imgs/play_store.png',
                     '{QR_IOS_2}' => base_url() . 'public/e_card_imgs/appstore.png',
+                    '{NHANCE_N_LOGO}' => base_url() . 'public/assets/images/Nhance_Favi.png',
                 ];
 
                 $placeholders['{LEVELS}'] = $this->generateAcmAndMForEcard($client_id);
-        
+                $placeholders['{NETWORK_HOSPITAL}'] = $this->generateNetworkHospitalsForEcard($value['network_hospitals']);
+       
                 foreach ($placeholders as $placeholder => $replaceValue) {
                     $htmlContent = str_replace($placeholder, $replaceValue, $htmlContent);
                 }
@@ -1534,13 +1537,23 @@ class EmployeeController extends AdminController
                 $html .= $htmlContent;
             }
 
+            // return $html;
             // DomPdf 
             $options = new Options();
             $options->set('isRemoteEnabled', true);
             $options->set('isHtml5ParserEnabled', true);
 
             $dompdf = new Dompdf($options);
-            $dompdf->loadHtml('<style>@page { margin: 0; }</style>' . $html); // remove the margin
+            // $dompdf->loadHtml('<style>@page { margin: 0; }</style>' . $html); // remove the margin
+            $dompdf->loadHtml('
+                <style>
+                    @page { margin: 0; }
+                    @import url("https://fonts.googleapis.com/css2?family=Lato:wght@400;700&display=swap");
+                    body { font-family: "Lato", sans-serif !important; }
+                </style>
+                ' . $html
+            );
+
             $dompdf->setPaper('A4', 'portrait');
             $dompdf->render();
 
@@ -2939,20 +2952,43 @@ class EmployeeController extends AdminController
     
         // Generate the HTML content
         $html = '';
-    
+        
+        $level_index = 1;
         foreach ($levels as $level => $contacts) {
             $displayLevel = $level == 3 ? 1 : 2; // Switch levels for display
-            $html .= '<br>Level ' . $displayLevel . '<br>';
+            if($level_index == 1){
+                $html .= 'Level ' . $displayLevel . '<br>';
+            }else{
+                $html .= '<br> Level ' . $displayLevel . '<br>';
+            }
             foreach ($contacts as $index => $contact) {
                 $html .= ($index + 1) . '. ' . $contact['first_name'] . ' / ' . $contact['mobile'] . ' / ' . $contact['email'] . '<br>';
             }
+            $level_index++;
         }
     
-        $html .= '<br><br><br>';
+        $html .= '<br>';
     
         return $html;
     }
 
+    public function generateNetworkHospitalsForEcard($network_hospitals)
+    {
+        $html = "";
+        if (!empty($network_hospitals)) {
+            $html = '<div style="margin-top: 6px;">
+                        <span style="font-weight: 500;">Network Hospital:</span>
+                        <a href="' . $network_hospitals . '" target="_blank" style="color: #0066cc; text-decoration: none; display: inline-block; max-width: 200px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; vertical-align: bottom;">' . $network_hospitals . '</a>
+                    </div>';
+        }
+
+        // For debugging
+        // print_r($html); die;
+
+        return $html;
+    }
+
+
     public function getBatchFileData()
     {
         $file_id = $this->request->getGet('file_id');
@@ -3065,7 +3101,8 @@ class EmployeeController extends AdminController
             } else {
                 $text   = "create";
                 $data['created_by'] = get_session_userid();
-                $this->thzMasterModel->insert($data);
+                $thzMasterModel = new ThzMasterModel();
+                $thzMasterModel->insert($data);
                 $insertID = $this->partnerEndorsementRequestModel->insertID();
                 $result = true;
             }

app/Controllers/MasterController.php

@@ -2073,7 +2073,7 @@ class MasterController extends AdminController
                 }
             }
 
-            $data = $nhanceBranchModel->where('is_active', 1)->findAll();
+            $data = $nhanceBranchModel->where('is_active', 1)->orderBy('id', 'DESC')->findAll();
             return $this->loadLayout('nhance_branch_list', ['data' => $data]);
 
         } elseif ($method === 'delete') {
@@ -2156,7 +2156,7 @@ class MasterController extends AdminController
                 }
             }
 
-            $data = $vehicleTypeModel->where('is_active', 1)->findAll();
+            $data = $vehicleTypeModel->where('is_active', 1)->orderBy('id', 'DESC')->findAll();
             return $this->loadLayout('vehicle_type_master_list', ['data' => $data]);
 
         } elseif ($method === 'delete') {
@@ -2239,7 +2239,7 @@ class MasterController extends AdminController
                 }
             }
 
-            $data = $rtoModel->where('is_active', 1)->findAll();
+            $data = $rtoModel->where('is_active', 1)->orderBy('id', 'DESC')->findAll();
             return $this->loadLayout('rto_master_list', ['data' => $data]);
 
         } elseif ($method === 'delete') {

app/Controllers/PolicyTransactionController.php

@@ -113,7 +113,8 @@ class PolicyTransactionController extends BaseController
 
     // Policy Transaction Inception
     public function viewInception()
-    {
+    {   
+        $bds_edit_pt_id = $this->request->getGet('pt_id') ?? null;
         $data['tab_name'] = 'Policy';
         $data['page_name'] = 'Policy';
 
@@ -151,6 +152,8 @@ class PolicyTransactionController extends BaseController
         //     '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',
@@ -181,34 +184,38 @@ class PolicyTransactionController extends BaseController
         $issuer = empty($issuer) ? 0 : $issuer;
         $status = empty($status) ? 0 : $status;  // Corrected from `$issuer`
 
-        if ($this->request->is('get')) {
+        if(empty($bds_edit_pt_id)){
+            if ($this->request->is('get')) {
 
-            // Fetch inception data list
+                // Fetch inception data list
-            $data['inception_data_list'] = $this->policyTransactionModel->getInceptionTranctionListData(
+                $data['inception_data_list'] = $this->policyTransactionModel->getInceptionTranctionListData(
-                $start_date,
+                    $start_date,
-                $end_date,
+                    $end_date,
-                $client_id,
+                    $client_id,
-                $insurer_id,
+                    $insurer_id,
-                $policy_type_id,
+                    $policy_type_id,
-                $date_type,
+                    $date_type,
-                $issuer,
+                    $issuer,
-                $status
+                    $status
-            );
+                );
-        } else {
+            } else {
 
-            $ids = $this->request->getPost('ids');
+                $ids = $this->request->getPost('ids');
-            $ids = array_filter(explode(',', $ids));
+                $ids = array_filter(explode(',', $ids));
-            $data['inception_data_list'] = $this->policyTransactionModel->getInceptionTranctionListData(
+                $data['inception_data_list'] = $this->policyTransactionModel->getInceptionTranctionListData(
-                $start_date = 0,
+                    $start_date = 0,
-                $end_date = 0,
+                    $end_date = 0,
-                $client_id = 0,
+                    $client_id = 0,
-                $insurer_id = 0,
+                    $insurer_id = 0,
-                $policy_type_id = 0,
+                    $policy_type_id = 0,
-                $date_type = 0,
+                    $date_type = 0,
-                $issuer = 0,
+                    $issuer = 0,
-                $status = 0,
+                    $status = 0,
-                $ids
+                    $ids
-            );
+                );
+            }
+        }else{
+            $data['inception_data_list'] = [];
         }
 
 
@@ -261,6 +268,7 @@ class PolicyTransactionController extends BaseController
         $data = $this->preparePolicyData();
         $data['cd_ac_pk'] = $this->request->getPost('cd_ac_no');
         $data['issuer'] = 2;
+        $data['status'] = 'completed';
         $this->myLogger->logme('error', 'Policy Trancaction modified form data ( insert data ) : '. json_encode($data));
 
 
@@ -276,7 +284,6 @@ class PolicyTransactionController extends BaseController
         $data = $this->request->getPost();
 
         // print_r($data); die;
-        // var_dump($data); die;
 
         if (empty($data['policy_issue_date'])) {
             $data['policy_issue_date'] = null;
@@ -304,7 +311,6 @@ class PolicyTransactionController extends BaseController
             $data['last_action_date'] = change_date_format($data['last_action_date']);
         }
 
-
         // Separate Insurer and TPA Branch IDs and IDs
         if (isset($data['insurer_id']) && !empty($data['insurer_id'])) {
             list($data['insurer_branch_id'], $data['insurer_id']) = explode('-', $data['insurer_id']);
@@ -373,6 +379,7 @@ class PolicyTransactionController extends BaseController
 
                 $pt_co_share_details = $this->insertOrUpdateCoShareDetails($data, $insert);
 
+                $client_policy_id = null;
                 if ($data['ct_type'] == 2) {
                     $client_policy_insert_data = $this->prepareClientPolicyInsertData($data);
                     $client_policy_id = $this->clientPolicyModel->insert($client_policy_insert_data);
@@ -381,7 +388,7 @@ class PolicyTransactionController extends BaseController
                 }
 
                 if ($data['client_type'] == 1 && $data['status'] == 'completed' && $data['is_cd_reduce_from_bds'] == 1) {
-                    $this->processCompletedStatus($data, $client_policy_id, $data['insurer_id']);
+                    $this->processCompletedStatus($data, $client_policy_id, $data['insurer_id'], $insert);
                 }
             }
 
@@ -391,7 +398,6 @@ class PolicyTransactionController extends BaseController
             $clientController = new ClientController();
             $data['client_kyc_primary_table']  =  $clientController->generateKycPrimaryTable($data['client_id']);
             $data['client_kyc_other_table']  =  $clientController->generateKycOthersTable($data['client_id']);
-
             $data['entity_type_id'] =  $client_data['entity_type_id'];
 
             return $this->respondSuccess($insert, "Policy transaction created successfully", $data);
@@ -432,20 +438,20 @@ class PolicyTransactionController extends BaseController
                     }
                 }
 
-                if($old_pt_data['status'] != "completed"){
+                // if($old_pt_data['status'] != "completed"){
-                    if ($data['status'] == 'completed' && $data['ct_type'] == 2) {
+                //     if ($data['status'] == 'completed' && $data['ct_type'] == 2) {
-                        if ($data['client_type'] == 1 && $data['is_cd_reduce_from_bds'] == 1) {
+                //         if ($data['client_type'] == 1 && $data['is_cd_reduce_from_bds'] == 1) {
-                            $this->processCompletedStatus($data, $data['client_policy_id'], $data['insurer_id']);
+                //             $this->processCompletedStatus($data, $data['client_policy_id'], $data['insurer_id'], $id);
-                        }
+                //         }
-                    }
+                //     }
-                }
+                // }
 
                 $data['pt_co_share_details'] = $this->PTCOShareDetailsModel->where('pt_id', $id)->where('is_active', 1)->findAll();
             }
 
             if(isset($data['cd_amt_changed']) && !empty($data['cd_amt_changed'])){
                 $policy_data = $this->policyTransactionModel->where('is_active', 1)->where('id', $id)->first();
-                $this->cdCorrection($policy_data, $data['cd_amt_changed']);
+                $this->cdCorrection($policy_data, $data['cd_amt_changed'], $id);
             }
 
             $client_data = $this->clientModel->where('id', $data['client_id'])->first();
@@ -467,10 +473,6 @@ class PolicyTransactionController extends BaseController
     {
         // Prepare data for insertion and updating
         $coShareDetails = [];
-
-        // print_r($data); die;
-        // die;
-
         if (isset($data['co_share_id']) && !empty($data['co_share_id'])) {
             $this->removePtCoShareRecords($data['co_share_id'], $pt_id);
         }
@@ -564,7 +566,6 @@ class PolicyTransactionController extends BaseController
             }
 
             // print_r($this->PTCOShareDetailsModel->getLastQuery()); die;
-
             // print_r($coShareDetails); 
             // die;
 
@@ -610,7 +611,7 @@ class PolicyTransactionController extends BaseController
         $this->policyTransactionStatusModel->insert($statusData);
     }
 
-    private function processCompletedStatus($data, $client_policy_id, $insurer_id)
+    private function processCompletedStatus($data, $client_policy_id, $insurer_id, $policyTranId)
     {
         $totalAmount = (int)$data['total'][0] ?? 0;
         $description = 'The following amount of Rs. ' . $totalAmount . '/- has been debited for the ' . $data['emp_count'] . ' employees at Inception (BDS).';
@@ -628,13 +629,19 @@ class PolicyTransactionController extends BaseController
             'updated_by' => get_session_userid(),
             'event_name' => 'inception',
             'is_active' => 1,
-            'cd_ac_pk'  => $data['cd_ac_pk']
+            'cd_ac_pk'  => $data['cd_ac_pk'],
+            'pt_id' => $policyTranId ?? null,
         ];
 
-        DepositHelper::saveDeposit($cdTransactionData, get_session_userid());
+        $result = DepositHelper::saveDeposit($cdTransactionData, get_session_userid());
+
+        if(isset($result) && $result['success'] == true){
+            $update_data['ct_tran_id'] = $result['insert_id'];
+            $this->policyTransactionModel->where('id', $policyTranId)->set($update_data)->update();
+        }
     }
 
-    private function cdCorrection($data, $amt)
+    private function cdCorrection($data, $amt, $policyTranId)
     {
         $totalAmount = (int)($amt ?? 0);
         $description = 'The following amount of Rs. ' . $totalAmount . '/- has been debited towards the difference arising from the change in the BDS base premium.';
@@ -652,7 +659,8 @@ class PolicyTransactionController extends BaseController
             'updated_by' => get_session_userid(),
             'event_name' => 'inception',
             'is_active' => 1,
-            'cd_ac_pk'  => $data['cd_ac_pk']
+            'cd_ac_pk'  => $data['cd_ac_pk'],
+            'pt_id' => $policyTranId ?? null,
         ];
 
         DepositHelper::saveDeposit($cdTransactionData, get_session_userid());
@@ -1026,20 +1034,28 @@ class PolicyTransactionController extends BaseController
         }
     }
 
-    public function removePolicyTransaction($id)
+    public function removePolicyTransaction($id, $type = 0)
-    {
+    {   
         if ($id) {
-
             $data['is_active']  = 0;
             $policy_transaction_data = $this->policyTransactionModel->where('id', $id)->first();
-            if($policy_transaction_data['policy_type_id'] > 7){
+            if($policy_transaction_data['policy_type_id'] > 7 && $type == 0){
+
                 $this->policyTransactionModel->where('id', $id)->set($data)->update();
                 $this->PTCOShareDetailsModel->where('pt_id', $id)->set($data)->update();
                 $this->clientPolicyModel->where('id', $policy_transaction_data['client_policy_id'])->set($data)->update();
                 $this->policyTransactionModel->where('client_policy_id', $policy_transaction_data['client_policy_id'])->set($data)->update();
+
+                $cd_transaction_model = new ClientDepositModel();
+                $cd_transaction_model->where('policy_transaction_id', $id)->set($data)->update();
+
             }else{
                 $this->policyTransactionModel->where('id', $id)->set($data)->update();
                 $this->PTCOShareDetailsModel->where('pt_id', $id)->set($data)->update();
+                
+                $cd_transaction_model = new ClientDepositModel();
+                $cd_transaction_model->where('policy_transaction_id', $id)->set($data)->update();
+
             }
             return $this->respond(['status' => true, 'code' => 200, 'message' => 'Policy Transaction removed successfully'], 200);
         } else {
@@ -1076,7 +1092,7 @@ class PolicyTransactionController extends BaseController
     {
         // echo '<pre>';
         // !dd($this->getEndorsementDataForEdit(17));
-
+        $bds_edit_pt_id = $this->request->getGet('pt_id') ?? null;
         $data['tab_name'] = 'Endorsement';
         $data['page_name'] = 'Endorsement';
         $data['issuer'] = [1 => 'JIBS', 2 => 'Nhance'];
@@ -1143,8 +1159,11 @@ class PolicyTransactionController extends BaseController
         $issuer = (!isset($issuer) || $issuer === '' || $issuer === null) ? 0 : $issuer;
         $status = (!isset($issuer) || $status === '' || $status === null) ? 0 : $status;
 
-
+        if($bds_edit_pt_id == null){
-        $data['endorsement_data_list'] = $this->policyTransactionModel->getEndorsementTranctionListData($start_date, $end_date, $client_id, $insurer_id, $policy_type_id, $date_type, $issuer, $status);
+            $data['endorsement_data_list'] = $this->policyTransactionModel->getEndorsementTranctionListData($start_date, $end_date, $client_id, $insurer_id, $policy_type_id, $date_type, $issuer, $status);
+        }else{
+            $data['endorsement_data_list'] = [];
+        }
         $data['client'] = $this->clientModel->where('is_active', 1)->findAll();
         $data['policy_types'] = $this->policyTypeModel->where('is_active', 1)->findAll();
 
@@ -1167,6 +1186,7 @@ class PolicyTransactionController extends BaseController
     {
         $id = $this->request->getPost('id');
         $data = $this->preparePolicyTransactionData();
+        $data['status'] = 'completed';
         // print_r($data); die;
 
         if (!$id) {
@@ -1334,9 +1354,9 @@ class PolicyTransactionController extends BaseController
         if ($update) {
 
             $this->insertTransactionStatus($id, $data, 1);
-            if($old_endorse_data['status'] != "completed"){
+            // if($old_endorse_data['status'] != "completed"){
-                $this->handleCompletedStatus($data, $id);
+            //     $this->handleCompletedStatus($data, $id);
-            }
+            // }
             $this->insertOrUpdateCoShareDetails($data, $id);
 
 
@@ -1347,30 +1367,40 @@ class PolicyTransactionController extends BaseController
     }
 
     private function handleCompletedStatus($data, $policy_tran_id)
-    {
+    {   
         if ($data['client_type'] == 1 && $data['status'] == 'completed' && $data['is_cd_reduce_from_bds'] == 1) {
 
             $tolamt = (int) $data['total'][0] ?? 0;
 
-            $description = 'The following amount of Rs. ' . round($tolamt, 2) . '/- has been' .
+            if(!empty($tolamt)){
-                ($data['action_type'] == 'deletion' ? ' Credit ' : ' Debit ') . 'from the policy transaction (BDS)';
+                $description = 'The following amount of Rs. ' . round($tolamt, 2) . '/- has been' .
-            $cd_tranction_data = [
+                    ($data['action_type'] == 'deletion' ? ' Credit ' : ' Debit ') . 'from the policy transaction (BDS)';
-                'amount' => $tolamt,
+                
-                'sub_type_id' => $data['action_type'] == 'deletion' ? 3 : 4,
+                $cd_tranction_data = [
-                'client_id' => $data['client_id'],
+                    'amount' => abs($tolamt),
-                'client_policy_id' => $data['client_policy_id'],
+                    'sub_type_id' => $data['action_type'] == 'deletion' ? 3 : 4,
-                'endorsement_no' => null,
+                    'client_id' => $data['client_id'],
-                'cd_ac_no' => $data['cd_ac_no'] ?? null,
+                    'client_policy_id' => $data['client_policy_id'],
-                'insurer_id' => $data['insurer_id'],
+                    'endorsement_no' => null,
-                'description' => $description,
+                    'cd_ac_no' => $data['cd_ac_no'] ?? null,
-                'transaction_type' => $data['action_type'] == 'deletion' ? 'Credit' : 'Debit',
+                    'insurer_id' => $data['insurer_id'],
-                'updated_by' => get_session_userid(),
+                    'description' => $description,
-                'event_name' => $data['action_type'],
+                    'transaction_type' => $data['action_type'] == 'deletion' ? 'Credit' : 'Debit',
-                'is_active' => 1,
+                    'updated_by' => get_session_userid(),
-                'cd_ac_pk' => $data['cd_ac_pk'] ?? null,
+                    'event_name' => $data['action_type'],
-            ];
+                    'is_active' => 1,
+                    'cd_ac_pk' => $data['cd_ac_pk'] ?? null,
+                    'pt_id' => $policy_tran_id ?? null,
+                ];
+
+                $result = DepositHelper::saveDeposit($cd_tranction_data, get_session_userid());
+
+                if(isset($result['success']) && $result['success']){
+                    $update_data['ct_tran_id'] = $result['insert_id'];
+                    $this->policyTransactionModel->where('id', $policy_tran_id)->set($update_data)->update();
+                }
+            }
 
-            DepositHelper::saveDeposit($cd_tranction_data, get_session_userid());
         }
     }
 
@@ -1398,13 +1428,13 @@ class PolicyTransactionController extends BaseController
             ->orderBy('id', 'asc')
             ->first();
 
-        $pt_id = null;    
+        $pt_id = null;   
+
         if(!empty($data)){
             $inception_data = $this->policyTransactionModel->where('policy_no', $data['policy_no'])->where('client_id', $data['client_id'])->first();
             $pt_id = $inception_data['id'];
         }    
 
-
         if (!empty($data['policy_start_date'])) {
             $data['policy_start_date'] =  change_date_format($data['policy_start_date'], 'Y-m-d', 'd/m/Y');
         }
@@ -1565,6 +1595,16 @@ class PolicyTransactionController extends BaseController
 
         // print_r($data['endorse_eff_date']); die;
 
+        $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;
+
         if ($data) {
             return $this->respond(['status' => true, 'data' => $data, 'pt_id' => $pt_id], 200);
         } else {
@@ -3128,4 +3168,116 @@ class PolicyTransactionController extends BaseController
 
         return [$policyList, $policyListByClient];
     }
+
+
+public function reportBDSNew()
+{
+    // 🧭 Basic Page Info
+    $data['tab_name']   = 'BDS Report';
+    $data['page_name']  = 'BDS Report';
+
+    // 📋 Dropdown Data
+    $data['issuer']         = [1 => 'JIBS', 2 => 'Nhance'];
+    $data['client_type']    = [1 => 'Group', 2 => 'Individual'];
+    $data['issuing_type']   = [1 => 'Fresh', 2 => 'Renewal', 3 => 'Roll Over'];
+    $data['policy_status']  = [
+        'pending'              => 'Pending',
+        'exported_to_insurer'  => 'Exported to Insurer',
+        'imported_from_insurer'=> 'Imported from Insurer',
+        'exported_to_tpa'      => 'Exported to TPA',
+        'imported_from_tpa'    => 'Imported from TPA',
+        'completed'            => 'Completed'
+    ];
+    $data['invoice_status_array'] = [
+        'yet_to_generate' => 'Yet to Generate',
+        'generated'       => 'Generated',
+        'send'            => 'Send',
+        'recived'         => 'Recived',
+    ];
+    $data['date_type'] = [
+        'policy_issue_date'  => 'Policy Issue Date',
+        'policy_start_date'  => 'Policy Start Date',
+        'policy_end_date'    => 'Policy End Date',
+        'data_received_date' => 'Data Received Date',
+        'closure_date'       => 'Closure Date',
+        'statement_month'    => 'Statement Month',
+    ];
+
+    // 🏢 Fetch Active Data
+    $data['insurer']       = $this->insurerModel->where('is_active', 1)->findAll();
+    $data['policy_types']  = $this->policyTypeModel->where('is_active', 1)->findAll();
+    $data['clients']       = $this->clientModel->where('is_active', 1)->findAll();
+    $data['users']         = $this->userModel->where('is_active', 1)->findAll();
+    $data['policy_count']  = $this->policyTransactionModel->where('is_active', 1)->countAllResults();
+
+    // 🕐 Filters
+    $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');
+    $client_branch_id  = $this->request->getGet('client_branch_id');
+    $insurer_branch_id = $this->request->getGet('insurer_branch_id');
+    $client_policy_id  = $this->request->getGet('client_policy_id');
+    $user_id           = $this->request->getGet('user_id');
+
+    // Handle statement month range
+    if ($date_type == 'statement_month') {
+        $start_date = (string) date('Y-m-01', strtotime($start_date));
+        $end_date   = (string) date('Y-m-31', strtotime($end_date));
+    }
+
+    // Ensure default values
+    $start_date        = $start_date        ?: 0;
+    $end_date          = $end_date          ?: 0;
+    $client_id         = $client_id         ?: 0;
+    $insurer_id        = $insurer_id        ?: 0;
+    $policy_type_id    = $policy_type_id    ?: 0;
+    $date_type         = $date_type         ?: 0;
+    $issuer            = $issuer            ?: 0;
+    $client_branch_id  = $client_branch_id  ?: 0;
+    $insurer_branch_id = $insurer_branch_id ?: 0;
+    $client_policy_id  = $client_policy_id  ?: 0;
+    $user_id           = $user_id           ?: 0;
+
+    // 🧾 Handle POST requests (Dashboard filters)
+    if ($this->request->is('post')) {
+        $isFromDashboard = $this->request->getPost('is_dashboard');
+
+        if (!empty($isFromDashboard) && $isFromDashboard == 1) {
+            $ids = array_filter(explode(',', $this->request->getPost('ids')));
+
+            if (!empty($ids)) {
+                $idsStr = implode(',', array_map('intval', $ids)); // sanitize IDs
+                $where  = "policy_transaction.id IN ($idsStr)";
+            } else {
+                $where = []; // No valid IDs
+            }
+        }
+    }
+
+    // 📊 Fetch report data
+    $data['report_list'] = $this->policyTransactionModel->reportBDSNew(
+        $start_date,
+        $end_date,
+        $client_id,
+        $insurer_id,
+        $policy_type_id,
+        $date_type,
+        $issuer,
+        $client_branch_id,
+        $insurer_branch_id,
+        $client_policy_id,
+        $user_id,
+        $where ?? ''
+    );
+
+    // 🧩 Load View
+    $this->loadLayout('report_bds_filter', $data);
+}
+
+
+
 }

app/Helpers/DepositHelper.php

@@ -66,7 +66,8 @@ class DepositHelper
             'updated_by' => $data['updated_by'],
             'balance' => $newBalance, // Include the new balance in the data array
             'cd_ac_pk'=> isset($data['cd_ac_pk'])?$data['cd_ac_pk']:null,
-            'record_date' => $data['record_date'] ?? null
+            'record_date' => $data['record_date'] ?? null,
+            'policy_transaction_id' => $data['pt_id'] ?? null
         ];
 
         // Insert data and get the insert ID

app/Models/ClientDepositModel.php

@@ -28,7 +28,8 @@ class ClientDepositModel extends Model
         "event_name",
         "unit",
         "cd_ac_pk",
-        "record_date"
+        "record_date",
+        "policy_transaction_id",
     ];
 
    

app/Models/EmployeePolicyModel.php

@@ -1471,7 +1471,7 @@ class EmployeePolicyModel extends Model
 
                     ep.tpa_id, 
                     ep.uhid,
-                    ep.policy_end_date,
+                    cp.policy_end_date,
                     ep.basic_cover_si,
 
                     clients.client_name, 
@@ -1537,7 +1537,7 @@ class EmployeePolicyModel extends Model
 
                     ep.tpa_id, 
                     ep.uhid,
-                    ep.policy_end_date,
+                    cp.policy_end_date,
                     ep.basic_cover_si,
 
                     clients.client_name, 

app/Models/PolicyTransactionModel.php

@@ -305,7 +305,7 @@ class PolicyTransactionModel extends Model
 
         if ($client_id == 0 && $insurer_id == 0 && $policy_type_id == 0 && $date_type == 0 && $issuer == 0) {
 
-            $fromDate = date('Y-m-d', strtotime('-30 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -881,7 +881,7 @@ class PolicyTransactionModel extends Model
 
         if ($client_id == 0 && $insurer_id == 0 && $policy_type_id == 0 && $date_type == 0 && $issuer == 0) {
 
-            $fromDate = date('Y-m-d', strtotime('-60 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             if (empty($where)) {
@@ -1060,7 +1060,7 @@ class PolicyTransactionModel extends Model
 
         // Default to Last 30 Days if No Filters Are Applied
         if (empty($client_id) && empty($insurer_id) && empty($policy_type_id) && empty($date_type) && empty($issuer) && empty($where)) {
-            $fromDate = date('Y-m-d', strtotime('-60 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -1108,7 +1108,7 @@ class PolicyTransactionModel extends Model
             ->join('client_branch', 'policy_transaction.client_branch_id = client_branch.id', 'left')
             ->join('insurers', 'pt_co_share_details.insurer_id = insurers.id', 'left')
             ->join('client_policy', 'policy_transaction.client_policy_id = client_policy.id', 'left')
-            ->join('policy_type', 'client_policy.policy_type_id = policy_type.id', 'left')
+            ->join('policy_type', 'policy_transaction.policy_type_id = policy_type.id', 'left')
             ->where('policy_transaction.is_active', 1)
             ->where('policy_transaction.action_type !=', 'inception');
 
@@ -1163,7 +1163,7 @@ class PolicyTransactionModel extends Model
 
         if ($client_id == 0 && $insurer_id == 0 && $policy_type_id == 0 && $date_type == 0 && $issuer == 0) {
 
-            $fromDate = date('Y-m-d', strtotime('-60 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -1313,7 +1313,7 @@ class PolicyTransactionModel extends Model
                 ->where('policy_transaction.' . $date_type . '<=', $endDate);
         } else {
 
-            $fromDate = date('Y-m-d', strtotime('-30 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -1416,7 +1416,7 @@ class PolicyTransactionModel extends Model
                 ->where('policy_transaction.' . $date_type . '<=', $endDate);
         } else {
 
-            $fromDate = date('Y-m-d', strtotime('-30 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -1457,7 +1457,7 @@ class PolicyTransactionModel extends Model
 
     public function getFinanceReportList($start_date = 0, $end_date = 0, $client_id = 0, $insurer_id = 0, $policy_type_id = 0, $date_type = 0, $issuer = 0, $status = 0)
     {
-        $dateThreshold = date('Y-m-d H:i:s', strtotime("- 3 days"));
+        $dateThreshold = date('Y-m-d H:i:s', strtotime("-90 days"));
 
         $builder = $this->db->table('policy_transaction')
             ->select("
@@ -1519,7 +1519,7 @@ class PolicyTransactionModel extends Model
                 ->where('policy_transaction.' . $date_type . '<=', $endDate);
         } else {
 
-            $fromDate = date('Y-m-d', strtotime('-30 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -1624,7 +1624,7 @@ class PolicyTransactionModel extends Model
             $builder->where('policy_transaction.' . $date_type . '>=', $startDate)
                 ->where('policy_transaction.' . $date_type . '<=', $endDate);
         } else {
-            $fromDate = date('Y-m-d', strtotime('-30 days'));
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
             $toDate = date('Y-m-d 23:59:59');
 
             $builder->where('policy_transaction.created_at >=', $fromDate)
@@ -1712,7 +1712,7 @@ class PolicyTransactionModel extends Model
     //function for fetch renewal report data
     public function getRenewalReportData($start_date = null, $end_date = null, $client_type = null, $client = null, $issuer = null)
     {
-        $fromDate = date('Y-m-d', strtotime('-60 days'));
+        $fromDate = date('Y-m-d', strtotime('-90 days'));
         $toDate = date('Y-m-d 23:59:59');
 
         if (!empty($start_date) && !empty($end_date)) {
@@ -1806,4 +1806,307 @@ class PolicyTransactionModel extends Model
 
         return $result[0];
     }
+
+    public function reportBDSNew(
+        $start_date = 0,
+        $end_date = 0,
+        $client_id = 0,
+        $insurer_id = 0,
+        $policy_type_id = 0,
+        $date_type = 0,
+        $issuer = 0,
+        $client_branch_id = 0,
+        $insurer_branch_id = 0,
+        $client_policy_id = 0,
+        $user_id = 0,
+        $where = []
+    ) {
+        
+        $date_condition = '';
+
+        // ==============================
+        // DATE FILTER FOR STATEMENT MONTH
+        // ==============================
+        if ($date_type == 'statement_month' && $start_date != 0 && $end_date != 0) {
+            $date_condition = "
+                AND insurer_statements.month >= '{$start_date}'
+                AND insurer_statements.month <= '{$end_date}'
+            ";
+        }
+
+        // ==============================
+        // BASE QUERY
+        // ==============================
+        $builder = $this->db->table('policy_transaction')
+            ->select("
+                policy_transaction.*,
+                DATE_FORMAT(policy_transaction.policy_issue_date, '%d %b %Y') AS policy_issue_date,
+                DATE_FORMAT(
+                    IF(policy_transaction.month IS NULL, 
+                        policy_transaction.policy_issue_date, 
+                        policy_transaction.month
+                    ), '%b %Y'
+                ) AS policy_issue_month,
+
+                CASE
+                    WHEN clients.client_type = 1 THEN 'Group'
+                    WHEN clients.client_type = 2 THEN 'Retail'
+                    ELSE '-'
+                END AS client_type,
+
+                CASE
+                    WHEN policy_transaction.revenue_type = 'NA' THEN 'Fresh'
+                    ELSE 'Renewal'
+                END AS revenue_type,
+
+                CASE
+                    WHEN policy_transaction.action_type = 'inception' THEN 'Policy'
+                    ELSE 'Endorsement'
+                END AS action_type,
+
+                clients.client_name AS client_name,
+                clients.short_name AS client_short_name,
+                client_branch.branch_name AS client_branch_name,
+                client_branch.address1 AS client_address,
+                policy_type.policy_type,
+                policy_type.bap,
+                insurers.name AS insurer_name,
+                insurers.short_name AS insurer_short_name,
+                insurer_branch.branch_name AS insurer_branch_name,
+                insurer_branch.branch_code AS insurer_branch_code,
+                user_profiles.first_name AS user_name,
+                vehicle.vehicle_no,
+                tpa.name AS tpa_name,
+                pt_co_share_details.remark AS remarks,
+                pt_co_share_details.cop_amt AS bp_amt,
+                pt_co_share_details.exp_amt,
+                pt_co_share_details.id AS pt_id,
+                sales_user.first_name AS salse_person_name,
+                service_user.first_name AS service_person_name,
+
+                ROUND(pt_co_share_details.cop_amt + pt_co_share_details.cotp_amt + pt_co_share_details.cotep_amt, 2) AS premium_wo_gst,
+                ROUND((ROUND(pt_co_share_details.cop_amt + pt_co_share_details.cotp_amt + pt_co_share_details.cotep_amt, 2) * 18 / 100), 2) AS gst_amount,
+                ROUND(
+                    ROUND(pt_co_share_details.cop_amt + pt_co_share_details.cotp_amt + pt_co_share_details.cotep_amt, 2) + 
+                    ROUND((ROUND(pt_co_share_details.cop_amt + pt_co_share_details.cotp_amt + pt_co_share_details.cotep_amt, 2) * 18 / 100), 2),
+                2) AS total_premium,
+
+                ROUND(pt_co_share_details.cotp_amt + pt_co_share_details.cotep_amt, 2) AS tp_or_ter,
+                DATEDIFF(policy_transaction.policy_end_date, CURDATE()) AS days,
+                (pt_co_share_details.agreed_tp_per + pt_co_share_details.agreed_tep_per) AS agreed_tp_or_ter_per,
+                pt_co_share_details.agreed_bp_per,
+
+                -- ==============================
+                -- SUBQUERY: Total IRDA Amount
+                -- ==============================
+                ROUND((
+                    SELECT (
+                        SUM(co_share_stmt_details.actual_bp_brokerage_amt) + 
+                        SUM(co_share_stmt_details.actual_tp_brokerage_amt) + 
+                        SUM(co_share_stmt_details.actual_tep_brokerage_amt) +
+                        SUM(co_share_stmt_details.reward)
+                    )
+                    FROM co_share_stmt_details
+                    JOIN insurer_statements ON co_share_stmt_details.statement_id = insurer_statements.id
+                    WHERE co_share_stmt_details.co_share_id = pt_co_share_details.id
+                    AND co_share_stmt_details.is_active = 1
+                    AND insurer_statements.is_active = 1
+                    {$date_condition}
+                ), 2) AS total_irda_amt,
+
+                -- Reward Only
+                ROUND((
+                    SELECT SUM(co_share_stmt_details.reward)
+                    FROM co_share_stmt_details
+                    JOIN insurer_statements ON co_share_stmt_details.statement_id = insurer_statements.id
+                    WHERE co_share_stmt_details.co_share_id = pt_co_share_details.id
+                    AND co_share_stmt_details.is_active = 1
+                    AND insurer_statements.is_active = 1
+                    {$date_condition}
+                ), 2) AS reward,
+
+                -- Billed Amount
+                ROUND((
+                    SELECT SUM(
+                        COALESCE(co_share_stmt_details.actual_bp_brokerage_amt, 0) +
+                        COALESCE(co_share_stmt_details.actual_tp_brokerage_amt, 0) +
+                        COALESCE(co_share_stmt_details.actual_tep_brokerage_amt, 0) +
+                        COALESCE(co_share_stmt_details.reward, 0)
+                    )
+                    FROM co_share_stmt_details
+                    JOIN pt_co_share_details AS pt_table ON co_share_stmt_details.co_share_id = pt_table.id
+                    JOIN insurer_statements ON co_share_stmt_details.statement_id = insurer_statements.id
+                    WHERE co_share_stmt_details.co_share_id = pt_co_share_details.id
+                    AND co_share_stmt_details.is_active = 1
+                    AND pt_table.is_active = 1
+                    AND insurer_statements.is_active = 1
+                    AND insurer_statements.invoice_status IS NOT NULL
+                    {$date_condition}
+                ), 2) AS billed_amt,
+
+                -- Unbilled Amount
+                ROUND(
+                (
+                    (
+                        SELECT 
+                            SUM(
+                                COALESCE(co_share_stmt_details.actual_bp_brokerage_amt, 0) +
+                                COALESCE(co_share_stmt_details.actual_tp_brokerage_amt, 0) +
+                                COALESCE(co_share_stmt_details.actual_tep_brokerage_amt, 0) +
+                                COALESCE(co_share_stmt_details.reward, 0)
+                            )
+                        FROM co_share_stmt_details
+                        JOIN insurer_statements ON co_share_stmt_details.statement_id = insurer_statements.id
+                        WHERE co_share_stmt_details.co_share_id = pt_co_share_details.id
+                        AND co_share_stmt_details.is_active = 1
+                        {$date_condition}
+                    ) 
+                        -
+                    (
+                        SELECT 
+                            SUM(
+                                COALESCE(co_share_stmt_details.actual_bp_brokerage_amt, 0) +
+                                COALESCE(co_share_stmt_details.actual_tp_brokerage_amt, 0) +
+                                COALESCE(co_share_stmt_details.actual_tep_brokerage_amt, 0) +
+                                COALESCE(co_share_stmt_details.reward, 0)
+                            )
+                        FROM co_share_stmt_details
+                        JOIN pt_co_share_details AS pt_table ON co_share_stmt_details.co_share_id = pt_table.id
+                        JOIN insurer_statements ON co_share_stmt_details.statement_id = insurer_statements.id
+                        WHERE co_share_stmt_details.co_share_id = pt_co_share_details.id
+                        AND co_share_stmt_details.is_active = 1
+                        AND pt_table.is_active = 1
+                        AND insurer_statements.is_active = 1
+                        AND insurer_statements.invoice_status IS NULL
+                        {$date_condition}
+                    )
+                ), 2) AS unbilled_amt,
+
+                created_user.first_name AS user_name,
+
+                CASE 
+                    WHEN pt_co_share_details.co_share_type IN (0, 1) THEN policy_transaction.policy_no
+                    WHEN pt_co_share_details.co_share_type > 1 THEN 
+                        CASE 
+                            WHEN pt_co_share_details.follower_policy_no IS NULL OR pt_co_share_details.follower_policy_no = '' 
+                            THEN policy_transaction.policy_no
+                            ELSE pt_co_share_details.follower_policy_no
+                        END
+                    ELSE policy_transaction.policy_no
+                END AS policy_no
+            ")
+
+            // ==============================
+            // JOINS
+            // ==============================
+            ->join('pt_co_share_details', 'policy_transaction.id = pt_co_share_details.pt_id', 'left')
+            ->join('clients', 'clients.id = policy_transaction.client_id')
+            ->join('client_branch', 'policy_transaction.client_branch_id = client_branch.id', 'left')
+            ->join('client_policy', 'policy_transaction.client_policy_id = client_policy.id', 'left')
+            ->join('user_profiles', 'policy_transaction.created_by = user_profiles.id', 'left')
+            ->join('vehicle', 'policy_transaction.vehicle_id = vehicle.id', 'left')
+            ->join('policy_type', 'policy_transaction.policy_type_id = policy_type.id', 'left')
+            ->join('insurers', 'pt_co_share_details.insurer_id = insurers.id', 'left')
+            ->join('insurer_branch', 'pt_co_share_details.insurer_branch_id = insurer_branch.id', 'left')
+            ->join('tpa', 'policy_transaction.tpa_id = tpa.id', 'left')
+            ->join('tpa_branch', 'policy_transaction.tpa_branch_id = tpa_branch.id', 'left')
+            ->join('user_profiles AS sales_user', 'policy_transaction.sales_generated_by = sales_user.id', 'left')
+            ->join('user_profiles AS service_user', 'policy_transaction.serviced_by = service_user.id', 'left')
+            ->join('user_profiles AS created_user', 'policy_transaction.created_by = created_user.id', 'left')
+            ->where('policy_transaction.is_active', 1)
+            ->where('pt_co_share_details.is_active', 1);
+
+        // ==============================
+        // ROLE-BASED FILTERS
+        // ==============================
+        if (
+            (!in_array(get_role_id(), [1, 5])) &&
+            !(
+                in_array(MANAGEMENT_TEAM_ID, user_team()) ||
+                in_array(FINANCE_TEAM_ID, user_team()) ||
+                in_array(BUSINESS_TEAM_ID, user_team())
+            )
+        ) {
+            if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
+                $builder->where('policy_transaction.created_by', get_session_userid());
+            }
+        }
+
+        // ==============================
+        // ADDITIONAL FILTERS
+        // ==============================
+        if (!empty($where)) {
+            log_message('info', 'Where condition: ' . json_encode($where));
+            $builder->where($where);
+        }
+
+        if ($start_date != 0 && $end_date != 0 && $date_type != 0 && $date_type != 'statement_month') {
+            $startDate = date('Y-m-d 00:00:00', strtotime($start_date));
+            $endDate   = date('Y-m-d 23:59:59', strtotime($end_date));
+
+            $builder->where("policy_transaction.{$date_type} >=", $startDate)
+                    ->where("policy_transaction.{$date_type} <=", $endDate);
+        }
+
+        // JOIN FOR STATEMENT MONTH FILTER
+        if ($date_type == 'statement_month' && $start_date != 0 && $end_date != 0) {
+            $startDate = date('Y-m-d', strtotime($start_date));
+            $endDate   = date('Y-m-d', strtotime($end_date));
+
+            $builder->join('co_share_stmt_details', 'pt_co_share_details.id = co_share_stmt_details.co_share_id', 'left')
+                    ->join('insurer_statements', 'co_share_stmt_details.statement_id = insurer_statements.id', 'left')
+                    ->where('insurer_statements.is_active', 1)
+                    ->where('insurer_statements.month >=', $startDate)
+                    ->where('insurer_statements.month <=', $endDate)
+                    ->groupBy('co_share_stmt_details.co_share_id');
+        }
+
+        // ==============================
+        // FILTER BY IDs
+        // ==============================
+        if ($client_id != 0) $builder->where('policy_transaction.client_id', $client_id);
+        if ($insurer_id != 0) $builder->where('policy_transaction.insurer_id', $insurer_id);
+        if ($client_branch_id != 0) $builder->where('policy_transaction.client_branch_id', $client_branch_id);
+        if ($insurer_branch_id != 0) $builder->where('policy_transaction.insurer_branch_id', $insurer_branch_id);
+        if ($client_policy_id != 0) $builder->where('policy_transaction.client_policy_id', $client_policy_id);
+        if ($user_id != 0) $builder->where('policy_transaction.created_by', $user_id);
+        if ($policy_type_id != 0) $builder->where('client_policy.policy_type_id', $policy_type_id);
+        if ($issuer != 0) $builder->where('policy_transaction.issuer', $issuer);
+
+        // ==============================
+        // DEFAULT 90-DAY FILTER
+        // ==============================
+        if (
+            $client_id == 0 && 
+            $insurer_id == 0 && 
+            $policy_type_id == 0 && 
+            $date_type == 0 && 
+            $issuer == 0
+        ) {
+            $fromDate = date('Y-m-d', strtotime('-90 days'));
+            $toDate   = date('Y-m-d 23:59:59');
+
+            if (empty($where)) {
+                $builder->where('policy_transaction.created_at >=', $fromDate)
+                        ->where('policy_transaction.created_at <=', $toDate);
+            }
+        }
+
+        // ==============================
+        // ORDER & EXECUTION
+        // ==============================
+        $builder->orderBy('policy_transaction.id', 'desc');
+
+        $result = $builder->get()->getResultArray();
+
+        // Uncomment if you need to debug SQL
+        // dd($this->db->getLastQuery());
+
+        return $result;
+    }
+
+
+ 
+
+
 }

app/Models/VehicleModel.php

@@ -25,6 +25,7 @@ class VehicleModel extends Model
         'is_active',
         'created_by',
         'updated_by',
+        'rto_id',
     ];
 
 

app/Views/DashBoard.php

@@ -208,7 +208,7 @@
 
                     <?php if(in_array(get_role_id(), [1,2,3,5]) || (get_role_id() == 4 && in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
 
-                         <li class="nav-item d-flex justify-content-center align-items-center">
+                         <!-- <li class="nav-item d-flex justify-content-center align-items-center">
                             <a href="#bds-dash-tab" data-toggle="tab" aria-expanded="true" class="nav-link px-3 py-1 dash-anchor nav-dash" id="bds_tab">
                                  <img src="<?= base_url() . "public"; ?>/assets/images/inactive_bds.png" alt="Logo" height="14" class="inactive_bds">
                                 <img src="<?= base_url() . "public"; ?>/assets/images/active_bds.png" alt="Logo" height="14" 
@@ -217,7 +217,7 @@
                                 <span class="d-none d-sm-inline-block dash-tab dash-tab-font">BDS</span>
                             </a>
                         </li>
-                         &nbsp;&nbsp;&nbsp;&nbsp;
+                         &nbsp;&nbsp;&nbsp;&nbsp; -->
 
                     <?php } ?>
                     <?php if ((get_role_id() == STAFF_ROLE_ID && in_array(CLAIMS_TEAM_ID,user_team())) || in_array(get_role_id(),[1,5])) :?>
@@ -262,7 +262,7 @@
                     <?php endif; ?>
 
                     <?php if(in_array(get_role_id(), [1,2,3,5]) || (get_role_id() == 4 && in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
-                        <?php include('bds_dash.php'); ?>
+                        <!-- <?php //include('bds_dash.php'); ?> -->
                     <?php } ?>
                     <?php if ((get_role_id() == STAFF_ROLE_ID && in_array(ENROLLMENT_TEAM_ID,user_team())) || in_array(get_role_id(),[1,5])) :?>
                         <?php include("leads_dash.php") ?>

app/Views/client_policy.php

@@ -27,13 +27,88 @@
 
 </style>
 
+<style>
+.switch-label {
+        position: relative;
+        display: inline-flex;
+        align-items: center;
+        gap: 10px;
+        cursor: pointer;
+        font-weight: 500;
+        color: #333;
+        justify-content: flex-end;
+        margin-right: 40px;
+    }
+
+    .switch-label input {
+    opacity: 0;
+    width: 0;
+    height: 0;
+    }
+
+.slider {
+  position: relative;
+  width: 50px;
+  height: 25px;
+  background-color: #fff;
+  border-radius: 25px;
+  box-shadow: 0 0 5px rgba(0,0,0,0.2);
+  transition: 0.3s;
+}
+
+.slider::before {
+  content: "";
+  position: absolute;
+  height: 19px;
+  width: 19px;
+  left: 3px;
+  top: 3px;
+  background-color: #ccc;
+  border-radius: 50%;
+  transition: 0.3s;
+}
+
+input:checked + .slider {
+  background-color: #ff4d4d; /* red when ON */
+}
+
+input:checked + .slider::before {
+  transform: translateX(25px);
+  background-color: #fff;
+}
+
+.switch-text {
+  user-select: none;
+}
+
+#table-client-policy_wrapper .row>.col-sm-12.col-md-6:first-child{
+    display: none;
+}
+
+#table-client-policy_filter{
+    text-align: left;
+}
+
+</style>
+
 <div class="save-indicator" id="saveIndicator">Saved</div>
 <div class="tab-pane fade" id="police-tab">
 
-    <div class="row float-right" style="padding-bottom: 10px; position: relative;right: 13px;">
+    <div class="row" style="padding-bottom: 10px; position: relative;right: 13px; justify-content: end;">
         <button type="button" id="BtnAdd" class="btn btn-primary waves-effect waves-light btnAdd btn-sm" style="position: relative;right: 10px;"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policy</button>
         <button type="button" id="BtnAddSuccess" class="btn btn-success waves-effect waves-light BtnAddSuccess btn-sm" onclick="showModal()"><span class="mdi mdi-plus-box-outline" aria-hidden="true" style="padding: 5px 10px;"></span>Add Policy From Lead</button>
     </div>
+    
+    <br>
+
+    <div class="" style="padding-bottom: 10px; position: absolute;
+    right: 0;">
+        <label class="switch-label">
+            <input type="checkbox" id="chk-show-expired">
+            <span class="slider"></span>
+            <span class="switch-text">Expired Policies</span>
+        </label>
+    </div>
 
     <div class="table-responsive" id="table_list">
         <table data-custom-table-css="table" class="table table-borderless table mb-0" id="table-client-policy">            
@@ -308,6 +383,8 @@
         // Get today's date
         var today = new Date();
 
+         const showExpired = $('#chk-show-expired').is(':checked');
+
         var startDatePicker = flatpickr("#start_date", {
             dateFormat: "d-m-Y",
             defaultDate: today,
@@ -412,37 +489,42 @@
 
                 var policy_name_data = `${item.policy_type_name ?? ''}` + ' - ' +  `${item.policy_no ?? ''}`;
 
+                    if(showExpired == false && checkDateStatus(item.policy_end_date) != 'Expired'){
+                           
 
-
-                    policyTable += `
-                        <tr>
-                            <td>${item.insurer_short} - ${item.insurer_branch_name}</td>
-                            <td>${policy_name_data}</td>
-                            <td>${item.branch_name ? item.branch_name : ' - '}</td>
-                            <td>${tpaValue}</td>
-                            <td>${(item.policy_start_date)} / ${(item.policy_end_date)}</td>
-                        
-                            <td>${checkDateStatus(item.policy_end_date, 1)}</td>
-                            <td>
-                                <div class="btn-group dropdown">
-                                    <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
-                                    <div class="dropdown-menu dropdown-menu-right">
-                                        <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
-                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
-                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
-
-                    // Conditionally render the delete option based on the role
-                    if (role !== 3 && role !== 4) {
                         policyTable += `
-                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item" onclick="removepolicy(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>`;
+                                <tr>
-                    }
+                                    <td>${item.insurer_short} - ${item.insurer_branch_name}</td>
+                                    <td>${policy_name_data}</td>
+                                    <td>${item.branch_name ? item.branch_name : ' - '}</td>
+                                    <td>${tpaValue}</td>
+                                    <td>${(item.policy_start_date)} / ${(item.policy_end_date)}</td>
+                                
+                                    <td>${checkDateStatus(item.policy_end_date, 1)}</td>
+                                    <td>
+                                        <div class="btn-group dropdown">
+                                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                            <div class="dropdown-menu dropdown-menu-right">
+                                                <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                                <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
+                                                <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
 
-                    policyTable += `              
+                            // Conditionally render the delete option based on the role
-                                    </div>
+                            if (role != 3 && role != 4) {
-                                </div>
+                                
-                            </td>
+                                policyTable += `
-                        </tr>
+                                                <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item" onclick="removepolicy(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>`;
-                    `;
+                            }
+
+                            policyTable += `              
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                            `;
+  
+                        
+                    }
 
             });
 
@@ -452,9 +534,11 @@
 
 
         $('#table-client-policy').DataTable({
-            paging: true,
+                paging: true,
-            searching: false,
+                searching: true,
-            // ordering: false
+                autoWidth: false,
+                responsive: true,
+
         });
 
 
@@ -658,35 +742,41 @@
 
                     var policy_name_data = `${item.policy_type_name ?? ''}` + ' - ' +  `${item.policy_no ?? ''}`;
 
-                    policyTable += `
+                    if(checkDateStatus(item.policy_end_date) != 'Expired'){
-                        <tr>
+                            
-                            <td>${item.insurer_short} - ${item.insurer_branch_name}</td>
-                            <td>${policy_name_data}</td>
-                            <td>${item.branch_name ? item.branch_name : ' - '}</td>
-                            <td>${tpaValue}</td>
-
-                            <td>${(item.policy_start_date)} / ${(item.policy_end_date)}</td>
-                            <td>${checkDateStatus(item.policy_end_date, 1)}</td>
-                            <td>
-                                <div class="btn-group dropdown">
-                                    <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
-                                    <div class="dropdown-menu dropdown-menu-right">
-                                        <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
-                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
-                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
-
-                    // Conditionally render the delete option based on the role
-                    if (role !== 3 && role !== 4) {
                         policyTable += `
-                                        <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item" onclick="removepolicy(this)"><i class="mdi mdi-delete-outline mr-2 text-muted font-18 vertical-middle"></i>Delete</a>`;
+                                            <tr>
+                                                <td>${item.insurer_short} - ${item.insurer_branch_name}</td>
+                                                <td>${policy_name_data}</td>
+                                                <td>${item.branch_name ? item.branch_name : ' - '}</td>
+                                                <td>${tpaValue}</td>
+
+                                                <td>${(item.policy_start_date)} / ${(item.policy_end_date)}</td>
+                                                <td>${checkDateStatus(item.policy_end_date, 1)}</td>
+                                                <td>
+                                                    <div class="btn-group dropdown">
+                                                        <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                                        <div class="dropdown-menu dropdown-menu-right">
+                                                            <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                                            <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
+                                                            <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
+
+                                        // Conditionally render the delete option based on the role
+                                        if (role != 3 && role != 4) {
+                                            
+                                            
+                                            policyTable += `
+                                                            <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item" onclick="removepolicy(this)"><i class="mdi mdi-delete-outline mr-2 text-muted font-18 vertical-middle"></i>Delete</a>`;
+                                        }
+
+                                        policyTable += `              
+                                                        </div>
+                                                    </div>
+                                                </td>
+                                            </tr>
+                                        `;
                     }
 
-                    policyTable += `              
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
-                    `;
                 });
                 $('#policy_table').append(policyTable);
                 // console.log(policyTable);
@@ -713,6 +803,9 @@
                         //console.log('Unknown error occurred', 'Warning');
                     }
                 }, 1000);
+            },
+            complete :function(){
+                console.log('AJAX request completed');
             }
         });
 
@@ -2286,4 +2379,144 @@
         }, 2000);
     }
 
-</script>
+</script>
+
+
+<script>
+$(document).ready(function () {
+
+        $('#chk-show-expired').on('change', function () {
+
+            const showExpired = $(this).is(':checked');
+
+            let policyTable = '';
+            let data = <?= isset($client_policy) ? json_encode($client_policy) : '[]' ?>;
+            let role = data.role
+            delete data.role;
+
+            console.log("checkbox working");
+
+            $.each(data, function(index, item) {
+                // console.log('step 1');
+                let patternGMC = /gmc/i; // Case insensitive pattern for 'gmc'
+                let patternGPA = /gpa/i; // Case insensitive pattern for 'gpa'
+                let subject = item.policy_type_name;
+
+                //console.log('search terms subject', subject);
+
+                if (patternGMC.test(subject)) {
+                    search_term = 'GMC';
+                } else if (patternGPA.test(subject)) {
+                    search_term = 'GPA';
+                } else {
+                    search_term = subject; // Set default value if neither 'GMC' nor 'GPA' exists
+                }
+   
+                let tpaValue = 'TPA Unavailable';
+
+                if (item.tpa_short && item.tpa_branch_code) {
+                    tpaValue = item.tpa_short + '-' + item.tpa_branch_code;
+                }
+
+                let policy_name_data = `${item.policy_type_name ?? ''}` + ' - ' +  `${item.policy_no ?? ''}`;
+
+                    if(showExpired == true && checkDateStatus(item.policy_end_date) == 'Expired'){
+                           
+
+                        policyTable += `
+                                <tr>
+                                    <td>${item.insurer_short} - ${item.insurer_branch_name}</td>
+                                    <td>${policy_name_data}</td>
+                                    <td>${item.branch_name ? item.branch_name : ' - '}</td>
+                                    <td>${tpaValue}</td>
+                                    <td>${(item.policy_start_date)} / ${(item.policy_end_date)}</td>
+                                
+                                    <td>${checkDateStatus(item.policy_end_date, 1)}</td>
+                                    <td>
+                                        <div class="btn-group dropdown">
+                                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                            <div class="dropdown-menu dropdown-menu-right">
+                                                <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                                <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
+                                                <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
+
+                            // Conditionally render the delete option based on the role
+                            if (role != 3 && role != 4) {
+                                policyTable += `
+                                                <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item" onclick="removepolicy(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>`;
+                            }
+
+                            policyTable += `              
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                            `;
+  
+                        
+                    }
+
+                    if(showExpired == false && checkDateStatus(item.policy_end_date) != 'Expired'){
+                           
+
+                        policyTable += `
+                                <tr>
+                                    <td>${item.insurer_short} - ${item.insurer_branch_name}</td>
+                                    <td>${policy_name_data}</td>
+                                    <td>${item.branch_name ? item.branch_name : ' - '}</td>
+                                    <td>${tpaValue}</td>
+                                    <td>${(item.policy_start_date)} / ${(item.policy_end_date)}</td>
+                                
+                                    <td>${checkDateStatus(item.policy_end_date, 1)}</td>
+                                    <td>
+                                        <div class="btn-group dropdown">
+                                            <a href="javascript: void(0);" class="dropdown-toggle arrow-none btn btn-light btn-sm" data-toggle="dropdown"aria-expanded="false"><i class="mdi mdi-dots-horizontal"></i></a>
+                                            <div class="dropdown-menu dropdown-menu-right">
+                                                <a href="#" data-id="${item.id}" id="${item.policy_id}" class="dropdown-item btnPolicyEdit"><i class="mdi mdi-lead-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit</a>
+                                                <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyMaster" ><i class="mdi mdi-wrench mr-2 text-muted font-18 vertical-middle"></i>Terms</a>
+                                                <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item btnPolicyModel"  data-toggle="modal" data-target="#bs-example-modal-lg"><i class="mdi mdi-book-open mr-2 text-muted font-18 vertical-middle"></i>Rack Rate</a>`;
+
+                            // Conditionally render the delete option based on the role
+                            if (role != 3 && role != 4) {
+                                policyTable += `
+                                                <a href="#" data-id="${item.id}" id="${search_term}" data-typeid="${item.policy_type_id}" class="dropdown-item" onclick="removepolicy(this)"><i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete</a>`;
+                            }
+
+                            policyTable += `              
+                                            </div>
+                                        </div>
+                                    </td>
+                                </tr>
+                            `;
+  
+                        
+                    }
+
+
+
+            });
+
+            const table = $('#table-client-policy').DataTable();
+            table.clear().destroy(); 
+
+            $('#table-client-policy tbody').html(policyTable); // replace tbody content
+
+            $('#table-client-policy').DataTable({
+                paging: true,
+                searching: true,
+                autoWidth: false,
+                responsive: true,
+            });
+
+
+
+
+        });
+
+
+
+});
+</script>
+
+
+

app/Views/layout/header.php

@@ -149,7 +149,7 @@
     <style>
         .nav-bar {
             position: fixed !important;
-            z-index: 2;
+            z-index: 4;
             width: 90%;
             margin-left: 120px !important;
             background: #fff;

app/Views/leads_form_handler.php

@@ -452,6 +452,58 @@ if (isset($selected_lead_type)) {
         $('#salse_person_id').trigger('change');
     }
 
+    // $('#client_name').on('input', generateShortName);
+
+    let shortNameTimer;
+
+    $('#client_name').on('input', function() {
+        clearTimeout(shortNameTimer);
+        shortNameTimer = setTimeout(generateShortName, 200);
+    });
+
+    function generateShortName() {
+        let clientInput = $("#client_name");
+        let shortInput = $("#client_short_name"); 
+        let newClientName = clientInput.val().trim();
+
+        console.log(`LN : NEW - ${newClientName}`);
+        if (newClientName.length == 0) { 
+            shortInput.val('');  
+            return; 
+        }
+
+        let shortName = newClientName.substring(0, 10).replace(/\s+/g, '').toUpperCase();
+        makeUniqueShortName(shortName);
+    }
+
+    function makeUniqueShortName(baseName) {
+        let input = $("#client_short_name")[0]; 
+
+        checkDuplicateTableFieldValue("clients", "short_name", baseName, function(isDuplicate) {
+            if (isDuplicate) {
+                let counter = 1;
+                function tryNext() {
+                    let padded = String(counter).padStart(3, '0'); // 001, 002, 003
+                    let newName = baseName + padded;
+
+                    checkDuplicateTableFieldValue("clients", "short_name", newName, function(exists) {
+                        if (exists) {
+                            counter++;
+                            tryNext();
+                        } else {
+                            $("#client_short_name").val(newName);
+                            validateInput(input, "clients", "short_name");
+                        }
+                    });
+                }
+                tryNext();
+            } else {
+                $("#client_short_name").val(baseName);
+                validateInput(input, "clients", "short_name");
+            }
+        });
+    }
+
     function validateInput(input, table, field){
 
         let client_type = $('#client_type').val();

app/Views/nhance_branch_list.php

@@ -19,10 +19,10 @@
                     </tr> 
                     </thead>                        
                     <tbody>
-                        <?php if(isset($data)) { ?>        
+                        <?php if(isset($data)) { $slno = 1;  ?>        
                         <?php foreach($data as $index => $row) { ?>
                             <tr>
-                                <td class="text-dark">&nbsp;&nbsp;<?= esc($index + 1); ?></td>
+                                <td class="text-center"><?= $slno++; ?></td>
                                 <td><?= $row['branch_name']; ?></td>
                                 <!-- <td>
                                       <span class="<?php if($row['is_active'] == 1){ echo 'badge badge-primary'; }else{ echo 'badge badge-danger'; } ?>">
@@ -254,6 +254,7 @@
                 } else if(type == 'remove'){
                     toastr.success(response.message, 'Success');
                     if(el) $(el).closest('tr').remove();
+                    window.location.reload();
                 } else if(type == 'submit'){
                     toastr.success(response.message, 'Success');
                     var myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));

app/Views/policy_transaction_endorsement_list.php

@@ -327,7 +327,7 @@ table.dataTable thead th {
                         <?php foreach ($endorsement_data_list as $index => $row) { ?>
                             <tr>
                                 <td class="text-center"><?php echo $index + 1; ?></td>
-                                <td><?php echo $issuer[$row['issuer']] ?: 'N/A'; ?></td><!-- Issuer -->
+                                <td><?php echo $issuer[$row['issuer']] ?? 'N/A'; ?></td><!-- Issuer -->
                                 <td><?php echo $row['client_short_name'] ?: 'N/A'; ?></td><!-- Client -->
                                 <td><?php echo $row['client_branch_name'] ?: 'N/A'; ?></td><!-- Branch -->
                                 <td><?php echo $row['insurer_short_name'] ?: 'N/A'; ?></td><!-- Insurer -->
@@ -346,6 +346,9 @@ table.dataTable thead th {
                                             <a class="dropdown-item btnEdit" data-id="<?= $row['id']; ?>" onclick="getPolicyTransactionDataForEndorsementEdit('<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>')">
                                                 <i class="mdi mdi-pencil mr-2 text-muted font-18 vertical-middle"></i>Edit
                                             </a>
+                                            <a class="dropdown-item delete" data-id="<?= $row['id'];?>" onclick="removePolicyTransaction(this, '<?= htmlspecialchars($row['id'], ENT_QUOTES) ?>', <?= $row['policy_type_id'] ?>)">
+                                                <i class="mdi mdi-delete mr-2 text-muted font-18 vertical-middle"></i>Delete
+                                            </a>
                                         </div>
                                     </div>
                                 </td>
@@ -717,6 +720,7 @@ table.dataTable thead th {
                 'data-iep': item.iep,
                 'data-itp': item.itp,
                 'data-bap': item.bap,
+                'data-allocg': item.allocg,
                 'data-tpa': item.tpa_branch_id + '-' + item.tpa_id,
                 'data-ptid': item.policy_type_id,
             });
@@ -978,4 +982,41 @@ table.dataTable thead th {
             $('#date_div').hide()
         }
     }
+
+    function removePolicyTransaction(input, pt_id, policy_type_id) {
+
+        let string = "Do you want to delete this transaction?";
+        if(policy_type_id > 7){
+            string = "Do you want to delete this transaction? Deleting this will also remove the linked CRM policy entry.";
+        }
+
+        confirmActionSweertAlert(string, "Yes, Proceed!", "No, Cancel").then((confirmed) => {
+            if (confirmed) {
+
+                let type = '1';
+                let url = '<?= base_url('policy_tranction/inception/removePolicyTransaction/') ?>' + pt_id + '/' + type;
+
+                // Include `pt_id` in the AJAX request if necessary
+                let requestData = { 
+                    pt_id: pt_id ,
+                    type: 1 ,
+                };
+
+                sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
+                    console.log('Data fetched successfully:', response);
+
+                    if (response.status === true) {
+                        toastr.success(response.message, 'SUCCESS');
+                        window.location.reload();
+                    } else {
+                        toastr.warning(response.message, 'WARNING');
+                    }
+                }, function(xhr, status, error) {
+                    console.error('Error fetching data:', error);
+                    console.error(xhr.responseText);
+                });
+            }
+        });
+    }
+
 </script>

app/Views/policy_transaction_inception_form.php

@@ -413,210 +413,208 @@
                         <!-- Pre sales Row -->
                         <div class="row" id="pre_sales_row">
                             <div class="col-md-12">
-                                
+                                <div id="accordion_1" class="mb-0">
-                                    <div id="accordion_1" class="mb-0">
+                                    <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
-                                        <label id="policyAccordion" class="m-1 d-flex justify-content-between align-items-center">
+                                                                <span class="font-color-black">Pre Sales</span>
-                                                                    <span class="font-color-black">Pre Sales</span>
+                                                                <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo"
-                                                                    <a id="toggleIcon" class="text-dark float-right" data-toggle="collapse" href="#collapseTwo"
+                                                                    aria-expanded="true">
-                                                                        aria-expanded="true">
+                                                                    <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
-                                                                        <i id="icon" class="mdi mdi-chevron-up mr-1 text-primary" style="font-size: 28px;"></i>
+                                                                </a>
-                                                                    </a>
+                                    </label>
-                                        </label>
+                                    <div class="card mb-1">
-                                        <div class="card mb-1">
+                                        <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_1">
-                                          <div id="collapseTwo" class="collapse show" aria-labelledby="headingOne" data-parent="#accordion_1">
+                                        <div class="card-body">
-                                            <div class="card-body">
+                                            <div class="row" id="policyholdernamediv" style="display: none;">                                        
-                                                <div class="row" id="policyholdernamediv" style="display: none;">                                        
+                                                <div class="form-group col-md-3">
-                                                    <div class="form-group col-md-3">
+                                                    <label for="bp_igst">Policyholder Name</label>
-                                                        <label for="bp_igst">Policyholder Name</label>
+                                                    <input id="policy_holder_name" value="" type="text" class="form-control" name="policy_holder_name">
-                                                        <input id="policy_holder_name" value="" type="text" class="form-control" name="policy_holder_name">
+                                                </div>
-                                                    </div>
 
-                                                    <div class="form-group col-md-3">
+                                                <div class="form-group col-md-3">
-                                                        <label class="switch" style="position: relative;top: 30px;left: 4px;">
+                                                    <label class="switch" style="position: relative;top: 30px;left: 4px;">
-                                                            <input id="same_as_proposer" type="checkbox" name="same_as_proposer" checked>
+                                                        <input id="same_as_proposer" type="checkbox" name="same_as_proposer" checked>
-                                                            <span class="slider round" style="height: 27px;"></span>
+                                                        <span class="slider round" style="height: 27px;"></span>
-                                                        </label>
+                                                    </label>
 
-                                                        <label for="same_as_proposer"
+                                                    <label for="same_as_proposer"
-                                                            style="position: relative;top: 31px;left: 17px;">Insured (Same as Proposer)</label>
+                                                        style="position: relative;top: 31px;left: 17px;">Insured (Same as Proposer)</label>
+                                                </div>
+                                            </div>
+                                            <div class="row" id="family_details" style="display: none;">
+                                                <div class="col-md-12">
+                                                    <div class="form-section">
+                                                        <h4>Family details</h4>
+                                                        <div id="dynamic-form-container-for-insured"></div>
                                                     </div>
                                                 </div>
-                                                <div class="row" id="family_details" style="display: none;">
+                                            </div> 
-                                                    <div class="col-md-12">
+                                            <hr>
-                                                        <div class="form-section">
+                                            <div class="row">
-                                                            <h4>Family details</h4>
-                                                            <div id="dynamic-form-container-for-insured"></div>
-                                                        </div>
-                                                    </div>
-                                                </div> 
-                                                <hr>
-                                                <div class="row">
 
-                                                    <div class="form-group col-md-3">
+                                                <div class="form-group col-md-3">
-                                                        <label for="addon_policy"> Business Type <span id="base_danger"
+                                                    <label for="addon_policy"> Business Type <span id="base_danger"
-                                                                class="text-danger">*</span></label>
+                                                            class="text-danger">*</span></label>
-                                                        <select class="form-control" id="issue_type" name="issue_type" required>
+                                                    <select class="form-control" id="issue_type" name="issue_type" required>
-                                                            <option value="" selected>Select Issue Type</option>
+                                                        <option value="" selected>Select Issue Type</option>
-                                                            <?php
+                                                        <?php
-                                                                if (isset($issuing_type) && count($issuing_type)) {
+                                                            if (isset($issuing_type) && count($issuing_type)) {
-                                                                    foreach ($issuing_type as $key => $value) {
+                                                                foreach ($issuing_type as $key => $value) {
-                                                                        echo "<option value=" . $key . ">" . $value . "</option>";
+                                                                    echo "<option value=" . $key . ">" . $value . "</option>";
+                                                                }
+                                                            }
+                                                        ?>
+                                                    </select>
+                                                </div>
+
+                                                <div class="form-group col-md-3">
+                                                    <label for="bp_gst_amt">Revenue Type</label>
+                                                    <select id="revenue_type" class="form-control" name="revenue_type">
+                                                        <option value="">Select</option>
+                                                        <option value="NA">NA</option>
+                                                        <option value="EA">EA</option>
+                                                        <option value="EANR">EANR</option>
+                                                    </select>
+                                                </div>
+
+                                                <div class="form-group col-md-3" id="renewal" style="display: none;">
+                                                    <label for="addon_policy"> Renewal Source Policy <span id="base_danger"class="text-danger"></span></label>
+                                                    <select class="form-control" id="source_client_policy_id"name="source_client_policy_id" onchange="setRenewalPolicyData(this)">
+                                                        <option value="" selected>Select Renewal Source Policy</option>
+                                                    </select>
+                                                </div>
+
+                                                <div class="form-group col-md-3 sded_dates" style="display: none;">
+                                                    <label for="addon_policy">Policy Start Date<span id="base_danger"
+                                                            class="text-danger">*</span></label>
+                                                    <input type="text" class="form-control" id="renewal_policy_start_date"
+                                                        name="renewal_policy_start_date" placeholder="DD/MM/YYYY" >
+                                                </div>
+
+                                                <div class="form-group col-md-3 sded_dates" style="display: none;">
+                                                    <label for="addon_policy">Policy End Date<span id="base_danger"
+                                                            class="text-danger">*</span></label>
+                                                    <input type="text" class="form-control" id="renewal_policy_end_date"
+                                                        name="renewal_policy_end_date" placeholder="DD/MM/YYYY" >
+                                                </div>
+
+                                                <div class="form-group col-md-3 roll_div" style="display: none;">
+                                                    <label for="rollover_date">Date of Expiring Policy for Rollover</label>
+                                                    <input id="rollover_date" value="" type="text" class="form-control" name="rollover_date" placeholder="DD/MM/YYYY">
+                                                </div>
+
+                                                <div class="form-group col-md-3">
+                                                    <label for="ref">Reference</label>
+                                                    <input id="ref" value="" type="text" class="form-control" name="ref">
+                                                </div>
+
+                                                <!-- <div class="form-group col-md-3">
+                                                    <label for="addon_policy"> Status <span id="base_danger"class="text-danger">*</span></label>
+                                                    <select class="form-control" id="policy_status" name="status" required>
+                                                        <option value="" selected>Select Status</option>
+                                                        <?php
+                                                                if (isset($policy_status) && count($policy_status)) {
+                                                                    foreach ($policy_status as $key => $value) {
+                                                                        if($key == 'pending'){
+                                                                            echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                                        }else{
+                                                                            echo "<option value=" . $key . ">" . $value . "</option>";
+                                                                        }
                                                                     }
                                                                 }
                                                             ?>
-                                                        </select>
+                                                    </select>
-                                                    </div>
+                                                </div> -->
 
-                                                    <div class="form-group col-md-3">
+                                                <!-- <div class="form-group col-md-3">
-                                                        <label for="bp_gst_amt">Revenue Type</label>
+                                                    <label for="ppteam">PP Team</label>
-                                                        <select id="revenue_type" class="form-control" name="revenue_type">
+                                                    <select class="form-control" id="ppteam" name="ppteam">
-                                                            <option value="">Select</option>
+                                                        <option value="">Select PP Team</option>
-                                                            <option value="NA">NA</option>
+                                                        <?php if (isset($ppTeamsData)) { ?>
-                                                            <option value="EA">EA</option>
+                                                            <?php foreach ($ppTeamsData as $value) { ?>
-                                                            <option value="EANR">EANR</option>
+                                                                <option value="<?= $value['id'];?>">
-                                                        </select>
+                                                                    <?= $value['first_name'];?>
-                                                    </div>
-
-                                                    <div class="form-group col-md-3" id="renewal" style="display: none;">
-                                                        <label for="addon_policy"> Renewal Source Policy <span id="base_danger"class="text-danger"></span></label>
-                                                        <select class="form-control" id="source_client_policy_id"name="source_client_policy_id" onchange="setRenewalPolicyData(this)">
-                                                            <option value="" selected>Select Renewal Source Policy</option>
-                                                        </select>
-                                                    </div>
-
-                                                    <div class="form-group col-md-3 sded_dates" style="display: none;">
-                                                        <label for="addon_policy">Policy Start Date<span id="base_danger"
-                                                                class="text-danger">*</span></label>
-                                                        <input type="text" class="form-control" id="renewal_policy_start_date"
-                                                            name="renewal_policy_start_date" placeholder="DD/MM/YYYY" >
-                                                    </div>
-
-                                                    <div class="form-group col-md-3 sded_dates" style="display: none;">
-                                                        <label for="addon_policy">Policy End Date<span id="base_danger"
-                                                                class="text-danger">*</span></label>
-                                                        <input type="text" class="form-control" id="renewal_policy_end_date"
-                                                            name="renewal_policy_end_date" placeholder="DD/MM/YYYY" >
-                                                    </div>
-
-                                                    <div class="form-group col-md-3 roll_div" style="display: none;">
-                                                        <label for="rollover_date">Date of Expiring Policy for Rollover</label>
-                                                        <input id="rollover_date" value="" type="text" class="form-control" name="rollover_date" placeholder="DD/MM/YYYY">
-                                                    </div>
-
-                                                    <div class="form-group col-md-3">
-                                                        <label for="ref">Reference</label>
-                                                        <input id="ref" value="" type="text" class="form-control" name="ref">
-                                                    </div>
-
-                                                    <div class="form-group col-md-3">
-                                                        <label for="addon_policy"> Status <span id="base_danger"class="text-danger">*</span></label>
-                                                        <select class="form-control" id="policy_status" name="status" required>
-                                                            <option value="" selected>Select Status</option>
-                                                            <?php
-                                                                    if (isset($policy_status) && count($policy_status)) {
-                                                                        foreach ($policy_status as $key => $value) {
-                                                                            if($key == 'pending'){
-                                                                                echo "<option value=" . $key . " selected>" . $value . "</option>";
-                                                                            }else{
-                                                                                echo "<option value=" . $key . ">" . $value . "</option>";
-                                                                            }
-                                                                        }
-                                                                    }
-                                                                ?>
-                                                        </select>
-                                                    </div>
-
-                                                    <!-- <div class="form-group col-md-3">
-                                                        <label for="ppteam">PP Team</label>
-                                                        <select class="form-control" id="ppteam" name="ppteam">
-                                                            <option value="">Select PP Team</option>
-                                                            <?php if (isset($ppTeamsData)) { ?>
-                                                                <?php foreach ($ppTeamsData as $value) { ?>
-                                                                    <option value="<?= $value['id'];?>">
-                                                                        <?= $value['first_name'];?>
-                                                                    </option>
-                                                                <?php } ?>
-                                                            <?php } ?>
-                                                        </select>   
-                                                    </div> -->
-
-                                                    <!-- <div class="form-group col-md-3">
-                                                        <label for="remark">Remarks</label>
-                                                        <textarea id="remark" class="form-control" name="remarks" rows="1"></textarea>
-                                                    </div> -->
-
-                                                    <!-- <div class="form-group col-md-6">
-                                                        <label for="listed_insurers">Shortlisted Insurers</label>
-                                                        <select class="form-control" id="listed_insurers" name="listed_insurers"  multiple>
-                                                            <option value=""></option>
-                                                            <?php foreach ($insurer_branch as $value) { ?>
-                                                                <option value="<?= $value['id'] . '-' . $value['insurer_id'] ?>" data-id="<?= $value['insurer_id'] ?>">
-                                                                    <?= $value['insurer_name'] . '-' . $value['branch_code'] ?>
                                                                 </option>
                                                             <?php } ?>
-                                                        </select>                                        
+                                                        <?php } ?>
-                                                    </div> -->
+                                                    </select>   
+                                                </div> -->
 
-                                                </div>
+                                                <!-- <div class="form-group col-md-3">
-                                                <!-- <hr> -->
+                                                    <label for="remark">Remarks</label>
-                                                <div class="row">
+                                                    <textarea id="remark" class="form-control" name="remarks" rows="1"></textarea>
-                                                    <!-- <div class="form-group col-md-3">
+                                                </div> -->
-                                                        <label for="addon_policy"> Status <span id="base_danger"class="text-danger">*</span></label>
+
-                                                        <select class="form-control" id="policy_status" name="status" required>
+                                                <!-- <div class="form-group col-md-6">
-                                                            <option value="" selected>Select Status</option>
+                                                    <label for="listed_insurers">Shortlisted Insurers</label>
-                                                            <?php
+                                                    <select class="form-control" id="listed_insurers" name="listed_insurers"  multiple>
-                                                                    if (isset($policy_status) && count($policy_status)) {
+                                                        <option value=""></option>
-                                                                        foreach ($policy_status as $key => $value) {
+                                                        <?php foreach ($insurer_branch as $value) { ?>
-                                                                            if($key == 'pending'){
+                                                            <option value="<?= $value['id'] . '-' . $value['insurer_id'] ?>" data-id="<?= $value['insurer_id'] ?>">
-                                                                                echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                                <?= $value['insurer_name'] . '-' . $value['branch_code'] ?>
-                                                                            }else{
+                                                            </option>
-                                                                                echo "<option value=" . $key . ">" . $value . "</option>";
+                                                        <?php } ?>
-                                                                            }
+                                                    </select>                                        
+                                                </div> -->
+
+                                            </div>
+                                            <!-- <hr> -->
+                                            <div class="row">
+                                                <!-- <div class="form-group col-md-3">
+                                                    <label for="addon_policy"> Status <span id="base_danger"class="text-danger">*</span></label>
+                                                    <select class="form-control" id="policy_status" name="status" required>
+                                                        <option value="" selected>Select Status</option>
+                                                        <?php
+                                                                if (isset($policy_status) && count($policy_status)) {
+                                                                    foreach ($policy_status as $key => $value) {
+                                                                        if($key == 'pending'){
+                                                                            echo "<option value=" . $key . " selected>" . $value . "</option>";
+                                                                        }else{
+                                                                            echo "<option value=" . $key . ">" . $value . "</option>";
                                                                         }
                                                                     }
-                                                                ?>
+                                                                }
-                                                        </select>
+                                                            ?>
-                                                    </div> -->
+                                                    </select>
+                                                </div> -->
 
-                                                    <!-- <div class="form-group col-md-3">
+                                                <!-- <div class="form-group col-md-3">
-                                                        <label for="bp_cgst">Latest Action Date</label>
+                                                    <label for="bp_cgst">Latest Action Date</label>
-                                                        <input id="last_action_date" type="text" class="form-control" name="last_action_date" placeholder="DD/MM/YYYY">
+                                                    <input id="last_action_date" type="text" class="form-control" name="last_action_date" placeholder="DD/MM/YYYY">
-                                                    </div> -->
+                                                </div> -->
 
-                                                    <!-- <div class="form-group col-md-3">
+                                                <!-- <div class="form-group col-md-3">
-                                                        <label for="fund_received">Fund Recd / Sent to Insurer</label>
+                                                    <label for="fund_received">Fund Recd / Sent to Insurer</label>
-                                                        <input id="fund_received" value="" type="text" class="form-control" name="fund_received">
+                                                    <input id="fund_received" value="" type="text" class="form-control" name="fund_received">
-                                                    </div> -->
+                                                </div> -->
 
-                                                    <!-- <div class="form-group col-md-3">
+                                                <!-- <div class="form-group col-md-3">
-                                                        <label class="switch" style="position: relative;top: 32px;left: 20px;">
+                                                    <label class="switch" style="position: relative;top: 32px;left: 20px;">
-                                                            <input id="policy_with_corr" type="checkbox" name="policy_with_corr">
+                                                        <input id="policy_with_corr" type="checkbox" name="policy_with_corr">
-                                                            <span class="slider round" style="height: 27px;"></span>
+                                                        <span class="slider round" style="height: 27px;"></span>
-                                                        </label>
+                                                    </label>
 
-                                                        <label for="policy_with_corr" style="position: relative;top: 33px;left: 25px;"> Policy with Correction</label>
+                                                    <label for="policy_with_corr" style="position: relative;top: 33px;left: 25px;"> Policy with Correction</label>
-                                                    </div> -->
+                                                </div> -->
 
-                                                    <!-- <div class="form-group col-md-3">
+                                                <!-- <div class="form-group col-md-3">
-                                                        <label class="switch" style="position: relative;top: 32px;left: 20px;">
+                                                    <label class="switch" style="position: relative;top: 32px;left: 20px;">
-                                                            <input id="is_cd_reduce_from_bds" type="checkbox" name="is_cd_reduce_from_bds">
+                                                        <input id="is_cd_reduce_from_bds" type="checkbox" name="is_cd_reduce_from_bds">
-                                                            <span class="slider round" style="height: 27px;"></span>
+                                                        <span class="slider round" style="height: 27px;"></span>
-                                                        </label>
+                                                    </label>
 
-                                                        <label for="is_cd_reduce_from_bds" style="position: relative;top: 33px;left: 25px;"> Make Entry in CD  &nbsp;&nbsp; <i class="mdi mdi-information-outline info-icon" data-toggle="tooltip" title="Enabling this will affect ( Credit/Debit ) the CD transaction. ( GMC, GPA, EDLI and GTLI,  CD transaction from CRM )"></i>
+                                                    <label for="is_cd_reduce_from_bds" style="position: relative;top: 33px;left: 25px;"> Make Entry in CD  &nbsp;&nbsp; <i class="mdi mdi-information-outline info-icon" data-toggle="tooltip" title="Enabling this will affect ( Credit/Debit ) the CD transaction. ( GMC, GPA, EDLI and GTLI,  CD transaction from CRM )"></i>
-                                                        </label>
+                                                    </label>
-                                                    </div> -->
+                                                </div> -->
 
-                                                    <!-- <div class="form-group col-md-3 current_date" style="display: none;">
+                                                <!-- <div class="form-group col-md-3 current_date" style="display: none;">
-                                                        <label for="bp_igst">Process Start Date</label>
+                                                    <label for="bp_igst">Process Start Date</label>
-                                                        <input id="process_start_date" type="text" class="form-control" name="process_start_date" placeholder="DD/MM/YYYY">
+                                                    <input id="process_start_date" type="text" class="form-control" name="process_start_date" placeholder="DD/MM/YYYY">
-                                                    </div> -->
+                                                </div> -->
-                                                </div>
                                             </div>
-                                          </div>
+                                        </div>
                                         </div>
                                     </div>
-                                
+                                </div>
                             </div>
                         </div> 
                         
@@ -957,7 +955,7 @@
 
                         </div> <!-- sales_row div closed here -->
                                                 
-                        <div class="form-group text-right mt-1 m-b-0" id="submitButton">
+                        <div class="form-group text-right mt-2 m-b-0" id="submitButton">
                             <button type="submit" class="btn btn-primary waves-effect waves-light mr-1"
                                 id="btnSubmit">Submit</button>
                         </div>
@@ -1132,6 +1130,17 @@
 
 <script>
 
+    $(document).ready(function(){
+
+        $('#sales_row').show();
+        $('#policy_no').prop('required', true);
+        $('#policy_issue_date').prop('required', true);
+        $('#policy_start_date').prop('required', true);
+        $('#policy_end_date').prop('required', true);
+        $('.follow_insurer').prop('required', true);
+
+    })
+
     $("#infoIcon").click(function() {
         var policyTransactionPK = $('#policy_tranction_primarykey').val();
         getDataForInfo(policyTransactionPK, function(data) {
@@ -1329,6 +1338,7 @@
     let isClientFormSubmitting = false;
     let isVehicleFormSubmitting = false;
     var insurer_count_array = [];
+    var redirect_url = '<?= base_url('policy_tranction/inception/list') ?>';
 
     $(document).ready(function(){
 
@@ -1495,7 +1505,7 @@
             $('#client_row_div').empty();
             $('#actcual_clients').show();
 
-            let status = $('#policy_status').val();
+            let status = $('#policy_status').val(); // REF : Venkatesh R - Status html Remove. Doubt here ask him - Q: why we need this? remove pannava ?.
 
             
             console.log(client_id);
@@ -1545,9 +1555,9 @@
             }else{
                 $('#pre_sales_row').show();
                 $('#submitButton').show();
-                if(status == "completed"){
+                // if(status == "completed"){
-                    $('#sales_row').show();
+                    $('#sales_row').show(); // REF : Venkatesh R - Status html Remove. so i removed the 'if'.
-                }
+                // }
             }
         })
 
@@ -1650,9 +1660,9 @@
             let status = $('#policy_status').val();
             $('#pre_sales_row').show();
             $('#submitButton').show();
-            if(status == "completed"){
+            // if(status == "completed"){
-                $('#sales_row').show();
+                $('#sales_row').show(); // REF : Venkatesh R - Status html Remove. so i removed the 'if'.
-            }
+            // }
 
             var client_type = $('#client_type').val();
             var value = $(this).val();
@@ -3548,7 +3558,7 @@
         if (!isValid) {
             $('#inception_form_id').find('input, select, textarea').each(function() {
                 if ($(this).parsley().isValid() === false && !$(this).val()) {
-                    console.log('Empty field ID:', this.id);
+                    console.log(' :) Empty field ID:', this.id);
                 }
             });
             console.log('Form is Empty', 'Warning');
@@ -3599,10 +3609,7 @@
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
 
-        var formData = new FormData($('#inception_form_id')[0]);
+        var formData = new FormData($('#inception_form_id')[0]);        
-
-        console.log(formData);
-        
 
         const jsonString = JSON.stringify(shortListedInsurer);
         // console.log('jsonString', jsonString);
@@ -3649,7 +3656,7 @@
                     toastr.success(res.message, 'Success');
 
                     show_list_hide_add();
-                    window.location.href = '<?= base_url('policy_tranction/inception/list') ?>';
+                    window.location.href = redirect_url;
 
 
                     $('#policy_tranction_primarykey').val(res.pt_id);
@@ -5027,6 +5034,12 @@
         const params = new URLSearchParams(window.location.search);
         const pt_id = params.get('pt_id') ?? 0;
 
+        // ✅ Get the previous page URL
+        const previousUrl = document.referrer || '';
+
+        console.log("PT ID:", pt_id);
+        console.log("Previous Page URL:", previousUrl);
+
         if (pt_id != 0) {
             hide_list_show_add();
             setTimeout(() => 
@@ -5036,6 +5049,11 @@
             show_list_hide_add();
         }
 
+        if(previousUrl != "" && pt_id != 0){
+            redirect_url = previousUrl;
+            $('#btnAdd').attr('href', previousUrl);
+        }
+
         console.log('getURLParamsForReport pt_id', pt_id);  // Retain the log if necessary
     }
 
@@ -5118,11 +5136,11 @@
     function checkCDAmountForBasePremium(input) {
 
         console.log('#################################### Check CD Amount For Base Premium ####################################');
+        console.log(input)
 
         let policy_type_id = $('#policy_type_id').val();
         console.log("policy_type_id ", policy_type_id);
 
-        console.log(input)
         let client_type = $('#client_type').val();
         console.log('client type', client_type);
 
@@ -5390,9 +5408,9 @@
         let status = $('#policy_status').val();
         $('#pre_sales_row').show();
         $('#submitButton').show();
-        if(status == "completed"){
+        // if(status == "completed"){
-            $('#sales_row').show();
+            $('#sales_row').show();//  REF : Venkatesh R - Status html Remove. so i removed the 'if'.
-        }
+        // }
     }
 
     function removeClientForm(){
@@ -5400,9 +5418,9 @@
         let status = $('#policy_status').val();
         $('#pre_sales_row').show();
         $('#submitButton').show();
-        if(status == "completed"){
+        // if(status == "completed"){
-            $('#sales_row').show();
+            $('#sales_row').show();//  REF : Venkatesh R - Status html Remove. so i removed the 'if'.
-        }
+        // }
     }
 
     function getVehicleFormData() {
@@ -5499,9 +5517,9 @@
             let status = $('#policy_status').val();
             $('#pre_sales_row').show();
             $('#submitButton').show();
-            if(status == "completed"){
+            // if(status == "completed"){
-                $('#sales_row').show();
+                $('#sales_row').show(); // REF : Venkatesh R - Status html Remove. so i removed the 'if'.
-            }
+            // }
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
@@ -5565,9 +5583,9 @@
             let status = $('#policy_status').val();
             $('#pre_sales_row').show();
             $('#submitButton').show();
-            if(status == "completed"){
+            // if(status == "completed"){
-                $('#sales_row').show();
+                $('#sales_row').show(); // REF : Venkatesh R - Status html Remove. so i removed the 'if' Submit la locked. "Empty field ID: Empty field ID: policy_issue_date"
-            }
+            // }
 
         }, function(xhr, status, error) {
             console.error('Error fetching data:', error);
@@ -5616,7 +5634,6 @@
                             <div class="form-group col-md-4">
                                 <label for="modal_vehicle_no">
                                     Vehicle No 
-                                    <span class="text-danger">*</span> 
                                     <small style="font-size: x-small;">( Normal: AA##AA#### | Bharat: ##BH####AA )</small>
                                 </label>
                                 <div class="vehicle-input-wrapper">
@@ -5640,6 +5657,20 @@
                                 </div>
                             </div>
 
+                            <div class="form-group col-md-3">
+                                <label for="rto_id">RTO</label>
+                                <select class="form-control readonly-color readonly-select" id="rto_id" name="rto_id" style="appearance:none;-webkit-appearance:none;-moz-appearance:none;cursor:not-allowed;">
+                                    <option value=""></option>
+                                    <?php
+                                        if (isset($rto_details) && count($rto_details)) {
+                                            foreach ($rto_details as $key => $value) {
+                                                echo '<option value="' . $value['id'] . '" data-state="' . $value['rto_state'] . '" data-code="' . $value['rto_code'] . '">' . $value['rto_name'] . '</option>';                                                
+                                            }
+                                        }
+                                    ?>
+                                </select>
+                            </div>
+
                             <div class="form-group col-md-3">
                                 <label for="rc">Chassis No</label>
                                 <input type="text" class="form-control" id="rc" name="rc"
@@ -6008,6 +6039,9 @@
                     // resultDiv.classList.add('show');
                     $('#vehicle_no_validation').val('1');
                 }
+
+                // call here
+                autoFetchRtoName(input);
             }
 
             // Custom Parsley validator for vehicle format
@@ -6338,5 +6372,32 @@
         console.log("✅ total[] changed:", val);
     });
 
+    function autoFetchRtoName(val) {
+        console.log(`i am here ${val}`);
+        val = val.toUpperCase().trim(); 
+
+        let stateCode = val.slice(0, 2); // 1st 2 here i am split the state code
+        let numberCode = val.slice(2, 4); // 2nd 2 here i am split the number code 
+
+        console.log(`Ln ST: ${stateCode} | NC: ${numberCode}`);
+
+        let matched = false;
+
+        $('#rto_id option').each(function() {
+            let optionState = $(this).attr('data-state');
+            let optionCode = $(this).attr('data-code');
+            console.log(`Ln optionState : ${optionState} | optionCode : ${optionCode}`);
+
+            if (stateCode === optionState && numberCode === optionCode) {
+                $('#rto_id').val($(this).val()).trigger('change'); // ✅ select it
+                matched = true;
+                return false; // break the loop
+            }
+        });
+
+        if (!matched) {
+            $('#rto_id').val('').trigger('change'); // reset select
+        }
+    }
 
 </script>

app/Views/policy_transaction_inception_list.php

@@ -570,6 +570,7 @@ $(document).ready(function() {
                         className: 'btn app-btn-primary  mr-2',
                         action: function (e, dt, node, config) {
                             hide_list_show_add();
+                            addInsurerColumn()  ;
                         }
                     },
                     {
@@ -806,9 +807,11 @@ function appendVehicles(data, vehicle_id = null)
     }));
 
     $.each(data, function(index, item) {
+        var displayValue = item.vehicle_no ? item.vehicle_no : item.rc;
+        var dbValue = item.id
         var option = $('<option>', {
-            value: item.id,
+            value: dbValue,
-            text: item.vehicle_no ?? item.rc,
+            text: displayValue,
             'data-cid': item.owner,
             'data-bid': item.branch_id,
             'data-cty': item.client_type,

app/Views/report_bds.php

@@ -79,36 +79,36 @@ table.dataTable tbody td {
                     <thead class="bg-light">
                         <tr>
                             <th>S. No</th>
-                            <th>User</th>
+                            <th style="display: none;">User</th>
                             <th>Month</th>
-                            <th>Business Type</th>
+                            <!-- <th style="display: none;">Business Type</th> -->
-                            <th>Client Type</th>
+                            <th style="display: none;">Client Type</th>
                             <th>Insured Name</th>
                             <th>Policy/<br>Endorsement</th>
                             <th>Policy Type</th>
-                            <th>BAP Group</th>
+                            <th style="display: none;">BAP Group</th>
-                            <th>Vehicle Number</th>
+                            <th style="display: none;">Vehicle Number</th>
                             <th>Policy No</th>
                             <th>Endorsement No</th>
-                            <th>Insurer Name</th>
+                            <!-- <th style="display: none;">Insurer Name</th> -->
                             <th>Insurer Branch</th>
-                            <th>TPA</th>
+                            <!-- <th style="display: none;">TPA</th> -->
-                            <th>Endorsement <br> Effective Date</th>
+                            <th style="display: none;">Endorsement <br> Effective Date</th>
-                            <th>Policy <br> Effective Date</th>
+                            <th style="display: none;">Policy <br> Effective Date</th>
-                            <th>Policy <br> Expiry Date</th>
+                            <th style="display: none;">Policy <br> Expiry Date</th>
-                            <th>Reference</th>
+                            <th style="display: none;">Reference</th>
-                            <th>Remarks</th>
+                            <th style="display: none;">Remarks</th>
-                            <th>Base Premium</th>
+                            <th>BP Premium</th>
-                            <th>Terrorism/TP</th>
+                            <th>TP/Ter Premium</th>
-                            <th>Premium <br> (without GST)</th>
+                            <th style="display: none;">Premium <br> (without GST)</th>
-                            <th>GST @ 18%</th>
+                            <!-- <th style="display: none;">GST @ 18%</th> -->
                             <th>Total Premium</th>
-                            <th>Base <br> Revenue %</th>
+                            <th>BP %</th>
-                            <th>TP / Terrorism <br> Revenue %</th>
+                            <th>TP/Ter %</th>
-                             <th>Rewards</th>
+                            <th style="display: none;">Rewards</th>
-                            <th>Total IRDA <br> Revenue INR</th>
+                            <th>Agreed Amount</th>
-                            <th>Billed Amount</th>
+                            <th>Invoiced Amount</th>
-                            <th>UnBilled Amount</th>
+                            <th>Outstanding Amount</th>
                            
                         </tr>
                     </thead>
@@ -116,34 +116,40 @@ table.dataTable tbody td {
                         <?php if (isset($report_list)) { ?>
                         <?php foreach($report_list as $index => $row){ ?>
                         <tr>
-                            <td><?= $index + 1 ?></td>
+                            <td><?= $index + 1 ?> &nbsp; <a href="<?php
-                            <td><?php echo $row['user_name'] ?: 'N/A'; ?></td>
+                                        if($row['action_type'] == "inception"){
+                                            echo base_url('policy_tranction/inception/list') . '?pt_id=' . $row['id'] ;
+                                        }else{
+                                            echo base_url('policy_tranction/endorsement/list') . '?pt_id=' . $row['id'] ;
+                                        }
+                                ?>" class="mdi mdi-pencil" ></a> </td>
+                            <td style="display: none;"><?php echo $row['user_name'] ?: 'N/A'; ?></td>
                             <td><?php echo $row['policy_issue_month'] ?: 'N/A'; ?></td>
-                            <td><?php echo $row['revenue_type'] ?: 'N/A'; ?></td>
+                            <!-- <td style="display: none;"><?php echo $row['revenue_type'] ?: 'N/A'; ?></td> -->
-                            <td><?php echo $row['client_type'] ?: 'N/A'; ?></td>
+                            <td style="display: none;"><?php echo $row['client_type'] ?: 'N/A'; ?></td>
                             <td><?php echo $row['client_name'] ?: 'N/A'; ?></td>
                             <td><?php echo $row['action_type'] ?: 'N/A'; ?></td>
                             <td><?php echo $row['policy_type'] ?: 'N/A'; ?></td>
-                            <td><?php echo $row['bap'] ?: 'N/A'; ?></td>
+                            <td style="display: none;"><?php echo $row['bap'] ?: 'N/A'; ?></td>
-                            <td><?php echo $row['vehicle_no'] ?: 'N/A'; ?></td>
+                            <td style="display: none;"><?php echo $row['vehicle_no'] ?: 'N/A'; ?></td>
                             <td><?php echo $row['policy_no'] ?: 'N/A'; ?></td>
                             <td><?php echo $row['endorsement_no'] ?: 'N/A'; ?></td>
-                            <td><?php echo $row['insurer_name'] ?: 'N/A'; ?> </td>
+                            <!-- <td style="display: none;"><?php echo $row['insurer_name'] ?: 'N/A'; ?> </td> -->
                             <td><?php echo $row['insurer_branch_name'] ?: 'N/A'; ?></td>
-                            <td><?php echo $row['tpa_name']; ?></td>
+                            <!-- <td style="display: none;"><?php echo $row['tpa_name']; ?></td> -->
-                            <td><?php echo empty($row['endorse_eff_date']) ? 'N/A' : date('d/m/Y', strtotime($row['endorse_eff_date'])) ?></td>
+                            <td style="display: none;"><?php echo empty($row['endorse_eff_date']) ? 'N/A' : date('d/m/Y', strtotime($row['endorse_eff_date'])) ?></td>
-                            <td><?php echo empty($row['policy_start_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_start_date'])); ?></td>
+                            <td style="display: none;"><?php echo empty($row['policy_start_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_start_date'])); ?></td>
-                            <td><?php echo empty($row['policy_end_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_end_date'])); ?></td>
+                            <td style="display: none;"><?php echo empty($row['policy_end_date']) ? 'N/A' : date('d/m/Y', strtotime($row['policy_end_date'])); ?></td>
-                            <td><?php echo $row['ref'] ?: 'N/A'; ?></td>
+                            <td style="display: none;"><?php echo $row['ref'] ?: 'N/A'; ?></td>
-                            <td><?php echo $row['remarks'] ?: 'N/A'; ?></td>
+                            <td style="display: none;"><?php echo $row['remarks'] ?: 'N/A'; ?></td>
                             <td class="right-align-input"><?php echo $row['bp_amt']; ?></td>
                             <td class="right-align-input"><?php echo $row['tp_or_ter']; ?></td>
-                            <td class="right-align-input"><?php echo $row['premium_wo_gst']; ?></td>
+                            <td class="right-align-input" style="display: none;"><?php echo $row['premium_wo_gst']; ?></td>
-                            <td class="right-align-input"><?php echo $row['gst_amount']; ?></td>
+                            <!-- <td class="right-align-input" style="display: none;"><?php echo $row['gst_amount']; ?></td> -->
                             <td class="right-align-input"><?php echo $row['total_premium']; ?></td>
                             <td class="right-align-input"><?php echo $row['agreed_bp_per']; ?>&nbsp;%</td>
                             <td class="right-align-input"><?php echo $row['agreed_tp_or_ter_per'];?>&nbsp;%</td>
-                            <td class="right-align-input"><?php echo isset($row['reward']) ? $row['reward'] : '0.00'; ?></td>
+                            <td class="right-align-input" style="display: none;"><?php echo isset($row['reward']) ? $row['reward'] : '0.00'; ?></td>
 
                             <?php $total_irda_amt =  empty($row['total_irda_amt']) ? $row['exp_amt'] : $row['total_irda_amt']; ?>
                             <td class="right-align-input" onclick="showCoShareStatementDetails(this)" data-id="<?= $row['pt_id'] ?>"><?php echo $total_irda_amt; ?></td>
@@ -415,33 +421,64 @@ $(document).ready(function() {
             paging: true, // Enable pagination
             pageLength: 10, // Set default number of rows per page (optional)
             ordering: false,
-           "footerCallback": function(row, data, start, end, display) {
+        //    "footerCallback": function(row, data, start, end, display) {
+        //         var api = this.api();
+                
+        //         // Calculate column totals
+        //         var totalPremium = api.column(23).data().reduce(function(a, b) {
+        //             return parseFloat(a) + parseFloat(b) || 0;
+        //         }, 0);
+                
+        //         var total_rewards = api.column(26).data().reduce(function(a, b) {
+        //             return parseFloat(a) + parseFloat(b) || 0;
+        //         }, 0); // Add initial value 0 here
+                
+        //         console.log('total_rewards - ' + total_rewards);
+                
+        //         var totalIrda = api.column(27).data().reduce(function(a, b) {
+        //             return parseFloat(a) + parseFloat(b) || 0;
+        //         }, 0);
+                
+        //         var totalBilled = api.column(28).data().reduce(function(a, b) {
+        //             return parseFloat(a) + parseFloat(b) || 0;
+        //         }, 0);
+                
+        //         var totalUnbilled = api.column(29).data().reduce(function(a, b) {
+        //             return parseFloat(a) + parseFloat(b) || 0;
+        //         }, 0);
+                
+        //         // Update the totals in the div above the table
+        //         $('#total_premium').text(totalPremium.toFixed(2));
+        //         $('#total_rewards').text(total_rewards.toFixed(2));
+        //         $('#total_irda').text(totalIrda.toFixed(2));
+        //         $('#total_billed').text(totalBilled.toFixed(2));
+        //         $('#total_unbilled').text(totalUnbilled.toFixed(2));
+        //    }
+        "footerCallback": function(row, data, start, end, display) {
                 var api = this.api();
                 
-                // Calculate column totals
+                // Calculate column totals (adjust indices based on VISIBLE columns)
-                var totalPremium = api.column(23).data().reduce(function(a, b) {
+                var totalPremium = api.column(20, {search: 'applied'}).data().reduce(function(a, b) {
-                    return parseFloat(a) + parseFloat(b) || 0;
+                    return parseFloat(a) + parseFloat(b || 0);
                 }, 0);
                 
-                var total_rewards = api.column(26).data().reduce(function(a, b) {
+                var total_rewards = api.column(23, {search: 'applied'}).data().reduce(function(a, b) {
-                    return parseFloat(a) + parseFloat(b) || 0;
+                    return parseFloat(a) + parseFloat(b || 0);
-                }, 0); // Add initial value 0 here
-                
-                console.log('total_rewards - ' + total_rewards);
-                
-                var totalIrda = api.column(27).data().reduce(function(a, b) {
-                    return parseFloat(a) + parseFloat(b) || 0;
                 }, 0);
                 
-                var totalBilled = api.column(28).data().reduce(function(a, b) {
+                var totalIrda = api.column(24, {search: 'applied'}).data().reduce(function(a, b) {
-                    return parseFloat(a) + parseFloat(b) || 0;
+                    return parseFloat(a) + parseFloat(b || 0);
                 }, 0);
                 
-                var totalUnbilled = api.column(29).data().reduce(function(a, b) {
+                var totalBilled = api.column(25, {search: 'applied'}).data().reduce(function(a, b) {
-                    return parseFloat(a) + parseFloat(b) || 0;
+                    return parseFloat(a) + parseFloat(b || 0);
                 }, 0);
                 
-                // Update the totals in the div above the table
+                var totalUnbilled = api.column(26, {search: 'applied'}).data().reduce(function(a, b) {
+                    return parseFloat(a) + parseFloat(b || 0);
+                }, 0);
+                
+                // Update the totals
                 $('#total_premium').text(totalPremium.toFixed(2));
                 $('#total_rewards').text(total_rewards.toFixed(2));
                 $('#total_irda').text(totalIrda.toFixed(2));

app/Views/rto_master_list.php

@@ -21,10 +21,10 @@
                     </tr> 
                     </thead>                        
                     <tbody>
-                        <?php if(isset($data)) { ?>        
+                        <?php if(isset($data)) { $slno = 1;  ?>        
                         <?php foreach($data as $index => $row) { ?>
                             <tr>
-                                <td class="text-dark">&nbsp;&nbsp;<?= esc($index + 1); ?></td>
+                                <td class="text-center"><?= $slno++; ?></td>
                                 <td><?= $row['rto_name']; ?></td>
                                 <td><?= $row['rto_code']; ?></td>
                                 <td><?= $row['rto_state']; ?></td>
@@ -216,6 +216,7 @@
                 } else if(type == 'remove'){
                     toastr.success(response.message, 'Success');
                     if(el) $(el).closest('tr').remove();
+                    window.location.reload();
                 } else if(type == 'submit'){
                     toastr.success(response.message, 'Success');
                     var myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));

app/Views/vehicle_type_master_list.php

@@ -19,10 +19,10 @@
                     </tr> 
                     </thead>                        
                     <tbody>
-                        <?php if(isset($data)) { ?>        
+                        <?php if(isset($data)) { $slno = 1;  ?>        
                         <?php foreach($data as $index => $row) { ?>
                             <tr>
-                                <td class="text-dark">&nbsp;&nbsp;<?= esc($index + 1); ?></td>
+                                <td class="text-center"><?= $slno++; ?></td>
                                 <td><?= $row['vehicle_type']; ?></td>
                                 <!-- <td>
                                       <span class="<?php if($row['is_active'] == 1){ echo 'badge badge-primary'; }else{ echo 'badge badge-danger'; } ?>">
@@ -194,6 +194,7 @@
                 } else if(type == 'remove'){
                     toastr.success(response.message, 'Success');
                     if(el) $(el).closest('tr').remove();
+                    window.location.reload();
                 } else if(type == 'submit'){
                     toastr.success(response.message, 'Success');
                     var myModal = new bootstrap.Modal(document.getElementById('con-close-modal'));

app/Views/view_rfq.php

@@ -1360,7 +1360,7 @@ $(document).ready(function () {
     if (lead_status != "won") {
         console.log("Lead status is not 'won', setting interval for submitData");
 
-        // startInterval();
+        startInterval();
     } else {
         console.log("Lead status is 'won', submitData will not be called");
     }
@@ -1557,8 +1557,8 @@ function saveFamilyMembersDetails() {
 
 function resetFamiliyDialogModalValues() {
 
-    $('#familiy_dialog_row_index').val('');
+    // $('#familiy_dialog_row_index').val('');
-    $('#familiy_dialog_column_index').val('');
+    // $('#familiy_dialog_column_index').val('');
     
     // Reset Self
     $('#family_self').prop('checked', true);
@@ -3751,6 +3751,8 @@ function setCellInnerHTMLByCellIndex(tableId, rowIndex, colIndex, htmlContent) {
                 // Set the innerHTML of the cell
                 cell.innerHTML = htmlContent;
                 console.log(`Updated cell at row ${rowIndex}, column ${colIndex} with content: ${htmlContent}`);
+                $('#familiy_dialog_row_index').val('');
+                $('#familiy_dialog_column_index').val('');
             } else {
                 console.error(`Column index ${colIndex} does not exist in row ${rowIndex}`);
             }

writable/e_card_template/new_ecard.html

@@ -0,0 +1,271 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Health Insurance E-Card</title>
+    <style>
+        * {
+            margin: 0;
+            padding: 0;
+            box-sizing: border-box;
+        }
+        
+        body {
+            /* font-family: 'Lato', sans-serif; */
+            background-color: #fff;
+            padding: 5px;
+        }
+        
+        .card-container {
+            display: table;
+            width: 100%;
+            max-width: 750px;
+            margin: 0 auto;
+            table-layout: fixed;
+            border-spacing: 5px 0;
+        }
+        
+        .card {
+            display: table-cell;
+            background: white;
+            width: 50%;
+            padding: 10px;
+            border: 1px solid #ddd;
+            vertical-align: top;
+        }
+        
+        .card-header {
+            display: table;
+            width: 100%;
+            margin-bottom: 10px;
+            table-layout: fixed;
+        }
+        
+        .logo-left {
+            display: table-cell;
+            width: 35px;
+            vertical-align: middle;
+        }
+        
+        .logo-left img {
+            width: 32px;
+            height: 32px;
+        }
+        
+        .logo-right {
+            display: table-cell;
+            text-align: right;
+            vertical-align: middle;
+        }
+        
+        .logo-right img {
+            width: 65px;
+            height: auto;
+        }
+        
+        .card-body {
+            position: relative;
+            padding-left: 65px;
+            min-height: 80px;
+        }
+        
+        .n-logo {
+            position: absolute;
+            left: 5px;
+            top: 30px;
+            width: 55px;
+        }
+        
+        .n-logo img {
+            width: 55px;
+            height: auto;
+        }
+        
+        .details {
+            width: 100%;
+            margin-left: 16px;
+        }
+        
+        .details-table {
+            width: 100%;
+            border-collapse: collapse;
+            font-size: 10px;
+            line-height: 1.4;
+        }
+
+        .details-table td {
+            padding: 1px 1px;
+            vertical-align: top;
+        }
+
+        .detail-label {
+            width: 65px;
+            font-weight: 600;
+            color: #333;
+            white-space: nowrap;
+        }
+
+        .detail-separator {
+            width: 8px;
+            text-align: center;
+            color: #666;
+        }
+
+        .detail-value {
+            color: #333;
+            word-break: break-word;
+            white-space: normal;
+            font-weight: 300;
+        }
+        
+        .support-section {
+            font-size: 7.5px;
+            
+        }
+                        
+        .support-title {
+            color: #ff6b35;
+            font-weight: 600;
+            margin-bottom: 6px;
+            font-size: 10px;
+        }
+        
+        .support-details {
+            font-size: 8px;
+            font-weight: 500;
+            line-height: 1.4;
+            color: #333;
+            margin-top: 0px;
+        }
+        
+        .level-title {
+            font-weight: 500;
+            margin-top: 4px;
+            margin-bottom: 2px;
+        }
+        
+        .cashless-title {
+            color: #ff6b35;
+            font-weight: 600;
+            margin-top: 0px;
+            margin-bottom: 3px;
+            font-size: 10px;
+        }
+        
+        .footer-note {
+            text-align: center;
+            margin-top: 8px;
+            font-size: 8px;
+            color: #666;
+        }
+    </style>
+</head>
+<body>
+    <div class="card-container">
+        <!-- Front Card -->
+        <div class="card">
+            <div class="card-header">
+                <div class="logo-left">
+                    <img src="{INSURER_LOGO}" alt="Insurer logo">
+                </div>
+                <div class="logo-right">
+                    <img src="{TPA_LOGO}" alt="TPA logo">
+                </div>
+            </div>
+            
+            <div class="card-body">
+                <div class="n-logo">
+                    <img src="{NHANCE_N_LOGO}" alt="N Logo">
+                </div>
+                
+                <div class="details">
+                    <table class="details-table">
+                        <tbody>
+                            <tr>
+                                <td class="detail-label">Policy Holder</td>
+                                <td class="detail-separator">:</td>
+                                <td class="detail-value">AMERICAN MEGATRENDS INTERNATIONAL INDIA PVT LTD</td>
+                            </tr>
+                            <tr>
+                                <td class="detail-label">Insurer</td>
+                                <td class="detail-separator">:</td>
+                                <td class="detail-value">The New India Assurance</td>
+                            </tr>
+                            <tr>
+                                <td class="detail-label">TPA</td>
+                                <td class="detail-separator">:</td>
+                                <td class="detail-value">Mediassit</td>
+                            </tr>
+                            <tr>
+                                <td class="detail-label">Primary Insured</td>
+                                <td class="detail-separator">:</td>
+                                <td class="detail-value">Suganya A</td>
+                            </tr>
+                            <tr>
+                                <td class="detail-label">Beneficiary Name</td>
+                                <td class="detail-separator">:</td>
+                                <td class="detail-value">Suganya A</td>
+                            </tr>
+                            <tr>
+                                <td class="detail-label">Member ID</td>
+                                <td class="detail-separator">:</td>
+                                <td class="detail-value">4060881280</td>
+                            </tr>
+                            <tr>
+                                <td class="detail-label">Employee Code</td>
+                                <td class="detail-separator">:</td>
+                                <td class="detail-value">9332</td>
+                            </tr>
+                            <tr>
+                                <td class="detail-label">Relation</td>
+                                <td class="detail-separator">:</td>
+                                <td class="detail-value">Self</td>
+                            </tr>
+                            <tr>
+                                <td class="detail-label">Policy Period</td>
+                                <td class="detail-separator">:</td>
+                                <td class="detail-value">1-Apr-2025 to 31-Mar-2026</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+        
+        <!-- Back Card -->
+        <div class="card">
+            <div class="card-header">
+                <div class="logo-left">
+                    <img src="{INSURER_LOGO}" alt="Insurer logo">
+                </div>
+                <div class="logo-right">
+                    <img src="{TPA_LOGO}" alt="TPA logo">
+                </div>
+            </div>
+            
+            <div class="card-body">
+                <div class="n-logo">
+                    <img src="{NHANCE_N_LOGO}" alt="N Logo">
+                </div>
+                
+                <div class="details">
+                    <div class="support-section">
+                        <div class="support-title">For support :</div> 
+                        <div class="support-details">
+                            {LEVELS}
+                            <div class="cashless-title">For cashless claims:</div>
+                            <div>Share a valid ID with this E-card at the Hospital Insurance Desk.</div>
+                            {NETWORK_HOSPITAL}
+                        </div>
+                    </div>
+                </div>
+            </div>
+            
+            <div class="footer-note">
+                This E-Card is non-transferable and valid only at network (cashless) hospitals
+            </div>
+        </div>
+    </div>
+</body>
+</html>