Bigbamboo/bbone
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mail issue

Browse Source
This commit is contained in:
heama 2024-03-05 17:18:08 +05:30
parent 3dac74521d
commit fb781ab722
5 changed files with 129 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/helpers/data_helper.php
View File

@ -46,9 +46,11 @@ function getTempleteData($code, $type){
function replaceTemplateWithData($originalTemplate, $placeholders) { function replaceTemplateWithData($originalTemplate, $placeholders) {
$notificationContent = $originalTemplate; $notificationContent = $originalTemplate;
foreach ($placeholders as $value) { foreach ($placeholders as $value) {
$notificationContent = str_replace($value['placeholder'], $value['strval'], $notificationContent); $notificationContent = str_replace($value['placeholder'], $value['strval'], $notificationContent);
} }
return $notificationContent; return $notificationContent;
} }

13
application/helpers/mail_helper.php
View File

@ -22,12 +22,12 @@ function send_emails($to, $subject, $body, $aliasName = '', $cc = null, $bcc = n
$mailer->Host= 'mail.venbait.in'; $mailer->Host= 'mail.venbait.in';
$mailer->SMTPSecure = 'ssl'; $mailer->SMTPSecure = 'ssl';
$mailer->SMTPAuth =true; $mailer->SMTPAuth =true;
$mailer->SMTPDebug = false; $mailer->SMTPDebug =false;
$mailer->Username='bbone@venbait.in'; $mailer->Username='bbone@venbait.in';
$mailer->Password='xk!L(N_-R#};'; $mailer->Password='xk!L(N_-R#};';
$mailer->Port=465; $mailer->Port=465;
$mailer->setFrom(business()->sender_mail, $aliasName); $mailer->setFrom(business()->sender_mail, $aliasName);
$mailer->addAddress('suseendhiran13@gmail.com'); $mailer->addAddress($to);
// Add CC recipients // Add CC recipients
// if ($cc !== null) { // if ($cc !== null) {
@ -52,6 +52,7 @@ function send_emails($to, $subject, $body, $aliasName = '', $cc = null, $bcc = n
// } // }
$mailer->Subject=$subject; $mailer->Subject=$subject;
$mailer->isHTML(true); $mailer->isHTML(true);
$mailer->Body=$body; $mailer->Body=$body;
@ -62,14 +63,14 @@ function send_emails($to, $subject, $body, $aliasName = '', $cc = null, $bcc = n
} }
$mailer->send(); $mailer->send();
return true;
log_message('info', 'success : mail sendsuccessfully'); log_message('info', 'success : mail sendsuccessfully');
return true;
} catch (Exception $e) { } catch (Exception $e) {
log_message('info', 'Error mail noy send: '.$mailer->ErrorInfo);
return 'Error: ' . $mailer->ErrorInfo; return 'Error: ' . $mailer->ErrorInfo;
log_message('info', 'Error : '.$mailer->ErrorInfo);
} }
} }

2
application/modules/Leave/controllers/Leave.php
View File

@ -235,7 +235,7 @@ public function createLeave()
$data['business_id'] = user()->business_id; $data['business_id'] = user()->business_id;
$data['status'] = 'pending'; $data['status'] = 'pending';
// $data['created_date'] = date('d-m-Y'); // $data['created_date'] = date('d-m-Y');
$perm_data['created_date_new'] = date('d-m-Y'); $data['created_date_new'] = date('Y-m-d');
$data['created_time'] = date('H:i A'); $data['created_time'] = date('H:i A');
$leave_year = date('Y', strtotime($this->input->post('from_date_new'))); $leave_year = date('Y', strtotime($this->input->post('from_date_new')));

43
application/modules/Notification/controllers/Notification.php
View File

@ -46,18 +46,23 @@ public function prepareNotificationData($body,$templateData,$Data,$type,$code){
{ {
// echo 1;die; // echo 1;die;
$getBusinessData = $this->Notification_model->get_admin_and_hr_mail_id(user()->business_id); $getBusinessData = $this->Notification_model->get_admin_and_hr_mail_id(user()->business_id);
$managerID = $Data->ManagerId; $managerID = $Data->ManagerId;
$managerMail = $this->Notification_model->get_user_data($managerID); $managerMail = $this->Notification_model->get_user_data($managerID);
$cc_mail_data = [$getBusinessData->admin_email, $getBusinessData->hr_email, $Data->managerEmail, $Data->delegatePersonEmail]; $cc_mail_data = [$getBusinessData->admin_email, $getBusinessData->hr_email, $Data->managerEmail, $Data->delegatePersonEmail];
if($Data->delegatePersonEmail == NULL) if($Data->delegatePersonEmail == NULL)
{ {
if($Data->managerEmail == NULL){ if($Data->managerEmail == NULL){
$cc_mail_data = [$getBusinessData->admin_email, $getBusinessData->hr_email]; $cc_mail_data = [$getBusinessData->admin_email, $getBusinessData->hr_email];
} }
else{ else{
$cc_mail_data = [$getBusinessData->admin_email, $getBusinessData->hr_email, $Data->managerEmail]; $cc_mail_data = [$getBusinessData->admin_email, $getBusinessData->hr_email, $Data->managerEmail];
} }
} }
@ -192,16 +197,22 @@ public function prepareNotificationDataForExpence($body,$templateData,$Data,$typ
public function sendNotification($leave_id, $code, $type){ public function sendNotification($leave_id, $code, $type){
try { try {
$leaveData = collectLeaveData($leave_id); $leaveData = collectLeaveData($leave_id);
// print_r($leaveData);
$templateData = getTempleteData($code, $type); $templateData = getTempleteData($code, $type);
if($code === 'APPLY_LEAVE' || $code === 'LEAVE_PERMISSION'){ if($code === 'APPLY_LEAVE' || $code === 'LEAVE_PERMISSION'){
$FormettedTemplateData = $this->preprocessTemplateData($leaveData,$templateData); $FormettedTemplateData = $this->preprocessTemplateData($leaveData,$templateData);
// print_r($leaveData);
} }
else if($code === 'APPROVE_LEAVE' || $code === 'APPROVE_PERMISSION'){ else if($code === 'APPROVE_LEAVE' || $code === 'APPROVE_PERMISSION'){
$FormettedTemplateData = $this->preprocessTemplateDataForLeaveApprove($leaveData,$templateData); $FormettedTemplateData = $this->preprocessTemplateDataForLeaveApprove($leaveData,$templateData);
// print_r($FormettedTemplateData);
// print_r($templateData);
} }
else if($code === 'DECLINE_LEAVE' || $code === 'DECLINE_PERMISSION'){ else if($code === 'DECLINE_LEAVE' || $code === 'DECLINE_PERMISSION'){
$FormettedTemplateData = $this->preprocessTemplateDataForLeaveDecline($leaveData,$templateData); $FormettedTemplateData = $this->preprocessTemplateDataForLeaveDecline($leaveData,$templateData);
// print_r($FormettedTemplateData);
// print_r($templateData);
} }
return $this->prepareNotificationData($FormettedTemplateData,$templateData,$leaveData,$type, $code); return $this->prepareNotificationData($FormettedTemplateData,$templateData,$leaveData,$type, $code);
} catch (Exception $e) { } catch (Exception $e) {
@ -219,19 +230,27 @@ public function preprocessTemplateData($leaveData, $templateData){
$placeholders = explode(',', $inputString); $placeholders = explode(',', $inputString);
if($leaveData->leave_code === 'permission'){ if($leaveData->leave_code === 'permission'){
if(empty($managerName->name)){ if(empty($managerName->name)){
$values = ['Manager', $leaveData->emp_name, $leaveData->leave_type, $leaveData->perm_date_new_new, $leaveData->from_time, $leaveData->to_time, $leaveData->risedby, $leaveData->status, $leaveData->comments]; $perm_date_new = date('d-m-Y', strtotime($leaveData->perm_date_new));
$values = ['Manager', $leaveData->emp_name, $leaveData->leave_type, $perm_date_new, $leaveData->from_time, $leaveData->to_time, $leaveData->risedby, $leaveData->status, $leaveData->comments];
} }
else{ else{
$values = [$managerName->name, $leaveData->emp_name, $leaveData->leave_type, $leaveData->perm_date_new_new, $leaveData->from_time, $leaveData->to_time, $leaveData->risedby, $leaveData->status, $leaveData->comments]; $perm_date_new = date('d-m-Y', strtotime($leaveData->perm_date_new));
$values = [$managerName->name, $leaveData->emp_name, $leaveData->leave_type, $perm_date_new, $leaveData->from_time, $leaveData->to_time, $leaveData->risedby, $leaveData->status, $leaveData->comments];
} }
} }
else{ else{
if(empty($managerName->name)){ if(empty($managerName->name)){
$values = ['Manager', $leaveData->emp_name, $leaveData->no_of_days, $leaveData->leave_type, $leaveData->from_date_new_new, $leaveData->to_date_new_new, $leaveData->risedby, $leaveData->leave_bal, $leaveData->status, $leaveData->comments]; $fromDate = date('d-m-Y', strtotime($leaveData->from_date_new));
$toDate = date('d-m-Y', strtotime($leaveData->to_date_new));
$values = ['Manager', $leaveData->emp_name, $leaveData->no_of_days, $leaveData->leave_type, $fromDate, $toDate, $leaveData->risedby, $leaveData->leave_bal, $leaveData->status, $leaveData->comments];
} }
else{ else{
$values = [$managerName->name, $leaveData->emp_name, $leaveData->no_of_days, $leaveData->leave_type, $leaveData->from_date_new_new, $leaveData->to_date_new_new, $leaveData->risedby, $leaveData->leave_bal, $leaveData->status, $leaveData->comments]; $fromDate = date('d-m-Y', strtotime($leaveData->from_date_new));
$toDate = date('d-m-Y', strtotime($leaveData->to_date_new));
$values = [$managerName->name, $leaveData->emp_name, $leaveData->no_of_days, $leaveData->leave_type, $fromDate, $toDate_new, $leaveData->risedby, $leaveData->leave_bal, $leaveData->status, $leaveData->comments];
} }
} }
@ -252,10 +271,14 @@ public function preprocessTemplateDataForLeaveApprove($leaveData, $templateData)
$inputString = $templateData->placeholder; $inputString = $templateData->placeholder;
$placeholders = explode(',', $inputString); $placeholders = explode(',', $inputString);
if($leaveData->leave_code === 'permission'){ if($leaveData->leave_code === 'permission'){
$values = [$leaveData->emp_name, $leaveData->from_time, $leaveData->to_time, $leaveData->perm_date_new, $leaveData->ApproveBy, $leaveData->status]; $perm_date_new = date('d-m-Y', strtotime($leaveData->perm_date_new));
$values = [$leaveData->emp_name, $leaveData->from_time, $leaveData->to_time, $perm_date_new, $leaveData->ApproveBy, $leaveData->status];
} }
else{ else{
$values = [$leaveData->emp_name, $leaveData->from_date_new, $leaveData->to_date_new, $leaveData->no_of_days, $leaveData->ApproveBy, $leaveData->status]; $fromDate = date('d-m-Y', strtotime($leaveData->from_date_new));
$toDate = date('d-m-Y', strtotime($leaveData->to_date_new));
$values = [$leaveData->emp_name, $fromDate, $toDate, $leaveData->no_of_days, $leaveData->ApproveBy, $leaveData->status];
} }
$result = []; $result = [];
foreach ($placeholders as $index => $placeholder) { foreach ($placeholders as $index => $placeholder) {
@ -274,10 +297,14 @@ public function preprocessTemplateDataForLeaveDecline($leaveData, $templateData)
$inputString = $templateData->placeholder; $inputString = $templateData->placeholder;
$placeholders = explode(',', $inputString); $placeholders = explode(',', $inputString);
if($leaveData->leave_code === 'permission'){ if($leaveData->leave_code === 'permission'){
$values = [$leaveData->emp_name, $leaveData->from_time, $leaveData->to_time, $leaveData->perm_date_new, $leaveData->declined_by, $leaveData->status, $leaveData->DReason]; $perm_date_new = date('d-m-Y', strtotime($leaveData->perm_date_new));
$values = [$leaveData->emp_name, $leaveData->from_time, $leaveData->to_time, $perm_date_new, $leaveData->declined_by, $leaveData->status, $leaveData->DReason];
} }
else{ else{
$values = [$leaveData->emp_name, $leaveData->from_date_new, $leaveData->to_date_new, $leaveData->no_of_days, $leaveData->declined_by, $leaveData->status, $leaveData->DReason]; $fromDate = date('d-m-Y', strtotime($leaveData->from_date_new));
$toDate = date('d-m-Y', strtotime($leaveData->to_date_new));
$values = [$leaveData->emp_name, $fromDate, $toDate, $leaveData->no_of_days, $leaveData->declined_by, $leaveData->status, $leaveData->DReason];
} }
$result = []; $result = [];
foreach ($placeholders as $index => $placeholder) { foreach ($placeholders as $index => $placeholder) {