Merge branch '1.0' into 1.x

pimcore · Mar 12, 2024 · 1126da3 · 1126da3
2 parents 6e22e26 + 95e2f7e
commit 1126da3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/FilterService/FilterType/ElasticSearch/SelectCategory.php b/src/FilterService/FilterType/ElasticSearch/SelectCategory.php
@@ -70,7 +70,7 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
         } elseif (empty($value) && !$isReload && method_exists($filterDefinition, 'getPreSelect')) {
             $value = $filterDefinition->getPreSelect();
             if ($value instanceof ElementInterface) {
-                $value = $value->getId();
+                $value = (string)$value->getId();
             }
         }
 

diff --git a/src/FilterService/FilterType/SelectFromMultiSelect.php b/src/FilterService/FilterType/SelectFromMultiSelect.php
@@ -67,7 +67,9 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
             $value = $preSelect;
         }
 
-        $value = trim($value);
+        if ($value) {
+            $value = trim($value);
+        }
 
         $currentFilter[$field] = $value;
         $db = Db::get();

diff --git a/src/VoucherService/TokenManager/Single.php b/src/VoucherService/TokenManager/Single.php
@@ -19,6 +19,7 @@
 use Knp\Component\Pager\PaginatorInterface;
 use Pimcore\Bundle\EcommerceFrameworkBundle\CartManager\CartInterface;
 use Pimcore\Bundle\EcommerceFrameworkBundle\Exception\InvalidConfigException;
+use Pimcore\Bundle\EcommerceFrameworkBundle\Exception\VoucherServiceException;
 use Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractOrder;
 use Pimcore\Bundle\EcommerceFrameworkBundle\Model\AbstractVoucherTokenType;
 use Pimcore\Bundle\EcommerceFrameworkBundle\VoucherService\Reservation;
@@ -259,6 +260,8 @@ public function checkToken(string $code, CartInterface $cart): bool
             if ($token->check((int)$this->configuration->getUsages())) {
                 return true;
             }
+
+            throw new VoucherServiceException('Max usage limit reached.', VoucherServiceException::ERROR_CODE_NO_MORE_USAGES);
         }
 
         return false;