From a4b6daf357afcd87b12624ffd83a1dcf618c8539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ANDRE=20s=C3=A9bastien?= <sandre@afi-sa.fr>
Date: Fri, 24 Sep 2021 08:52:12 +0200
Subject: [PATCH] hotline: #141490 : activities user cant subscribe

---
 VERSIONS_HOTLINE/141490                       |  1 +
 library/Class/SessionActivity.php             |  2 +-
 .../AbonneControllerWithQuotasTest.php        | 24 +++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 VERSIONS_HOTLINE/141490

diff --git a/VERSIONS_HOTLINE/141490 b/VERSIONS_HOTLINE/141490
new file mode 100644
index 00000000000..726395daa85
--- /dev/null
+++ b/VERSIONS_HOTLINE/141490
@@ -0,0 +1 @@
+ - ticket #141490 : Activités : Correction, on ne pouvait pas s'inscrire au même jour que la date de début d'inscription
\ No newline at end of file
diff --git a/library/Class/SessionActivity.php b/library/Class/SessionActivity.php
index da6b2474248..d2feca5ea31 100644
--- a/library/Class/SessionActivity.php
+++ b/library/Class/SessionActivity.php
@@ -243,7 +243,7 @@ class Class_SessionActivity extends Storm_Model_Abstract {
       return false;
 
     return !$this->hasDateLimiteDebut()
-      || strtotime($this->getDateLimiteDebut()) < strtotime(self::getTimeSource()->dateYmd());
+      || strtotime($this->getDateLimiteDebut()) <= strtotime(self::getTimeSource()->dateYmd());
   }
 
 
diff --git a/tests/scenarios/Activities/AbonneControllerWithQuotasTest.php b/tests/scenarios/Activities/AbonneControllerWithQuotasTest.php
index 919815b2603..017f3e75d21 100644
--- a/tests/scenarios/Activities/AbonneControllerWithQuotasTest.php
+++ b/tests/scenarios/Activities/AbonneControllerWithQuotasTest.php
@@ -857,3 +857,27 @@ class Activities_AbonneControllerWithQuotasNotFullWithQueuePostTest
     $this->assertFalse($this->_inscription->isQueue());
   }
 }
+
+
+
+
+/* hotline: #141490 */
+class AbonneControllerWithQuotasWithDateDebutInscriptionTest
+  extends AbonneControllerWithQuotasTestCase {
+
+  public function setUp() {
+    parent::setUp();
+    $this->_session_smalltalk_janvier
+      ->setDateLimiteDebut('2014-05-01')
+      ->assertSave();
+
+    $this->dispatch('/activities');
+  }
+
+
+  /** @test */
+  public function userCanSubscribe() {
+    $this->assertXPathContentContains('//table[@class="sessions"]//td',
+                                      "S'inscrire");
+  }
+}
-- 
GitLab