A bunch of new updates from icehrm pro

This commit is contained in:
Thilina Hasantha
2019-02-03 13:55:39 +01:00
parent a75325fb52
commit 96b0ad8496
598 changed files with 74156 additions and 29979 deletions

View File

@@ -30,7 +30,7 @@ class NotificationManager
if ($employee->id === $fromEmployee) {
continue;
}
$this->addNotification($employee->id, $message, $action, $type, $toUserId, $fromSystem, $sendEmail);
$this->addNotification($employee->id, $message, $action, $type, $toUserId, $fromSystem, $sendEmail, true);
}
}
@@ -41,7 +41,8 @@ class NotificationManager
$type,
$toUserId = null,
$fromSystem = false,
$sendEmail = false
$sendEmail = false,
$isEmailDelayed = false
) {
@@ -108,7 +109,7 @@ class NotificationManager
} elseif ($sendEmail) {
$emailSender = BaseService::getInstance()->getEmailSender();
if (!empty($emailSender)) {
$emailSender->sendEmailFromNotification($noti);
$emailSender->sendEmailFromNotification($noti, $isEmailDelayed);
}
}
}