diff --git a/app/Controllers/LeadsController.php b/app/Controllers/LeadsController.php index ee908837..8572a87b 100644 --- a/app/Controllers/LeadsController.php +++ b/app/Controllers/LeadsController.php @@ -1310,9 +1310,9 @@ class LeadsController extends BaseController 'Policy Run Days' => $rfq_data['policy_run_days'], 'Inception Premium' => formatIndianCurrency($rfq_data['premium_at_inception']), 'Premium as on (' . date('d-m-Y', strtotime($rfq_data['incurred_claims_date'])) . ')' => formatIndianCurrency($rfq_data['premium_date']), - 'Earned Premium' => $rfq_data['earned_premium'], + 'Earned Premium' => formatIndianCurrency(intval($rfq_data['earned_premium'])), 'Incurred Claims as on (' . date('d-m-Y', strtotime($rfq_data['incurred_claims_date'])) . ')' => formatIndianCurrency($rfq_data['incurred_claims']), - 'Annualised Claims' => formatIndianCurrency($rfq_data['annualised_claims']), + 'Annualised Claims' => formatIndianCurrency(intval($rfq_data['annualised_claims'])), 'Incurred Claims Ratio' => $rfq_data['incurred_claims_ratio'] . " %", 'Earned Claims Ratio' => $rfq_data['earned_claims_ratio'] . " %", ]; diff --git a/app/Models/UserModel.php b/app/Models/UserModel.php index ed5a8ace..8a5eff7d 100755 --- a/app/Models/UserModel.php +++ b/app/Models/UserModel.php @@ -112,6 +112,7 @@ class UserModel extends Model ->join('user_teams', 'user_profiles.id = user_teams.user_id') ->where('user_profiles.id', $user_id) ->where('user_teams.is_active', 1) + ->where("user_profiles.is_active", 1) ->get() ->getResultArray(); diff --git a/app/Views/leads_form.php b/app/Views/leads_form.php index 472516f8..01586d13 100644 --- a/app/Views/leads_form.php +++ b/app/Views/leads_form.php @@ -1423,7 +1423,9 @@ console.log('Policy Run Days (Final):', policy_run_days); let annualised_claims = policy_run_days > 0 ? (incurred_claims / policy_run_days) * 365 : 0; - let annualised_claims_roundoff = annualised_claims.toFixed(2); + // let annualised_claims_roundoff = annualised_claims.toFixed(2); + let annualised_claims_roundoff = Math.trunc(annualised_claims); + console.log('Annualised Claims:', annualised_claims); console.log('Annualised Claims (Rounded):', annualised_claims_roundoff); $('#annualised_claims').val(annualised_claims_roundoff); @@ -1440,7 +1442,9 @@ $('#incurred_claims_ratio').val(incurred_claim_ratio_roundoff); let earned_premium = premium_as_on_date > 0 ? (premium_as_on_date / 365) * policy_run_days : 0; - let earned_premium_roundoff = earned_premium.toFixed(2); + // let earned_premium_roundoff = earned_premium.toFixed(2); + let earned_premium_roundoff = Math.trunc(earned_premium); + console.log('Earned Premium:', earned_premium); console.log('Earned Premium (Rounded):', earned_premium_roundoff); $('#earned_premium').val(earned_premium_roundoff); diff --git a/app/Views/view_rfq.php b/app/Views/view_rfq.php index 4d3ee31e..845d7229 100644 --- a/app/Views/view_rfq.php +++ b/app/Views/view_rfq.php @@ -230,7 +230,7 @@       Export Excel - +