thelia · lopes-vincent · Jun 30, 2023 · Jun 30, 2023
diff --git a/core/lib/Thelia/Condition/ConditionFactory.php b/core/lib/Thelia/Condition/ConditionFactory.php
@@ -114,6 +114,8 @@ public function unserializeConditionCollection(string $serializedConditions)
      */
     public function build(string $conditionServiceId, array $operators, array $values)
     {
+        $conditionServiceId = urldecode($conditionServiceId);
+
         if (!$this->container->has($conditionServiceId)) {
             return false;
         }

diff --git a/core/lib/Thelia/Condition/Implementation/ConditionAbstract.php b/core/lib/Thelia/Condition/Implementation/ConditionAbstract.php
@@ -139,16 +139,9 @@ protected function generateInputs()
         );
     }
 
-    /**
-     * Get ConditionManager Service id.
-     *
-     * @return string
-     */
     public function getServiceId()
     {
-        throw new \Thelia\Exception\NotImplementedException(
-            'The getServiceId method must be implemented in '.__CLASS__
-        );
+        return static::class;
     }
 
     /**

diff --git a/core/lib/Thelia/Core/Thelia.php b/core/lib/Thelia/Core/Thelia.php
@@ -457,7 +457,6 @@ protected function loadConfiguration(ContainerBuilder $container): void
             FormExtensionInterface::class => 'thelia.forms.extension',
             ContainerAwareInterface::class => 'thelia.command',
             CouponInterface::class => 'thelia.coupon.addCoupon',
-            ConditionInterface::class => 'thelia.coupon.addCondition',
             ControllerInterface::class => 'controller.service_arguments',
             TaxTypeInterface::class => 'thelia.taxType',
         ];
@@ -467,6 +466,10 @@ protected function loadConfiguration(ContainerBuilder $container): void
                 ->addTag($tag);
         }
 
+        $container->registerForAutoconfiguration(ConditionInterface::class)
+            ->setPublic(true)
+            ->addTag('thelia.coupon.addCondition');
+
         $container->registerForAutoconfiguration(LoopInterface::class)
             ->setPublic(true)
             ->setShared(false)

diff --git a/templates/backOffice/default/coupon/form.html b/templates/backOffice/default/coupon/form.html
@@ -274,7 +274,7 @@
                             <select name="categoryCondition" id="category-condition" class="form-control">
                                 <option value="" data-description="">{intl l='Please select a condition'}</option>
                                 {foreach from=$availableConditions item=availableCondition}
-                                    <option value="{$availableCondition.serviceId}" data-description="{$availableCondition.toolTip}">{$availableCondition.name}</option>
+                                    <option value="{$availableCondition.serviceId|escape:'url'}" data-description="{$availableCondition.toolTip}">{$availableCondition.name}</option>
                                 {/foreach}
                             </select>
                             <span class="help-block typeToolTip"></span>