diff --git a/app/Controllers/PolicyTransactionController.php b/app/Controllers/PolicyTransactionController.php index c6c9aaa8..d5c162b5 100644 --- a/app/Controllers/PolicyTransactionController.php +++ b/app/Controllers/PolicyTransactionController.php @@ -1648,6 +1648,7 @@ class PolicyTransactionController extends BaseController ->where('policy_transaction.client_id', $client_id) ->where('policy_transaction.client_policy_id', $client_policy_id) ->where('policy_transaction.action_type', 'inception') + ->where('policy_transaction.is_active', 1) ->findAll(); $is_copay_yes = $this->policyTransactionModel diff --git a/app/Models/EmployeePolicyModel.php b/app/Models/EmployeePolicyModel.php index 7f6310af..9d33f75c 100755 --- a/app/Models/EmployeePolicyModel.php +++ b/app/Models/EmployeePolicyModel.php @@ -416,7 +416,7 @@ class EmployeePolicyModel extends Model employees.designation AS emp_designation, employees.basic_pay AS emp_basic_pay, - TIMESTAMPDIFF(YEAR, employees.dob, CURDATE()) AS emp_age, + TIMESTAMPDIFF(YEAR, employees.dob, employee_polices.date_coverage) AS emp_age, employees.emp_type as emp_type, @@ -641,21 +641,22 @@ class EmployeePolicyModel extends Model sidata.new_basic_cover_si, sidata.new_si_premium, + sidata.old_si_premium, sidata.date_of_coverage, DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1 AS no_of_days, - sidata.new_si_premium - employee_polices.rata_premimum AS difference_premium, + ROUND(sidata.new_si_premium - sidata.old_si_premium, 2) AS difference_premium, - ROUND((sidata.new_si_premium - employee_polices.rata_premimum) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365, 2) AS pro_rata_premium, + ROUND((sidata.new_si_premium - sidata.old_si_premium) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365, 2) AS pro_rata_premium, - ROUND(((sidata.new_si_premium - employee_polices.rata_premimum) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365) * 0.18, 2) AS gst, + ROUND(((sidata.new_si_premium - sidata.old_si_premium) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365) * 0.18, 2) AS gst, ROUND( - ((sidata.new_si_premium - employee_polices.rata_premimum) * + ((sidata.new_si_premium - sidata.old_si_premium) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365) + ROUND( - ((sidata.new_si_premium - employee_polices.rata_premimum) * + ((sidata.new_si_premium - sidata.old_si_premium) * (DATEDIFF(employee_polices.policy_end_date, sidata.date_of_coverage) + 1) / 365) * 0.18, 2 ), 2 ) AS total @@ -671,12 +672,14 @@ class EmployeePolicyModel extends Model aa.emp_code, aa.new_value as 'new_basic_cover_si', bb.new_value as 'new_si_premium', + bb.old_value as 'old_si_premium', cc.new_value as 'date_of_coverage' FROM ( SELECT a1.emp_code, a1.field_name, - a1.new_value + a1.new_value, + a1.old_value FROM emp_endorsement as a1 WHERE @@ -686,7 +689,8 @@ class EmployeePolicyModel extends Model SELECT b1.emp_code, b1.field_name, - b1.new_value + b1.new_value, + b1.old_value FROM emp_endorsement as b1 WHERE @@ -696,7 +700,8 @@ class EmployeePolicyModel extends Model SELECT c1.emp_code, c1.field_name, - c1.new_value + c1.new_value, + c1.old_value FROM emp_endorsement as c1 WHERE