From 91c292e84ca00d274ddf487e36bbadf1884d0962 Mon Sep 17 00:00:00 2001
From: tjeujansen <tjansen@emico.nl>
Date: Fri, 23 Jan 2026 11:16:15 +0100
Subject: [PATCH] Fixed issue when category suffix is configured as slash

---
 src/Model/UrlRewriteService.php | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/Model/UrlRewriteService.php b/src/Model/UrlRewriteService.php
index 76a94bc..0a8c3ee 100644
--- a/src/Model/UrlRewriteService.php
+++ b/src/Model/UrlRewriteService.php
@@ -11,7 +11,9 @@
 use Emico\AttributeLanding\Api\LandingPageRepositoryInterface;
 use Emico\AttributeLanding\Api\UrlRewriteGeneratorInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\UrlRewrite\Model\UrlFinderInterface;
 use Magento\UrlRewrite\Model\UrlPersistInterface;
@@ -58,6 +60,7 @@ class UrlRewriteService
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param UrlFinderInterface $urlFinder
      * @param LandingPageRepositoryInterface $landingPageRepository
+     * @param Config $config
      */
     public function __construct(
         UrlRewriteFactory $urlRewriteFactory,
@@ -65,7 +68,8 @@ public function __construct(
         UrlPersistInterface $urlPersist,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         UrlFinderInterface $urlFinder,
-        LandingPageRepositoryInterface $landingPageRepository
+        LandingPageRepositoryInterface $landingPageRepository,
+        private readonly Config $config,
     ) {
         $this->urlRewriteFactory = $urlRewriteFactory;
         $this->storeManager = $storeManager;
@@ -244,13 +248,31 @@ private function createUrlRewrite(
             ? $page->getUrlRewriteRequestPath()
             : $page->getUrlPath() . $suffix; // @phpstan-ignore-line
 
-        $requestPath = trim($requestPath, '/');
+        if ($this->shouldStripRequestPath($suffix)) {
+            $requestPath = trim($requestPath, '/');
+        }
 
         $urlRewrite->setRequestPath($requestPath);
 
         return $urlRewrite;
     }
 
+    /**
+     * @param string|null $newSuffix
+     * @return bool
+     * @throws NoSuchEntityException
+     */
+    private function shouldStripRequestPath(?string $newSuffix): bool
+    {
+        /** @var Store $store */
+        $store = $this->storeManager->getStore();
+        $suffix = $newSuffix ?? $this->config->getCategoryUrlSuffix($store);
+        return !(
+            $suffix === '/' &&
+            $this->config->isAppendCategoryUrlSuffix($store)
+        );
+    }
+
     protected function getActiveStoreIds(UrlRewriteGeneratorInterface $landingPage): array
     {
         // phpcs:disable SlevomatCodingStandard.Functions.StrictCall.NonStrictComparison