diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 1527b8cc..ef4c655c 100755
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -360,6 +360,9 @@ $routes->group("/util", ["filter" => "authMVC"], function ($routes) {
     $routes->get('removeInstallments', 'LeadsController::removeInstallments');
 });
 
+$routes->post("policy_tranction/sendInstallmentRemainderMail","PolicyTransactionController::sendInstallmentRemainderMail");
+$routes->cli("cli/sendInstallmentRemainderMail","PolicyTransactionController::sendInstallmentRemainderMail");
+
 $routes->group("policy_tranction", ["filter" => "authMVC"], function ($routes) {
 
     $routes->group("inception", ["filter" => "authMVC"], function ($routes) {
diff --git a/app/Controllers/MasterController.php b/app/Controllers/MasterController.php
index fa094bb8..0a3c357d 100755
--- a/app/Controllers/MasterController.php
+++ b/app/Controllers/MasterController.php
@@ -1680,7 +1680,7 @@ class MasterController extends AdminController
             ["filePath" => ROOTPATH."public/sample_excel/sample_inception.xls","fileName" => "sample_inception.xls"],
             ["filePath" => ROOTPATH."public/assets/images/login_bg.jpg","fileName" => "login_bg.jpg"]
         ];
-        $email_id = 'srinivas.saravanan@venbainfotech.com';
+        $email_id = ['srinivas.saravanan@venbainfotech.com','srinivassaravanan2002@gmail.com'];
         $params = ['mail'=>$email_id];
         $common = ['mail_type'=>'test_mail_cli'];
         // $bcc = "vijayalakshmi@nhanceindia.in,vitvelz@gmail.com,velmurugan.s@venbainfotech.com,hariharan@nhanceindia.in,hariharan@jubiliant.in,srinivas.saravanan@venbainfotech.com";
diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php
index d0242215..d7270335 100644
--- a/app/Controllers/PolicyTransactionController.php
+++ b/app/Controllers/PolicyTransactionController.php
@@ -32,10 +32,13 @@ use App\Models\InvPaymentDetailsModel;
 use App\Models\BatchFileModel;
 use App\Models\FileModel;
 use App\Models\COShareStmtDetailsModel;
-use Kint;
+use App\Models\BdsPlacementModel;
+use Kint\Kint;
+use App\Helpers\MailHelper;
+use Exception;
 
 class PolicyTransactionController extends BaseController
-{   
+{
     use ResponseTrait;
 
     protected $myLogger;
@@ -64,6 +67,7 @@ class PolicyTransactionController extends BaseController
     protected $batchFileModel;
     protected $filesModel;
     protected $coShareStmtDetailsModel;
+    protected $BdsPlacementModel;
 
     public function __construct()
     {
@@ -94,6 +98,7 @@ class PolicyTransactionController extends BaseController
         $this->batchFileModel                = new BatchFileModel();
         $this->filesModel                    = new FileModel();
         $this->coShareStmtDetailsModel       = new COShareStmtDetailsModel();
+        $this->BdsPlacementModel             = new BdsPlacementModel();
         $this->invoiceStatus = [
             'pending' => 'Pending',
             'generated' => 'Generated',
@@ -182,8 +187,7 @@ class PolicyTransactionController extends BaseController
                 $issuer,
                 $status
             );
-
-        }else{
+        } else {
 
             $ids = $this->request->getPost('ids');
             $ids = array_filter(explode(',', $ids));
@@ -1831,7 +1835,7 @@ class PolicyTransactionController extends BaseController
 
             if (isset($isFromDashboard) && !empty($isFromDashboard) && $isFromDashboard == 1) {
                 $ids = $this->request->getPost('ids');
-                
+
                 $ids = array_filter(explode(',', $ids));
 
                 if (!empty($ids)) {
@@ -2801,4 +2805,105 @@ class PolicyTransactionController extends BaseController
             ->update();
         return $this->respond(['dataStatus' => true, 'code' => 200], 200);
     }
+
+    public function sendInstallmentRemainderMail()
+    {
+
+        $this->myLogger->logme("error", "Cron Job For Send Installment Remainder Mail Started");
+
+        try {
+
+            try {
+
+                $bdsInstallmentData = $this->BdsPlacementModel->getClientInstallmentDetails();
+
+            }catch (Exception $e) {
+
+                $this->myLogger->logme('error', 'Exception: ' . $e->getMessage() . 'Page: ' . $e->getFile() . ' Line: ' . $e->getLine());
+    
+            }
+            $this->myLogger->logme("error", "Data for BDS Installment " . json_encode($bdsInstallmentData));
+            // dd($bdsInstallmentData);
+
+            if (empty($bdsInstallmentData)) {
+
+                $this->myLogger->logme("error", "No Client Installment is Due in the 15th Day");
+
+                return false;
+            }
+
+            foreach ($bdsInstallmentData as $installmentData) {
+
+                $mailData = $this->PrepareBDSMailData($installmentData);
+                $to_mail = $mailData['to_mail'];
+                $message = $mailData['message'];
+                $subject = $mailData['subject'];
+
+                $this->myLogger->logme("error", "Installment Pending for" . $subject);
+
+                $common = ['mail_type' => 'installment_amount_due_remainder_mail'];
+
+                $res = MailHelper::send_email(['mail' => $to_mail, 'subject' => $subject, 'message' => $message, 'common' => $common]);
+
+                $res = json_decode($res);
+                $this->myLogger->logme('error', 'res: ' . json_encode($res));
+
+                if ($res->status == 'success') {
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        } catch (Exception $e) {
+
+            $this->myLogger->logme('error', 'Exception: ' . $e->getMessage() . 'Page: ' . $e->getFile() . ' Line: ' . $e->getLine());
+        }
+    }
+
+    protected function PrepareBDSMailData($data)
+    {
+
+        try {
+
+            $installment_amount =   $data['installment_amount'];
+            $payment_date       =   date('d-m-Y', strtotime($data['payment_date']));
+            $client             =   $data['client_name'];
+            $branch             =   $data['branch_name'];
+            $sales_person_mail  =   $data['sales_person'];
+            $heads              =   $data['heads'];
+            $admins             =   $data['admins'];
+            $buisness_team      =   $data['buisness_team'];
+            $policy_no          =   $data['policy_no'];
+            $client_short_name  =   isset($data['short_name']) && $data['short_name'] != null ? $data['short_name'] : $data['client_name'];
+
+            $subject = "Installment Amount Due For Client - {$client_short_name} - Policy NO({$policy_no}) is Due On - {$payment_date}";
+
+            $message = "Policy Installment for Client - {$client}, Branch - {$branch} is Due on {$payment_date} 
+            with amount of {$installment_amount}.<br>
+            Policy No : {$policy_no}";
+
+
+            $to_mail = array_merge(
+                array_column($heads, 'email'),
+                array_column($admins, 'email'),
+                array_column($buisness_team, 'email'),
+                [$sales_person_mail]
+            );
+
+            $to_mail = array_unique($to_mail);
+
+            $this->myLogger->logme("error", "Selected To Address : " . json_encode($to_mail));
+
+            // dd($to_mail);
+            return [
+                'to_mail' => $to_mail,
+                'message' => $message,
+                'subject' => $subject
+            ];
+
+        } catch (Exception $e) {
+
+            $this->myLogger->logme('error', 'Exception: ' . $e->getMessage() . 'Page: ' . $e->getFile() . ' Line: ' . $e->getLine());
+        }
+    }
 }
diff --git a/app/Models/BdsPlacementModel.php b/app/Models/BdsPlacementModel.php
new file mode 100644
index 00000000..2cd7c6f4
--- /dev/null
+++ b/app/Models/BdsPlacementModel.php
@@ -0,0 +1,93 @@
+<?php
+
+namespace App\Models;
+
+use CodeIgniter\Model;
+
+class BdsPlacementModel extends Model
+{
+    protected $table            = 'bds_installment_payment_details';
+    protected $primaryKey       = 'id';
+    protected $allowedFields    = [
+        'id',
+        'pt_id',
+        'lead_id',
+        'installment_amount',
+        'payment_date',
+        'utr_no',
+        'created_at',
+        'created_by',
+        'updated_at',
+        'updated_by',
+        'is_active'
+    ];
+
+
+    public function getClientInstallmentDetails()
+    {
+
+        $builder = $this->db->table("bds_installment_payment_details bipd")
+            ->select("bipd.*, ct.client_name,ct.short_name, cb.branch_name, leads.salse_person_id,cp.policy_no")
+            ->join("policy_transaction pt", "pt.id = bipd.pt_id")
+            ->join("clients ct", "ct.id = pt.client_id")
+            ->join("client_branch cb", "cb.id = pt.client_branch_id")
+            ->join("leads", "leads.id = bipd.lead_id")
+            ->join("client_policy cp","cp.id = pt.client_policy_id")
+            ->where("bipd.is_active", 1)
+            ->where("bipd.payment_date", date('Y-m-d', strtotime('+15 days')));
+
+        $data = $builder->get()->getResultArray();
+
+        // Loop through to extract sales person details
+        foreach ($data as &$row) {
+            $sales_person_ids = json_decode($row['salse_person_id'], true);
+            $sales_person_id = $sales_person_ids[0] ?? null;
+
+            if ($sales_person_id) {
+                $user = $this->db->table('user_profiles')
+                    ->select('email') // or whatever field
+                    ->where('id', $sales_person_id)
+                    ->get()
+                    ->getRowArray();
+
+                $row['sales_person'] = $user['email'] ?? 'N/A';
+            } else {
+                $row['sales_person'] = 'Not Assigned';
+            }
+
+            $head = $this->db->table('user_profiles')
+            ->select('email') // or whatever field
+            ->where('role', 5)
+            ->where('is_active',1)
+            ->get()
+            ->getResultArray();
+            
+
+            $row['heads'] = $head;
+
+            $admin = $this->db->table('user_profiles')
+                    ->select('email')
+                    ->where("is_active",1)
+                    ->where("role",1)
+                    ->get()
+                    ->getResultArray();
+
+            $row['admins'] = $admin;
+
+            $buisenessTeam = $this->db->table("user_teams ut")
+                        ->select("up.email")
+                        ->join('user_profiles up','up.id = ut.user_id and up.is_active = 1')
+                        ->where("ut.team_id",7)
+                        ->where("ut.is_active",1)
+                        ->get()
+                        ->getResultArray();
+
+            $row['buisness_team'] = $buisenessTeam;
+
+
+        }
+
+
+        return $data;
+    }
+}
diff --git a/app/Models/TicketMasterModel.php b/app/Models/TicketMasterModel.php
index 62a5e101..b85dad62 100644
--- a/app/Models/TicketMasterModel.php
+++ b/app/Models/TicketMasterModel.php
@@ -541,7 +541,7 @@ class TicketMasterModel extends Model
                          AND th.is_active = 1),
                         tm.created_at
                     )) BETWEEN 13 AND 20 THEN "13-20 Days"
-                    ELSE "Above 20 Days"g
+                    ELSE "Above 20 Days"
                 END AS tat_category',
                 'COUNT(*) AS count'
             ])
diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php
index 265d1f32..25044797 100644
--- a/app/Views/leads_form.php
+++ b/app/Views/leads_form.php
@@ -777,6 +777,7 @@
                 console.log(response.message, 'SUCCESS');
                 $('#appendArea_' + dataIncrement).append(response.data);
 
+                console.log("Policy Type ID : ",policy_type_id);
                 if (policy_type_id == 1 || policy_type_id == 6 || policy_type_id == 7) {
 
                     let newId = 'appendAreaForClaim_' + dataIncrement;
diff --git a/app/Views/leads_form_handler.php b/app/Views/leads_form_handler.php
index 11ba47a7..f796ee6e 100644
--- a/app/Views/leads_form_handler.php
+++ b/app/Views/leads_form_handler.php
@@ -719,6 +719,11 @@ if (isset($selected_lead_type)) {
                             $('#policy_type_id').val(data.policy_type_id || '').select2();
                             $('.loader').fadeOut();
                             $('.loader-mask').delay(350).fadeOut('slow');
+                            $(".loss_date").each(function () {
+                                flatpickr(this, {
+                                    dateFormat: "d-m-Y", 
+                                });
+                            });
                         }, 1000);
                     }, 1000);
                 }, 2000);
diff --git a/app/Views/leads_non_eb.php b/app/Views/leads_non_eb.php
index 0dc0d785..9c826359 100644
--- a/app/Views/leads_non_eb.php
+++ b/app/Views/leads_non_eb.php
@@ -1,41 +1,41 @@
 <!-- Leads Non EB -->
 
 <style>
-.readonly-color {
-    background-color: #e0e0e0;
-    /* Darker background */
-    color: #666;
-    /* Darker text color */
-}
+    .readonly-color {
+        background-color: #e0e0e0;
+        /* Darker background */
+        color: #666;
+        /* Darker text color */
+    }
 
-.readonly-select {
-    pointer-events: none;
-    background-color: #f0f0f0;
-    color: #666;
-}
+    .readonly-select {
+        pointer-events: none;
+        background-color: #f0f0f0;
+        color: #666;
+    }
 
-hr.solid {
-    border-top: 3px solid #bbb;
-}
+    hr.solid {
+        border-top: 3px solid #bbb;
+    }
 
-.select2-hidden-accessible+.select2-container .select2-dropdown {
-    display: none !important;
-}
+    .select2-hidden-accessible+.select2-container .select2-dropdown {
+        display: none !important;
+    }
 
-.select2-container .select2-selection--multiple .select2-selection__choice {
-    color: #000000;
-}
+    .select2-container .select2-selection--multiple .select2-selection__choice {
+        color: #000000;
+    }
 
-.select2-selection__choice {
-    background-color: #0a8794 !important;
-    color: white !important;
-    font-weight: bold;
-}
+    .select2-selection__choice {
+        background-color: #0a8794 !important;
+        color: white !important;
+        font-weight: bold;
+    }
 
-.select2-selection__choice__remove {
-    color: white !important;
-    margin-right: 5px;
-}
+    .select2-selection__choice__remove {
+        color: white !important;
+        margin-right: 5px;
+    }
 </style>
 
 
@@ -233,8 +233,8 @@ hr.solid {
                                 <?php
                                 if (isset($policy_type) && count($policy_type)) {
                                     foreach ($policy_type as $value) {
-                                        if(in_array($value['allocg'], ["Non-EB", "Marine"])){
-                                            echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] ."</option>";
+                                        if (in_array($value['allocg'], ["Non-EB", "Marine"])) {
+                                            echo "<option value='" . $value['id'] . "'>" . $value['policy_type'] . "</option>";
                                         }
                                     }
                                 }
@@ -247,11 +247,11 @@ hr.solid {
                             <select class="form-control" id="insurer" name="insurer">
                                 <option value="">Select Insurer</option>
                                 <?php if (isset($insurer)) { ?>
-                                <?php foreach ($insurer as $value) { ?>
-                                <option value="<?= $value['id'] . '-' . $value['insurer_id'] ?>">
-                                    <?= $value['insurer_name'] . '-' . $value['branch_code'] ?>
-                                </option>
-                                <?php } ?>
+                                    <?php foreach ($insurer as $value) { ?>
+                                        <option value="<?= $value['id'] . '-' . $value['insurer_id'] ?>">
+                                            <?= $value['insurer_name'] . '-' . $value['branch_code'] ?>
+                                        </option>
+                                    <?php } ?>
                                 <?php } ?>
                             </select>
                         </div>
@@ -260,13 +260,19 @@ hr.solid {
                             <label for="tpa">TPA <span class="text-danger"></span></label>
                             <select class="form-control" id="tpa" name="tpa">
                                 <option value="">Select TPA</option>
-                                <?php //if (isset($tpa)) { ?>
-                                <?php //foreach ($tpa as $value) { ?>
-                                <option value="<?php // echo $value['id'] . '-' . $value['tpa_id'] ?>">
-                                    <?php // echo $value['tpa_short_name'] . '-' . $value['branch_code'] ?>
+                                <?php //if (isset($tpa)) { 
+                                ?>
+                                <?php //foreach ($tpa as $value) { 
+                                ?>
+                                <option value="<?php // echo $value['id'] . '-' . $value['tpa_id'] 
+                                                ?>">
+                                    <?php // echo $value['tpa_short_name'] . '-' . $value['branch_code'] 
+                                    ?>
                                 </option>
-                                <?php //} ?>
-                                <?php //} ?>
+                                <?php //} 
+                                ?>
+                                <?php //} 
+                                ?>
                             </select>
                         </div> -->
 
@@ -308,11 +314,11 @@ hr.solid {
                             <select class="form-control" id="salse_person_id" name="salse_person_id" multiple required>
                                 <option value="">Select Sales Person</option>
                                 <?php if (isset($salse_team)) { ?>
-                                <?php foreach ($salse_team as $value) { ?>
-                                <option value="<?= $value['id']; ?>">
-                                    <?= $value['first_name']; ?>
-                                </option>
-                                <?php } ?>
+                                    <?php foreach ($salse_team as $value) { ?>
+                                        <option value="<?= $value['id']; ?>">
+                                            <?= $value['first_name']; ?>
+                                        </option>
+                                    <?php } ?>
                                 <?php } ?>
                             </select>
                         </div>
@@ -355,60 +361,83 @@ hr.solid {
 </div>
 
 <script>
+    $(document).ready(function() {
 
-$(document).ready(function(){
+        var today = new Date();
 
-    var today = new Date();
-    
-    var policy_start_datePicker = flatpickr("#policy_start_date", {
-        dateFormat: "d/m/Y",
-        allowInput: false,
-        onChange: function(selectedDates, dateStr, instance) {
-            var endDate = new Date(selectedDates[0]);
-            endDate.setFullYear(endDate.getFullYear() + 1);
-            endDate.setDate(endDate.getDate() - 1); // Set end date to last day of selected year
-            policy_end_datePicker.setDate(endDate);
-        }
-    });
-    var policy_end_datePicker = flatpickr("#policy_end_date", {
-        dateFormat: "d/m/Y",
-        allowInput: false
-    });
+        var policy_start_datePicker = flatpickr("#policy_start_date", {
+            dateFormat: "d/m/Y",
+            allowInput: false,
+            onChange: function(selectedDates, dateStr, instance) {
+                var endDate = new Date(selectedDates[0]);
+                endDate.setFullYear(endDate.getFullYear() + 1);
+                endDate.setDate(endDate.getDate() - 1); // Set end date to last day of selected year
+                policy_end_datePicker.setDate(endDate);
+            }
+        });
+        var policy_end_datePicker = flatpickr("#policy_end_date", {
+            dateFormat: "d/m/Y",
+            allowInput: false
+        });
 
-    addFileField(1);
-})
+        addFileField(1);
+    })
 
-function getPolicyTypeFields(input) {
+    function getPolicyTypeFields(input) {
 
-    console.log('getPolicyTypeFields', input);
-    let policy_type_id = $(input).val();
+        console.log('getPolicyTypeFields', input);
+        let policy_type_id = $(input).val();
 
-    console.log(policy_type_id)
-    let url = '<?= base_url('util/getPolicyTypeFields/') ?>';
+        console.log(policy_type_id)
+        let url = '<?= base_url('util/getPolicyTypeFields/') ?>';
 
-    let requestData = {
-        policy_type_id: policy_type_id,
-    };
+        let requestData = {
+            policy_type_id: policy_type_id,
+        };
 
-    // Show loader
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
+        // Show loader
+        $('.loader').fadeIn();
+        $('.loader-mask').fadeIn();
 
-    // Send AJAX request
-    sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
+        // Send AJAX request
+        sendAjaxRequestForGlobal(url, 'GET', requestData, function(response) {
 
-        console.log('Data fetched successfully:', response);
+            console.log('Data fetched successfully:', response);
 
-        $('#appendArea').empty();
-        $('#appendAreaForClaim').empty();
+            $('#appendArea').empty();
+            $('#appendAreaForClaim').empty();
 
-        if (response.status == true) {
+            if (response.status == true) {
 
-            console.log(response.message, 'SUCCESS');
-            $('#appendArea').append(response.data);
-            let lead_type = $('#lead_type').val();
+                console.log(response.message, 'SUCCESS');
+                $('#appendArea').append(response.data);
+                let lead_type = $('#lead_type').val();
 
-            if(lead_type != 1){
+                // if (lead_type != 1) {
+
+                //     alert('hello')
+                //     let html = `<hr><div class="form-row"> <div class="form-group col-md-3"><h4> Claim Details </h4></div></div>`
+                //     let referenceDiv = document.getElementById('appendAreaForClaim');
+                //     referenceDiv.insertAdjacentHTML('beforeend', html);
+
+                //     appendThreeYearsClaims();
+                // }
+
+                var retro_active_datePicker = flatpickr("#retro_active_date", {
+                    dateFormat: "d/m/Y",
+                    allowInput: false
+                });
+
+                var project_start_datePicker = flatpickr("#project_start_date", {
+                    dateFormat: "d/m/Y",
+                    allowInput: false
+                });
+
+            } else {
+                console.log(response.message, 'WARNING');
+            }
+
+            if (lead_type != 1) {
 
                 let html = `<hr><div class="form-row"> <div class="form-group col-md-3"><h4> Claim Details </h4></div></div>`
                 let referenceDiv = document.getElementById('appendAreaForClaim');
@@ -417,296 +446,282 @@ function getPolicyTypeFields(input) {
                 appendThreeYearsClaims();
             }
 
-            var retro_active_datePicker = flatpickr("#retro_active_date", {
-                dateFormat: "d/m/Y",
-                allowInput: false
-            });
-
-            var project_start_datePicker = flatpickr("#project_start_date", {
-                dateFormat: "d/m/Y",
-                allowInput: false
-            });
-
-        } else {
-            console.log(response.message, 'WARNING');
-        }
-
-        // Hide loader
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
-
-    }, function(xhr, status, error) {
-        console.error('Error fetching data:', error);
-        console.error(xhr.responseText);
-        toastr.error('An error occurred while fetch data.', 'ERROR');
-
-        // Hide loader
-        $('.loader').fadeOut();
-        $('.loader-mask').delay(350).fadeOut('slow');
-    });
-}
-
-$("#leads_non_eb_form_id").submit(function(event) {
-
-    event.preventDefault();
-
-    var isValid = $('#leads_non_eb_form_id').parsley().validate();
-    console.log('isValid', isValid)
-
-    if (!isValid) {
-        $('#leads_non_eb_form_id').find('input, select, textarea').each(function() {
-            if ($(this).parsley().isValid() === false && !$(this).val()) {
-                console.log('Empty field ID:', this.id);
-            }
-        });
-        console.log('Form is Empty', 'Warning');
-        return;
-    }
-
-    var salse_person_id = $("#salse_person_id").val();
-    console.log('salse_person_id : ', salse_person_id);
-
-    $('.loader').fadeIn();
-    $('.loader-mask').fadeIn();
-
-    var formData = new FormData($('#leads_non_eb_form_id')[0]);
-    var policy_type_ids = formData.getAll('policy_type_id[]');
-    console.log('form policy ', policy_type_ids);
-
-    const jsonString = JSON.stringify(salse_person_id);
-    console.log('jsonString', jsonString);
-
-    let customFieldData = {};
-        
-    $('.custom_fields').find('input, select, textarea').each(function () {
-        let key = $(this).attr('name');
-        let value;
-
-        if ($(this).is(':radio')) {
-            if ($(this).is(':checked')) {
-                value = $(this).val();
-            } else {
-                return; // Skip unchecked radio buttons
-            }
-        } else if ($(this).is(':checkbox')) {
-            value = $(this).is(':checked') ? $(this).val() : ''; // Store value if checked, otherwise empty
-        } else {
-            value = $(this).val();
-        }
-
-        customFieldData[key] = value;
-    });
-
-    const finyearJsonString = gatherClaimExperienceData();
-    console.log('finyearJsonString', finyearJsonString);
-    formData.append('fin_years_claims', finyearJsonString);
-
-
-    // Append the JSON string to the FormData object
-    formData.append('salse_person_id', jsonString);
-    formData.append('custom_fields', JSON.stringify(customFieldData));
-
-    form_action = '<?= base_url('leads/create') ?>';
-
-    $.ajax({
-        data: formData,
-        url: form_action,
-        type: "POST",
-        dataType: 'json',
-        processData: false,
-        contentType: false,
-        success: function(res) {
-
+            // Hide loader
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
 
-            console.log('inception_form_response', res)
-
-            if (res.status == true) {
-
-                toastr.success(res.message, 'Success');
-
-                window.location.href = '<?= base_url('leads/list') ?>';
-
-            } else {
-                toastr.error(res.message, 'Error');
-            }
-
-        },
-        error: function(xhr, status, error) {
+        }, function(xhr, status, error) {
+            console.error('Error fetching data:', error);
             console.error(xhr.responseText);
-            console.error(status, error);
+            toastr.error('An error occurred while fetch data.', 'ERROR');
+
+            // Hide loader
             $('.loader').fadeOut();
             $('.loader-mask').delay(350).fadeOut('slow');
-        }
-    });
-});
-
-$('#lead_type').change(function() {
-    let value = $(this).val()
-    leadTypeBsedHideAndShow(value, true)
-})
-
-function leadTypeBsedHideAndShow(value, resetValues = false) {
-
-    if (value == 1) {
-
-        $('.btnDiv').show();
-        $('.claim-row').hide();
-
-
-        $('.emp_title').text('No of Employees')
-        $('.depnd_title').text('No of Dependents')
-        $('.total_title').text('Total Lives')
-
-        $('.renewalFields').find('select, input').removeAttr('required');
-        $('.renewalFields').hide();
-
-        $('.freshFields').find('select, input').attr('required', 'required');
-        $('.freshFields').show();
-
-        $('#policy_end_date').attr('required', 'required');
-        $('#policy_start_date').attr('required', 'required');
-
-        if(resetValues){
-            
-            $('#gst').val('');
-            $('#pan').val('');
-            $('#branch_name').val('');
-            $('#branch_code').val('');
-            $('#contact_person_name').val('');
-            $('#contact_person_mobile').val('');
-            $('#contact_person_email').val('');
-
-            $('#client_type').val('');
-            $('#client_name').val('');
-            $('#client_short_name').val('');
-            $('#entity_type_id').val('');
-
-        }
-
-    } else {
-
-        $('.btnDiv').hide();
-        $('.claim-row').show();
-
-        $('.emp_title').text('No of Employees at Inception')
-        $('.depnd_title').text(' No of Dependents at Inception')
-        $('.total_title').text('Total Lives at Inception')
-
-        $('.freshFields').find('select, input').removeAttr('required');
-        $('.freshFields').hide();
-
-        $('.renewalFields').show();
-        $('.renewalFields').find('select, input').attr('required', 'required');
-
-        $('.proposed_div').show().find('select, input').attr('required', 'required');
-
-        $('#policy_end_date').removeAttr('required');
-        $('#policy_start_date').removeAttr('required');
-        $('#claims').removeAttr('required');
-
-        if(resetValues){
-
-            $('#gst').val('');
-            $('#pan').val('');
-            $('#branch_name').val('');
-            $('#branch_code').val('');
-            $('#contact_person_name').val('');
-            $('#contact_person_mobile').val('');
-            $('#contact_person_email').val('');
-
-        }
-
+        });
     }
 
-}
+    $("#leads_non_eb_form_id").submit(function(event) {
 
-function getBranchData(input) {
+        event.preventDefault();
 
-    var client_branch_id = $(input).val();
+        var isValid = $('#leads_non_eb_form_id').parsley().validate();
+        console.log('isValid', isValid)
 
-    if (client_branch_id) {
+        if (!isValid) {
+            $('#leads_non_eb_form_id').find('input, select, textarea').each(function() {
+                if ($(this).parsley().isValid() === false && !$(this).val()) {
+                    console.log('Empty field ID:', this.id);
+                }
+            });
+            console.log('Form is Empty', 'Warning');
+            return;
+        }
+
+        var salse_person_id = $("#salse_person_id").val();
+        console.log('salse_person_id : ', salse_person_id);
 
         $('.loader').fadeIn();
         $('.loader-mask').fadeIn();
 
-        $.ajax({
-            url: '<?php echo base_url('util/get_client_branch_data/'); ?>' + client_branch_id,
-            type: "GET",
-            dataType: 'json',
-            success: function(res) {
+        var formData = new FormData($('#leads_non_eb_form_id')[0]);
+        var policy_type_ids = formData.getAll('policy_type_id[]');
+        console.log('form policy ', policy_type_ids);
 
-                console.log('getBranchData response', res);
+        const jsonString = JSON.stringify(salse_person_id);
+        console.log('jsonString', jsonString);
 
-                if (res.status == true) {
+        let customFieldData = {};
 
-                    $('#gst').val(res.data.gst);
-                    $('#pan').val(res.data.pan);
-                    $('#branch_name').val(res.data.branch_name);
-                    $('#branch_code').val(res.data.branch_code);
-                    $('#contact_person_name').val(res?.contact?.name || '');
-                    $('#contact_person_mobile').val(res?.contact?.mobile || '');
-                    $('#contact_person_email').val(res?.contact?.email || '');
-
-
-                    $('#pan').prop('readOnly', true);
-                    $('#gst').prop('readOnly', true);
-                    $('#branch_name').prop('readOnly', true);
-                    $('#branch_code').prop('readOnly', true);
-                    $('#contact_person_name').prop('readOnly', true);
-                    $('#contact_person_mobile').prop('readOnly', true);
-                    $('#contact_person_email').prop('readOnly', true);
-                    // $('#policy_type_id_1').prop('readOnly', true);
-
-                    $('.loader').fadeOut();
-                    $('.loader-mask').delay(350).fadeOut('slow');
+        $('.custom_fields').find('input, select, textarea').each(function() {
+            let key = $(this).attr('name');
+            let value;
 
+            if ($(this).is(':radio')) {
+                if ($(this).is(':checked')) {
+                    value = $(this).val();
                 } else {
-
-                    $('#gst').val('');
-                    $('#pan').val('');
-                    $('#branch_name').val('');
-                    $('#branch_code').val('');
-                    $('#contact_person_name').val('');
-                    $('#contact_person_mobile').val('');
-                    $('#contact_person_email').val('');
-
-                    console.log(res.message, 'warning');
-
+                    return; // Skip unchecked radio buttons
                 }
+            } else if ($(this).is(':checkbox')) {
+                value = $(this).is(':checked') ? $(this).val() : ''; // Store value if checked, otherwise empty
+            } else {
+                value = $(this).val();
+            }
+
+            customFieldData[key] = value;
+        });
+
+        const finyearJsonString = gatherClaimExperienceData();
+        console.log('finyearJsonString', finyearJsonString);
+        formData.append('fin_years_claims', finyearJsonString);
+
+
+        // Append the JSON string to the FormData object
+        formData.append('salse_person_id', jsonString);
+        formData.append('custom_fields', JSON.stringify(customFieldData));
+
+        form_action = '<?= base_url('leads/create') ?>';
+
+        $.ajax({
+            data: formData,
+            url: form_action,
+            type: "POST",
+            dataType: 'json',
+            processData: false,
+            contentType: false,
+            success: function(res) {
 
                 $('.loader').fadeOut();
                 $('.loader-mask').delay(350).fadeOut('slow');
+
+                console.log('inception_form_response', res)
+
+                if (res.status == true) {
+
+                    toastr.success(res.message, 'Success');
+
+                    window.location.href = '<?= base_url('leads/list') ?>';
+
+                } else {
+                    toastr.error(res.message, 'Error');
+                }
+
             },
             error: function(xhr, status, error) {
                 console.error(xhr.responseText);
                 console.error(status, error);
+                $('.loader').fadeOut();
+                $('.loader-mask').delay(350).fadeOut('slow');
             }
         });
+    });
+
+    $('#lead_type').change(function() {
+        let value = $(this).val()
+        leadTypeBsedHideAndShow(value, true)
+    })
+
+    function leadTypeBsedHideAndShow(value, resetValues = false) {
+
+        if (value == 1) {
+
+            $('.btnDiv').show();
+            $('.claim-row').hide();
+
+
+            $('.emp_title').text('No of Employees')
+            $('.depnd_title').text('No of Dependents')
+            $('.total_title').text('Total Lives')
+
+            $('.renewalFields').find('select, input').removeAttr('required');
+            $('.renewalFields').hide();
+
+            $('.freshFields').find('select, input').attr('required', 'required');
+            $('.freshFields').show();
+
+            $('#policy_end_date').attr('required', 'required');
+            $('#policy_start_date').attr('required', 'required');
+
+            if (resetValues) {
+
+                $('#gst').val('');
+                $('#pan').val('');
+                $('#branch_name').val('');
+                $('#branch_code').val('');
+                $('#contact_person_name').val('');
+                $('#contact_person_mobile').val('');
+                $('#contact_person_email').val('');
+
+                $('#client_type').val('');
+                $('#client_name').val('');
+                $('#client_short_name').val('');
+                $('#entity_type_id').val('');
+
+            }
+
+        } else {
+
+            $('.btnDiv').hide();
+            $('.claim-row').show();
+
+            $('.emp_title').text('No of Employees at Inception')
+            $('.depnd_title').text(' No of Dependents at Inception')
+            $('.total_title').text('Total Lives at Inception')
+
+            $('.freshFields').find('select, input').removeAttr('required');
+            $('.freshFields').hide();
+
+            $('.renewalFields').show();
+            $('.renewalFields').find('select, input').attr('required', 'required');
+
+            $('.proposed_div').show().find('select, input').attr('required', 'required');
+
+            $('#policy_end_date').removeAttr('required');
+            $('#policy_start_date').removeAttr('required');
+            $('#claims').removeAttr('required');
+
+            if (resetValues) {
+
+                $('#gst').val('');
+                $('#pan').val('');
+                $('#branch_name').val('');
+                $('#branch_code').val('');
+                $('#contact_person_name').val('');
+                $('#contact_person_mobile').val('');
+                $('#contact_person_email').val('');
+
+            }
+
+        }
+
     }
-}
 
-// Client Policy Data
-function getPolicyData(input) {
+    function getBranchData(input) {
 
-    var client_policy_id = $(input).val();
-    console.log('client_policy_id', client_policy_id);
+        var client_branch_id = $(input).val();
 
-    if (client_policy_id) {
+        if (client_branch_id) {
 
-        // Show loader
-        $('.loader').fadeIn();
-        $('.loader-mask').fadeIn();
+            $('.loader').fadeIn();
+            $('.loader-mask').fadeIn();
 
-        $.ajax({
-            url: '<?php echo base_url('client/policy/list/'); ?>' + client_policy_id,
-            type: "GET",
-            dataType: 'json',
-            success: function(res) {
-                console.log('getPolicyData response:', res);
+            $.ajax({
+                url: '<?php echo base_url('util/get_client_branch_data/'); ?>' + client_branch_id,
+                type: "GET",
+                dataType: 'json',
+                success: function(res) {
 
-                if (res.status === true && res.data) {
+                    console.log('getBranchData response', res);
+
+                    if (res.status == true) {
+
+                        $('#gst').val(res.data.gst);
+                        $('#pan').val(res.data.pan);
+                        $('#branch_name').val(res.data.branch_name);
+                        $('#branch_code').val(res.data.branch_code);
+                        $('#contact_person_name').val(res?.contact?.name || '');
+                        $('#contact_person_mobile').val(res?.contact?.mobile || '');
+                        $('#contact_person_email').val(res?.contact?.email || '');
+
+
+                        $('#pan').prop('readOnly', true);
+                        $('#gst').prop('readOnly', true);
+                        $('#branch_name').prop('readOnly', true);
+                        $('#branch_code').prop('readOnly', true);
+                        $('#contact_person_name').prop('readOnly', true);
+                        $('#contact_person_mobile').prop('readOnly', true);
+                        $('#contact_person_email').prop('readOnly', true);
+                        // $('#policy_type_id_1').prop('readOnly', true);
+
+                        $('.loader').fadeOut();
+                        $('.loader-mask').delay(350).fadeOut('slow');
+
+                    } else {
+
+                        $('#gst').val('');
+                        $('#pan').val('');
+                        $('#branch_name').val('');
+                        $('#branch_code').val('');
+                        $('#contact_person_name').val('');
+                        $('#contact_person_mobile').val('');
+                        $('#contact_person_email').val('');
+
+                        console.log(res.message, 'warning');
+
+                    }
+
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                },
+                error: function(xhr, status, error) {
+                    console.error(xhr.responseText);
+                    console.error(status, error);
+                }
+            });
+        }
+    }
+
+    // Client Policy Data
+    function getPolicyData(input) {
+
+        var client_policy_id = $(input).val();
+        console.log('client_policy_id', client_policy_id);
+
+        if (client_policy_id) {
+
+            // Show loader
+            $('.loader').fadeIn();
+            $('.loader-mask').fadeIn();
+
+            $.ajax({
+                url: '<?php echo base_url('client/policy/list/'); ?>' + client_policy_id,
+                type: "GET",
+                dataType: 'json',
+                success: function(res) {
+                    console.log('getPolicyData response:', res);
+
+                    if (res.status === true && res.data) {
 
                         $(`#policy_type_id`).removeClass('readonly-select ').select2();
                         $(`#insurer`).removeClass('readonly-select ').select2();
@@ -714,12 +729,12 @@ function getPolicyData(input) {
 
                         const insurer = `${res.data.insurer_branch_id}-${res.data.insurer_id}`;
                         const tpa = `${res.data.tpa_branch_id}-${res.data.tpa_id}`;
-                        
+
                         // Update fields with response data
                         $(`#policy_type_id`).val(res.data.policy_type_id).trigger('change');
                         $(`#insurer`).val(insurer).trigger('change');
                         $(`#tpa`).val(tpa).trigger('change');
-                        
+
                         if ($('#policy_start_date').hasClass('flatpickr-input')) {
                             const fpInstance = $('#policy_start_date')[0]._flatpickr;
                             if (fpInstance) {
@@ -744,45 +759,45 @@ function getPolicyData(input) {
                         $(`#insurer`).addClass('readonly-select ').select2('destroy');
                         $(`#tpa`).addClass('readonly-select ').select2('destroy');
 
-                } else {
-                    console.warn('Invalid response:', res.message || 'Unknown error');
-                    // Reset fields if response is invalid
+                    } else {
+                        console.warn('Invalid response:', res.message || 'Unknown error');
+                        // Reset fields if response is invalid
+                        $(`#policy_type_id`).val('').trigger('change');
+                        $(`#insurer`).val('').trigger('change');
+                        $(`#tpa`).val('').trigger('change');
+                    }
+
+                    // Hide loader
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
+                },
+                error: function(xhr, status, error) {
+                    console.error('AJAX Error:', xhr.responseText || error);
+
+                    // Reset fields on error
                     $(`#policy_type_id`).val('').trigger('change');
                     $(`#insurer`).val('').trigger('change');
                     $(`#tpa`).val('').trigger('change');
+
+                    $('.loader').fadeOut();
+                    $('.loader-mask').delay(350).fadeOut('slow');
                 }
+            });
+        } else {
+            console.warn('Client policy ID is required.');
 
-                // Hide loader
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-            },
-            error: function(xhr, status, error) {
-                console.error('AJAX Error:', xhr.responseText || error);
-
-                // Reset fields on error
-                $(`#policy_type_id`).val('').trigger('change');
-                $(`#insurer`).val('').trigger('change');
-                $(`#tpa`).val('').trigger('change');                
-
-                $('.loader').fadeOut();
-                $('.loader-mask').delay(350).fadeOut('slow');
-            }
-        });
-    } else {
-        console.warn('Client policy ID is required.');
-
-        // Reset fields if no client policy ID is provided
-        $(`#policy_type_id`).val('').trigger('change');
-        $(`#insurer`).val('').trigger('change');
-        $(`#tpa`).val('').trigger('change');
+            // Reset fields if no client policy ID is provided
+            $(`#policy_type_id`).val('').trigger('change');
+            $(`#insurer`).val('').trigger('change');
+            $(`#tpa`).val('').trigger('change');
+        }
     }
-}
 
-var increment = 1;
+    var increment = 1;
 
-function appendThreeYearsClaims() {
+    function appendThreeYearsClaims() {
 
-    let claimsFields = `
+        let claimsFields = `
 
             <div class="row claim-row">
 
@@ -795,6 +810,18 @@ function appendThreeYearsClaims() {
                         } ?>
                     </select>
                 </div>
+                <div class="form-group col-md-2">
+                    <label for="first_policy_type_${increment}">Policy Type<span class="text-danger">*</span></label>
+                    <input type="text" class="form-control" id="first_policy_type_${increment}" name="first_policy_type_[]">
+                </div>
+                <div class="form-group col-md-2">
+                    <label for="first_date_of_loss_${increment}">Date of Loss<span class="text-danger">*</span></label>
+                    <input type="text" class="form-control loss_date" id="first_date_of_loss_${increment}" name="first_date_of_loss_[]">
+                </div>
+                <div class="form-group col-md-2">
+                    <label for="first_cause_of_death_${increment}">Cause Of Loss <span class="text-danger">*</span></label>
+                    <input type="text" class="form-control" id="first_cause_of_loss_${increment}" name="first_cause_of_loss[]">
+                </div>
                 <div class="form-group col-md-2">
                     <label for="first_claim_amount_${increment}">Claim Amount<span class="text-danger">*</span></label>
                     <input type="text" class="form-control" id="first_claim_amount_${increment}" name="first_claim_amount[]">
@@ -803,10 +830,6 @@ function appendThreeYearsClaims() {
                     <label for="first_claim_amount_${increment}">Settled Amount<span class="text-danger">*</span></label>
                     <input type="text" class="form-control" id="first_settled_amount_${increment}" name="first_settled_amount[]">
                 </div>
-                <div class="form-group col-md-2">
-                    <label for="first_cause_of_death_${increment}">Cause Of Loss <span class="text-danger">*</span></label>
-                    <input type="text" class="form-control" id="first_cause_of_loss_${increment}" name="first_cause_of_loss[]">
-                </div>
                 <div class="form-group col-md-2">
                     <label for="first_claim_status_${increment}">Claim Status<span class="text-danger">*</span></label>
                     <input type="text" class="form-control" id="first_claim_status_${increment}" name="first_claim_status[]">
@@ -820,57 +843,69 @@ function appendThreeYearsClaims() {
             </div>
         `;
 
-    // Append new claim fields
-    let referenceDiv = document.getElementById('appendAreaForClaim');
+        // Append new claim fields
+        let referenceDiv = document.getElementById('appendAreaForClaim');
 
-    referenceDiv.insertAdjacentHTML('beforeend', claimsFields);
+        referenceDiv.insertAdjacentHTML('beforeend', claimsFields);
 
-    // Increment claim index
-    increment = increment + 1;
+        // Increment claim index
+        increment = increment + 1;
 
-}
-
-function removeClaim(btn) {
-    const container = document.getElementById('appendAreaForClaim');
-    const rows = container.querySelectorAll('.claim-row');
-
-    if (rows.length > 1) {
-        const row = btn.closest('.claim-row');
-        row.remove();
-    }
-}
-
-function gatherClaimExperienceData() {
-
-    let claimData = [];
-
-    $(".claim-row").each(function() {
-
-        let year = $(this).find("[name='first_year[]']").val();
-        let claimAmount = $(this).find("[name='first_claim_amount[]']").val();
-        let settledAmount = $(this).find("[name='first_settled_amount[]']").val();
-        let causeOfLoss = $(this).find("[name='first_cause_of_loss[]']").val();
-        let claimStatus = $(this).find("[name='first_claim_status[]']").val();
-
-        claimData.push({
-            "year": year,
-            "claim_amount": claimAmount,
-            "settled_amount": settledAmount,
-            "cause_of_loss": causeOfLoss,
-            "status": claimStatus,
+        $(".loss_date").each(function () {
+            flatpickr(this, {
+                dateFormat: "d-m-Y", 
+            });
         });
-    });
 
-    let finalJson = {
-        "finyear": claimData
-    };
+        
 
-    console.log(finalJson);
+    }
 
-    let jsonString = JSON.stringify(finalJson);
-    console.log(jsonString);
+    function removeClaim(btn) {
+        const container = document.getElementById('appendAreaForClaim');
+        const rows = container.querySelectorAll('.claim-row');
 
-    return jsonString;
-}
+        if (rows.length > 1) {
+            const row = btn.closest('.claim-row');
+            row.remove();
+        }
+    }
+
+    function gatherClaimExperienceData() {
+
+        let claimData = [];
+
+        $(".claim-row").each(function() {
+
+            let year = $(this).find("[name='first_year[]']").val();
+            let policyType = $(this).find("[name='first_policy_type_[]']").val();
+            let dateOfLoss = $(this).find("[name='first_date_of_loss_[]']").val();
+            let claimAmount = $(this).find("[name='first_claim_amount[]']").val();
+            let settledAmount = $(this).find("[name='first_settled_amount[]']").val();
+            let causeOfLoss = $(this).find("[name='first_cause_of_loss[]']").val();
+            let claimStatus = $(this).find("[name='first_claim_status[]']").val();
+
+            claimData.push({
+                "year": year,
+                "policy_type" : policyType,
+                'date_of_loss' : dateOfLoss,
+                "claim_amount": claimAmount,
+                "settled_amount": settledAmount,
+                "cause_of_loss": causeOfLoss,
+                "status": claimStatus,
+            });
+        });
+
+        let finalJson = {
+            "finyear": claimData
+        };
+
+        console.log(finalJson);
+
+        let jsonString = JSON.stringify(finalJson);
+        console.log(jsonString);
+
+        return jsonString;
+    }
 
 </script>
\ No newline at end of file
diff --git a/app/Views/rfq/claims_details_non_eb.php b/app/Views/rfq/claims_details_non_eb.php
index 9a7b590b..04592201 100644
--- a/app/Views/rfq/claims_details_non_eb.php
+++ b/app/Views/rfq/claims_details_non_eb.php
@@ -13,6 +13,21 @@
                             } ?>
                 </select>
             </div>
+            <div class="form-group col-md-2">
+                <label for="first_policy_type_${increment}">Policy Type<span class="text-danger">*</span></label>
+                <input type="text" class="form-control" id="first_policy_type_${increment}" name="first_policy_type_[]"
+                value="<?= htmlspecialchars($value['policy_type']) ?>">
+            </div>
+            <div class="form-group col-md-2">
+                <label for="first_date_of_loss_${increment}">Date of Loss<span class="text-danger">*</span></label>
+                <input type="text" class="form-control loss_date" id="first_date_of_loss_${increment}" name="first_date_of_loss_[]"
+                value="<?= htmlspecialchars($value['date_of_loss']) ?>">
+            </div>
+            <div class="form-group col-md-2">
+                <label for="first_cause_of_death_${increment}">Cause Of Loss <span class="text-danger">*</span></label>
+                <input type="text" class="form-control" id="first_cause_of_loss_${increment}" name="first_cause_of_loss[]"
+                value="<?= htmlspecialchars($value['cause_of_loss']) ?>">
+            </div>
             <div class="form-group col-md-2">
                 <label for="first_claim_amount_${increment}">Claim Amount<span class="text-danger">*</span></label>
                 <input type="text" class="form-control" id="first_claim_amount_${increment}" name="first_claim_amount[]"
@@ -23,11 +38,6 @@
                 <input type="text" class="form-control" id="first_settled_amount_${increment}" name="first_settled_amount[]"
                     value="<?= htmlspecialchars($value['settled_amount']) ?>">
             </div>
-            <div class="form-group col-md-2">
-                <label for="first_cause_of_death_${increment}">Cause Of Loss <span class="text-danger">*</span></label>
-                <input type="text" class="form-control" id="first_cause_of_loss_${increment}" name="first_cause_of_loss[]"
-                    value="<?= htmlspecialchars($value['cause_of_loss']) ?>">
-            </div>
             <div class="form-group col-md-2">
                 <label for="first_claim_status_${increment}">Claim Status<span class="text-danger">*</span></label>
                 <input type="text" class="form-control" id="first_claim_status_${increment}" name="first_claim_status[]"