diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php index ef8f0320..0865865a 100755 --- a/app/Helpers/sendMailNotification.php +++ b/app/Helpers/sendMailNotification.php @@ -205,8 +205,8 @@ class sendMailNotification //Only Display SI Topup and Dependent Addon if ($inner_item['is_addon'] == 2 || $inner_item['is_addon'] == 3) { - $temp_data .= '₹' . format_indian_number($inner_item['premium']) . ''; - $temp_data .= '₹' . format_indian_number($inner_item['gst']) . ''; + $temp_data .= '₹' . format_indian_number(round($inner_item['premium'])) . ''; + $temp_data .= '₹' . format_indian_number(round($inner_item['gst'])) . ''; } $temp_data .= ''; @@ -250,8 +250,8 @@ class sendMailNotification if ($is_addon == 2 || $is_addon == 3) { $addon_list_array = [ 'policy_name' => $policy_name, - 'addtional_premium' => $addtional_premium, - 'gst' => $gst + 'addtional_premium' => round($addtional_premium), + 'gst' => round($gst) ]; $Addon_list[] = $addon_list_array; } @@ -267,7 +267,7 @@ class sendMailNotification $table_content .= '
'; $table_content .= '
'; $table_content .= ''; - $table_content .= ''; + $table_content .= ''; $table_content .= ''; $table_content .= ''; $sum_tolal = 0; @@ -275,15 +275,15 @@ class sendMailNotification foreach ($Addon_list as $key => $value) { $sum_tolal = $value['gst'] + $value['addtional_premium'] + $sum_tolal; $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; + $table_content .= ''; + $table_content .= ''; + $table_content .= ''; } $sum_total_words = numberToWords($sum_tolal); $table_content .= ''; $table_content .= '
Policy NameAdditional PremiumGSTTotal
' . $value['policy_name'] . '₹' . $value['addtional_premium'] . '₹' . $value['gst'] . '₹' . ($value['gst'] + $value['addtional_premium']) . '
₹' . format_indian_number($value['addtional_premium']) . '₹' . format_indian_number($value['gst']) . '₹' . format_indian_number(($value['gst'] + $value['addtional_premium'])) . '
Total₹' . format_indian_number($sum_tolal) . '
'; - $table_content .= '
' . $sum_total_words . '
'; + // $table_content .= '
' . $sum_total_words . '
'; } @@ -373,8 +373,8 @@ class sendMailNotification //Only Display SI Topup and Dependent Addon if ($inner_item['is_addon'] == 2 || $inner_item['is_addon'] == 3) { - $temp_data .= '₹' . format_indian_number($inner_item['premium']) . ''; - $temp_data .= '₹' . format_indian_number($inner_item['gst']) . ''; + $temp_data .= '₹' . format_indian_number(round($inner_item['premium'])) . ''; + $temp_data .= '₹' . format_indian_number(round($inner_item['gst'])) . ''; } $temp_data .= ''; @@ -410,8 +410,8 @@ class sendMailNotification if ($is_addon == 2 || $is_addon == 3) { $addon_list_array = [ 'policy_name' => $policy_name, - 'addtional_premium' => $addtional_premium, - 'gst' => $gst + 'addtional_premium' => round($addtional_premium), + 'gst' => round($gst) ]; $Addon_list[] = $addon_list_array; } @@ -425,7 +425,7 @@ class sendMailNotification if (count($Addon_list) > 0) { $table_content .= '
'; $table_content .= ''; - $table_content .= ''; + $table_content .= ''; $table_content .= ''; $table_content .= ''; $table_content .= ''; @@ -455,7 +455,7 @@ class sendMailNotification $table_content .= ''; $table_content .= ''; $table_content .= '
Policy NameAdditional Premium
'; - $table_content .= '
' . $sum_total_words . '
'; + // $table_content .= '
' . $sum_total_words . '
'; } $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content); @@ -543,8 +543,8 @@ class sendMailNotification //Only Display SI Topup and Dependent Addon if ($inner_item['is_addon'] == 2 || $inner_item['is_addon'] == 3) { - $temp_data .= '₹' . format_indian_number($inner_item['premium']) . ''; - $temp_data .= '₹' . format_indian_number($inner_item['gst']) . ''; + $temp_data .= '₹' . format_indian_number(round($inner_item['premium'])) . ''; + $temp_data .= '₹' . format_indian_number(round($inner_item['gst'])) . ''; } $temp_data .= ''; @@ -580,8 +580,8 @@ class sendMailNotification if ($is_addon == 2 || $is_addon == 3) { $addon_list_array = [ 'policy_name' => $policy_name, - 'addtional_premium' => $addtional_premium, - 'gst' => $gst + 'addtional_premium' => round($addtional_premium), + 'gst' => round($gst) ]; $Addon_list[] = $addon_list_array; } @@ -595,7 +595,7 @@ class sendMailNotification if (count($Addon_list) > 0) { $table_content .= '
'; $table_content .= ''; - $table_content .= ''; + $table_content .= ''; $table_content .= ''; $table_content .= ''; $table_content .= ''; @@ -625,7 +625,7 @@ class sendMailNotification $table_content .= ''; $table_content .= ''; $table_content .= '
Policy NameAdditional Premium
'; - $table_content .= '
' . $sum_total_words . '
'; + // $table_content .= '
' . $sum_total_words . '
'; } $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content); diff --git a/app/Views/client_policy.php b/app/Views/client_policy.php index f20c8e05..40e682f2 100755 --- a/app/Views/client_policy.php +++ b/app/Views/client_policy.php @@ -242,12 +242,6 @@ dateFormat: "d-m-Y", defaultDate: today, allowInput: false, - onChange: function(selectedDates, dateStr, instance) { - var closeDate = new Date(selectedDates[0]); - closeDate.setFullYear(closeDate.getFullYear() + 1); - closeDate.setDate(closeDate.getDate() - 1); // Set end date to last day of selected year - closeDatePicker.setDate(closeDate); - } }); // Calculate the end date (today + 1 year) @@ -264,13 +258,13 @@ // Initialize Flatpickr for the end date with the calculated end date var closeDatePicker = flatpickr("#close_date", { dateFormat: "d-m-Y", - defaultDate: closeDate, + defaultDate: today, allowInput: false }); var reminderDatePicker = flatpickr("#reminder_date", { dateFormat: "d-m-Y", - defaultDate: closeDate, + defaultDate: today, allowInput: false });