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

ss

Browse Source
This commit is contained in:
bitbucket 2024-02-21 17:26:19 +05:30
parent 549dc11a9c
commit 702ba6dd05
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,19 +219,19 @@ public function preprocessTemplateData($leaveData, $templateData){
$placeholders = explode(',', $inputString);
if($leaveData->leave_code === 'permission'){
if(empty($managerName->name)){
$values = ['Manager', $leaveData->emp_name, $leaveData->leave_type, $leaveData->perm_date, $leaveData->from_time, $leaveData->to_time, $leaveData->risedby, $leaveData->status, $leaveData->comments];
$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];
}
else{
$values = [$managerName->name, $leaveData->emp_name, $leaveData->leave_type, $leaveData->perm_date, $leaveData->from_time, $leaveData->to_time, $leaveData->risedby, $leaveData->status, $leaveData->comments];
$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];
}
}
else{
if(empty($managerName->name)){
$values = ['Manager', $leaveData->emp_name, $leaveData->no_of_days, $leaveData->leave_type, $leaveData->from_date, $leaveData->to_date, $leaveData->risedby, $leaveData->leave_bal, $leaveData->status, $leaveData->comments];
$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];
}
else{
$values = [$managerName->name, $leaveData->emp_name, $leaveData->no_of_days, $leaveData->leave_type, $leaveData->from_date, $leaveData->to_date, $leaveData->risedby, $leaveData->leave_bal, $leaveData->status, $leaveData->comments];
$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];
}
}
@ -252,10 +252,10 @@ public function preprocessTemplateDataForLeaveApprove($leaveData, $templateData)
$inputString = $templateData->placeholder;
$placeholders = explode(',', $inputString);
if($leaveData->leave_code === 'permission'){
$values = [$leaveData->emp_name, $leaveData->from_time, $leaveData->to_time, $leaveData->perm_date, $leaveData->ApproveBy, $leaveData->status];
$values = [$leaveData->emp_name, $leaveData->from_time, $leaveData->to_time, $leaveData->perm_date_new, $leaveData->ApproveBy, $leaveData->status];
}
else{
$values = [$leaveData->emp_name, $leaveData->from_date, $leaveData->to_date, $leaveData->no_of_days, $leaveData->ApproveBy, $leaveData->status];
$values = [$leaveData->emp_name, $leaveData->from_date_new, $leaveData->to_date_new, $leaveData->no_of_days, $leaveData->ApproveBy, $leaveData->status];
}
$result = [];
foreach ($placeholders as $index => $placeholder) {
@ -274,10 +274,10 @@ public function preprocessTemplateDataForLeaveDecline($leaveData, $templateData)
$inputString = $templateData->placeholder;
$placeholders = explode(',', $inputString);
if($leaveData->leave_code === 'permission'){
$values = [$leaveData->emp_name, $leaveData->from_time, $leaveData->to_time, $leaveData->perm_date, $leaveData->declined_by, $leaveData->status, $leaveData->DReason];
$values = [$leaveData->emp_name, $leaveData->from_time, $leaveData->to_time, $leaveData->perm_date_new, $leaveData->declined_by, $leaveData->status, $leaveData->DReason];
}
else{
$values = [$leaveData->emp_name, $leaveData->from_date, $leaveData->to_date, $leaveData->no_of_days, $leaveData->declined_by, $leaveData->status, $leaveData->DReason];
$values = [$leaveData->emp_name, $leaveData->from_date_new, $leaveData->to_date_new, $leaveData->no_of_days, $leaveData->declined_by, $leaveData->status, $leaveData->DReason];
}
$result = [];
foreach ($placeholders as $index => $placeholder) {
@ -309,7 +309,7 @@ public function preprocessTemplateDataForAssignDelegation($Data, $templateData){
$inputString = $templateData->placeholder;
$placeholders = explode(',', $inputString);
$values = [$Data->delegatePersonName, $Data->from_date, $Data->to_date, $Data->emp_name];
$values = [$Data->delegatePersonName, $Data->from_date_new, $Data->to_date_new, $Data->emp_name];
$result = [];
foreach ($placeholders as $index => $placeholder) {
$result[] = ['placeholder' => '[' . trim($placeholder, '[]') . ']', 'strval' => $values[$index]];