Merge pull request #1800 from benwalch/bugfix/cartcontext-latest-cart…

…-if-multiple fixes #1699 cart context returns latest cart even if multiple found
coreshop · Nov 29, 2021 · b2a018c · b2a018c
2 parents 78fdaaa + e258533
commit b2a018c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/CoreShop/Bundle/OrderBundle/Pimcore/Repository/CartRepository.php b/src/CoreShop/Bundle/OrderBundle/Pimcore/Repository/CartRepository.php
@@ -43,12 +43,11 @@ public function findLatestByStoreAndCustomer(StoreInterface $store, CustomerInte
         $list->setCondition('customer__id = ? AND store = ? AND order__id is null ', [$customer->getId(), $store->getId()]);
         $list->setOrderKey('o_creationDate');
         $list->setOrder('DESC');
-        $list->setLimit(1);
         $list->load();
 
         $objects = $list->getObjects();
 
-        if (count($objects) === 1 && $objects[0] instanceof OrderInterface) {
+        if (count($objects) > 0 && $objects[0] instanceof OrderInterface) {
             return $objects[0];
         }
 

diff --git a/src/CoreShop/Bundle/OrderBundle/Pimcore/Repository/OrderRepository.php b/src/CoreShop/Bundle/OrderBundle/Pimcore/Repository/OrderRepository.php
@@ -65,7 +65,7 @@ public function findLatestCartByStoreAndCustomer(StoreInterface $store, Customer
 
         $objects = $list->getObjects();
 
-        if (count($objects) === 1 && $objects[0] instanceof OrderInterface) {
+        if (count($objects) > 0 && $objects[0] instanceof OrderInterface) {
             return $objects[0];
         }