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

app/Controllers/ClientController.php

@@ -882,15 +882,20 @@ class ClientController extends AdminController
                 $data = $this->request->getPost();
                 $insert = true;
             } else if ($policy_grid_id == '9') {
-                $premium=$this->request->getPost('9_premium[]');
+
-                $sum_insure =$this->request->getPost('9_si[]');
+                $data['premium'] = str_replace(',', '', $this->request->getPost('gpa_premium'));
-                $grade =$this->request->getPost('9_grade[]');
+                $data['si'] = str_replace(',', '', $this->request->getPost('gpa_si'));
-                for ($i=0; $i < count($premium) ; $i++) { 
+
-                    $data['premium'] = str_replace(',', '',$premium[$i]);
+                $policyPremium = $this->policyPremium2Model->insert($data);
-                    $data['si'] = str_replace(',', '', $sum_insure[$i]);
+                // $premium = $this->request->getPost('9_premium[]');
-                    $data['grade'] = $grade[$i];
+                // $sum_insure = $this->request->getPost('9_si[]');
-                        $dataa= $this->policyPremium2Model->insert($data);
+                // $grade = $this->request->getPost('9_grade[]');
-                }
+                // for ($i = 0; $i < count($premium); $i++) {
+                //     $data['premium'] = str_replace(',', '', $premium[$i]);
+                //     $data['si'] = str_replace(',', '', $sum_insure[$i]);
+                //     // $data['grade'] = $grade[$i];
+                //     $dataa = $this->policyPremium2Model->insert($data);
+                // }
                 $data = $this->request->getPost();
                 $insert = true;
             } else if ($policy_grid_id == '10') {
@@ -1081,15 +1086,15 @@ class ClientController extends AdminController
         if ($search_term === 'GPA') {
 
             $premiumData = $this->policyPremium1Model->where(['client_id' => $record['client_id'], 'client_policy_id' => $client_policy_id, 'is_active' => 1])->findAll();
-
         } else if ($search_term === 'GMC') {
 
             $premiumData = $this->policyPremium2Model->where(['client_id' => $record['client_id'], 'client_policy_id' => $client_policy_id, 'is_active' => 1])->findAll();
-
         } else {
 
             $premiumData = "";
         }
+        // echo '<pre>';
+        // print_r($premiumData); die;
 
         // echo $record['client_id'];
         // echo "-----";
@@ -1128,8 +1133,7 @@ class ClientController extends AdminController
                 } else if ($premiumData[0]['policy_grid_id'] == '3' || $premiumData[0]['policy_grid_id'] == '4' || $premiumData[0]['policy_grid_id'] == '5' || $premiumData[0]['policy_grid_id'] == '6' || $premiumData[0]['policy_grid_id'] == '7' || $premiumData[0]['policy_grid_id'] == '8' || $premiumData[0]['policy_grid_id'] == '9') {
                     $premiumDataa = $premiumData;
                 }
-            } 
+            } else if ($family_floater == 1) {
-            else if($family_floater == 1){
                 if (count($premiumData) == 0) {
                     $premiumDataa = $premiumData;
                 } else if ($premiumData[0]['policy_grid_id'] == '10' || $premiumData[0]['policy_grid_id'] == '11') {
@@ -1150,15 +1154,12 @@ class ClientController extends AdminController
             // return json_encode($premiumData);
 
             return $this->respond(['status' => true, 'code' => 200, 'data' => $resultss, 'premiumData' => json_encode($premiumDataa), 'count' => $emp_count, 'policy_name' => $policy_name, 'family_floater' => $family_floater, 'self' => $self], 200);
-
         } else if ($search_term === 'GPA') {
 
             return $this->respond(['status' => true, 'code' => 200, 'data' => $results, 'premiumData' => json_encode($premiumData), 'count' => $emp_count, 'policy_name' => $policy_name, 'family_floater' => $family_floater, 'self' => $self], 200);
-
         } else {
 
             return $this->respond(['status' => false, 'code' => 200, 'data' => $results, 'premiumData' => json_encode($premiumData), 'count' => $emp_count, 'policy_name' => $policy_name, 'family_floater' => $family_floater, 'self' => $self], 200);
-
         }
     }
 

app/Models/PolicyPremium1Model.php

@@ -27,4 +27,39 @@ class PolicyPremium1Model extends Model
         'premium_type',
 
     ];
+
+    // Callbacks
+    protected $allowCallbacks       = true;
+    protected $beforeInsert         = ["checkAndADDCreatedByValue"];
+    protected $afterInsert          = [];
+    protected $beforeUpdate         = ["checkAndUpdateUpdatedByValue"];
+    protected $afterUpdate          = [];
+    protected $beforeFind           = [];
+    protected $afterFind            = [];
+    protected $beforeDelete         = [];
+    protected $afterDelete          = [];
+
+    protected function checkAndADDCreatedByValue(array $data)
+    {
+        // Check if 'updated_by' value is null or empty
+        if (empty($data['data']['created_by'])) {           
+            // Set 'updated_by' value to the current session user ID
+            $data['data']['created_by'] = get_session_userid();
+        }
+
+        return $data;
+    }
+
+    protected function checkAndUpdateUpdatedByValue(array $data)
+    {
+        // Check if 'updated_by' value is null or empty
+        if (empty($data['data']['updated_by'])) {           
+            // Set 'updated_by' value to the current session user ID
+            $data['data']['updated_by'] = get_session_userid();
+        }
+
+        return $data;
+    }
+
+
 }

app/Models/PolicyPremium2Model.php

@@ -28,4 +28,37 @@ class PolicyPremium2Model extends Model
         
     ];
 
+    // Callbacks
+    protected $allowCallbacks       = true;
+    protected $beforeInsert         = ["checkAndADDCreatedByValue"];
+    protected $afterInsert          = [];
+    protected $beforeUpdate         = ["checkAndUpdateUpdatedByValue"];
+    protected $afterUpdate          = [];
+    protected $beforeFind           = [];
+    protected $afterFind            = [];
+    protected $beforeDelete         = [];
+    protected $afterDelete          = [];
+
+    protected function checkAndADDCreatedByValue(array $data)
+    {
+        // Check if 'updated_by' value is null or empty
+        if (empty($data['data']['created_by'])) {           
+            // Set 'updated_by' value to the current session user ID
+            $data['data']['created_by'] = get_session_userid();
+        }
+
+        return $data;
+    }
+
+    protected function checkAndUpdateUpdatedByValue(array $data)
+    {
+        // Check if 'updated_by' value is null or empty
+        if (empty($data['data']['updated_by'])) {           
+            // Set 'updated_by' value to the current session user ID
+            $data['data']['updated_by'] = get_session_userid();
+        }
+
+        return $data;
+    }
+
 }

app/Views/policy_grid.php

@@ -382,25 +382,17 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
         }
 
         grid_html = `
-
+        <div class="form-row" id="grid_2" style="width:84%">   
-        <div class="form-row" id="grid_9" style="width:84%">   
+            <input value="1" type="hidden"  name="policy_type">
-            <div class="form-group col-md-3">
+            <div class="form-group col-md-6">
                 <label for="mobile">Sum Insured<span class="text-danger">*</span></label>
-                <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="9_si[]" id="9_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
+                <input value="${data !== false && data !== undefined && data !== '' ? data.si : ''}" type="text" class="form-control" placeholder="Enter Sum Insured" name="gpa_si" id="gpa_si" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
-                <div id='sum_insured_number_word' class="text-danger-2" ></div>
+                <div id='gpa_si_number_word' class="text-danger-2" ></div>                                             
             </div>                            
-            <div class="form-group col-md-3">
+            <div class="form-group col-md-6">
-                <label for="mobile">Grade/Band<span class="text-danger">*</span></label>
-                <input value="${data !== false && data !== undefined && data !== '' ? data.grade : ''}" type="text" class="form-control" placeholder="Enter Grade/Band " name="9_grade[]" id="9_grade" required>
-            </div>                           
-            <div class="form-group col-md-3">
                 <label for="mobile">Premium<span class="text-danger">*</span></label>
-                <input value="${data !== false && data !== undefined && data !== '' ? data.premium : ''}" type="text" class="form-control" placeholder="Enter Premium" name="9_premium[]" id="9_premium" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)"  required>
+                <input value="${data !== false && data !== undefined && data !== '' ? data.premium : ''}" type="text" class="form-control" placeholder="Enter Premium" name="gpa_premium" id="gpa_premium" onkeypress = "return onlyNumbers(event)"  onkeyup="formatNumber(this)" required>
-                <div id='premium_number_word' class="text-danger-2" ></div>
+                <div id='gpa_premium_number_word' class="text-danger-2" ></div>
-            </div>
-            <div class="form-group">
-                <button style="margin-top: 44px;" type="button" class="btn btn-danger" id="gmc_remove" onclick="removebutton(0,9)">x</button>
-                <button style="margin-top: 44px;" type="button" class="btn btn-primary" id="gmc_add_more" onclick="appendGridtHtml(9)">+</button>
             </div>
         </div>`;
 
@@ -563,8 +555,6 @@ function addGridHTML(event = false, data = false, ui_type = false, si_or_bp = fa
 
     }
 
-
-
     grid_container.insertAdjacentHTML('beforeend', grid_html);
 
     if (dataIdValue == '1') {
@@ -708,8 +698,10 @@ $('body').on('click', '.btnPolicyModel', function() {
                 }, 1000);
                 console.log('policy grid responce', res);
                 var temp_for_premiumData = JSON.parse(res.premiumData);
-
+                console.log('policy grid responce', temp_for_premiumData);
                 res.premiumData = JSON.parse(res.premiumData);
+                console.log('policy grid responce',  res.premiumData);
+
 
                 $('#nameOfThePolicy').html(' - ' + res.policy_name);
                 $('#grid_emp_count').val(res.count);