From a9aa4884d20b7b0ab1e626bac4939f3baab715bd Mon Sep 17 00:00:00 2001 From: "venkatesh.r" Date: Fri, 24 Jan 2025 12:03:09 +0530 Subject: [PATCH 1/2] CHANGE_REST_CONTRL_GETADDONPOLICY_IS_ACTIVE : RV --- app/Controllers/EmployeeRestController.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Controllers/EmployeeRestController.php b/app/Controllers/EmployeeRestController.php index f21e567..640531a 100755 --- a/app/Controllers/EmployeeRestController.php +++ b/app/Controllers/EmployeeRestController.php @@ -1654,6 +1654,7 @@ class EmployeeRestController extends AdminController $clientPolicy = $this->clientPolicyModel->where('client_id',$this->request->getGet('client_id')) ->where('client_branch_id',$this->request->getGet('client_branch_id')) ->where('policy_status', 1) + ->where('is_active', 1) ->findAll(); if(count($clientPolicy)) From 68d4ff16206fe311171f6ed9b8c4746f89ef5d77 Mon Sep 17 00:00:00 2001 From: Srinivas-Saravanan Date: Mon, 17 Feb 2025 12:43:20 +0530 Subject: [PATCH 2/2] FEAT_UNLAYER_IN_MAIL_TEMPLATE --- .vscode/settings.json | 2 + app/Controllers/NotificationController.php | 9 +- app/Helpers/sendMailNotification.php | 649 ++--- app/Models/NotificationModel.php | 2 +- app/Views/layout/header.php | 4 + app/Views/notification.php | 2569 ++++++++++++-------- 6 files changed, 1870 insertions(+), 1365 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..7a73a41 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/app/Controllers/NotificationController.php b/app/Controllers/NotificationController.php index a3c8efe..a3d6679 100755 --- a/app/Controllers/NotificationController.php +++ b/app/Controllers/NotificationController.php @@ -52,6 +52,8 @@ class NotificationController extends AdminController $form_data['subject'] = $this->request->getPost('subject'); $form_data['mail_content'] = $this->request->getPost('mailContent'); $form_data['client_id'] = $this->request->getPost('client_id'); + $form_data['mail_content_json'] = $this->request->getPost('mailJson'); + $notificationModel = new NotificationModel(); $find_notification = $notificationModel->where('client_id',$form_data['client_id'])->where('template_name',$form_data['template_name'])->first(); @@ -80,10 +82,10 @@ class NotificationController extends AdminController $checkboxNames = [ 'member_welcome_mail_btn', 'member_reminder_mail_btn', - 'member_ecard_mail_btn', + // 'member_ecard_mail_btn', 'member_review_and_summary_mail_btn', - 'account_maneger_summary_mail_btn', - 'client_hr_summary_mail_btn' + // 'account_maneger_summary_mail_btn', + // 'client_hr_summary_mail_btn' ]; $data = []; @@ -101,7 +103,6 @@ class NotificationController extends AdminController $clientData['reply_to'] = $this->request->getPost('reply_to'); $clientData['mail_domain'] = $this->request->getPost('mail_domain'); $clientModel->update($id,$clientData); - foreach ($data as $key => $value) { $find = $notificationModel->where('client_id',$this->request->getPost('client_id'))->where('template_name', $key)->first(); diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php index 2615b1f..bea00db 100755 --- a/app/Helpers/sendMailNotification.php +++ b/app/Helpers/sendMailNotification.php @@ -49,13 +49,13 @@ class sendMailNotification $nhance_logo = $_ENV['NHANCE_LOGO']; $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo']; - $mail_content = str_replace("[[client_logo]]", "Client Logo", $mail_content); - $mail_content = str_replace("[[nhance_logo]]", "Nhance Logo", $mail_content); - $mail_content = str_replace("[[member_name]]", $employee_name, $mail_content); - $mail_content = str_replace("[[member_mobile]]", $employee_mobile_no, $mail_content); - $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content); + $mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "Client Logo", $mail_content); + $mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "Nhance Logo", $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $employee_name, $mail_content); + $mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $employee_mobile_no, $mail_content); + $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content); - $mail_content = str_replace("[[app_link]]", "Review Details", $mail_content); + $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content); if ($dataToInsert['relationship'] == 'Self' && $mail != null || $mail != '') { $wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'attachments' => $attachments, 'common' => $common]; } @@ -77,16 +77,16 @@ class sendMailNotification $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo']; - $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content); - $mail_content = str_replace("[[nhance_logo]]", "Nhance Logo", $mail_content); - $mail_content = str_replace("[[client_logo]]", "Client Logo", $mail_content); - $mail_content = str_replace("[[app_link]]", "Review Details", $mail_content); + $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content); + $mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "Nhance Logo", $mail_content); + $mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "Client Logo", $mail_content); + $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content); $employee_name =$emp_data['name']; $employee_mobile_no =$emp_data['mobile']; - $mail_content = str_replace("[[member_name]]", $employee_name, $mail_content); - $mail_content = str_replace("[[member_mobile]]", $employee_mobile_no, $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $employee_name, $mail_content); + $mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $employee_mobile_no, $mail_content); $mail = $emp_data['email_corporate']; $wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'common' => $common]; @@ -113,7 +113,7 @@ class sendMailNotification $subject = $cleanedText; - $link = generate_download_link($rand_string); + $link = generate_download_link($rand_string).'/1'; $app_link = $_ENV['App_Url']; $name = $get_emp_email_and_other_details['name']; @@ -128,16 +128,17 @@ class sendMailNotification $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo']; // $client_logo = $nhance_logo; - $mail_content = str_replace("[[nhance_logo]]", "Nhance Logo", $mail_content); - $mail_content = str_replace("[[client_logo]]", "Client Logo", $mail_content); + $mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "Nhance Logo", $mail_content); + $mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "Client Logo", $mail_content); - $mail_content = str_replace("[[member_name]]", $name, $mail_content); - $mail_content = str_replace("[[member_mobile]]", $employee_mobile_no, $mail_content); - $mail_content = str_replace("[[app_link]]", "Review Details", $mail_content); - $mail_content = str_replace("[[post_enrollment_app_link]]", "Review Details", $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name, $mail_content); + $mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $employee_mobile_no, $mail_content); + $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content); + $mail_content = str_replace(["[[post_enrollment_app_link]]", "{{post_enrollment_app_link}}"], "Review Details", $mail_content); // $mail_content = str_replace("[[tpa_id]]", $tpa_id, $mail_content); - $mail_content = str_replace("[[ecard_download_link]]", "Download Insurance Card", $mail_content); - $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content); + $mail_content = str_replace(["[[ecard_download_link]]", "{{ecard_download_link}}"], "Download Insurance Card", $mail_content); + $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content); + $wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'common' => $common]; return $wholeData; @@ -172,11 +173,11 @@ class sendMailNotification $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo']; // $client_logo = $nhance_logo; - $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content); - $mail_content = str_replace("[[nhance_logo]]", "Nhance Logo", $mail_content); - $mail_content = str_replace("[[client_logo]]", "Client Logo", $mail_content); + $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content); + $mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "Nhance Logo", $mail_content); + $mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "Client Logo", $mail_content); - $mail_content = str_replace("[[app_link]]", "Review Details", $mail_content); + $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content); // Step 1: Replace the placeholder with an HTML table structure $mail = ''; @@ -189,7 +190,7 @@ class sendMailNotification $emp_code = ''; // echo '
';
-                // print_r($array_list); die;
+                // dd($array_list); die;
 
                
 
@@ -204,6 +205,7 @@ class sendMailNotification
                         $policy_name = '';
                         $is_addon = '';
                         $rowspan = count($item) ?? 2;
+                        $is_si_set = 0;
                         
                         foreach ($item as $inner_item) {
 
@@ -262,7 +264,23 @@ class sendMailNotification
                             if($policy_premium_data['premium_type'] == 2){
                                 $temp_data .= '' . $si . '';
                             }else{
-                                $temp_data .= (($si != 0 && count($item) != 1) ? ('' . $si . '') : ($si == 0 ? "" : '' . $si . '') );
+                                // $temp_data .= (($si != 0 && count($item) != 1) ? ('' . $si . '') : ($si == 0 ? "" : '' . $si . '') );
+                                
+                                if ($si != 0 && count($item) != 1 && $is_si_set == 0) {
+                                    
+                                    $temp_data .= '' . $si . '';
+                                    $is_si_set = 1;
+
+                                } else {
+
+                                    if ($is_si_set == 1) {
+                                        $temp_data .= '';
+                                    } else {
+                                        $temp_data .= '' . $si . '';
+                                    }
+                                }     
+                                
+
                             }
                                             
                             // Only Display SI Topup and Dependent Addon 
@@ -501,9 +519,9 @@ class sendMailNotification
                 // dd($payable_employee_array, $Addon_list);
                 // print_r($table_content); die;
 
-                $mail_content = str_replace("[[member_name]]", $name . ' (' . $emp_code . ')' , $mail_content);
-                $mail_content = str_replace("[[member_mobile]]", $employee_mobile_no, $mail_content);
-                $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content);
+                $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . ' (' . $emp_code . ')' , $mail_content);
+                $mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $employee_mobile_no, $mail_content);
+                $mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content);
 
                 // print_r($mail_content); die;
 
@@ -553,11 +571,11 @@ class sendMailNotification
                 $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo'];
                 // $client_logo = $nhance_logo;
 
-                $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content);
-                $mail_content = str_replace("[[nhance_logo]]", "Nhance Logo", $mail_content);
-                $mail_content = str_replace("[[client_logo]]", "Client Logo", $mail_content);
+                $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content);
+                $mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "Nhance Logo", $mail_content);
+                $mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "Client Logo", $mail_content);
 
-                $mail_content = str_replace("[[app_link]]", "Review Details", $mail_content);
+                $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content);
 
                 // Step 1: Replace the placeholder with an HTML table structure
                 $mail = '';
@@ -799,321 +817,321 @@ class sendMailNotification
                 }
                 
                                 
-                $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content);
+                $mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content);
 
                 $account_manager_mail_list = [];
                 if(isset($user_list)){
                     foreach ($user_list as $key => $value) {
                         $full_name = $value['first_name'] .' ' .$value['last_name'];
-                        $mail_content = str_replace("[[member_name]]", $full_name , $mail_content); 
+                        $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $full_name , $mail_content); 
 
                         $wholeData[] =  ['mail' => $value['email'], 'subject' => $subject,'message'=> $mail_content, 'reply_to' => $client_data['reply_to'], 'common' => $common];
-                        // $wholeData[] =  ['mail' => $value['email'], 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails']];
+                        // $wholeData[] =  ['mail' => $value['email'], 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails'}};
                     }
                     return  $wholeData;
                 }
            }
-        } else if($action == 'client_hr_summary_mail'){
+        } //else if($action == 'client_hr_summary_mail'){
 
-            $client_id = $params['client_id'];
-            $client_policy_id = $params['client_policy_id'];
-            $common = $params['common'];
+        //     $client_id = $params['client_id'];
+        //     $client_policy_id = $params['client_policy_id'];
+        //     $common = $params['common'];
 
-            $clientModel = new ClientModel();
-            $clientPolicyModel = new ClientPolicyModel();
-            $PolicyPremium1Model = new PolicyPremium1Model();
-            $PolicyPremium2Model = new PolicyPremium2Model();
+        //     $clientModel = new ClientModel();
+        //     $clientPolicyModel = new ClientPolicyModel();
+        //     $PolicyPremium1Model = new PolicyPremium1Model();
+        //     $PolicyPremium2Model = new PolicyPremium2Model();
 
-            $client_data =$clientModel->where('id', $client_id)->first();
-            $notificationModel = new NotificationModel();
-            $notification_data = $notificationModel->where('client_id' ,$client_id)->where('template_name', $action)->first();
-            $clientRMModel =new ClientRMModel();
+        //     $client_data =$clientModel->where('id', $client_id)->first();
+        //     $notificationModel = new NotificationModel();
+        //     $notification_data = $notificationModel->where('client_id' ,$client_id)->where('template_name', $action)->first();
+        //     $clientRMModel =new ClientRMModel();
 
-            if (isset($notification_data['enabled']) && $notification_data['enabled'] == 1) {    
+        //     if (isset($notification_data['enabled']) && $notification_data['enabled'] == 1) {    
 
-                $client_rm_data=  $clientRMModel->where('client_id', $client_id)->where('is_active',1)->findAll();
-                $user_list= [];
-                foreach ($client_rm_data as $key => $value) {
-                    if($value['level'] == 3){
-                        $userModel = new UserModel();
-                        $user_data = $userModel->where('id', $value['user_id'])->first();
-                        $user_list[]=$user_data;
-                    }
-                }
+        //         $client_rm_data=  $clientRMModel->where('client_id', $client_id)->where('is_active',1)->findAll();
+        //         $user_list= [];
+        //         foreach ($client_rm_data as $key => $value) {
+        //             if($value['level'] == 3){
+        //                 $userModel = new UserModel();
+        //                 $user_data = $userModel->where('id', $value['user_id'])->first();
+        //                 $user_list[]=$user_data;
+        //             }
+        //         }
     
                 
 
-                $mail_content = $notification_data['mail_content'];
-                $subject = $notification_data['subject'];
-                $app_link = $_ENV['App_Url'];
-                $nhance_logo = $_ENV['NHANCE_LOGO'];
+        //         $mail_content = $notification_data['mail_content'];
+        //         $subject = $notification_data['subject'];
+        //         $app_link = $_ENV['App_Url'];
+        //         $nhance_logo = $_ENV['NHANCE_LOGO'];
                 
-                $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo'];
-                // $client_logo = $nhance_logo;
+        //         $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo'];
+        //         // $client_logo = $nhance_logo;
                 
-                $mail_content = str_replace("[[nhance_logo]]", "Nhance Logo", $mail_content);
-                $mail_content = str_replace("[[client_logo]]", "Client Logo", $mail_content);
-                $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content);
+        //         $mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "Nhance Logo", $mail_content);
+        //         $mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "Client Logo", $mail_content);
+        //         $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content);
 
-                $mail_content = str_replace("[[app_link]]", "Review Details", $mail_content);
+        //         $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content);
 
-                // Step 1: Replace the placeholder with an HTML table structure
-                $mail = '';
-                $table_content = '';
-                $addtional_premium = 0;
-                $gst = 0;
-                $array_list = $params['array_list'];
-                $Addon_list = [];
+        //         // Step 1: Replace the placeholder with an HTML table structure
+        //         $mail = '';
+        //         $table_content = '';
+        //         $addtional_premium = 0;
+        //         $gst = 0;
+        //         $array_list = $params['array_list'];
+        //         $Addon_list = [];
                 
-                foreach ($array_list as $item) {
+        //         foreach ($array_list as $item) {
 
-                    $payable_employee_array = [];
+        //             $payable_employee_array = [];
 
-                    if (count($item) != 0) {
-                        $table_content .= '

Policy Type :'; - $temp_data = ''; - $policy_name = ''; - $is_addon = ''; + // if (count($item) != 0) { + // $table_content .= '

Policy Type :'; + // $temp_data = ''; + // $policy_name = ''; + // $is_addon = ''; - foreach ($item as $inner_item) { + // foreach ($item as $inner_item) { - //getting policy premium data - $client_policy_data = $clientPolicyModel->where('id', $inner_item['client_policy_id'])->first(); - if($client_policy_data['policy_type_id'] == 1 || $client_policy_data['policy_type_id'] == 6 || $client_policy_data['policy_type_id'] == 7 ){ - $policy_premium_data = $PolicyPremium1Model->where('client_policy_id', $inner_item['client_policy_id'])->where('is_active', '1')->first(); - }else{ - $policy_premium_data = $PolicyPremium2Model->where('client_policy_id', $inner_item['client_policy_id'])->where('is_active', '1')->first(); - } - //end of getting policy premium data + // //getting policy premium data + // $client_policy_data = $clientPolicyModel->where('id', $inner_item['client_policy_id'])->first(); + // if($client_policy_data['policy_type_id'] == 1 || $client_policy_data['policy_type_id'] == 6 || $client_policy_data['policy_type_id'] == 7 ){ + // $policy_premium_data = $PolicyPremium1Model->where('client_policy_id', $inner_item['client_policy_id'])->where('is_active', '1')->first(); + // }else{ + // $policy_premium_data = $PolicyPremium2Model->where('client_policy_id', $inner_item['client_policy_id'])->where('is_active', '1')->first(); + // } + // //end of getting policy premium data - if($inner_item['payable_employee'] == 1 && $client_policy_data['policy_type_id'] == 2){ - $payable_employee_array[] = $inner_item; - } + // if($inner_item['payable_employee'] == 1 && $client_policy_data['policy_type_id'] == 2){ + // $payable_employee_array[] = $inner_item; + // } - $policy_name = $inner_item['policy_name']; + // $policy_name = $inner_item['policy_name']; - if ($inner_item['relationship'] == 'Self') { - $emp_code = ' (' . $inner_item['emp_code'] . ')'; - } else { - $emp_code = ''; - } + // if ($inner_item['relationship'] == 'Self') { + // $emp_code = ' (' . $inner_item['emp_code'] . ')'; + // } else { + // $emp_code = ''; + // } - $si = ''; - $premium = ''; - $gst_forself = ''; + // $si = ''; + // $premium = ''; + // $gst_forself = ''; - // dd($policy_premium_data, $client_policy_data, $inner_item); + // // dd($policy_premium_data, $client_policy_data, $inner_item); - // if(checkFamilyFloaters($policy_premium_data, $client_policy_data, $inner_item)){ - $si = '₹ ' .format_indian_number($inner_item['basic_cover_si']); - $premium = '₹ ' .format_indian_number(round($inner_item['premium'])); - $gst_forself = '₹ ' .format_indian_number(round($inner_item['gst'])); - // } + // // if(checkFamilyFloaters($policy_premium_data, $client_policy_data, $inner_item)){ + // $si = '₹ ' .format_indian_number($inner_item['basic_cover_si']); + // $premium = '₹ ' .format_indian_number(round($inner_item['premium'])); + // $gst_forself = '₹ ' .format_indian_number(round($inner_item['gst'])); + // // } - $temp_data .= ''; - $temp_data .= '' . $inner_item['name'] . $emp_code . ''; - $temp_data .= '' . $inner_item['relationship'] . ''; - $temp_data .= '' . \DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y') . ''; - $temp_data .= '' . $si . ''; + // $temp_data .= ''; + // $temp_data .= '' . $inner_item['name'] . $emp_code . ''; + // $temp_data .= '' . $inner_item['relationship'] . ''; + // $temp_data .= '' . \DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y') . ''; + // $temp_data .= '' . $si . ''; - // Only Display SI Topup and Dependent Addon - if ($inner_item['is_addon'] == 2 || $inner_item['is_addon'] == 3) { - $temp_data .= '' . $premium . ''; - $temp_data .= '' . $gst_forself . ''; - } + // // Only Display SI Topup and Dependent Addon + // if ($inner_item['is_addon'] == 2 || $inner_item['is_addon'] == 3) { + // $temp_data .= '' . $premium . ''; + // $temp_data .= '' . $gst_forself . ''; + // } - $temp_data .= ''; + // $temp_data .= ''; - $is_addon = $inner_item['is_addon']; + // $is_addon = $inner_item['is_addon']; - if ($inner_item['is_addon'] == 2 || $inner_item['is_addon'] == 3) { - $addtional_premium = $inner_item['rata_premimum'] + $addtional_premium; - $gst = $inner_item['gst'] + $gst; - } - } + // if ($inner_item['is_addon'] == 2 || $inner_item['is_addon'] == 3) { + // $addtional_premium = $inner_item['rata_premimum'] + $addtional_premium; + // $gst = $inner_item['gst'] + $gst; + // } + // } - $policy_name_for_policy_type = $inner_item['policy_name']; - if($client_policy_data['policy_type_id'] == 3 && $client_policy_data['is_addon'] == 3){ - $policy_name_for_policy_type = 'Add-On Group Medical Coverage for Parents'; - } + // $policy_name_for_policy_type = $inner_item['policy_name']; + // if($client_policy_data['policy_type_id'] == 3 && $client_policy_data['is_addon'] == 3){ + // $policy_name_for_policy_type = 'Add-On Group Medical Coverage for Parents'; + // } - $table_content .= $policy_name_for_policy_type . '

'; - $table_content .= ''; + // $table_content .= $policy_name_for_policy_type . ''; + // $table_content .= '
'; - // Add text-align: center to the table head - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; + // // Add text-align: center to the table head + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; - // Only Display SI Topup and Dependent Addon - if ($is_addon == 2 || $is_addon == 3) { - $table_content .= ''; - $table_content .= ''; - } + // // Only Display SI Topup and Dependent Addon + // if ($is_addon == 2 || $is_addon == 3) { + // $table_content .= ''; + // $table_content .= ''; + // } - $table_content .= ''; - $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; - // Add text-align: center to the table body - $table_content .= '' . $temp_data . ''; - $table_content .= '
NameRelationDate Of BirthSum Insured
NameRelationDate Of BirthSum InsuredPremiumGSTPremiumGST
'; + // // Add text-align: center to the table body + // $table_content .= '' . $temp_data . ''; + // $table_content .= '

'; - if ($is_addon == 2 || $is_addon == 3) { - $addon_list_array = [ - 'policy_name' => $policy_name_for_policy_type, - 'addtional_premium' => round($addtional_premium), - 'gst' => round($gst) - ]; - $Addon_list[] = $addon_list_array; - } + // if ($is_addon == 2 || $is_addon == 3) { + // $addon_list_array = [ + // 'policy_name' => $policy_name_for_policy_type, + // 'addtional_premium' => round($addtional_premium), + // 'gst' => round($gst) + // ]; + // $Addon_list[] = $addon_list_array; + // } - $temp_data = ''; - $addtional_premium = 0; - $gst = 0; - } + // $temp_data = ''; + // $addtional_premium = 0; + // $gst = 0; + // } - if(count($payable_employee_array) > 0){ + // if(count($payable_employee_array) > 0){ - $table_content .= '

Policy Type :'; - $temp_data = ''; - $is_addon = ''; + // $table_content .= '

Policy Type :'; + // $temp_data = ''; + // $is_addon = ''; - foreach ($payable_employee_array as $inner_item) { + // foreach ($payable_employee_array as $inner_item) { - //getting policy premium data - $client_policy_data = $clientPolicyModel->where('id', $inner_item['client_policy_id'])->first(); - if($client_policy_data['policy_type_id'] == 1 || $client_policy_data['policy_type_id'] == 6 || $client_policy_data['policy_type_id'] == 7 ){ - $policy_premium_data = $PolicyPremium1Model->where('client_policy_id', $inner_item['client_policy_id'])->where('is_active', '1')->first(); - }else{ - $policy_premium_data = $PolicyPremium2Model->where('client_policy_id', $inner_item['client_policy_id'])->where('is_active', '1')->first(); - } - //end of getting policy premium data + // //getting policy premium data + // $client_policy_data = $clientPolicyModel->where('id', $inner_item['client_policy_id'])->first(); + // if($client_policy_data['policy_type_id'] == 1 || $client_policy_data['policy_type_id'] == 6 || $client_policy_data['policy_type_id'] == 7 ){ + // $policy_premium_data = $PolicyPremium1Model->where('client_policy_id', $inner_item['client_policy_id'])->where('is_active', '1')->first(); + // }else{ + // $policy_premium_data = $PolicyPremium2Model->where('client_policy_id', $inner_item['client_policy_id'])->where('is_active', '1')->first(); + // } + // //end of getting policy premium data - $si = ''; - $premium = ''; - $gst_forself = ''; + // $si = ''; + // $premium = ''; + // $gst_forself = ''; - $si = '₹ ' .format_indian_number($inner_item['basic_cover_si']); - $premium = '₹ ' .format_indian_number(round($inner_item['rata_premimum'])); - $gst_forself = '₹ ' .format_indian_number(round($inner_item['gst'])); + // $si = '₹ ' .format_indian_number($inner_item['basic_cover_si']); + // $premium = '₹ ' .format_indian_number(round($inner_item['rata_premimum'])); + // $gst_forself = '₹ ' .format_indian_number(round($inner_item['gst'])); - $temp_data .= ''; - $temp_data .= '' . $inner_item['name'] . ($inner_item['relationship'] == 'Self' ? ' (' . $inner_item['emp_code'] . ')' : '') . ''; - $temp_data .= '' . $inner_item['relationship'] . ''; - $temp_data .= '' . \DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y') . ''; - $temp_data .= '' . $si . ''; - $temp_data .= '' . $premium . ''; - $temp_data .= '' . $gst_forself . ''; + // $temp_data .= ''; + // $temp_data .= '' . $inner_item['name'] . ($inner_item['relationship'] == 'Self' ? ' (' . $inner_item['emp_code'] . ')' : '') . ''; + // $temp_data .= '' . $inner_item['relationship'] . ''; + // $temp_data .= '' . \DateTime::createFromFormat('Y-m-d', $inner_item['dob'])->format('d-m-Y') . ''; + // $temp_data .= '' . $si . ''; + // $temp_data .= '' . $premium . ''; + // $temp_data .= '' . $gst_forself . ''; - $temp_data .= ''; + // $temp_data .= ''; - $is_addon = $inner_item['is_addon']; + // $is_addon = $inner_item['is_addon']; - $addtional_premium = $inner_item['rata_premimum'] + $addtional_premium; - $gst = $inner_item['gst'] + $gst; - } + // $addtional_premium = $inner_item['rata_premimum'] + $addtional_premium; + // $gst = $inner_item['gst'] + $gst; + // } - $policy_name_for_policy_type = $inner_item['policy_name']; - if($client_policy_data['policy_type_id'] == 3 && $client_policy_data['is_addon'] == 3){ - $policy_name_for_policy_type = 'Add-On Group Medical Coverage for Parents'; - } + // $policy_name_for_policy_type = $inner_item['policy_name']; + // if($client_policy_data['policy_type_id'] == 3 && $client_policy_data['is_addon'] == 3){ + // $policy_name_for_policy_type = 'Add-On Group Medical Coverage for Parents'; + // } - $table_content .= $policy_name_for_policy_type . ' ( Payable By Employee )

'; - $table_content .= ''; + // $table_content .= $policy_name_for_policy_type . ' ( Payable By Employee ) '; + // $table_content .= '
'; - // Add text-align: center to the table head - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; + // // Add text-align: center to the table head + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; - $table_content .= ''; - $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; - // Add text-align: center to the table body - $table_content .= '' . $temp_data . ''; - $table_content .= '
NameRelationDate Of BirthSum InsuredPremiumGST
NameRelationDate Of BirthSum InsuredPremiumGST
'; + // // Add text-align: center to the table body + // $table_content .= '' . $temp_data . ''; + // $table_content .= '

'; - $addon_list_array = [ - 'policy_name' => $policy_name_for_policy_type . '( Payable By Employee )', - 'addtional_premium' => round($addtional_premium), - 'gst' => round($gst) - ]; - $Addon_list[] = $addon_list_array; + // $addon_list_array = [ + // 'policy_name' => $policy_name_for_policy_type . '( Payable By Employee )', + // 'addtional_premium' => round($addtional_premium), + // 'gst' => round($gst) + // ]; + // $Addon_list[] = $addon_list_array; - $temp_data = ''; - $addtional_premium = 0; - $gst = 0; + // $temp_data = ''; + // $addtional_premium = 0; + // $gst = 0; - } - } + // } + // } - if (count($Addon_list) > 0) { - $table_content .= '
'; - $table_content .= ''; + // if (count($Addon_list) > 0) { + // $table_content .= '
'; + // $table_content .= '
'; - // Center align for table header and body - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; + // // Center align for table header and body + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; - $table_content .= ''; + // $table_content .= ''; - $sum_total = 0; - foreach ($Addon_list as $key => $value) { - $total_addon = $value['gst'] + $value['addtional_premium']; - $sum_total += $total_addon; + // $sum_total = 0; + // foreach ($Addon_list as $key => $value) { + // $total_addon = $value['gst'] + $value['addtional_premium']; + // $sum_total += $total_addon; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - } + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= ''; + // } - $sum_total_words = numberToWords($sum_total); - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= ''; - $table_content .= '
Policy NameAdditional PremiumGSTTotal
Policy NameAdditional PremiumGSTTotal
' . $value['policy_name'] . '₹' . format_indian_number($value['addtional_premium']) . '₹' . format_indian_number($value['gst']) . '₹' . format_indian_number($total_addon) . '
' . $value['policy_name'] . '₹' . format_indian_number($value['addtional_premium']) . '₹' . format_indian_number($value['gst']) . '₹' . format_indian_number($total_addon) . '
Total₹' . format_indian_number($sum_total) . '
'; - // $table_content .= '
' . $sum_total_words . '
'; - } + // $sum_total_words = numberToWords($sum_total); + // $table_content .= ''; + // $table_content .= 'Total'; + // $table_content .= '₹' . format_indian_number($sum_total) . ''; + // $table_content .= ''; + // $table_content .= ''; + // $table_content .= '
'; + // // $table_content .= '
' . $sum_total_words . '
'; + // } - $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content); + // $mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content); - $hr_mails = $client_data['hr_mails']; - $mail_array = explode(',', $hr_mails); - $mail_array = array_map('trim', $mail_array); - $wholeData = []; - foreach ($mail_array as $key => $value) { - $wholeData[] = ['mail' => $value, 'subject' => $subject,'message'=> $mail_content, 'reply_to' => $client_data['reply_to'], 'common' => $common]; - // $wholeData[] = ['mail' => $value, 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails']]; - } + // $hr_mails = $client_data['hr_mails']; + // $mail_array = explode(',', $hr_mails); + // $mail_array = array_map('trim', $mail_array); + // $wholeData = []; + // foreach ($mail_array as $key => $value) { + // $wholeData[] = ['mail' => $value, 'subject' => $subject,'message'=> $mail_content, 'reply_to' => $client_data['reply_to'], 'common' => $common]; + // // $wholeData[] = ['mail' => $value, 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails'}}; + // } - return $wholeData; - } + // return $wholeData; + // } - } + // } } public static function sendMailNotificationForTesting($action, $params) @@ -1156,13 +1174,13 @@ class sendMailNotification $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo']; - $mail_content = str_replace("[[client_logo]]", "Client Logo", $mail_content); - $mail_content = str_replace("[[nhance_logo]]", "Nhance Logo", $mail_content); - $mail_content = str_replace("[[member_name]]", $employee_name, $mail_content); - $mail_content = str_replace("[[member_mobile]]", $mobile, $mail_content); - $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content); + $mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "Client Logo", $mail_content); + $mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "Nhance Logo", $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $employee_name, $mail_content); + $mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $mobile, $mail_content); + $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content); - $mail_content = str_replace("[[app_link]]", "Review Details", $mail_content); + $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content); if ($mail != null || $mail != '') { $wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'attachments' => $attachments]; @@ -1187,11 +1205,12 @@ class sendMailNotification $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo']; - $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content); - $mail_content = str_replace("[[nhance_logo]]", "Nhance Logo", $mail_content); - $mail_content = str_replace("[[client_logo]]", "Client Logo", $mail_content); - $mail_content = str_replace("[[app_link]]", "Review Details", $mail_content); - $mail_content = str_replace("[[member_mobile]]", $mobile, $mail_content); + $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content); + $mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "Nhance Logo", $mail_content); + $mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "Client Logo", $mail_content); + $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $employee_name, $mail_content); + $mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $mobile, $mail_content); if ((isset($notification_data) && $notification_data['enabled'] == 1)) { @@ -1209,6 +1228,20 @@ class sendMailNotification $notification = $params['notification_data']; $client_data = $params['client_data']; $mail = $params['test_mail']; + $mailAttachmentModel = new MailAttachmentModel(); + $attachment_data = $mailAttachmentModel + ->select('file_path, file_name') + ->where('notification_id', $notification['id']) + ->where('is_active', 1) + ->findAll(); + + $attachments = []; + foreach ($attachment_data as $data) { + $attachments[] = [ + "filePath" => WRITEPATH . $data['file_path'], + "fileName" => $data['file_name'] + ]; + } $mail_content = $notification['mail_content']; $subject = $notification['subject']; @@ -1225,17 +1258,17 @@ class sendMailNotification $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo']; - $mail_content = str_replace("[[nhance_logo]]", "Nhance Logo", $mail_content); - $mail_content = str_replace("[[client_logo]]", "Client Logo", $mail_content); + $mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "Nhance Logo", $mail_content); + $mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "Client Logo", $mail_content); - $mail_content = str_replace("[[member_name]]", $name, $mail_content); - $mail_content = str_replace("[[member_mobile]]", $mobile, $mail_content); - $mail_content = str_replace("[[app_link]]", "Review Details", $mail_content); - $mail_content = str_replace("[[post_enrollment_app_link]]", "Review Details", $mail_content); - $mail_content = str_replace("[[ecard_download_link]]", "Download Insurance Card", $mail_content); - $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name, $mail_content); + $mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $mobile, $mail_content); + $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content); + $mail_content = str_replace(["[[post_enrollment_app_link]]", "{{post_enrollment_app_link}}"], "Review Details", $mail_content); + $mail_content = str_replace(["[[ecard_download_link]]", "{{ecard_download_link}}"], "Download Insurance Card", $mail_content); + $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content); - $wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to']]; + $wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content,'bcc'=> $client_data['common_mails'],'attachments' => $attachments, 'reply_to' => $client_data['reply_to']]; return $wholeData; @@ -1270,11 +1303,11 @@ class sendMailNotification $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo']; - $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content); - $mail_content = str_replace("[[nhance_logo]]", "Nhance Logo", $mail_content); - $mail_content = str_replace("[[client_logo]]", "Client Logo", $mail_content); + $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content); + $mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "Nhance Logo", $mail_content); + $mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "Client Logo", $mail_content); - $mail_content = str_replace("[[app_link]]", "Review Details", $mail_content); + $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content); // Step 1: Replace the placeholder with an HTML table structure $table_content = ''; @@ -1382,9 +1415,9 @@ class sendMailNotification } } - $mail_content = str_replace("[[member_name]]", $name . ' (' . $emp_code . ')' , $mail_content); - $mail_content = str_replace("[[member_mobile]]", $mobile, $mail_content); - $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . ' (' . $emp_code . ')' , $mail_content); + $mail_content = str_replace(["[[member_mobile]]", "{{member_mobile}}"], $mobile, $mail_content); + $mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content); $wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'bcc'=> $client_data['common_mails'], 'reply_to' => $client_data['reply_to']]; @@ -1422,11 +1455,11 @@ class sendMailNotification $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo']; - $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content); - $mail_content = str_replace("[[nhance_logo]]", "Nhance Logo", $mail_content); - $mail_content = str_replace("[[client_logo]]", "Client Logo", $mail_content); + $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content); + $mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "Nhance Logo", $mail_content); + $mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "Client Logo", $mail_content); - $mail_content = str_replace("[[app_link]]", "Review Details", $mail_content); + $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content); // Step 1: Replace the placeholder with an HTML table structure $table_content = ''; @@ -1532,8 +1565,8 @@ class sendMailNotification } } - $mail_content = str_replace("[[member_name]]", $name . ' (' . $emp_code . ')' , $mail_content); - $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . ' (' . $emp_code . ')' , $mail_content); + $mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content); $wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'reply_to' => $client_data['reply_to']]; @@ -1569,11 +1602,11 @@ class sendMailNotification $client_logo = base_url() . "public/uploads/logo/" . $client_data['client_logo']; - $mail_content = str_replace("[[nhance_logo]]", "Nhance Logo", $mail_content); - $mail_content = str_replace("[[client_logo]]", "Client Logo", $mail_content); - $mail_content = str_replace("[[client_name]]", $client_data['client_name'], $mail_content); + $mail_content = str_replace(["[[nhance_logo]]", "{{nhance_logo}}"], "Nhance Logo", $mail_content); + $mail_content = str_replace(["[[client_logo]]", "{{client_logo}}"], "Client Logo", $mail_content); + $mail_content = str_replace(["[[client_name]]", "{{client_name}}"], $client_data['client_name'], $mail_content); - $mail_content = str_replace("[[app_link]]", "Review Details", $mail_content); + $mail_content = str_replace(["[[app_link]]", "{{app_link}}"], "Review Details", $mail_content); // Step 1: Replace the placeholder with an HTML table structure $table_content = ''; @@ -1681,8 +1714,8 @@ class sendMailNotification } } - $mail_content = str_replace("[[member_name]]", $name . ' (' . $emp_code . ')' , $mail_content); - $mail_content = str_replace("[[member_summary]]", $table_content , $mail_content); + $mail_content = str_replace(["[[member_name]]", "{{member_name}}"], $name . ' (' . $emp_code . ')' , $mail_content); + $mail_content = str_replace(["[[member_summary]]", "{{member_summary}}"], $table_content , $mail_content); $wholeData = ['mail' => $mail, 'subject' => $subject,'message'=> $mail_content, 'reply_to' => $client_data['reply_to']]; diff --git a/app/Models/NotificationModel.php b/app/Models/NotificationModel.php index d78d2a6..9f27687 100755 --- a/app/Models/NotificationModel.php +++ b/app/Models/NotificationModel.php @@ -8,5 +8,5 @@ class NotificationModel extends Model { protected $table = 'notifications'; protected $primaryKey = 'id'; - protected $allowedFields = ["id","client_id","template_name","subject","mail_content","enabled","created_by","updated_by","is_active",]; + protected $allowedFields = ["id","client_id","template_name","subject","mail_content","enabled","created_by","updated_by","is_active",'mail_content_json','mail_content_copy']; } \ No newline at end of file diff --git a/app/Views/layout/header.php b/app/Views/layout/header.php index 355699b..be4b592 100755 --- a/app/Views/layout/header.php +++ b/app/Views/layout/header.php @@ -79,6 +79,10 @@ + + + +
- +
-
- +
+
-

+ ?>

-
+
-
-
- - -
-
- - -
+
+
+ +
- -
- -
- - -
-
- -
-
- - -     - Edit -
-
- -
- -
- -
-
- - -     - Edit -
-
- -
-
- - - -
-
- - -     - Edit -
-
- -
-
- - - -
-
-
-
- Submit -
+
+ +
+
+
+ + +
+
+ + +
+
+ +
+
+ + +     + Edit +
+
+ +
+ +
+ +
+
+ + +     + Edit +
+
+ +
+
+ + + +
+
+ + +     + Edit +
+
+ +
+
+ + + + + +
+
+
+
+ Submit +
+
+
+
@@ -194,7 +216,7 @@ +*/ ?> - +
@@ -489,22 +527,27 @@
-->
- + + +
+
+
+ +
+
+
+
-
-
- -
-
@@ -524,8 +567,8 @@
+ -->
- + + +
+
+
+ +
+
+
+
-
-
- -
-
@@ -697,7 +727,8 @@
- + +*/ ?> - - \ No newline at end of file