Skip to content
Snippets Groups Projects

Hotline

Merged Patrick Barroca requested to merge hotline into master
Compare and
15 files
+ 372
17
Preferences
Compare changes
Files
15
+ 15
5
@@ -24,12 +24,22 @@ class Class_Hold_PnbLoader extends Storm_Model_Loader {
if (!$user)
return [];
$by_user_id = $this->findAllOngoingBy(['user_id' => $user->getId()]);
$by_user_id = Class_Hold_Pnb::findAllOngoingBy(['user_id' => $user->getId()]);
if (!$user->isAbonne())
return $by_user_id;
return array_unique(array_merge($by_user_id,
$this->findAllOngoingBy(['subscriber_id' => $user->getIdabon()])));
Class_Hold_Pnb::findAllOngoingBy(['subscriber_id' => $user->getIdabon()])));
}
public function findFirstAllocatedOn($album, $user) {
if (!$album || !$user)
return;
return Class_Hold_Pnb::findAllOngoingOfUserAndAlbum($user, $album)
->select('isAllocated')
->first();
}
@@ -104,14 +114,14 @@ class Class_Hold_Pnb extends Storm_Model_Abstract {
'subscriber_id' => ''];
public function getNextExpirationDate(){
public function getNextExpirationDate() {
$days = (int)Class_AdminVar::getValueOrDefault('DILICOM_PNB_HOLD_MAX_AVAILABILITY');
$timestamp = strtotime($this->getCurrentDateTime() . ' +' . $days . ' day');
return date('Y-m-d',$timestamp).' 23:59:59';
return date('Y-m-d', $timestamp).' 23:59:59';
}
public function allocateHold(){
public function allocateHold() {
$this->setExpirationDate($this->getNextExpirationDate())
->save();