OrderShopStore : correctif excludeComplementaryOrderShops

Repository/Order/OrderShopStore.php

@@ -362,7 +362,7 @@ class OrderShopStore extends AbstractStore
 
         $orderShops = $query->find();
 
-        if (isset($params['mergeComplementaryOrderShops'])) {
+        if (isset($params['mergeComplementaryOrderShops']) && $params['mergeComplementaryOrderShops'] == true) {
             foreach ($orderShops as $orderShop) {
                 $this->orderShopSolver->mergeComplentaryOrderShops($orderShop);
             }
@@ -429,12 +429,13 @@ class OrderShopStore extends AbstractStore
             $query->filterMinimumTomorrowDelivery();
         }
 
-        if (isset($params['mergeComplementaryOrderShops'])) {
+        if (isset($params['mergeComplementaryOrderShops']) && $params['mergeComplementaryOrderShops']) {
             $query
                 ->joinComplementaryOrderShops();
         }
 
-        if (isset($params['excludeComplementaryOrderShops']) || isset($params['mergeComplementaryOrderShops'])) {
+        if ( (isset($params['excludeComplementaryOrderShops']) && $params['excludeComplementaryOrderShops'])
+                || (isset($params['mergeComplementaryOrderShops']) && $params['mergeComplementaryOrderShops'])) {
             $query->filterIsNullMainOrderShop();
         }