diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 655da7e1..45f70e25 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -330,6 +330,7 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
     $routes->get('getCoShareStatementDetails/(:any)', 'PolicyTransactionController::getCoShareStatementDetails/$1');
     $routes->get('getClientPolicyDataBasedOnClientAndInsuer', 'PolicyTransactionController::getClientPolicyDataBasedOnClientAndInsuer');
     $routes->get('checkCDAmountForBasePremium', 'PolicyTransactionController::checkCDAmountForBasePremium');
+    $routes->get('transformMailContent', 'LeadsController::transformMailContent');
 });
 
 $routes->group("policy_tranction", ["filter" => "authMVC"], function ($routes) {
@@ -377,6 +378,7 @@ $routes->group("leads", ["filter" => "authMVC"], function ($routes) {
         $routes->post("create", "LeadsController::createLead");
         $routes->get("list/(:any)", "LeadsController::getLeadDataForEdit/$1");
         $routes->get("sendMail", "LeadsController::sendMailWithAttachement");
+        $routes->post("sendMail", "LeadsController::sendMailWithAttachement");
         $routes->get("exportQCRandRFQ/(:any)", "LeadsController::exportQCRandRFQ/$1");
         $routes->get("featchLeadDataAndInsertClient/(:any)", "LeadsController::featchLeadDataAndInsertClient/$1");
         $routes->get("featchClientPolicyFromLead/(:any)", "LeadsController::featchClientPolicyFromLead/$1");
diff --git a/app/Controllers/EmpDataServiceController.php b/app/Controllers/EmpDataServiceController.php
index 78baac0b..5c79e589 100755
--- a/app/Controllers/EmpDataServiceController.php
+++ b/app/Controllers/EmpDataServiceController.php
@@ -205,9 +205,6 @@ class EmpDataServiceController extends BaseController
         // Log the export file name
         $this->myLogger->logme('error', 'Inception export file name : {data}', ['data' => $export_data['file_name']]);
 
-        // remove existing batch file anf batch list data every time export
-        $this->removeOldExportInfoFromBatchFile($export_data);
-
         // default excel header information
         $excel_header_columns = [
             [
@@ -258,7 +255,7 @@ class EmpDataServiceController extends BaseController
             [
                 'column_index' => 7, 
                 'column_name' => 'DATE OF COVERAGE', 
-                'db_column_name' => 'date_coverage'
+                'db_column_name' => 'date_of_coverage'
             ],
             [
                 'column_index' => 8, 
@@ -368,7 +365,7 @@ class EmpDataServiceController extends BaseController
                 [
                     'column_index' => 7, 
                     'column_name' => 'DATE OF COVERAGE', 
-                    'db_column_name' => 'date_coverage'
+                    'db_column_name' => 'date_of_coverage'
                 ],
                 [
                     'column_index' => 8, 
@@ -428,14 +425,35 @@ class EmpDataServiceController extends BaseController
             ];
         }else{
             // get excel export format structure array
-            $template_json = $this->clientPolicyModel
-                ->select('insurer_excel_export_template.jsoncolumns')
-                ->join('insurer_excel_export_template', 'insurer_excel_export_template.insurer_id = client_policy.insurer_id and insurer_excel_export_template.policy_type_id = client_policy.policy_type_id')
-                ->where('client_policy.id', $export_data['client_policy_id'])
-                ->where('insurer_excel_export_template.event_name', $export_data['event_type'])
-                ->where('insurer_excel_export_template.is_active', 1) //Live issue changes 17-10-2024
-                ->where('insurer_excel_export_template.type_name', $export_data['actions'])
-                ->first();
+            // $template_json = $this->clientPolicyModel
+            //     ->select('insurer_excel_export_template.jsoncolumns')
+            //     ->join('insurer_excel_export_template', 'insurer_excel_export_template.insurer_id = client_policy.insurer_id and insurer_excel_export_template.policy_type_id = client_policy.policy_type_id')
+            //     ->where('client_policy.id', $export_data['client_policy_id'])
+            //     ->where('insurer_excel_export_template.event_name', $export_data['event_type'])
+            //     ->where('insurer_excel_export_template.is_active', 1) //Live issue changes 17-10-2024
+            //     ->where('insurer_excel_export_template.type_name', $export_data['actions'])
+            //     ->first();
+
+            $sql = "
+                SELECT `insurer_excel_export_template`.`jsoncolumns`
+                FROM `client_policy`
+                JOIN `insurer_excel_export_template` 
+                ON `insurer_excel_export_template`.`insurer_id` = `client_policy`.`insurer_id`
+                AND `insurer_excel_export_template`.`policy_type_id` = 
+                    CASE 
+                        WHEN `client_policy`.`policy_type_id` IN (2, 3, 4, 5) THEN 2
+                        ELSE `client_policy`.`policy_type_id`
+                    END
+                WHERE `client_policy`.`id` = '".$export_data['client_policy_id']."'
+                AND `insurer_excel_export_template`.`event_name` = '".$export_data['event_type']."'
+                AND `insurer_excel_export_template`.`is_active` = 1
+                AND `insurer_excel_export_template`.`type_name` = '".$export_data['actions']."'
+                LIMIT 1";
+            
+            $query = db_connect()->query($sql);
+            $template_json = $query->getRowArray();
+        
+            // dd(db_connect()->getLastQuery());
             
             if(!empty($template_json) && $template_json != null){
                 $excel_header_columns = json_decode($template_json['jsoncolumns'], true); 
@@ -444,6 +462,10 @@ class EmpDataServiceController extends BaseController
                 }
         }
 
+        // remove existing batch file anf batch list data every time export
+        $this->removeOldExportInfoFromBatchFile($export_data);
+
+        //convert the excel data based on the insurer
         $excel_data_info = generate_insurer_based_excel($excel_header_columns, $objects);
 
         // Generate Excel file
@@ -1343,7 +1365,7 @@ class EmpDataServiceController extends BaseController
             //         employees.gender AS emp_gender,
             //         employee_polices.pre_existing_alignments, 
             //         employee_polices.basic_cover_si, 
-            //         employee_polices.date_coverage, 
+            //         employee_polices.date_of_coverage, 
             //         TIMESTAMPDIFF(YEAR, employees.dob, CURDATE()) AS emp_age,
             //         employees.relationship AS emp_relationship,
             //         employees.change_event AS change_event,
@@ -1954,12 +1976,14 @@ class EmpDataServiceController extends BaseController
             ->where("employees.is_active", 1)
             ->where("employees.emp_status", "active")
             ->where("emp_endorsement.actions", "c")
+            ->where("emp_endorsement.is_active", 1)
+            ->where("emp_endorsement.status !=", "truncated")
             ->where("(emp_endorsement.endorsement_id IS NULL OR emp_endorsement.endorsement_id = '')")
             ->findAll();
 
 
 
-        // dd($endorsement_data, $excel_data);
+        dd($endorsement_data, $excel_data);
 
 
         if ($endorsement_data == null || empty($endorsement_data)) {
@@ -2253,6 +2277,8 @@ class EmpDataServiceController extends BaseController
             ->where('employee_polices.status', 'active')
             ->where('employees.is_active', 1)
             ->where('employees.emp_status', 'active')
+            ->where("emp_endorsement.is_active", 1)
+            ->where("emp_endorsement.status !=", "truncated")
             ->first();
 
             if (isset($result['id']) && $result['id'] !== null) {
diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php
index b8d47cce..ea15cb12 100644
--- a/app/Controllers/LeadsController.php
+++ b/app/Controllers/LeadsController.php
@@ -32,6 +32,9 @@ use App\Helpers\ExcelMergeHelper;
 use Google\Service\CloudSearch\PushItem;
 use Kint;
 
+use App\Controllers\Jobs;
+use App\Controllers\JobWorker;
+
 
 class LeadsController extends BaseController
 {
@@ -98,7 +101,7 @@ class LeadsController extends BaseController
     {
 
         // $d = $this->constructExcelToSaveTemp(24, 1, $propsal_and_insurer = null);
-        $job_details  = new Jobs();
+        // $job_details  = new Jobs();
         // $r = Jobs::addJob(['job_name' => 'calculateMembersDemography', 'payload' => ['lead_id' => 24]]);
         // $d = $this->calculateMembersDemography(['lead_id' => 24]);
         //$this->mergeQuoteExcelFileWithMembersListExcelFile(24, 1, $propsal_and_insurer = null);
@@ -323,6 +326,12 @@ class LeadsController extends BaseController
             $insert = $this->leadsModel->insert($value);
             $insertCount[] = $insert;
             $this->insertLeadStatus($insert, $value['status'], 3);
+
+            //for this push the job to the  calculateMembersDemography() function
+            $job_details  = new Jobs();
+            $r = Jobs::addJob(['job_name' => 'calculateMembersDemography', 'payload' => [
+                'lead_id' => $insert,
+            ]]);
         }
 
         if (count($insertCount) > 0) {
@@ -423,11 +432,13 @@ class LeadsController extends BaseController
         }
 
         $data['question_json'] = $lead_data['question_json'];
-        $data['page_name'] = isset($data['rfq_data']['type']) && $data['rfq_data']['type'] == 2 ? 'QCR' : 'RFQ';
+        $data['page_name'] = $type == 2 ? 'QCR' : 'RFQ';
         $data['insurer'] = $this->insurerBranchModel->getInsurerBranchesWithInsurerNames();
         $data['userList'] = $this->userModel->getUserListForRFQ();
         $data['lead_data'] = $lead_data;
 
+        $data['mail_content'] = $this->transformMailContent($id);
+
         // dd($data);
         $this->loadLayout('view_rfq.php', $data);
     }
@@ -449,7 +460,10 @@ class LeadsController extends BaseController
         $result = $this->RFQModel->insert($data);
 
         if ($result) {
-            return $this->respond(['status' => true, 'id' => $result, 'message' => 'RFQ created successfully', 'data' => $data], 200);
+
+            $message = "RFQ submitted successfully";
+            if($data['submit_type'] == 'QCR'){ $message = "QCR submitted successfully"; }
+            return $this->respond(['status' => true, 'id' => $result, 'message' => $message, 'data' => $data], 200);
         }
 
         return $this->respond(['status' => false, 'id' => $result, 'message' => "Failed to create RFQ", 'data' => $data], 200);
@@ -492,6 +506,29 @@ class LeadsController extends BaseController
     public function exportExcelForQCRandRFQ($lead_id, $type)
     {
         $filepath = $this->constructExcelToSaveTemp($lead_id, $type);
+        $lead_data = $this->RFQModel->getRFQTableDataWithLeadIDAndType($lead_id, $type);
+        // dd($filepath);
+
+        //Excel merging part
+        if ($lead_data['file_name'] != null && $lead_data['file_name'] != '') {
+
+            $temp_file_path = $filepath['filePath'];
+            $temp_file_name = $filepath['fileName'];
+            $lead_file_path = WRITEPATH . 'uploads/lead_files/' . $lead_data['file_name'];
+
+            // dd($lead_data, $temp_file_path, $temp_file_name, $lead_file_path);
+
+            if ($lead_file_path) {
+                $filePaths = [
+                    ['file_path' => $temp_file_path, 'sheets' => []],
+                    ['file_path' => $lead_file_path, 'sheets' => []]
+                ];
+                // $outputPath = dirname($temp_file_path) . '/' . 'merged_' . $temp_file_name;
+                $result = ExcelMergeHelper::mergeExcelFiles($filePaths, $temp_file_path);
+                // print_rr($result);
+            }
+        }
+
         $filepath = $filepath['filePath'];
 
         if (file_exists($filepath)) {
@@ -522,11 +559,51 @@ class LeadsController extends BaseController
         // dd($rfq_data, $lead_id, $type, $propsal_and_insurer);
         // print_r($propsal_and_insurer); die;
 
-        $lead_data = [
-            'Insured' => $rfq_data['client_name'],
-            'Insurer' => $rfq_data['insurer_name'] . ' - ' . $rfq_data['insurer_branch_name'],
-            'TPA' => $rfq_data['tpa_name'] . ' - ' . $rfq_data['tpa_branch_name'],
-        ];
+        if($rfq_data['lead_type'] == 1){
+
+            $lead_data = [
+
+                'Insured' => $rfq_data['client_name'],
+                'Policy Status' => $rfq_data['status'],
+
+                'No of Employees' => $rfq_data['incept_emp_count'],
+                'No of Dependents' => $rfq_data['incept_dept_count'],
+                'Total Lives' => $rfq_data['incept_no_of_lives'],
+
+                'Period of Insurance ' => date('d/m/Y', strtotime($rfq_data['policy_start_date'])).' to '. date('d/m/Y', strtotime($rfq_data['policy_end_date'])),
+                'Policy Run Days' => $rfq_data['policy_run_days'],
+            ];
+            
+        }else{
+
+            $lead_data = [
+
+                'Insured' => $rfq_data['client_name'],
+                'Policy Status' => $rfq_data['status'],
+
+                'No of Employees at Inception' => $rfq_data['incept_emp_count'],
+                'No of Dependents at Inception' => $rfq_data['incept_dept_count'],
+                'Total Lives at Inception ' => $rfq_data['incept_no_of_lives'],
+
+                'No of Employees at Expiry' => $rfq_data['exp_emp_count'],
+                'No of Dependents at Expiry' => $rfq_data['exp_dept_count'],
+                'Total Lives at Expiry ' => $rfq_data['exp_no_of_lives'],
+
+                'No of Employees at Renewal' => $rfq_data['renewal_emp_count'],
+                'No of Dependents at Renewal' => $rfq_data['renewal_dept_count'],
+                'Total Lives at Renewal ' => $rfq_data['renewal_no_of_lives'],
+
+                'Period of Insurance ' => date('d/m/Y', strtotime($rfq_data['policy_start_date'])).' to '. date('d/m/Y', strtotime($rfq_data['policy_end_date'])),
+                'Policy Run Days' => $rfq_data['policy_run_days'],
+                'Inception Premium' => $rfq_data['premium_at_inception'],
+                'Premium as on (Date - DD MM YYYY should be entered based on the claims dump report)' => $rfq_data['premium_date'],
+                'Earned Premium' => $rfq_data['earned_premium'],
+                'Incurred Claims as on (Date - DD MM YYYY should be entered based on the claims dump report)' => $rfq_data['incurred_claims_date'],
+                'Annualised Claims' => $rfq_data['annualised_claims'],
+                'Incurred Claims Ratio' => $rfq_data['incurred_claims_ratio'],
+                'Earned Claims Ratio' => $rfq_data['earned_claims_ratio'],
+            ];
+        }
 
         $data = json_decode($rfq_data['json'], true);
 
@@ -538,6 +615,7 @@ class LeadsController extends BaseController
             }
         }else if($type == 1){
             $data = $this->convertJsonForQCR($data, $type);
+            // dd($data);
         }
 
         $spreadsheet = new Spreadsheet();
@@ -1135,14 +1213,18 @@ class LeadsController extends BaseController
         helper('excel_util_helper');
         helper('MailHelper');
         helper('ExcelMergeHelper');
-        $params = $this->request->getGet();
+        $params = $this->request->getPost();
+
         // print_r($params); die;
+
         $lead_id = $params['lead_id'];
         $file_type  = $params['file_type']; //rfq or qcr
         $recipient_type = $params['recipient_type']; //insurer or client or internal or placement  
         $recipient_mail = $params['recipient_mail']; // - only primary key of contacts
         $recipient_mail = json_decode($params['recipient_mail'], true); // - only primary key of contacts
         $propsal_and_insurer = isset($params['proposal_insurer']) ? $params['proposal_insurer'] : null;
+        $mail_content = $params['mail_content'];
+        $mail_subject = $params['subject'];
 
         $result_data = [];
         // dd($recipient_mail);
@@ -1161,9 +1243,10 @@ class LeadsController extends BaseController
         // print_r($lead_data ); die;
 
         $cc_mails = [];
+        $bcc_mails = [];
 
         //get CC Mails
-        if ($recipient_type == 'internal' || $recipient_type == 'placement') {
+        if ($recipient_type == 'internal' || $recipient_type == 'placement' || $recipient_type == 'insurer' || $recipient_type == 'client') {
 
             $cc_data = isset($params['cc']) ? $params['cc'] : "";
             $param_cc_mail = json_decode($cc_data, true);
@@ -1193,6 +1276,37 @@ class LeadsController extends BaseController
             }
         }
 
+        //get BCC Mails
+        if ($recipient_type == 'insurer' || $recipient_type == 'client') {
+
+            $bcc_data = isset($params['bcc']) ? $params['bcc'] : "";
+            $param_bcc_mail = json_decode($bcc_data, true);
+            
+            if (isset($param_bcc_mail) && is_array($param_bcc_mail) && count($param_bcc_mail) > 0) {
+                // Fetch user data where ID is in the param_cc_mail array
+                $userData = $this->userModel
+                    ->where('is_active', 1)
+                    ->whereIn('id', $param_bcc_mail)
+                    ->findAll();
+
+                // print_r($userData); die;
+
+                // Extract emails from the fetched user data
+                $bcc_mails = array_column($userData, 'email');
+
+                // print_r(json_encode($cc_mails)); die;
+
+                // If no emails were found, return an error response
+                // if (empty($cc_mails)) {
+                //     return $this->respond(['status' => 'failed','code' => 400,'data' => '','message' => 'No valid CC mail addresses found!'], 200);
+                // }
+
+            } else {
+                // Handle case where param_cc_mail is not valid
+                // return $this->respond(['status' => 'failed','code' => 400,'data' => '','message' => 'CC mail not found!'], 200);
+            }
+        }
+
         if ($recipient_type == 'client' && ($lead_data['contact_person_email'] == '' || $lead_data['contact_person_email'] == null)) {
             return $this->respond(['status' => 'failed', 'code' => 400, 'data' => '', 'messgae' => 'Recipient mail not found ! '], 200);
         }
@@ -1248,6 +1362,18 @@ class LeadsController extends BaseController
         $subject = $file_type == 'rfq' ? 'Request for Quotation from ' . $lead_data['client_name'] . ' for ' . $lead_data['policy_type'] : 'Quotation Comparison Report for ' . $lead_data['policy_type'];
         $original_message = '<div style="width:100%;max-width:600px;margin:0 auto;padding:20px;border:1px solid #e0e0e0;background-color:#f9f9f9;font-family:Arial,sans-serif;color:#333;line-height:1.6"><div style=background-color:#4a90e2;color:#fff;padding:15px;text-align:center><h1 style=margin:0;font-size:24px>Request for Quotation (RFQ)</h1></div><div style=padding:20px;background-color:#fff><h2 style=color:#4a90e2;font-size:20px;margin-top:0>Dear {{RECIPIENT_NAME}},</h2><p>We are reaching out to request a quotation for the following insurance coverage. Please review the details below and provide your quote at your earliest convenience.<h2 style=color:#4a90e2;font-size:20px;margin-top:20px>RFQ Details</h2><table style=width:100%;border-collapse:collapse;margin-top:20px><tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Client name<td style="border:1px solid #ddd;padding:10px;text-align:left">{{CLIENT_NAME}}<tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Coverage Type<td style="border:1px solid #ddd;padding:10px;text-align:left">{{POLICY_LONG_NAME}}<tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Policy Start Date<td style="border:1px solid #ddd;padding:10px;text-align:left">{{POLICY_START_DATE}}<tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Policy Duration<td style="border:1px solid #ddd;padding:10px;text-align:left">{{DURATION}}</table><div style="margin-top:20px;padding:10px;background-color:#f7f7f7;border-left:4px solid #4a90e2;font-style:italic">Please note: Additional terms and details are included in the attachment for your reference.</div><p>Please feel free to reach out if you require any further information to prepare the quote. We look forward to receiving your proposal.<p>Best regards,<p><strong>Nhance India Pvt Ltd</strong><br></div><div style=margin-top:20px;font-size:12px;color:#777;text-align:center><p>© Nhance India Pvt Ltd. All rights reserved.</div></div>';
 
+        //for mail content
+        if(!empty($mail_content)){
+            $original_message = $mail_content;
+        }
+
+        //for mail subject
+        if(!empty($mail_subject)){
+            $subject = $mail_subject;
+        }
+
+        // print_r($subject); die;
+
         if ($recipient_data) {
             foreach ($recipient_data as $recipient) {
 
@@ -1260,7 +1386,7 @@ class LeadsController extends BaseController
 
                 // print_rr($message);calculate_days_bw_dates
 
-                $res = MailHelper::send_email(['mail' => $recipient['email'], 'cc' => $cc_mails, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to]);
+                $res = MailHelper::send_email(['mail' => $recipient['email'], 'cc' => $cc_mails, 'subject' => $subject, 'message' => $message, 'attachments' => $attachments, 'reply_to' => $reply_to, 'bcc' => $bcc_mails]);
                 // !dd($res);
                 $result_data[] = ['mail' => $recipient['email'], 'status' => $res];
             }
@@ -1434,83 +1560,126 @@ class LeadsController extends BaseController
     public function convertJsonForQCR($json, $type)
     {
         if ($json) {
+            
             // Deep copy of JSON
             $first_json = json_decode(json_encode($json), true);
-
             // dd($first_json);
     
-            // Column-wise Check: Remove headers and relevant data if qcr == 0
-            foreach ($json['proposal_data']['over_all_column_data'] as $proposalKey => $proposalData) {
+            if($type == 2){
 
-                if ($proposalData['stc'] == 0 || $proposalData['stc'] === false) {
-                    // Remove matching parentHeader in headers
-                    foreach ($first_json['table_data']['headers'] as $index => $header) {
-                        if ($header['parentHeader'] === $proposalKey) {
-                            unset($first_json['table_data']['headers'][$index]);
-                        }
-                    }
+                // Column-wise Check: Remove headers and relevant data if qcr == 0
+                foreach ($json['proposal_data']['over_all_column_data'] as $proposalKey => $proposalData) {
 
-                    // Remove data entries with matching parentth
-                    foreach ($first_json['table_data']['data'] as &$item) {
-                        $item['data'] = array_values(array_filter($item['data'], function ($entry) use ($proposalKey) {
-                            return $entry['parentth'] !== $proposalKey;
-                        }));
-                    }
+                    if (($proposalData['qcr'] == 0 || $proposalData['qcr'] === false) || ($proposalData['stc'] == 0 || $proposalData['stc'] === false)) {
 
-                    // Remove proposalKey from over_all_column_data
-                    unset($first_json['proposal_data']['over_all_column_data'][$proposalKey]);
-                    
-                    if($type == 2){
-                        // Remove proposalKey from premium_data
-                        unset($first_json['premium_data']['data'][$proposalKey]);
-                    }
-                }
-
-                // Insurer Check: Remove subHeaders and relevant data for insurers with qcr == 0
-                foreach ($proposalData['insurers'] as $insurerIndex => $insurer) {
-                    if ($insurer['stc'] === 0 || $insurer['stc'] === false) {
-                        foreach ($first_json['table_data']['headers'] as &$header) {
-                            if (isset($header['subHeaders'])) {
-                                $header['subHeaders'] = array_values(array_filter($header['subHeaders'], function ($sub) use ($insurer) {
-                                    return $sub !== $insurer['display_name'];
-                                }));
+                        // Remove matching parentHeader in headers
+                        foreach ($first_json['table_data']['headers'] as $index => $header) {
+                            if ($header['parentHeader'] === $proposalKey) {
+                                unset($first_json['table_data']['headers'][$index]);
                             }
                         }
 
-
+                        // Remove data entries with matching parentth
                         foreach ($first_json['table_data']['data'] as &$item) {
-                            $item['data'] = array_values(array_filter($item['data'], function ($entry) use ($insurer) {
-                                return $entry['subth'] !== $insurer['display_name'];
+                            $item['data'] = array_values(array_filter($item['data'], function ($entry) use ($proposalKey) {
+                                return $entry['parentth'] !== $proposalKey;
                             }));
                         }
 
-                        // Remove insurer from proposal's insurers array
-                        unset($first_json['proposal_data']['over_all_column_data'][$proposalKey]['insurers'][$insurerIndex]);
-
+                        // Remove proposalKey from over_all_column_data
+                        unset($first_json['proposal_data']['over_all_column_data'][$proposalKey]);
+                        
                         if($type == 2){
-                            unset($first_json['premium_data']['data'][$proposalKey][$insurer['display_name']]);
+                            // Remove proposalKey from premium_data
+                            unset($first_json['premium_data']['data'][$proposalKey]);
+                        }
+                    }
+
+                    // Insurer Check: Remove subHeaders and relevant data for insurers with qcr == 0
+                    foreach ($proposalData['insurers'] as $insurerIndex => $insurer) {
+                        if (($insurer['qcr'] === 0 || $insurer['qcr'] === false) || ($insurer['stc'] === 0 || $insurer['stc'] === false) ) {
+                            foreach ($first_json['table_data']['headers'] as &$header) {
+                                if (isset($header['subHeaders'])) {
+                                    $header['subHeaders'] = array_values(array_filter($header['subHeaders'], function ($sub) use ($insurer) {
+                                        return $sub !== $insurer['display_name'];
+                                    }));
+                                }
+                            }
+
+
+                            foreach ($first_json['table_data']['data'] as &$item) {
+                                $item['data'] = array_values(array_filter($item['data'], function ($entry) use ($insurer) {
+                                    return $entry['subth'] !== $insurer['display_name'];
+                                }));
+                            }
+
+                            // Remove insurer from proposal's insurers array
+                            unset($first_json['proposal_data']['over_all_column_data'][$proposalKey]['insurers'][$insurerIndex]);
+
+                            if($type == 2){
+                                unset($first_json['premium_data']['data'][$proposalKey][$insurer['display_name']]);
+                            }
                         }
                     }
                 }
-            }
 
-            // Row-wise Check: Remove rows if qcr == 0 for actions
-            foreach ($first_json['table_data']['data'] as $rowKey => $rowData) {
-                foreach ($rowData['data'] as $data) {
-                    if ($data['parentth'] === "Action" && isset($data['input_value']['stc']) && $data['input_value']['stc'] == 0) {
-                        unset($first_json['table_data']['data'][$rowKey]);
-                        break;
+                // Row-wise Check: Remove rows if qcr == 0 for actions
+                foreach ($first_json['table_data']['data'] as $rowKey => $rowData) {
+                    foreach ($rowData['data'] as $data) {
+                        if ($data['parentth'] === "Action" && (isset($data['input_value']['qcr']) && $data['input_value']['qcr'] == 0) || (isset($data['input_value']['stc']) && $data['input_value']['stc'] == 0)) {
+                            unset($first_json['table_data']['data'][$rowKey]);
+                            break;
+                        }
                     }
                 }
-            }
 
-            // Reindex arrays to maintain proper structure
-            $first_json['table_data']['headers'] = array_values($first_json['table_data']['headers']);
-            $first_json['table_data']['data'] = array_values($first_json['table_data']['data']);
-            $first_json['proposal_data']['over_all_column_data'] = array_map(function ($proposal) {
-                $proposal['insurers'] = array_values($proposal['insurers']);
-                return $proposal;
-            }, $first_json['proposal_data']['over_all_column_data']);
+                // Reindex arrays to maintain proper structure
+                $first_json['table_data']['headers'] = array_values($first_json['table_data']['headers']);
+                $first_json['table_data']['data'] = array_values($first_json['table_data']['data']);
+                $first_json['proposal_data']['over_all_column_data'] = array_map(function ($proposal) {
+                    $proposal['insurers'] = array_values($proposal['insurers']);
+                    return $proposal;
+                }, $first_json['proposal_data']['over_all_column_data']);
+
+            }else{
+
+                //remove insurer as Subheaders for RFQ
+                foreach ($first_json['table_data']['headers'] as &$header) {
+                    $header['subHeaders'] = array_filter($header['subHeaders'], function ($subHeader) {
+                        return in_array($subHeader, ['Quote Asked', '-']);
+                    });
+                }
+
+                //Remove insurer Row wise data for RFQ
+                foreach ($first_json['table_data']['data'] as &$row) {
+
+                    // Filter the inner data array
+                    $row['data'] = array_filter(
+                        $row['data'],
+                        function ($item) {
+                            return in_array($item['subth'], ['Quote Asked', '-']);
+                        }
+                    );
+
+                    $row['data'] = array_values($row['data']);
+                }
+
+                // Ensure to unset the reference after the loop
+                unset($row);
+
+
+                // Remove insurers from Proposal Data key for RFQ
+                foreach ($first_json['proposal_data']['over_all_column_data'] as $key => &$proposal) {
+                    if (isset($proposal['insurers'])) {
+                        // Set the insurers array to empty
+                        $proposal['insurers'] = [];
+                    }
+                }
+                
+                // Ensure to reset the reference
+                unset($proposal);
+
+            }
 
             return $first_json;
         }
@@ -1850,8 +2019,54 @@ class LeadsController extends BaseController
     //------------------------------------------------------------------------------------------------
 
 
-    public function transformMailContent()
-    {
+    public function transformMailContent($lead_id)
+    {   
+        helper('excel_util_helper');
+        // $params = $this->request->getGet();
 
+        // print_r($params); die;
+        // $lead_id = $params['lead_id'];
+        // $file_type  = $params['file_type']; //rfq or qcr
+        // $recipient_type = $params['recipient_type']; //insurer or client or internal or placement 
+        // $recipient_mail = $params['recipient_mail']; // - only primary key of contacts
+        // $propsal_and_insurer = isset($params['proposal_insurer']) ? $params['proposal_insurer'] : null;
+
+        // if ($recipient_type == 'insurer' && empty($recipient_mail)) {
+        //     return $this->respond(['status' => 'failed', 'code' => 400, 'data' => '', 'messgae' => 'Recipient mail not found ! '], 200);
+        // }
+
+        //gather lead info
+        $lead_data = $this->leadsModel
+            ->select('leads.*,policy_type.long_name,policy_type.policy_type,user_profiles.email as created_person_email')
+            ->join('policy_type', 'leads.policy_type_id = policy_type.id', 'left')
+            ->join('user_profiles', 'leads.created_by = user_profiles.id', 'left')
+            ->where('leads.id', $lead_id)
+            ->first();
+
+        // dd($lead_data);
+
+        if($lead_data){
+
+            $recipient_data = ['name' => "Team"];
+            $original_message = '<div style="width:100%;max-width:600px;margin:0 auto;padding:20px;border:1px solid #e0e0e0;background-color:#f9f9f9;font-family:Arial,sans-serif;color:#333;line-height:1.6"><div style=background-color:#4a90e2;color:#fff;padding:15px;text-align:center><h1 style=margin:0;font-size:24px>Request for Quotation (RFQ)</h1></div><div style=padding:20px;background-color:#fff><h2 style=color:#4a90e2;font-size:20px;margin-top:0>Dear {{RECIPIENT_NAME}},</h2><p>We are reaching out to request a quotation for the following insurance coverage. Please review the details below and provide your quote at your earliest convenience.<h2 style=color:#4a90e2;font-size:20px;margin-top:20px>RFQ Details</h2><table style=width:100%;border-collapse:collapse;margin-top:20px><tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Client name<td style="border:1px solid #ddd;padding:10px;text-align:left">{{CLIENT_NAME}}<tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Coverage Type<td style="border:1px solid #ddd;padding:10px;text-align:left">{{POLICY_LONG_NAME}}<tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Policy Start Date<td style="border:1px solid #ddd;padding:10px;text-align:left">{{POLICY_START_DATE}}<tr><th style="border:1px solid #ddd;padding:10px;text-align:left;background-color:#f2f2f2">Policy Duration<td style="border:1px solid #ddd;padding:10px;text-align:left">{{DURATION}}</table><div style="margin-top:20px;padding:10px;background-color:#f7f7f7;border-left:4px solid #4a90e2;font-style:italic">Please note: Additional terms and details are included in the attachment for your reference.</div><p>Please feel free to reach out if you require any further information to prepare the quote. We look forward to receiving your proposal.<p>Best regards,<p><strong>Nhance India Pvt Ltd</strong><br></div><div style=margin-top:20px;font-size:12px;color:#777;text-align:center><p>© Nhance India Pvt Ltd. All rights reserved.</div></div>';
+    
+            $message = $original_message;
+            $message = str_replace("{{RECIPIENT_NAME}}", $recipient_data['name'], $message);
+            $message = str_replace("{{CLIENT_NAME}}", $lead_data['client_name'], $message);
+            $message = str_replace("{{POLICY_LONG_NAME}}", $lead_data['long_name'], $message);
+            $message = str_replace("{{POLICY_START_DATE}}", change_date_format($lead_data['policy_start_date'], 'Y-m-d', 'd-m-Y'), $message);
+            $message = str_replace("{{DURATION}}", calculate_days_bw_dates($lead_data['policy_end_date'] ?? "", $lead_data['policy_start_date'] ?? "")->days, $message) ?? '--';
+
+            // return $this->respond(['status' => true, 'code' => 200, 'data' => $message], 200);
+            return $message;
+
+        }else{
+
+            // return $this->respond(['status' => false, 'code' => 404, 'message' => "This lead has not data"], 200);
+            return '';
+        }
+
+
+  
     }
 }
diff --git a/app/Helpers/MailHelper.php b/app/Helpers/MailHelper.php
index 6116bc0c..085c510f 100755
--- a/app/Helpers/MailHelper.php
+++ b/app/Helpers/MailHelper.php
@@ -97,7 +97,9 @@ class MailHelper
         //check BCC mail
         if (isset($params['bcc'])) {
             $bcc = $params['bcc'];
-            $bcc = explode(',', $bcc);
+            if(!is_array($bcc)){
+                $bcc = explode(',', $bcc);
+            }
         }else{
             $bcc = [];
         }
diff --git a/app/Helpers/excel_import_export_helper.php b/app/Helpers/excel_import_export_helper.php
index 3355253e..ad484ffe 100755
--- a/app/Helpers/excel_import_export_helper.php
+++ b/app/Helpers/excel_import_export_helper.php
@@ -128,7 +128,7 @@ if (! function_exists('transform_objects_to_array_for_inception')) {
                 $obj->emp_gender,                    // Employee Gender
                 $obj->pre_existing_alignments,       // Pre-existing Alignments
                 $obj->basic_cover_si,                // Basic Cover SI
-                $obj->date_coverage,                 // Date Coverage
+                $obj->date_of_coverage,                 // Date Coverage
                 $obj->emp_age,                       // Employee Age
                 $obj->emp_relationship,              // Employee Relationship
                 $obj->change_event,                  // Change Event
@@ -260,7 +260,6 @@ if (! function_exists('transform_objects_to_array_for_deletion')) {
                 $obj->total,                        
                 $claim_status,
                 $endorsement_id
-
             ];
 
             // Append the row data to the main data array
@@ -487,7 +486,7 @@ if (!function_exists('format_Excel_BasedOn_Client'))
                             $rowData[] = $obj->basic_cover_si; // Employee BASIC COVER SI
                             break;
                         case 'dateofcoverage':
-                            $rowData[] = $obj->date_coverage; //  DATE OF COVERAGE
+                            $rowData[] = $obj->date_of_coverage; //  DATE OF COVERAGE
                             break;
                         case 'age':
                             $rowData[] = $obj->emp_age; // Employee AGE
diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php
index f0f7eaa2..9908c094 100755
--- a/app/Models/EmployeePolicyModel.php
+++ b/app/Models/EmployeePolicyModel.php
@@ -179,7 +179,11 @@ class EmployeePolicyModel extends Model
         $result->where('employee_polices.is_active', 1)
         ->where('emp.is_active', 1);
 
-        return $result->findAll();
+        $res = $result->findAll();
+
+        // dd($this->db->getLastQuery());
+
+        return $res;
     }
 
    public function getEmployeePolicyForEcard($policy_id = 0)
@@ -275,7 +279,7 @@ class EmployeePolicyModel extends Model
                 employee_polices.uhid, 
                 employee_polices.pre_existing_alignments, 
                 employee_polices.basic_cover_si, 
-                employee_polices.date_coverage, 
+                employee_polices.date_coverage as date_of_coverage, 
                 employee_polices.policy_end_date, 
                 employee_polices.days as no_of_days,
                 employee_polices.premium,
@@ -322,6 +326,9 @@ class EmployeePolicyModel extends Model
             }else{
                 $results = $query->getResult();
             }
+
+            // dd($this->db->getLastQuery());
+
             return $results;
     }
 
@@ -556,6 +563,175 @@ class EmployeePolicyModel extends Model
 
     }
 
+    // DO NOT DELETE this DELETION QUERY FUNCTION
+
+    // public function getDeletionEmployeeDataForExportExcel($ref_data, $return_type = 0)
+    // {
+
+    //         $client_id = $ref_data['client_id'];
+    //         $client_policy_id = $ref_data['client_policy_id'];
+    //         $client_branch_id = $ref_data['client_branch_id'];
+    //         $insurer_or_tpa = $ref_data['insurer_or_tpa'];
+
+    //         $get_insurer_id_from_client_policy = $this->db->table('client_policy')
+    //             ->select('insurer_id')
+    //             ->where('id', $client_policy_id)
+    //             ->get()
+    //             ->getRowArray();
+
+    //         $add_one_day = 0;
+
+    //         if (!empty($get_insurer_id_from_client_policy)) {
+
+    //             $get_the_insurer_add_one_for_delete = $this->db->table('insurers')
+    //                 ->select('deletion_add_day')
+    //                 ->where('id', $get_insurer_id_from_client_policy['insurer_id'])
+    //                 ->get()
+    //                 ->getRowArray();
+
+    //             if (!empty($get_the_insurer_add_one_for_delete) && $get_the_insurer_add_one_for_delete['deletion_add_day'] == 1) {
+    //                 $add_one_day = 1;
+    //             }
+    //         }
+
+    //         $status_condition = "{$insurer_or_tpa}" === 'tpa' 
+    //             ? "employee_polices.status = 'inactive' AND employees.emp_status = 'inactive'" 
+    //             : "employee_polices.status = 'active' AND employees.emp_status = 'active'";
+
+    //         $endorsement_condition = "{$insurer_or_tpa}" === 'tpa' ? "AND (a.endorsement_id IS NOT NULL OR a.endorsement_id != '')" : "AND (a.endorsement_id IS NULL OR a.endorsement_id = '')";
+
+    //         $query = $this->db->query("
+    //         SELECT DISTINCT
+    //             a.id as endorsement_primarykey,
+    //             a.group_key,
+    //             employee_polices.id as primaryKey, 
+    //             employees.name AS emp_name,
+    //             employees.emp_code AS emp_code,
+    //             employees.dob AS emp_dob,
+    //             employees.gender AS emp_gender,
+    //             employees.relationship AS emp_relationship,
+    //             employees.relationship_code AS emp_relationship_code,
+    //             employees.emp_type as emp_type,
+    //             'D' as event_type_data,
+    //             TIMESTAMPDIFF(YEAR, employees.dob, CURDATE()) AS emp_age,
+
+    //             employees.doj AS emp_doj,
+    //             employees.mobile AS emp_mobile,
+    //             employees.email_corporate AS emp_email_c,
+    //             employees.email_personal AS emp_email_p,
+    //             employees.band AS emp_grade,
+    //             employees.designation AS emp_designation,
+    //             employees.basic_pay AS emp_basic_pay,
+                
+    //             employee_polices.basic_cover_si, 
+    //             employee_polices.uhid as uhid, 
+    //             employee_polices.policy_end_date, 
+    //             employee_polices.rata_premimum as premium, 
+    //             employee_polices.claim_status,
+                
+    //             batch_data.emp_policy_id AS emp_policy_id,
+    //             batch_data.bl AS batch_list_batch_code,
+    //             batch_data.bf AS batch_files_batch_code,
+                
+    //             deletiondata.empstatus, 
+    //             deletiondata.changeevent,
+    //             deletiondata.dateofexit,
+    //             deletiondata.reasonforexit,
+    //             deletiondata.status,
+                
+    //             DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + '$add_one_day' AS no_of_days,
+                
+                
+    //             CASE 
+    //                 WHEN employee_polices.claim_status = 0 THEN 
+    //                     ROUND((employee_polices.rata_premimum * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + $add_one_day)) / 365, 2)
+    //                 ELSE 
+    //                     0
+    //             END AS pro_rata_premium,
+                
+    //             CASE 
+    //                 WHEN employee_polices.claim_status = 0 THEN 
+    //                     ROUND(((employee_polices.rata_premimum * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + $add_one_day)) / 365) * 0.18, 2)
+    //                 ELSE 
+    //                     0
+    //             END AS gst,
+                
+    //             CASE 
+    //                 WHEN employee_polices.claim_status = 0 THEN 
+    //                     ROUND(((employee_polices.rata_premimum * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + $add_one_day)) / 365) + 
+    //                         (((employee_polices.rata_premimum * (DATEDIFF(employee_polices.policy_end_date, deletiondata.dateofexit) + $add_one_day)) / 365) * 0.18), 2)
+    //                 ELSE 
+    //                     0
+    //             END AS total,
+                
+    //             CASE 
+    //                 WHEN employee_polices.claim_status = 0 THEN 
+    //                     'No claim'
+    //                 ELSE 
+    //                     'Claim'
+    //             END AS claim_status            
+            
+    //         FROM 
+    //             emp_endorsement a
+    //         LEFT JOIN 
+    //             employees ON a.emp_code = employees.emp_code
+    //         LEFT JOIN 
+    //             employee_polices ON employees.id = employee_polices.employee_id 
+            
+    //         LEFT JOIN( 
+        
+    //          select aa.emp_code, aa.new_value as 'empstatus', bb.new_value as 'changeevent', cc.new_value as 'dateofexit', dd.new_value as 'reasonforexit', ee.new_value as 'status' from
+                
+    //             ( SELECT  a1.emp_code, a1.field_name, a1.new_value from emp_endorsement as a1 where a1.field_name = 'emp_status' and a1.status != 'truncated') aa 
+    //             left join 
+    //             ( SELECT  b1.emp_code, b1.field_name, b1.new_value from emp_endorsement as b1 where b1.field_name = 'change_event' and b1.status != 'truncated') bb on aa.emp_code = bb.emp_code 
+    //             left join
+    //             ( SELECT  c1.emp_code, c1.field_name, c1.new_value from emp_endorsement as c1  where c1.field_name = 'date_of_exit' and c1.status != 'truncated') cc on aa.emp_code = cc.emp_code
+    //             left join
+    //             ( SELECT  d1.emp_code, d1.field_name, d1.new_value from emp_endorsement as d1  where d1.field_name = 'reason_for_exit' and d1.status != 'truncated') dd on aa.emp_code = dd.emp_code 
+    //             left JOIN
+    //             ( SELECT  e1.emp_code, e1.field_name, e1.new_value from emp_endorsement as e1  where e1.field_name = 'status' and e1.status != 'truncated') ee on aa.emp_code = ee.emp_code
+                
+    //         ) as deletiondata on a.emp_code = deletiondata.emp_code and a.status != 'truncated'
+        
+    //         LEFT JOIN 
+    //             (
+    //             SELECT  
+    //                 batch_list.emp_policy_id,
+    //                 batch_list.batch_code AS bl,
+    //                 batch_files.batch_code AS bf
+    //             FROM 
+    //                 batch_files
+    //             LEFT JOIN 
+    //                 batch_list ON batch_files.batch_code = batch_list.batch_code 
+    //             WHERE 
+    //                 batch_files.event_type = 'deletion'
+    //                 AND batch_files.actions = 'export'
+    //                 AND batch_files.insurer_or_tpa = '{$insurer_or_tpa}'
+    //             ) AS batch_data ON employee_polices.id = batch_data.emp_policy_id 
+
+    //         WHERE employee_polices.client_policy_id = {$client_policy_id}
+    //             AND employees.client_branch_id = {$client_branch_id}
+    //             $endorsement_condition
+    //             AND a.actions = 'd'
+    //             AND a.status != 'truncated'
+    //             AND employee_polices.is_active = 1
+    //             AND employees.is_active = 1
+    //             AND $status_condition
+    //             group by group_key
+    //     ");
+    
+    //     if($return_type == 1){
+    //         $result = $query->getResultArray();
+    //     }else{
+    //         $result = $query->getResult();
+    //     }
+
+    //     // dd($this->db->getLastQuery(), $result);
+
+    //     return $result;
+        
+    // }
 
     public function getDeletionEmployeeDataForExportExcel($ref_data, $return_type = 0)
     {
@@ -666,28 +842,31 @@ class EmployeePolicyModel extends Model
             FROM 
                 emp_endorsement a
             LEFT JOIN 
-                employees ON a.emp_code = employees.emp_code and a.pk = employees.id 
+                employee_polices ON a.pk = employee_polices.id
             LEFT JOIN 
-                employee_polices ON employees.id = employee_polices.employee_id 
-            
-            LEFT JOIN( 
-        
-             select aa.emp_code, aa.new_value as 'empstatus', bb.new_value as 'changeevent', cc.new_value as 'dateofexit', dd.new_value as 'reasonforexit', ee.new_value as 'status' from
-                
-                ( SELECT  a1.emp_code, a1.field_name, a1.new_value from emp_endorsement as a1 where a1.field_name = 'emp_status' and a1.status != 'truncated') aa 
-                left join 
-                ( SELECT  b1.emp_code, b1.field_name, b1.new_value from emp_endorsement as b1 where b1.field_name = 'change_event' and b1.status != 'truncated') bb on aa.emp_code = bb.emp_code 
-                left join
-                ( SELECT  c1.emp_code, c1.field_name, c1.new_value from emp_endorsement as c1  where c1.field_name = 'date_of_exit' and c1.status != 'truncated') cc on aa.emp_code = cc.emp_code
-                left join
-                ( SELECT  d1.emp_code, d1.field_name, d1.new_value from emp_endorsement as d1  where d1.field_name = 'reason_for_exit' and d1.status != 'truncated') dd on aa.emp_code = dd.emp_code 
-                left JOIN
-                ( SELECT  e1.emp_code, e1.field_name, e1.new_value from emp_endorsement as e1  where e1.field_name = 'status' and e1.status != 'truncated') ee on aa.emp_code = ee.emp_code
-                
-            ) as deletiondata on a.emp_code = deletiondata.emp_code and a.status != 'truncated'
+                employees ON employee_polices.employee_id = employees.id
+
+            LEFT JOIN (
+                SELECT 
+                    emp_code,
+                    group_key,
+                    MAX(CASE WHEN field_name = 'emp_status' THEN new_value END) AS empstatus,
+                    MAX(CASE WHEN field_name = 'change_event' THEN new_value END) AS changeevent,
+                    MAX(CASE WHEN field_name = 'date_of_exit' THEN new_value END) AS dateofexit,
+                    MAX(CASE WHEN field_name = 'reason_for_exit' THEN new_value END) AS reasonforexit,
+                    MAX(CASE WHEN field_name = 'status' THEN new_value END) AS status
+                FROM 
+                    emp_endorsement
+                WHERE 
+                    status != 'truncated' 
+                GROUP BY 
+                    group_key
+                    
+            ) AS deletiondata 
+            ON a.emp_code = deletiondata.emp_code AND a.status != 'truncated'
         
             LEFT JOIN 
-                (
+            (
                 SELECT  
                     batch_list.emp_policy_id,
                     batch_list.batch_code AS bl,
@@ -700,7 +879,7 @@ class EmployeePolicyModel extends Model
                     batch_files.event_type = 'deletion'
                     AND batch_files.actions = 'export'
                     AND batch_files.insurer_or_tpa = '{$insurer_or_tpa}'
-                ) AS batch_data ON employee_polices.id = batch_data.emp_policy_id 
+            ) AS batch_data ON employee_polices.id = batch_data.emp_policy_id 
 
             WHERE employee_polices.client_policy_id = {$client_policy_id}
                 AND employees.client_branch_id = {$client_branch_id}
@@ -720,6 +899,7 @@ class EmployeePolicyModel extends Model
         }
 
         // dd($this->db->getLastQuery(), $result);
+        // dd($result);
 
         return $result;
         
diff --git a/app/Models/RFQModel.php b/app/Models/RFQModel.php
index d165b339..2b1560e0 100644
--- a/app/Models/RFQModel.php
+++ b/app/Models/RFQModel.php
@@ -60,15 +60,13 @@ class RFQModel extends Model
         public function getRFQTableDataWithLeadIDAndType($lead_id, $type){
             
             return $this->select('
-                    leads.client_name,
-                    leads.client_short_name,
+                    leads.*,
                     insurers.name as insurer_name,
                     insurer_branch.branch_name as insurer_branch_name,
                     tpa.name as tpa_name,
                     tpa_branch.branch_name as tpa_branch_name,
                     policy_type.policy_type,
                     rfq.json,
-                    file_name
             ')
             ->join('leads', 'rfq.lead_id = leads.id')
             ->join('policy_type', 'leads.policy_type_id = policy_type.id')
diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php
index 0d04d44e..9674abf7 100644
--- a/app/Views/leads_form.php
+++ b/app/Views/leads_form.php
@@ -887,7 +887,7 @@ function addHTMLInput(check) {
     newRow7.innerHTML += `
         <div class="form-group col-md-3">
             <label for="file_upload">File Upload<span class="text-danger">*</span></label>
-            <input type="file" class="form-control" id="file_name" name="file_name[]" required>
+            <input type="file" class="form-control" id="file_name" name="file_name[]" accept=".xls,.xlsx" required>
             <span class="text-danger" id="file_name_display"></span>
         </div>
     `;
diff --git a/app/Views/policy_transaction_inception_form.php b/app/Views/policy_transaction_inception_form.php
index 1f25dd2c..13fc0933 100644
--- a/app/Views/policy_transaction_inception_form.php
+++ b/app/Views/policy_transaction_inception_form.php
@@ -1649,6 +1649,13 @@ function getPolicyTransactionDataForEdit(input) {
                     $('#table_tr_3').hide();
                     $('#table_tr_7').hide();
                     $('#table_tr_35').hide();
+
+                    setTimeout(function(){
+                        $('input[name="co_share_per[]"], input[name="co_premium[]"]').each(function () {
+                            $(this).val(''); // Clear value
+                            console.log('Input cleared:', $(this).attr('name')); 
+                        });
+                    }, 4000);
                 }
 
                 // Handle "Same Insured Name"
@@ -1820,17 +1827,32 @@ function amountCalculation(input) {
         console.log(gst_per);
     }
 
+    console.log('gst_per', gst_per);
+    console.log('igst', igst);
+    console.log('cgst', cgst);
+    console.log('sgst', sgst);
+
     // Calculate the total premium (Base + TP + Co-Premium)
     let tpTotal = bp + tp + tep + cop;
 
+    console.log('bp', bp);
+    console.log('tp', tp);
+    console.log('tep', tep);
+    console.log('cop', cop);
+    console.log('tpTotal', tpTotal);
+
+
     let gst_per_amt = (tpTotal * gst_per) / 100;
+    console.log('gst_per_amt', gst_per_amt);
+
+
     // $('#gst_amount_' + input).val(gst_per_amt.toFixed(2));
     $('#gst_amount_' + input).val(!isNaN(gst_per_amt) && isFinite(gst_per_amt) ? gst_per_amt.toFixed(2) : '0.00');
 
 
     let finalTotal = tpTotal + gst_per_amt + stamp_duty_amt;
 
-    // console.log('Summed Amount:', finalTotal);
+    console.log('Summed Amount:', finalTotal);
     // $('#total_amt_' + input).val(finalTotal.toFixed(2));
     $('#total_amt_' + input).val(!isNaN(finalTotal) && isFinite(finalTotal) ? finalTotal.toFixed(2) : '0.00');
 
@@ -3274,6 +3296,12 @@ $('#cop_yes').change(function() {
         $('#table_tr_3').show()
         $('#table_tr_7').show()
         $('#table_tr_35').show()
+
+        $('input[name="co_share_per[]"], input[name="co_premium[]"]').each(function () {
+            $(this).val(''); // Clear value
+            console.log('Input cleared:', $(this).attr('name')); // Log cleared input
+        });
+        
     } else {
         $('#add_more_row').addClass('d-none');
         $('.payby').addClass('d-none');
@@ -3282,6 +3310,11 @@ $('#cop_yes').change(function() {
         $('#table_tr_3').hide()
         $('#table_tr_7').hide()
         $('#table_tr_35').hide()
+
+        $('input[name="co_share_per[]"], input[name="co_premium[]"]').each(function () {
+            $(this).val(''); // Clear value
+            console.log('Input cleared:', $(this).attr('name')); // Log cleared input
+        });
     }
 });
 
@@ -3621,6 +3654,10 @@ function addInsurerColumn() {
         
         if(team_id.includes('4')){
 
+            console.log(
+                    '################ TEAM ID 4 insurerTable '+  index + '########################'
+                )
+
             switch(index) {
                 case 0: // Insurer selection
                     newCell = `<td>
@@ -3749,6 +3786,10 @@ function addInsurerColumn() {
 
         }else if(team_id.includes('3')){
 
+            console.log(
+                    '################ TEAM ID 3 ########################'
+                )
+
             switch(index) {
                 case 0: // Insurer selection
                     newCell = `<td>
@@ -3841,6 +3882,10 @@ function addInsurerColumn() {
 
         }else if(team_id.includes('6')){
 
+            console.log(
+                    '################ TEAM ID 6 ########################'
+                )
+
             switch(index) {
                 case 0: // Insurer selection
                     newCell = `<td>
@@ -3971,7 +4016,9 @@ function addInsurerColumn() {
             }
         }
 
-
+        console.log('#################################################################');
+        console.log(newCell);
+        console.log('#################################################################');
         $(this).append(newCell);
 
         $('#follow_insurer_id_' + insurerCount).select2()
@@ -4065,6 +4112,10 @@ function populateTable(dataArray) {
 
             if(team_id.includes('4')){
 
+                console.log(
+                    '################ TEAM ID 4 ########################'
+                )
+
                 switch (rowIndex) {
                     case 0: // Insurer selection
                         cell.find('select').val(insurer).change().toggleClass('readonly-select', !!disable_td);
@@ -4172,6 +4223,10 @@ function populateTable(dataArray) {
 
             }else if(team_id.includes('3')){ 
 
+                console.log(
+                    '################ TEAM ID 3 ########################'
+                )
+
                 switch (rowIndex) {
                     case 0: // Insurer selection
                         cell.find('select').val(insurer).change().toggleClass('readonly-select', !!disable_td);
@@ -4236,7 +4291,6 @@ function populateTable(dataArray) {
                     case 20: // Standard Ter %
                         cell.find('input').val(data.standerd_tep_per).toggleClass('readonly-select', !!disable_td);
                         break;
-
                     case 21: // Co-share ID (hidden field)
                         cell.find('input[type="hidden"]').val(data.id);
                         break;
@@ -4244,6 +4298,10 @@ function populateTable(dataArray) {
 
             }else if(team_id.includes('6')){ 
 
+                console.log(
+                    '################ TEAM ID 6 ########################'
+                )
+
                 switch (rowIndex) {
                     case 0: // Insurer selection
                         cell.find('select').val(insurer).change().toggleClass('readonly-select', !!disable_td);
diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php
index c0a4bef7..8700ecad 100644
--- a/app/Views/view_rfq.php
+++ b/app/Views/view_rfq.php
@@ -188,6 +188,12 @@
         color: white !important;
         margin-right: 5px;
     }
+
+    .readonly-select {
+        pointer-events: none;
+        background-color: #f0f0f0; 
+        color: #666; 
+    }
 </style>
 
 
@@ -345,7 +351,7 @@
 <!-- Modal content for Send Insurer and Client Mail -->
 <div class="modal fade" id="list_model" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel"
     aria-hidden="false">
-    <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-dialog modal-full-width">
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title" id="myCenterModalLabel"></h4>
@@ -407,12 +413,12 @@
 
                         <div class="form-group col-md-4">
                             <label for="subject">Subject</label>
-                            <input id="subject" type="text" class="form-control" name="subject" value="Send Internal Mail">
+                            <input id="subject" type="text" class="form-control" name="subject" value="Internal Mail - ">
                         </div>
 
                         <div class="form-group col-md-12">
-                            <label for="mail_content">Mail Content</label>
-                            <textarea id="mail_content" class="form-control" name="mail_content" rows="3"></textarea>
+                            <label for="internal_mail_content">Mail Content</label>
+                            <textarea id="internal_mail_content" class="form-control" name="internal_mail_content" rows="3"><?= isset($mail_content) ? $mail_content : " " ?></textarea>
                         </div>
                     </div>
 
@@ -504,7 +510,7 @@
 
                         <div class="form-group col-md-6">
                             <label for="subject">Subject</label>
-                            <input type="text" class="form-control" id="placement_subject" name="placement_subject" placeholder="Enter Subject">
+                            <input type="text" class="form-control" id="placement_subject" name="placement_subject" value="Proposel Mail for - " placeholder="Enter Subject">
                         </div>
 
                     </div>
@@ -512,7 +518,7 @@
                     <div class="form-row">
                         <div class="form-group col-md-12">
                             <label for="mail_content">Mail Content</label>
-                            <textarea id="placement_mail_content" class="form-control" name="placement_mail_content" rows="3"><?= isset($mail_content) ? $mail_content : "empty" ?></textarea>
+                            <textarea id="placement_mail_content" class="form-control" name="placement_mail_content" rows="3"><?= isset($mail_content) ? $mail_content : " " ?></textarea>
                         </div>
                     </div>
 
@@ -538,7 +544,34 @@
     var proposalDataForDropDown = {};
     var policy_terms = {};
     var premium_data_check = false;
-    var user_role_id = <?= get_role_id(); ?>
+    var user_role_id = <?= get_role_id(); ?>;
+    var jsonDataForHide = null;
+
+    const editorConfig = {
+        buttons: [
+            "bold", 
+            "italic", 
+            "strikethrough", 
+            "|", 
+            "superscript", 
+            "subscript", 
+            "|", 
+            "align", 
+            "fontsize", 
+            "|", 
+            "source" // Add the "source" button for editing HTML
+        ],
+        fontsize: ["8px", "10px", "12px", "14px", "16px", "18px", "20px", "22px", "24px"], // Font sizes in pixels
+        showPlaceholder: false,
+        toolbarButtonSize: "small",
+        toolbarAdaptive: false,
+        saveHeightInStorage: true,
+        minHeight: 400,
+        height: 400, // Optional fixed height
+        defaultMode: "1", // Start in WYSIWYG mode
+        enableDragAndDropFileToEditor: true, // Allow file uploads via drag and drop
+        placeholder: "Start typing here...", // Optional placeholder text
+    };
 
     $(document).ready(function() {
 
@@ -591,15 +624,14 @@
         suggestions = JSON.parse(question_json);
         policy_terms = JSON.parse(policy_terms_json);
 
+        jsonDataForHide = data?.premium_data ?? null;
         if(data){
             proposalDataForDropDown = data.proposal_data;
-
             if(!data.premium_data){
                 premium_data_check = true;
             }
         }
 
-
         console.log('policy_terms', policy_terms);
         console.log('JSON DATA', data);
         console.log('suggestions data', suggestions);
@@ -635,9 +667,22 @@
 
             $('#submitData').text('Save RFQ');
             $('#submitMail').text('Send Insurer Mail');
-            $('#submitQCRData').show();
+
+            if(data){
+                $('#submitQCRData').show();
+            }else{
+                $('#submitQCRData').hide();
+                $('#submitMail').hide();
+                $('#submitExcel').hide();
+x           }
+
             $('#submitPlacement').hide();
-            document.getElementById("second_table")?.remove();
+
+            if(jsonDataForHide){
+                $('#second_table').hide();
+            }else{
+                document.getElementById("second_table")?.remove();
+            }
 
         }else{
 
@@ -697,36 +742,10 @@
     //JoDit editor
     $(document).ready(function(){
 
-        const editorConfig = {
-            buttons: [
-                "bold", 
-                "italic", 
-                "strikethrough", 
-                "|", 
-                "superscript", 
-                "subscript", 
-                "|", 
-                "align", 
-                "fontsize", 
-                "|", 
-                "source" // Add the "source" button for editing HTML
-            ],
-            fontsize: ["8px", "10px", "12px", "14px", "16px", "18px", "20px", "22px", "24px"], // Font sizes in pixels
-            showPlaceholder: false,
-            toolbarButtonSize: "small",
-            toolbarAdaptive: false,
-            saveHeightInStorage: true,
-            minHeight: 400,
-            height: 400, // Optional fixed height
-            defaultMode: "1", // Start in WYSIWYG mode
-            enableDragAndDropFileToEditor: true, // Allow file uploads via drag and drop
-            placeholder: "Start typing here...", // Optional placeholder text
-        };
-
         // Initialize the Jodit editor
         const editor = Jodit.make("#placement_mail_content", editorConfig);
 
-
+        const editor2 = Jodit.make("#internal_mail_content", editorConfig);
 
         var placement_date_datePicker = flatpickr("#placement_date", {
             dateFormat: "d/m/Y",
@@ -1414,7 +1433,7 @@ document.addEventListener('input', function(e) {
 document.getElementById('rfqTable').addEventListener('focusout', function(e) {
     // Ensure the event target is a td element
     if (e.target && e.target.tagName === 'TD' && e.target.classList.contains('editablecolumns')) {
-        validateCellContent(e.target);
+        // validateCellContent(e.target);
     }
     if (e.target && e.target.tagName === 'TD' && e.target.classList.contains('particulars')) {
         validateQuestionCellContent(e.target);
@@ -1493,10 +1512,29 @@ function addRow(e) {
 
 // Function to update row numbers
 function updateRowNumbers() {
+
+    // console.log('updateRowNumbers function called')
+
+    // const rows = rfqTable.tBodies[0].rows;
+    // console.log('rows', rows);
+
+    // for (let i = 0; i < rows.length; i++) {
+    //     rows[i].cells[0].innerText = i + 1;
+    // }
+
     const rows = rfqTable.tBodies[0].rows;
-    for (let i = 0; i < rows.length; i++) {
-        rows[i].cells[0].innerText = i + 1;
+    // console.log('rows', rows);
+
+    for (let i = 0, rowNumber = 1; i < rows.length; i++) {
+        const row = rows[i];
+        // Check if the row has the 'hidden' class
+        if (!row.classList.contains('hidden')) {
+            row.cells[0].innerText = rowNumber; // Set the row number
+            rowNumber++; // Increment row number only for visible rows
+        }
     }
+
+
 }
 
 function realignSpecialConditions() {
@@ -2343,6 +2381,7 @@ function changeState(event) {
         let proposal_name = closestTh.innerText.split('⋮')[0].trim();
         // let subThIndex = closestTh.cellIndex;
         if (over_all_column_data[proposal_name]) {
+
             if (type === 'qcrProposal') {
 
                 console.log('Proposal qcrProposal');
@@ -2363,12 +2402,47 @@ function changeState(event) {
                         icon.style.marginLeft = '8px';
                         this.appendChild(icon);
                     }
+
                 } else {
 
                     if (icon) {
                         this.removeChild(icon);
                     }
                 }
+
+                var sendClientProposal = $(this).siblings('.sendClientProposal');
+                console.log('sendClientProposal', sendClientProposal);
+
+                if(sendClientProposal){
+
+                    over_all_column_data[proposal_name].stc = !over_all_column_data[proposal_name].stc;
+                    sendClientProposal.css('background-color', over_all_column_data[proposal_name].stc ? '#ddd' : '#f1f1f1');
+
+                    // Check if an icon already exists
+                    let icon = sendClientProposal.find('.fa-check-square')[0];
+
+                    if (over_all_column_data[proposal_name].stc) {
+
+                        // If qcr is true and no icon exists, create and append it
+                        if (!icon) {
+
+                             if (!icon) {
+                                icon = $('<i></i>')
+                                    .addClass('fa fa-check-square')
+                                    .css('color', 'green')
+                                    .css('margin-left', '8px');
+                                sendClientProposal.append(icon);
+                            }
+                        }
+                    } else {
+                        if (icon) {
+                            icon.remove();
+                        }
+                    }
+                }
+
+
+                
             } else {
 
                 console.log('Proposal sendClientProposal');
@@ -2396,6 +2470,8 @@ function changeState(event) {
                 }
             }
 
+            console.log(over_all_column_data[proposal_name])
+
         }
     } else {
         console.log('insurer');
@@ -2829,24 +2905,51 @@ function hideQCR() {
 
 }
 
-function setRowWiseQCRandSTCDatachange(){
-    console.log('isFormDataModified', isFormDataModified);
-    isFormDataModified = true; // if any value changeing in the table to set true
+function setRowWiseQCRandSTCDatachange(input) {
+
+    // Ensure input is a jQuery object
+    var $input = $(input);
+
+    // Find the sibling 'input' with name 'client'
+    var client = $input.siblings('input[name="client"]');
+    console.log('client', client);
+
+    // Check if the current input is unchecked, and uncheck the client input
+    if (!$input.prop('checked')) {
+        client.prop('checked', false);
+    } else {
+        client.prop('checked', true);
+    }
+
+    // Ensure 'isFormDataModified' is declared before using it
+    console.log('isFormDataModified', window.isFormDataModified);
+    window.isFormDataModified = true; // Mark the form data as modified
 }
 
+
 //-----------------------------------------------------------------------------------------------------------
 
 function showModal(mail_type) {
 
     if(mail_type == 1){
+
         insurerAndClientMailPopUp()
+
     }else if(mail_type == 2){
+
         var myModal = new bootstrap.Modal(document.getElementById('internal_mail_modal'));
         myModal.show();
+
+        // getMailContent('internal_mail_content');
+
     }else if(mail_type == 3){
+
         placementMailPopUp()
+        // getMailContent('placement_mail_content');
+
     }
 
+
 }
 
 function insurerAndClientMailPopUp(){
@@ -2930,7 +3033,7 @@ function appendInput(data) {
         const url = '<?= base_url('leads/list') ?>?lead_id=' + lead_id;
 
         html += `
-            <div class="form-group col-md-12">
+            <div class="form-group col-md-4">
                 <label for="contact_mail">Client Contact Mail</label>
                 <input value="${data.contact_person_email || ''}" type="text" id="contact_mail" class="form-control" placeholder="Contact Mail" readonly>
             </div>
@@ -2938,7 +3041,7 @@ function appendInput(data) {
 
         if (!data.contact_person_email) {
             html += `
-                <div class="form-group col-md-12">
+                <div class="form-group col-md-4">
                     <a href="${url}">Click here to update mail ID</a>
                 </div>
             `;
@@ -2948,7 +3051,7 @@ function appendInput(data) {
 
             html += `
 
-                <div class="form-group col-md-12">
+                <div class="form-group col-md-4">
                     <label for="client_cc">CC </label>
                     <select class="form-control" id="client_cc" name="client_cc" required multiple>
                         <?php if (isset($userList)) { ?>
@@ -2961,7 +3064,7 @@ function appendInput(data) {
                     </select>   
                 </div>
 
-                <div class="form-group col-md-12">
+                <div class="form-group col-md-4">
                     <label for="client_bcc">BCC </label>
                     <select class="form-control" id="client_bcc" name="client_bcc" required multiple>
                         <?php if (isset($userList)) { ?>
@@ -2977,12 +3080,19 @@ function appendInput(data) {
 
         }
 
+        html += `
+            <div class="form-group col-md-4">
+                <label for="mail_subject">Subject</label>
+                <input value="Client Mail - " type="text" id="mail_subject" class="form-control" placeholder="Subject">
+            </div>
+        `;
+
     } else {
         // Assuming `data.contacts` is an array of contact objects within the main data object
         const contacts = data || {};
 
         html = `
-            <div class="form-group col-md-12">
+            <div class="form-group col-md-4">
                 <label for="insurerContact">Insurers</label>
                 <select id="insurerContact" class="form-control" name="insurerContact[]" multiple>
                     <option></option>
@@ -3003,7 +3113,7 @@ function appendInput(data) {
 
         html += `
 
-            <div class="form-group col-md-12">
+            <div class="form-group col-md-4">
                 <label for="client_cc">CC </label>
                 <select class="form-control" id="client_cc" name="client_cc" required multiple>
                     <?php if (isset($userList)) { ?>
@@ -3016,7 +3126,7 @@ function appendInput(data) {
                 </select>   
             </div>
 
-            <div class="form-group col-md-12">
+            <div class="form-group col-md-4">
                 <label for="client_bcc">BCC </label>
                 <select class="form-control" id="client_bcc" name="client_bcc" required multiple>
                     <?php if (isset($userList)) { ?>
@@ -3030,8 +3140,22 @@ function appendInput(data) {
             </div>
         `;
 
+        html += `
+            <div class="form-group col-md-4">
+                <label for="mail_subject">Subject</label>
+                <input value="Insurer Mail - " type="text" id="mail_subject" class="form-control" placeholder="Subject">
+            </div>
+        `;
+
     }
 
+    html += `
+                <div class="form-group col-md-12">
+                    <label for="insurer_and_client_mail_content">Mail Content</label>
+                    <textarea id="insurer_and_client_mail_content" class="form-control" name="insurer_and_client_mail_content" rows="3"><?= isset($mail_content) ? $mail_content : " " ?></textarea>
+                </div>
+            `; 
+
     $('#input_for_row').append(html);
 
     // Initialize select2 for the dropdown if insurerContact is present
@@ -3059,6 +3183,12 @@ function appendInput(data) {
         $("textarea.select2-search__field").attr('rows', '1');
         $("textarea.select2-search__field").css('resize', 'none');
     }
+
+    // Initialize the Jodit editor
+    const editor = Jodit.make("#insurer_and_client_mail_content", editorConfig);
+
+    // getMailContent('insurer_and_client_mail_content');
+
 }
 
 function constructURL(url_type) {
@@ -3087,64 +3217,215 @@ function constructURL(url_type) {
     }
 }
 
+// function constructURL_ForInsurerAndClientMailSend() {
+
+//     var lead_id = $('#lead_id').val();
+//     var mail_content = $('#insurer_and_client_mail_content').val();
+//     var subject = $('#mail_subject').val();
+//     var apiURL;
+
+//     if (RFQ_or_QCR == 2) {
+//         apiURL = '<?= base_url('leads/sendMail') ?>?lead_id=' + encodeURIComponent(lead_id) +
+//             '&file_type=qcr' +
+//             '&recipient_type=client' +
+//             '&recipient_mail='+
+//             '&mail_content=' + String(mail_content) +
+//             '&subject=' + String(subject);
+
+//     } else {
+//         var insurerContact = $('#insurerContact').val();
+//         insurerContact = insurerContact.map(Number);
+//         console.log(insurerContact);
+
+//         apiURL = '<?= base_url('leads/sendMail') ?>?lead_id=' + encodeURIComponent(lead_id) +
+//             '&file_type=rfq' +
+//             '&recipient_type=insurer' +
+//             '&recipient_mail=' + JSON.stringify(insurerContact)+
+//             '&mail_content=' + String(mail_content) +
+//             '&subject=' + String(subject);
+//     }
+
+//     console.log(apiURL);
+//     ajaxRequest(apiURL);
+// }
+
+// function constructURL_ForInternalMailSend() {
+
+//     var lead_id = $('#lead_id').val();
+//     let to = $('#to').val();
+//     let mail_content = $('#internal_mail_content').val();
+//     let subject = $('#subject').val();
+
+
+//     let cc = $('#cc').val();
+//     cc = cc.map(Number);
+//     cc = JSON.stringify(cc)
+
+//     var file_type = 'rfq';
+//     if (RFQ_or_QCR == 2) {
+//         file_type = 'qcr'
+//     } 
+
+//     var queryParams = {
+//         lead_id: lead_id,
+//         file_type: file_type,
+//         recipient_type: 'internal',
+//         to: to,
+//         cc: cc,
+//         subject: subject,
+//         // mail_content: mail_content,
+//         recipient_mail: '',
+//         mail_content: mail_content,
+//         subject: subject,
+//     };
+
+//     const queryString = objectToQueryString(queryParams);
+//     console.log(queryString);
+
+//     var apiURL = '<?= base_url('leads/sendMail') ?>?'+queryString
+
+//     console.log(apiURL);
+//     ajaxRequest(apiURL);
+// }
+
+// function constructURL_ForPlacementMailSend() {
+
+//     var lead_id = $('#lead_id').val();
+//     let to = $('#placement_to').val();
+//     console.log('to mail', to);
+
+//     let placement_date = $('#placement_date').val();
+//     let utr_no = $('#utr_no').val();
+//     let premium_amount = $('#premium_amount').val();
+//     let total_amount = $('#total_amount').val();
+//     let cd_amount = $('#cd_amount').val();
+
+//     let subject = $('#placement_subject').val();
+//     // let = mail_content = $('#placement_mail_content').val();
+//     let proposal_insurer = $('#proposals option:selected').data('id');
+//     let insurer_and_branch = $('#proposals').val();
+
+//     let cc = $('#placement_cc').val();
+//     cc = cc.map(Number);
+//     // cc = cc.split(',').map(email => email.trim());
+//     cc = JSON.stringify(cc);
+
+//     // to = to.map(String);
+//     // to = JSON.stringify(to)
+//     to = to.split(',').map(email => email.trim());
+//     to = JSON.stringify(to)
+//     console.log('to (array):', to);
+
+//     var file_type = 'rfq';
+//     if (RFQ_or_QCR == 2) {
+//         file_type = 'qcr'
+//     } 
+
+//     var queryParams = {
+//         lead_id: lead_id,
+//         file_type: file_type,
+//         recipient_type: 'placement',
+//         to: to,
+//         cc: cc,
+//         subject: subject,
+//         proposal_insurer: proposal_insurer,
+//         insurer_and_branch: insurer_and_branch,
+//         recipient_mail: to,
+
+//         placement_date: placement_date,
+//         utr_no: utr_no,
+//         premium_amount: premium_amount,
+//         total_amount: total_amount,
+//         cd_amount: cd_amount,
+//     };
+
+//     const queryString = objectToQueryString(queryParams);
+//     console.log(queryString);
+
+//     var apiURL = '<?= base_url('leads/sendMail') ?>?'+queryString
+
+//     console.log(apiURL);
+//     ajaxRequest(apiURL);
+// }
+
+
+// Insurer and Client Mail
 function constructURL_ForInsurerAndClientMailSend() {
 
     var lead_id = $('#lead_id').val();
-    var apiURL;
+    var mail_content = $('#insurer_and_client_mail_content').val();
+    var subject = $('#mail_subject').val();
+    var bcc = $('#client_bcc').val();
+    var cc = $('#client_cc').val();
+
+    console.log('lead_id', lead_id)
+    console.log('subject', subject)
+    console.log('mail_content', mail_content)
+    console.log('bcc', bcc)
+    console.log('cc', cc)
+
+    // Convert cc to JSON string
+    cc = cc.map(Number);
+    cc = JSON.stringify(cc);
+
+    // Convert bcc to JSON string
+    bcc = bcc.map(Number);
+    bcc = JSON.stringify(bcc);
+
+    // Prepare FormData object
+    var formData = new FormData();
+    formData.append('lead_id', lead_id);
+    formData.append('mail_content', mail_content);
+    formData.append('subject', subject);
+    formData.append('cc', cc);
+    formData.append('bcc', bcc);
 
     if (RFQ_or_QCR == 2) {
-        apiURL = '<?= base_url('leads/sendMail') ?>?lead_id=' + encodeURIComponent(lead_id) +
-            '&file_type=qcr' +
-            '&recipient_type=client' +
-            '&recipient_mail=';
+        formData.append('file_type', 'qcr');
+        formData.append('recipient_type', 'client');
+        formData.append('recipient_mail', '');
     } else {
         var insurerContact = $('#insurerContact').val();
         insurerContact = insurerContact.map(Number);
-        console.log(insurerContact);
-
-        apiURL = '<?= base_url('leads/sendMail') ?>?lead_id=' + encodeURIComponent(lead_id) +
-            '&file_type=rfq' +
-            '&recipient_type=insurer' +
-            '&recipient_mail=' + JSON.stringify(insurerContact);
+        formData.append('file_type', 'rfq');
+        formData.append('recipient_type', 'insurer');
+        formData.append('recipient_mail', JSON.stringify(insurerContact));
     }
 
-    console.log(apiURL);
-    ajaxRequest(apiURL);
+    ajaxRequest(formData)
+    console.log('formData', formData)
+
 }
 
+//Internal Mail
 function constructURL_ForInternalMailSend() {
 
     var lead_id = $('#lead_id').val();
     let to = $('#to').val();
-    let = subject = $('#subject').val();
-
+    let mail_content = $('#internal_mail_content').val();
+    let subject = $('#subject').val();
     let cc = $('#cc').val();
+
+    // Convert cc to JSON string
     cc = cc.map(Number);
-    cc = JSON.stringify(cc)
+    cc = JSON.stringify(cc);
 
-    var file_type = 'rfq';
-    if (RFQ_or_QCR == 2) {
-        file_type = 'qcr'
-    } 
+    // Determine file type
+    var file_type = RFQ_or_QCR == 2 ? 'qcr' : 'rfq';
 
-    var queryParams = {
-        lead_id: lead_id,
-        file_type: file_type,
-        recipient_type: 'internal',
-        to: to,
-        cc: cc,
-        subject: subject,
-        // mail_content: mail_content,
-        recipient_mail: '',
-    };
+    // Create FormData
+    var formData = new FormData();
+    formData.append('lead_id', lead_id);
+    formData.append('file_type', file_type);
+    formData.append('recipient_type', 'internal');
+    formData.append('to', to);
+    formData.append('cc', cc);
+    formData.append('subject', subject);
+    formData.append('mail_content', mail_content);
+    formData.append('recipient_mail', ''); // Empty value as per logic
 
-    const queryString = objectToQueryString(queryParams);
-    console.log(queryString);
+    ajaxRequest(formData)
 
-    var apiURL = '<?= base_url('leads/sendMail') ?>?'+queryString
-
-    console.log(apiURL);
-    ajaxRequest(apiURL);
 }
 
 //placement mail
@@ -3152,72 +3433,58 @@ function constructURL_ForPlacementMailSend() {
 
     var lead_id = $('#lead_id').val();
     let to = $('#placement_to').val();
-    console.log('to mail', to);
-
     let placement_date = $('#placement_date').val();
     let utr_no = $('#utr_no').val();
     let premium_amount = $('#premium_amount').val();
     let total_amount = $('#total_amount').val();
     let cd_amount = $('#cd_amount').val();
-
     let subject = $('#placement_subject').val();
-    // let = mail_content = $('#placement_mail_content').val();
+    let mail_content = $('#placement_mail_content').val();
     let proposal_insurer = $('#proposals option:selected').data('id');
     let insurer_and_branch = $('#proposals').val();
-
     let cc = $('#placement_cc').val();
-    cc = cc.map(Number);
-    // cc = cc.split(',').map(email => email.trim());
-    cc = JSON.stringify(cc);
 
-    // to = to.map(String);
-    // to = JSON.stringify(to)
+    // Process `to` field
     to = to.split(',').map(email => email.trim());
-    to = JSON.stringify(to)
-    console.log('to (array):', to);
+    cc = cc.map(Number); // or split if it's a string: `cc.split(',').map(email => email.trim())`
 
-    var file_type = 'rfq';
-    if (RFQ_or_QCR == 2) {
-        file_type = 'qcr'
-    } 
+    // Prepare FormData
+    var formData = new FormData();
+    formData.append('lead_id', lead_id);
+    formData.append('file_type', RFQ_or_QCR == 2 ? 'qcr' : 'rfq');
+    formData.append('recipient_type', 'placement');
+    formData.append('recipient_mail', JSON.stringify(to));
+    formData.append('cc', JSON.stringify(cc));
+    formData.append('subject', subject);
+    formData.append('proposal_insurer', proposal_insurer);
+    formData.append('insurer_and_branch', insurer_and_branch);
+    formData.append('placement_date', placement_date);
+    formData.append('utr_no', utr_no);
+    formData.append('premium_amount', premium_amount);
+    formData.append('total_amount', total_amount);
+    formData.append('cd_amount', cd_amount);
+    formData.append('mail_content', mail_content);
 
-    var queryParams = {
-        lead_id: lead_id,
-        file_type: file_type,
-        recipient_type: 'placement',
-        to: to,
-        cc: cc,
-        subject: subject,
-        proposal_insurer: proposal_insurer,
-        insurer_and_branch: insurer_and_branch,
-        recipient_mail: to,
+    ajaxRequest(formData);
 
-        placement_date: placement_date,
-        utr_no: utr_no,
-        premium_amount: premium_amount,
-        total_amount: total_amount,
-        cd_amount: cd_amount,
-    };
-
-    const queryString = objectToQueryString(queryParams);
-    console.log(queryString);
-
-    var apiURL = '<?= base_url('leads/sendMail') ?>?'+queryString
-
-    console.log(apiURL);
-    ajaxRequest(apiURL);
 }
 
-function ajaxRequest(url) {
 
-    console.log(url);
+
+function ajaxRequest(formData) {
+
+    var apiURL = '<?= base_url('leads/sendMail') ?>';
+    console.log(apiURL);
 
     $('.loader').fadeIn();
     $('.loader-mask').fadeIn();
 
     $.ajax({
-        url: url,
-        type: "GET",
+        url: apiURL,
+        type: "POST",
+        data: formData,
+        processData: false, // Required for FormData
+        contentType: false, // Required for FormData
         dataType: 'json',
         success: function(res) {
 
@@ -3406,23 +3673,55 @@ function mapValues(data) {
   return data; // Return unchanged value for other cases
 }
 
-// const tableContainer1 = document.getElementById('first_table');
-// const tableContainer2 = document.getElementById('second_table');
+const tableContainer1 = document.getElementById('first_table');
+const tableContainer2 = document.getElementById('second_table');
 
-// function syncScroll(source, target) {
-//     target.scrollLeft = source.scrollLeft;
-// }
+function syncScroll(source, target) {
+    target.scrollLeft = source.scrollLeft;
+}
 
-// tableContainer1.addEventListener('scroll', () => {
-//     syncScroll(tableContainer1, tableContainer2);
-// });
+tableContainer1.addEventListener('scroll', () => {
+    syncScroll(tableContainer1, tableContainer2);
+});
 
-// tableContainer2.addEventListener('scroll', () => {
-//     syncScroll(tableContainer2, tableContainer1);
-// });
+tableContainer2.addEventListener('scroll', () => {
+    syncScroll(tableContainer2, tableContainer1);
+});
 
 
+function getMailContent(id){
 
+    let url = '<?= base_url('util/transformMailContent') ?>';
+
+    let lead_id = $('#lead_id').val();
+    let file_type = RFQ_or_QCR == 2 ? 'qcr' : 'rfq';
+    let recipient_mail = 'venkateshraman786@gmail.com'
+    let recipient_type = 'venkateshraman786@gmail.com'
+
+    // Data to send in the AJAX request
+    let requestData = {
+        lead_id: lead_id,
+        recipient_type: recipient_type,
+        recipient_mail: recipient_mail,
+        file_type: file_type,
+    };
+
+    // Send AJAX request
+    sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
+        console.log('Data fetched successfully:', response);
+
+        if (response.status) {
+           console.log(response);
+           $('#'+id).val(response.data)
+        } else {
+            toastr.error(response.message || 'Unable to fetch data', 'ERROR');
+        }
+    }, function(xhr, status, error) {
+        console.error('Error fetching data:', error);
+        console.error(xhr.responseText);
+    });    
+
+}
 
 //--------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -3990,10 +4289,23 @@ function jsonToTable(json) {
                 `;
             } else {
 
-                td.contentEditable = true;
-                td.classList.add('editablecolumns');
+                //Hide QUOTE ASKED if insurer exist
+                let insurerCountForDisableQuoteAsked = 0;
                 td.innerText = dataEntry.value || '';
 
+                if(!["Sno", "Item Key", "Particulars", "Action"].includes(dataEntry.parentth)){
+                    insurerCountForDisableQuoteAsked = proposels[dataEntry.parentth]['insurers'].length
+                }
+
+                if(dataEntry.subth === "Quote Asked" && insurerCountForDisableQuoteAsked > 0){
+                    td.contentEditable = false;
+                    td.classList.add('readonly-select');
+                }else{
+                    td.contentEditable = true;
+                    td.classList.add('editablecolumns');
+                }
+                // end of hide QUOTE ASKED if insurer exist
+
                 const hiddenInput = document.createElement('input');
                 hiddenInput.type = 'hidden';
                 hiddenInput.value = dataEntry.input_value || '';
@@ -4050,12 +4362,13 @@ function jsonToTable(json) {
     moveAddRowButton();
     attachEventListeners();
     checkCellValueAndHighlight();
+    updateRowNumbers()
     hideQCR()
 
     isFormDataModified = false;
-    if(RFQ_or_QCR == 2){
+    // if(RFQ_or_QCR == 2){
         populateTable(json)
-    }
+    // }
 }
 
 function populateTable(json) {
@@ -4076,14 +4389,22 @@ function populateTable(json) {
         let randomColor = 'hsl(' + Math.random() * 360 + ', 100%, 93%)';
 
         // Skip unwanted parent headers
-        if (!["Item Key", "Sno", "Action"].includes(header.parentHeader)) {
+        if (!["Item Key", "Action"].includes(header.parentHeader)) {
             // console.log(header.parentHeader);
 
             // Create the parent header
             const th = document.createElement("th");
             th.textContent = header.parentHeader;
-            th.className = header.parentHeader === "Particulars" ? "sticky" : "";
-            if(header.parentHeader !== 'Particulars'){
+
+            if (header.parentHeader === "Particulars") {
+                th.classList.add('sticky');
+            }
+
+            if (header.parentHeader === "Sno") {
+                th.classList.add('sticky');
+            }
+
+            if(header.parentHeader !== 'Particulars' && header.parentHeader !== 'Sno'){
                 th.style.backgroundColor = randomColor;
             }
             // Calculate colspan based on the number of subheaders
@@ -4100,11 +4421,19 @@ function populateTable(json) {
             header.subHeaders.forEach(subHeader => {
                 const subTh = document.createElement("th");
                 subTh.textContent = subHeader;
-                if(subHeader == '-'){
-                    subTh.className = "sticky";
-                }else{
+
+                if (header.parentHeader === "Particulars") {
+                    subTh.classList.add('sticky');
+                }
+
+                if (header.parentHeader === "Sno") {
+                    subTh.classList.add('sticky');
+                }
+
+                if(header.parentHeader != "Particulars" && header.parentHeader !== 'Sno'){
                     subTh.style.backgroundColor = randomColor;
                 }
+                
                 headerRow2.appendChild(subTh);
             });
 
@@ -4119,23 +4448,38 @@ function populateTable(json) {
     table.appendChild(thead);
 
     // Generate tbody rows based on subheaders
-    const rowLabels = ["Premium", "GST", "Total"];
-    rowLabels.forEach(label => {
+    const rowLabels = ["Premium", "GST (%)", "GST Amount (₹)", "Total"];
+
+    rowLabels.forEach((label, rowIndex) => {
+
         const tr = document.createElement("tr");
 
-        // First column: Row label
+        // First column: Serial No
+        const tdFirst = document.createElement("td");
+        tdFirst.textContent = rowIndex + 1;
+        tdFirst.className = "sticky";
+        tr.appendChild(tdFirst);
+
+        // Second column: Row label
         const tdLabel = document.createElement("td");
         tdLabel.textContent = label;
         tdLabel.className = "sticky";
         tr.appendChild(tdLabel);
 
         // Create a td for each subheader
-        json.table_data.headers.forEach(header => {
-            if (!["Item Key", "Particulars", "Sno", "Action"].includes(header.parentHeader)) {
+        json.table_data.headers.forEach((header, headerIndexForCalc) => {
+            if (!["Item Key", "Sno", "Particulars", "Action"].includes(header.parentHeader)) {
                 header.subHeaders.forEach((value, index) => {
+                   
                     // if(value != '-'){
                         const td = document.createElement("td");
                         td.setAttribute("contenteditable", "true");
+                        // td.classList.add('editablecolumnsforcalc')
+                        td.classList.add(
+                            'editablecolumnsforcalc', 
+                            label.toLowerCase().replace(/\s+/g, '').replace(/[%₹()]/g, '')
+                        );
+                        // td.id = `${label.toLowerCase()}`;
                         td.textContent = json.premium_data?.data?.[header.parentHeader]?.[value]?.[label] || "";
                         tr.appendChild(td);
                     // }
@@ -4155,73 +4499,11 @@ function populateTable(json) {
     }
 }
 
-// function generateJSONFromTable() {
-
-//     const table = document.getElementById("rfqTable_for_calc");
-//     const jsonData = { data: {} };
-
-//     // Get the header rows
-//     const headerRows = table.querySelectorAll("thead tr");
-//     const parentHeaders = [];
-//     const subHeadersMap = {};
-
-//     // Extract parent headers and map them to subheaders
-//     headerRows[0].querySelectorAll("th").forEach((th, index) => {
-//         if (index > 0) parentHeaders.push(th.textContent.trim());
-//     });
-
-//     const subHeaderCountPerParent = Math.floor(headerRows[1].children.length / parentHeaders.length);
-//     console.log('subHeaderCountPerParent', subHeaderCountPerParent);
-//     console.log('subHeaderCountPerParent', subHeaderCountPerParent-1);
-
-//     headerRows[1].querySelectorAll("th").forEach((th, index) => {
-//         if (index > 0) {
-//             const parentIndex = Math.floor(index / subHeaderCountPerParent); // Adjust parent grouping
-//             const parentHeader = parentHeaders[parentIndex] || "Unknown";
-//             if (!subHeadersMap[parentHeader]) {
-//                 subHeadersMap[parentHeader] = [];
-//             }
-//             subHeadersMap[parentHeader].push(th.textContent.trim());
-//         }
-//     });
-
-//     // Initialize JSON structure for each parent header
-//     parentHeaders.forEach(parentHeader => {
-//         jsonData.data[parentHeader] = {};
-//         subHeadersMap[parentHeader]?.forEach(subHeader => {
-//             jsonData.data[parentHeader][subHeader] = {};
-//         });
-//     });
-
-//     // Extract tbody data and populate JSON
-//     const bodyRows = table.querySelectorAll("tbody tr");
-//     const rowLabels = Array.from(bodyRows).map(row =>
-//         row.querySelector("td").textContent.trim()
-//     );
-
-//     bodyRows.forEach((row, rowIndex) => {
-//         const cells = row.querySelectorAll("td");
-//         let cellIndex = 1; // Start after the first column (row labels)
-
-//         parentHeaders.forEach(parentHeader => {
-//             subHeadersMap[parentHeader]?.forEach(subHeader => {
-//                 const cellValue = cells[cellIndex]?.textContent.trim() || "";
-//                 jsonData.data[parentHeader][subHeader][rowLabels[rowIndex]] =
-//                     cellValue;
-//                 cellIndex++;
-//             });
-//         });
-//     });
-
-//     console.log(jsonData);
-//     console.log(JSON.stringify(jsonData, null, 2));
-//     localStorage.setItem('premium_data', JSON.stringify(jsonData));
-//     return jsonData;
-// }
-
 function generateJSONFromTable() {
 
     const table = document.getElementById("rfqTable_for_calc");
+    console.log(table);
+    
     const jsonData = { data: {} };
 
     // Get header rows
@@ -4229,10 +4511,10 @@ function generateJSONFromTable() {
     const parentHeaders = [];
     const subHeaders = [];
 
-    // console.log('headerRows', headerRows);
-    // console.log('headerRows 1', headerRows[1]);
-    // console.log('headerRows 0', headerRows[0]);
-    // console.log('headerRows 0', headerRows[1].length);
+    console.log('headerRows', headerRows);
+    console.log('headerRows 1', headerRows[1]);
+    console.log('headerRows 0', headerRows[0]);
+    console.log('headerRows 0', headerRows[1].length);
 
     // Extract parent headers
     headerRows[0].querySelectorAll("th").forEach((th, index) => {
@@ -4279,7 +4561,7 @@ function generateJSONFromTable() {
 
     bodyRows.forEach(row => {
         const cells = row.querySelectorAll("td");
-        const rowLabel = cells[0]?.textContent.trim();
+        const rowLabel = cells[1]?.textContent.trim();
 
         let cellIndex = 1; // Start after the first column (row labels)
         subHeaders.forEach(({ parent, subHeader }) => {
@@ -4561,6 +4843,112 @@ function removeProposalForPremiumTable(secondRowIndex) {
     }
 }
 
+document.getElementById('rfqTable_for_calc').addEventListener('focusout', function(e) {
+    console.log('callsed', e);
+    console.log('callsed', e.target);
+    console.log('callsed', e.target.tagName);
+    console.log('callsed', e.target.classList);
+
+    // Ensure the event target is a td element
+    if (e.target && e.target.tagName === 'TD' && e.target.classList.contains('editablecolumnsforcalc')) {
+        autoCaluculationForPremiumChildTable(e.target);
+    }
+});
+
+// function autoCaluculationForPremiumChildTable(input) {
+
+//     console.log('autoCaluculationForPremiumChildTable input', input);
+//     console.log('autoCalucationForPremiumChildTable textContent', input.textContent);
+    
+//     // Get the row where the input was made
+//     const row = input.closest('tr');
+//     console.log('row', row);
+    
+//     // Find the index of the input td
+//     const tdIndex = Array.from(row.children).indexOf(input);
+//     console.log('tdIndex', tdIndex);
+    
+//     // Get all rows (assuming there are exactly 3 rows)
+//     const rows = Array.from(row.parentNode.children);
+//     console.log('rows', rows);
+    
+//     // Now we need to get the relevant td values from all rows based on the tdIndex
+//     let premium = 0, gst = 0, total = 0, gst_amt = 0;
+
+//     rows.forEach((r, index) => {
+//         const tds = r.querySelectorAll('td');
+        
+//         // Check if the row contains premium, gst, or total based on tdIndex
+//         if (index === 0) { // First row
+//             premium = Number(tds[tdIndex]?.textContent) || 0;
+//         } else if (index === 1) { // Second row
+//             gst = Number(tds[tdIndex]?.textContent) || 0;
+//         } else if (index === 2) { // Third row
+//             gst_amt = Number(tds[tdIndex]?.textContent) || 0;
+//         }else if (index === 3) { // Fouth row
+//             total = Number(tds[tdIndex]?.textContent) || 0;
+//         }
+//     });
+    
+//     console.log('premium', premium);
+//     console.log('gst', gst);
+//     console.log('gst_amt', gst_amt);
+//     console.log('total', total);
+
+//     // Perform calculation for GST (for example, premium * gst / 100)
+//     const calculatedGSTAmount = (premium * gst) / 100 || 0;
+//     console.log('Calculated GST Amount:', calculatedGSTAmount);
+
+//     const calculatedTotal = premium + calculatedGSTAmount;
+//     console.log('Calculated Total Amount:', calculatedTotal);
+
+//     const beforeLastRow = rows[1]; // Assuming the last row is the total row
+//     const gstAmtCell = beforeLastRow.children[tdIndex];
+//     gstAmtCell.textContent = calculatedTotal.toFixed(2); // Set the calculated total to two decimal places
+    
+//     // Update the total field in the last row
+//     const lastRow = rows[2]; // Assuming the last row is the total row
+//     const totalCell = lastRow.children[tdIndex];
+//     totalCell.textContent = calculatedTotal.toFixed(2); // Set the calculated total to two decimal places
+// }
+
+function autoCaluculationForPremiumChildTable(input) {
+    console.log('autoCaluculationForPremiumChildTable input', input);
+
+    // Get the row where the input was made
+    const row = input.closest('tr');
+    console.log('row', row);
+
+    // Find the index of the input td
+    const tdIndex = Array.from(row.children).indexOf(input);
+    console.log('tdIndex', tdIndex);
+
+    // Get all rows (assuming there are exactly 4 rows: Premium, GST, GST Amount, Total)
+    const rows = Array.from(row.parentNode.children);
+    console.log('rows', rows);
+
+    // Extract values from the corresponding cells in each row
+    const premium = Number(rows[0].children[tdIndex]?.textContent.trim()) || 0;
+    const gst = Number(rows[1].children[tdIndex]?.textContent.trim()) || 0;
+
+    console.log('premium', premium);
+    console.log('gst', gst);
+
+    // Calculate GST Amount and Total
+    const gstAmount = (premium * gst) / 100;
+    const total = premium + gstAmount;
+
+    console.log('Calculated GST Amount:', gstAmount.toFixed(2));
+    console.log('Calculated Total Amount:', total.toFixed(2));
+
+    // Update GST Amount row
+    rows[2].children[tdIndex].textContent = gstAmount.toFixed(2);
+
+    // Update Total row
+    rows[3].children[tdIndex].textContent = total.toFixed(2);
+}
+
+
 </script>
 
 
@@ -4582,8 +4970,12 @@ function removeProposalForPremiumTable(secondRowIndex) {
             const formData = new FormData();
             let lead_id = $('#lead_id').val();
 
+            let submit_type = "RFQ"
+            if(RFQ_or_QCR == 2){submit_type = 'QCR'} 
+
             formData.append('json', JSON.stringify(jsonData));
             formData.append('lead_id', lead_id);
+            formData.append('submit_type', submit_type);
 
             const postUrl = '<?= base_url('rfq/create')?>';
             console.log(postUrl);
@@ -4709,7 +5101,7 @@ function removeProposalForPremiumTable(secondRowIndex) {
             const table = document.getElementById('rfqTable');
             
             let premium_data = '';
-            if(RFQ_or_QCR == 2){
+            if(jsonDataForHide){
                 premium_data = generateJSONFromTable();
                 console.log('save premium data', premium_data); 
             }
@@ -4847,9 +5239,9 @@ function removeProposalForPremiumTable(secondRowIndex) {
             };
 
             // Add `premium_data` only if `QCR` equals 2
-            if (RFQ_or_QCR == 2) {
-                jsonData.premium_data = premium_data;
-            }
+            // if (RFQ_or_QCR == 2) {
+            jsonData.premium_data = premium_data;
+            // }
 
             localStorage.setItem('data', JSON.stringify(jsonData));
             resolve(jsonData);