diff --git a/application/modules/Notification/controllers/Notification.php b/application/modules/Notification/controllers/Notification.php index 2718e78..8f408f7 100644 --- a/application/modules/Notification/controllers/Notification.php +++ b/application/modules/Notification/controllers/Notification.php @@ -241,7 +241,7 @@ public function preprocessTemplateData($leaveData, $templateData){ else{ if(empty($managerName->name)){ $fromDate = date('d-m-Y', strtotime($leaveData->from_date_new)); -$toDate = date('d-m-Y', strtotime($leaveData->to_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]; @@ -250,7 +250,7 @@ public function preprocessTemplateData($leaveData, $templateData){ $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]; + $values = [$managerName->name, $leaveData->emp_name, $leaveData->no_of_days, $leaveData->leave_type, $fromDate, $toDate, $leaveData->risedby, $leaveData->leave_bal, $leaveData->status, $leaveData->comments]; } } @@ -258,7 +258,9 @@ public function preprocessTemplateData($leaveData, $templateData){ foreach ($placeholders as $index => $placeholder) { $result[] = ['placeholder' => '[' . trim($placeholder, '[]') . ']', 'strval' => $values[$index]]; } - + // echo($managerID)."
";print_r($managerName); echo "IS".$inputString."
"; + // echo $templateData->content."
";print_r($result); + // die; return $body = replaceTemplateWithData($templateData->content,$result); }