Hide expiration date field when the 'period never expires' option is checked

nicosomb · jolelievre · commit 56ec30e86bc6 · 2026-03-05T15:05:24.000+01:00
fix review

add test

Fix for ps_apiresources testsuite

update ps_apiresources

Fix review

Small improvement on FormFieldToggler

update module ps_apiresources
diff --git a/admin-dev/themes/new-theme/js/components/form/form-field-toggler.ts b/admin-dev/themes/new-theme/js/components/form/form-field-toggler.ts
@@ -113,7 +113,7 @@ export default class FormFieldToggler {
     this.toggle(targetSelector, disabledState, switchEvent);
   }
 
-  private getInputValue(inputElement: HTMLInputElement): string | undefined {
+  private getInputValue(inputElement: HTMLInputElement): string | false | undefined {
     switch (inputElement.type) {
       case 'radio': {
         const checkedRadios = document.querySelectorAll<HTMLInputElement>(`[name="${inputElement.name}"]`);
@@ -127,7 +127,7 @@ export default class FormFieldToggler {
         return checkedValue;
       }
       case 'checkbox':
-        return inputElement.checked ? inputElement.value : undefined;
+        return inputElement.checked ? inputElement.value : false;
       default:
         return inputElement.value;
     }
diff --git a/admin-dev/themes/new-theme/js/pages/discount/discount-map.ts b/admin-dev/themes/new-theme/js/pages/discount/discount-map.ts
@@ -28,4 +28,6 @@ export default {
   productSegmentFeatures: '#discount_conditions_product_product_segment_features',
   quantityPerCustomerInput: '#discount_usability_quantity_per_customer',
   customerEligibilityInput: '#discount_customer_eligibility_eligibility',
+  periodNeverExpiresCheckbox: 'input[name*="[period_never_expires]"]',
+  periodExpiryDateFormGroup: '.date-range.row .col:has(.date-range-end-date)',
 };
diff --git a/admin-dev/themes/new-theme/js/pages/discount/form/index.ts b/admin-dev/themes/new-theme/js/pages/discount/form/index.ts
@@ -3,6 +3,7 @@
  * docs/licenses/LICENSE.txt file that was distributed with this source code.
  */
 
+import FormFieldToggler, {ToggleType} from '@components/form/form-field-toggler';
 import PriceReductionManager from '@components/form/price-reduction-manager';
 import DiscountMap from '@pages/discount/discount-map';
 import CreateFreeGiftDiscount from '@pages/discount/form/create-free-gift-discount';
@@ -75,6 +76,14 @@ $(() => {
     $(DiscountMap.quantityPerCustomerInput).parents('.form-group').show();
   }
 
+  new FormFieldToggler({
+    disablingInputSelector: DiscountMap.periodNeverExpiresCheckbox,
+    matchingValue: '1',
+    disableOnMatch: true,
+    targetSelector: DiscountMap.periodExpiryDateFormGroup,
+    toggleType: ToggleType.visibility,
+  });
+
   $(DiscountMap.countriesSelect).select2({
     templateResult: formatOption,
     templateSelection: formatOption,
diff --git a/classes/CartRule.php b/classes/CartRule.php
@@ -10,6 +10,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Discount\ValueObject\DiscountType;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagSettings;
 use PrestaShop\PrestaShop\Core\FeatureFlag\FeatureFlagStateCheckerInterface;
+use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime as DateTimeUtil;
 
 /**
  * Class CartRuleCore.
@@ -46,7 +47,7 @@ class CartRuleCore extends ObjectModel
     /**
      * @var string|null
      */
-    public $date_to;
+    public $date_to = null;
     public $description;
     public $quantity = 1;
     public ?int $total_quantity = null;
@@ -111,7 +112,7 @@ class CartRuleCore extends ObjectModel
         'fields' => [
             'id_customer' => ['type' => self::TYPE_INT, 'validate' => 'isUnsignedId'],
             'date_from' => ['type' => self::TYPE_DATE, 'validate' => 'isDate', 'required' => true],
-            'date_to' => ['type' => self::TYPE_DATE, 'validate' => 'isDate', 'required' => true],
+            'date_to' => ['type' => self::TYPE_DATE, 'validate' => 'isDateOrNull', 'required' => false, 'allow_null' => true],
             'description' => ['type' => self::TYPE_STRING, 'validate' => 'isCleanHtml', 'size' => DiscountSettings::MAX_DESCRIPTION_LENGTH],
             'quantity' => ['type' => self::TYPE_INT, 'allow_null' => true, 'validate' => 'isUnsignedInt'],
             'total_quantity' => ['type' => self::TYPE_INT, 'allow_null' => true, 'validate' => 'isUnsignedInt'],
@@ -377,8 +378,9 @@ public static function haveCartRuleToday($idCustomer)
                 '") OR (date_from >= "' . $start_date .
                 '" AND date_from <= "' . $end_date .
                 '") OR (date_from < "' . $start_date .
-                '" AND date_to > "' . $end_date .
-                '")) AND `id_customer` IN (0,' . (int) $idCustomer . ')';
+                '" AND (date_to > "' . $end_date .
+                '" OR date_to IS NULL)' .
+                ')) AND `id_customer` IN (0,' . (int) $idCustomer . ')';
 
             $haveCartRuleToday[$idCustomer] = Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($sql);
         }
@@ -432,7 +434,7 @@ public static function getCustomerCartRules(
         $sql .= ')';
 
         // Then, conditions for date, voucher active property and total amount of vouchers in stock
-        $sql .= ' AND NOW() BETWEEN cr.date_from AND cr.date_to
+        $sql .= ' AND ((cr.date_from <= NOW() AND cr.date_to IS NULL) OR (NOW() BETWEEN cr.date_from AND cr.date_to))
             ' . ($active ? 'AND cr.`active` = 1' : '') . '
             ' . ($inStock ? 'AND (cr.`quantity` > 0 OR cr.`quantity` is null)' : '');
 
@@ -789,7 +791,7 @@ public function checkValidity(Context $context, $alreadyInCart = false, $display
             if (strtotime($this->date_from) > time()) {
                 return (!$display_error) ? false : $this->trans('This voucher is not valid yet', [], 'Shop.Notifications.Error');
             }
-            if (strtotime($this->date_to) < time()) {
+            if (!DateTimeUtil::isNull($this->date_to ?? null) && strtotime($this->date_to) < time()) {
                 return (!$display_error) ? false : $this->trans('This voucher has expired', [], 'Shop.Notifications.Error');
             }
 
@@ -1995,7 +1997,7 @@ public static function autoAddToCart(?Context $context = null, bool $useOrderPri
 		WHERE cr.active = 1
 		AND cr.code = ""
 		AND (cr.quantity > 0 OR cr.quantity is null)
-        AND NOW() BETWEEN cr.date_from AND cr.date_to
+		AND ((cr.date_from <= NOW() AND cr.date_to IS NULL) OR (NOW() BETWEEN cr.date_from AND cr.date_to))
 		AND (
 			cr.id_customer = 0
 			' . (Validate::isLoadedObject($context->customer) ? 'OR cr.id_customer = ' . (int) $context->cart->id_customer : '') . '
diff --git a/composer.json b/composer.json
@@ -71,7 +71,7 @@
         "prestashop/hummingbird": "^2.0",
         "prestashop/pagesnotfound": "^3",
         "prestashop/productcomments": "^8.0",
-        "prestashop/ps_apiresources": "0.5.0",
+        "prestashop/ps_apiresources": "dev-change-validto",
         "prestashop/ps_banner": "^2",
         "prestashop/ps_bestsellers": "^1.0",
         "prestashop/ps_brandlist": "^1.0",
diff --git a/composer.lock b/composer.lock
diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql
@@ -167,7 +167,7 @@ CREATE TABLE `PREFIX_cart_rule` (
   `id_cart_rule` int(10) unsigned NOT NULL auto_increment,
   `id_customer` int unsigned NOT NULL DEFAULT '0',
   `date_from` datetime NOT NULL,
-  `date_to` datetime NOT NULL,
+  `date_to` datetime DEFAULT NULL,
   `description` MEDIUMTEXT,
   `quantity` int(10) unsigned DEFAULT '0',
   `quantity_per_user` int(10) unsigned DEFAULT '0',
diff --git a/src/Adapter/Discount/QueryHandler/GetDiscountForEditingHandler.php b/src/Adapter/Discount/QueryHandler/GetDiscountForEditingHandler.php
@@ -16,6 +16,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Discount\Query\GetDiscountForEditing;
 use PrestaShop\PrestaShop\Core\Domain\Discount\QueryHandler\GetDiscountForEditingHandlerInterface;
 use PrestaShop\PrestaShop\Core\Domain\Discount\QueryResult\DiscountForEditing;
+use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime as DateTimeUtil;
 
 #[AsQueryHandler]
 class GetDiscountForEditingHandler implements GetDiscountForEditingHandlerInterface
@@ -45,7 +46,7 @@ public function handle(GetDiscountForEditing $query): DiscountForEditing
             $cartRule->priority,
             $cartRule->active,
             new DateTimeImmutable($cartRule->date_from),
-            new DateTimeImmutable($cartRule->date_to),
+            DateTimeUtil::buildDateTimeOrNull($cartRule->date_to),
             $cartRule->total_quantity,
             $cartRule->quantity,
             $quantityUsedInOrders,
diff --git a/src/Adapter/Discount/Update/DiscountBuilder.php b/src/Adapter/Discount/Update/DiscountBuilder.php
@@ -25,7 +25,7 @@ public function build(AddDiscountCommand $command): CartRule
     {
         $cartRule = new CartRule();
         $validFrom = $command->getValidFrom() ?: new DateTimeImmutable();
-        $validTo = $command->getValidTo() ?: $validFrom->modify('+1 month');
+        $validTo = $command->getValidTo();
 
         $cartRule->name = $command->getLocalizedNames();
         $cartRule->description = $command->getDescription();
@@ -36,7 +36,7 @@ public function build(AddDiscountCommand $command): CartRule
         $cartRule->active = $command->isActive();
         $cartRule->id_customer = $command->getCustomerId()?->getValue();
         $cartRule->date_from = $validFrom->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
-        $cartRule->date_to = $validTo->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
+        $cartRule->date_to = $validTo !== null ? $validTo->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT) : null;
         // We are initializing the discount so the remaining quantity and the total quantity are the same thing
         $cartRule->total_quantity = $command->getTotalQuantity();
         $cartRule->quantity = $command->getTotalQuantity();
diff --git a/src/Adapter/Discount/Update/Filler/DiscountFiller.php b/src/Adapter/Discount/Update/Filler/DiscountFiller.php
@@ -32,7 +32,8 @@ public function fillUpdatableProperties(CartRule $cartRule, UpdateDiscountComman
             $updatableProperties[] = 'date_from';
         }
         if ($command->isDirty('validTo')) {
-            $cartRule->date_to = $command->getValidTo()->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);
+            $validTo = $command->getValidTo();
+            $cartRule->date_to = $validTo !== null ? $validTo->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT) : null;
             $updatableProperties[] = 'date_to';
         }
         if ($command->isDirty('localizedNames')) {
diff --git a/src/Adapter/Discount/Validate/DiscountValidator.php b/src/Adapter/Discount/Validate/DiscountValidator.php
@@ -41,6 +41,7 @@
 use PrestaShop\PrestaShop\Core\Domain\Shop\ValueObject\ShopConstraint;
 use PrestaShop\PrestaShop\Core\Domain\Supplier\ValueObject\SupplierId;
 use PrestaShop\PrestaShop\Core\Exception\CoreException;
+use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime as DateTimeUtil;
 use PrestaShopException;
 
 /**
@@ -296,6 +297,10 @@ private function assertCodeIsUnique(CartRule $cartRule): void
 
     private function assertDateRangeIsCorrect(CartRule $cartrule): void
     {
+        if (DateTimeUtil::isNull($cartrule->date_to)) {
+            return;
+        }
+
         if ($cartrule->date_from > $cartrule->date_to) {
             throw new DiscountConstraintException('Date from cannot be greater than date to.', DiscountConstraintException::DATE_FROM_GREATER_THAN_DATE_TO);
         }
diff --git a/src/Core/Domain/Discount/Command/AddDiscountCommand.php b/src/Core/Domain/Discount/Command/AddDiscountCommand.php
@@ -124,9 +124,11 @@ public function getValidTo(): ?DateTimeImmutable
     /**
      * @throws DiscountConstraintException
      */
-    public function setValidityDateRange(DateTimeImmutable $from, DateTimeImmutable $to): self
+    public function setValidityDateRange(DateTimeImmutable $from, ?DateTimeImmutable $to = null): self
     {
-        $this->assertDateRangeIsValid($from, $to);
+        if ($to !== null) {
+            $this->assertDateRangeIsValid($from, $to);
+        }
         $this->validFrom = $from;
         $this->validTo = $to;
 
diff --git a/src/Core/Domain/Discount/Command/UpdateDiscountCommand.php b/src/Core/Domain/Discount/Command/UpdateDiscountCommand.php
@@ -136,7 +136,7 @@ public function setValidFrom(DateTimeImmutable $validFrom): self
         return $this;
     }
 
-    public function setValidTo(DateTimeImmutable $validTo): self
+    public function setValidTo(?DateTimeImmutable $validTo): self
     {
         $this->validTo = $validTo;
         $this->markDirty('validTo');
@@ -147,9 +147,9 @@ public function setValidTo(DateTimeImmutable $validTo): self
     /**
      * @throws DiscountConstraintException
      */
-    public function setValidityDateRange(DateTimeImmutable $from, DateTimeImmutable $to): self
+    public function setValidityDateRange(DateTimeImmutable $from, ?DateTimeImmutable $to = null): self
     {
-        if ($from > $to) {
+        if ($to !== null && $from > $to) {
             throw new DiscountConstraintException('Date from cannot be greater than date to.', DiscountConstraintException::DATE_FROM_GREATER_THAN_DATE_TO);
         }
 
diff --git a/src/Core/Form/IdentifiableObject/DataHandler/DiscountFormDataHandler.php b/src/Core/Form/IdentifiableObject/DataHandler/DiscountFormDataHandler.php
@@ -128,13 +128,12 @@ private function fillCommandFromData(AddDiscountCommand|UpdateDiscountCommand $c
 
             $neverExpires = !empty($data['period']['period_never_expires']);
             if ($neverExpires) {
-                $validTo = (new DateTime())->modify('+100 years')->setTime(23, 59, 59);
-                $validTo = DateTimeImmutable::createFromMutable($validTo);
+                $validTo = null;
             } else {
                 $validTo = $this->parseDateWithDefaultTime($dateRange['to'] ?? null, '23:59');
             }
 
-            if ($validFrom && $validTo) {
+            if ($validFrom) {
                 $command->setValidityDateRange($validFrom, $validTo);
             }
         }
diff --git a/src/Core/Form/IdentifiableObject/DataProvider/DiscountFormDataProvider.php b/src/Core/Form/IdentifiableObject/DataProvider/DiscountFormDataProvider.php
@@ -7,7 +7,6 @@
 namespace PrestaShop\PrestaShop\Core\Form\IdentifiableObject\DataProvider;
 
 use DateTime;
-use DateTimeInterface;
 use PrestaShop\PrestaShop\Adapter\Attribute\Repository\AttributeRepository;
 use PrestaShop\PrestaShop\Adapter\Customer\Repository\CustomerRepository;
 use PrestaShop\PrestaShop\Adapter\Feature\Repository\FeatureValueRepository;
@@ -212,7 +211,7 @@ public function getData($id)
                     'from' => $discountForEditing->getValidFrom() ? $discountForEditing->getValidFrom()->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT) : null,
                     'to' => $discountForEditing->getValidTo() ? $discountForEditing->getValidTo()->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT) : null,
                 ],
-                'period_never_expires' => $this->isPeriodNeverExpires($discountForEditing->getValidFrom(), $discountForEditing->getValidTo()),
+                'period_never_expires' => null === $discountForEditing->getValidTo(),
             ],
             'customer_eligibility' => [
                 'eligibility' => $this->getCustomerEligibilityData($discountForEditing),
@@ -465,19 +464,4 @@ private function getCustomerEligibilityData(DiscountForEditing $discountForEditi
 
         return $data;
     }
-
-    /**
-     * Check if the discount period is set to "never expires" (>= 100 years duration).
-     */
-    private function isPeriodNeverExpires(?DateTimeInterface $validFrom, ?DateTimeInterface $validTo): bool
-    {
-        if ($validFrom === null || $validTo === null) {
-            return false;
-        }
-
-        $diff = $validFrom->diff($validTo);
-        $years = $diff->y + ($diff->m / 12) + ($diff->d / 365);
-
-        return $years >= 100;
-    }
 }
diff --git a/src/Core/Grid/Data/Factory/DiscountGridDataFactoryDecorator.php b/src/Core/Grid/Data/Factory/DiscountGridDataFactoryDecorator.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * For the full copyright and license information, please view the
+ * docs/licenses/LICENSE.txt file that was distributed with this source code.
+ */
+
+declare(strict_types=1);
+
+namespace PrestaShop\PrestaShop\Core\Grid\Data\Factory;
+
+use PrestaShop\PrestaShop\Core\Grid\Data\GridData;
+use PrestaShop\PrestaShop\Core\Grid\Data\GridDataInterface;
+use PrestaShop\PrestaShop\Core\Grid\Record\RecordCollection;
+use PrestaShop\PrestaShop\Core\Grid\Search\SearchCriteriaInterface;
+use PrestaShop\PrestaShop\Core\Util\DateTime\DateTime as DateTimeUtil;
+
+/**
+ * Decorates discount grid data to display a fallback when expiration date is null
+ */
+final class DiscountGridDataFactoryDecorator implements GridDataFactoryInterface
+{
+    private const EMPTY_DATE_FALLBACK = '—';
+
+    public function __construct(
+        private readonly GridDataFactoryInterface $discountGridDataFactory,
+    ) {
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getData(SearchCriteriaInterface $searchCriteria): GridDataInterface
+    {
+        $data = $this->discountGridDataFactory->getData($searchCriteria);
+        $records = $data->getRecords()->all();
+
+        foreach ($records as &$record) {
+            if (DateTimeUtil::isNull($record['date_to'] ?? null)) {
+                $record['date_to'] = self::EMPTY_DATE_FALLBACK;
+            }
+        }
+
+        return new GridData(
+            new RecordCollection($records),
+            $data->getRecordsTotal(),
+            $data->getQuery()
+        );
+    }
+}
diff --git a/src/PrestaShopBundle/ApiPlatform/Normalizer/DateTimeImmutableNormalizer.php b/src/PrestaShopBundle/ApiPlatform/Normalizer/DateTimeImmutableNormalizer.php
@@ -23,6 +23,10 @@ class DateTimeImmutableNormalizer implements DenormalizerInterface, NormalizerIn
 {
     public function denormalize($data, string $type, ?string $format = null, array $context = [])
     {
+        if (DateTimeUtil::isNull($data)) {
+            return null;
+        }
+
         return new DateTimeImmutable($data);
     }
 
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_data_factory.yml
diff --git a/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml b/src/PrestaShopBundle/Resources/config/services/core/grid/grid_factory.yml
diff --git a/tests/Integration/Behaviour/Features/Context/Domain/Discount/DiscountFeatureContext.php b/tests/Integration/Behaviour/Features/Context/Domain/Discount/DiscountFeatureContext.php
diff --git a/tests/Integration/Behaviour/Features/Scenario/Discount/BO/update_discount_validity_dates.feature b/tests/Integration/Behaviour/Features/Scenario/Discount/BO/update_discount_validity_dates.feature
diff --git a/tests/Integration/Behaviour/Features/Scenario/Discount/FO/discount_validity_date_range.feature b/tests/Integration/Behaviour/Features/Scenario/Discount/FO/discount_validity_date_range.feature

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ export default class FormFieldToggler {`
`113`	`113`	`this.toggle(targetSelector, disabledState, switchEvent);`
`114`	`114`	`}`
`115`	`115`
`116`		`- private getInputValue(inputElement: HTMLInputElement): string \| undefined {`
	`116`	`+ private getInputValue(inputElement: HTMLInputElement): string \| false \| undefined {`
`117`	`117`	`switch (inputElement.type) {`
`118`	`118`	`case 'radio': {`
`119`	`119`	const checkedRadios = document.querySelectorAll<HTMLInputElement>(`[name="${inputElement.name}"]`);
`@@ -127,7 +127,7 @@ export default class FormFieldToggler {`
`127`	`127`	`return checkedValue;`
`128`	`128`	`}`
`129`	`129`	`case 'checkbox':`
`130`		`- return inputElement.checked ? inputElement.value : undefined;`
	`130`	`+ return inputElement.checked ? inputElement.value : false;`
`131`	`131`	`default:`
`132`	`132`	`return inputElement.value;`
`133`	`133`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ public function fillUpdatableProperties(CartRule $cartRule, UpdateDiscountComman`
`32`	`32`	`$updatableProperties[] = 'date_from';`
`33`	`33`	`}`
`34`	`34`	`if ($command->isDirty('validTo')) {`
`35`		`- $cartRule->date_to = $command->getValidTo()->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT);`
	`35`	`+ $validTo = $command->getValidTo();`
	`36`	`+ $cartRule->date_to = $validTo !== null ? $validTo->format(DateTimeUtil::DEFAULT_DATETIME_FORMAT) : null;`
`36`	`37`	`$updatableProperties[] = 'date_to';`
`37`	`38`	`}`
`38`	`39`	`if ($command->isDirty('localizedNames')) {`