Skip to content
Snippets Groups Projects
Commit 3ba3f41d authored by Sebastien ANDRE's avatar Sebastien ANDRE
Browse files

hotline : #186186 : with var at 0 created uers datefin with

currenttime - 1
parent f4e3d6d8
Branches
Tags 6.47
1 merge request!4842[RTOK] hotline : #186186 : with var at 0 created uers datefin with
Pipeline #26483 passed with stage
in 20 minutes and 20 seconds
- correctif #186186 : Abonnés portail : Un abonnement ne sera plus valide avec une PORTAL_BORROWERS_VALIDATION_DELAY = 0.
\ No newline at end of file
...@@ -193,7 +193,12 @@ class Class_User_ILSSubscription { ...@@ -193,7 +193,12 @@ class Class_User_ILSSubscription {
$this->_user->beAbonnePortail(); $this->_user->beAbonnePortail();
$date = new DateTime($this->getTimeSource()->dateYmd()); $date = new DateTime($this->getTimeSource()->dateYmd());
$date->modify('+' . $days . ' day');
if ($days > 0)
$date->modify('+' . $days . ' day');
if ($days <= 0)
$date->modify('-1 day');
$this->_user->setDateFin($date->format('Y-m-d')); $this->_user->setDateFin($date->format('Y-m-d'));
return $this; return $this;
......
...@@ -242,6 +242,45 @@ class PortalBorrowersFrontRegisterActivationTest extends PortalBorrowersActivate ...@@ -242,6 +242,45 @@ class PortalBorrowersFrontRegisterActivationTest extends PortalBorrowersActivate
/* hotline : https://forge.afi-sa.net/issues/186186 */
class PortalBorrowersFrontRegisterActivationWithValidationDelayZeroTest
extends PortalBorrowersActivatedTestCase {
public function setUp() {
parent::setUp();
Class_AdminVar::set('PORTAL_BORROWERS_LIBRARIES_IDS', '1');
Class_AdminVar::set('PORTAL_BORROWERS_VALIDATION_DELAY', '0');
$time_source = (new TimeSourceForTest('2022-10-21 10:43:04'));
Class_User_ILSSubscription::setTimeSource($time_source);
$activation_key = 'zzhz';
$this->fixture(Class_UsersNonValid::class,
['id' => 188,
'login' => 'newuser',
'password' => 'pass',
'mail' => 'user@server.io',
'date' => $time_source->time(),
'id_site' => '1',
'civilite' => '1',
'naissance' => '1977-08-18',
'cle' => $activation_key]);
$this->dispatch('/opac/auth/activeuser?c=' . $activation_key);
}
/** @test */
public function createdUserDateFinShouldBeCurrentDayLessOne() {
$this->assertEquals('2022-10-20',
Class_Users::findFirstBy(['login' => 'newuser'])->getDateFin());
}
}
class PortalBorrowersFrontDisabledRegisterTest extends PortalBorrowersDisabledTestCase { class PortalBorrowersFrontDisabledRegisterTest extends PortalBorrowersDisabledTestCase {
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment