Add condition with current route condition

monsieurbiz · Sep 4, 2024 · d49d6e5 · d49d6e5
1 parent 61b6563
commit d49d6e5
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Kernel/SyliusNoCommerceKernelTrait.php b/src/Kernel/SyliusNoCommerceKernelTrait.php
@@ -38,7 +38,12 @@ public function loadRoutes(LoaderInterface $loader): RouteCollection
         foreach ($collection as $name => $route) {
             foreach ($routesToRemove as $routeToRemove) {
                 if (false !== strpos($name, $routeToRemove)) {
-                    $route->setCondition('not context.checkNoCommerce()');
+                    $routeCondition = $route->getCondition();
+                    if ($routeCondition && false === strpos($routeCondition, 'not context.checkNoCommerce()')) {
+                        $route->setCondition($routeCondition . ' and not context.checkNoCommerce()');
+                    } elseif (!$routeCondition) {
+                        $route->setCondition('not context.checkNoCommerce()');
+                    }
                 }
             }
         }