galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Upgrade to v26 (#172)

Browse Source 
* A bunch of new updates from icehrm pro

* Push changes to frontend
This commit is contained in:
Thilina Hasantha
2019-02-03 14:00:34 +01:00
committed by GitHub
parent a75325fb52
commit 16014bb38e
734 changed files with 131230 additions and 17430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/Classes/NotificationManager.php
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);
}
}
}