[TASK] Adaption after split of ProductPlugin

After the migration of switchableControllerActions the pluginName can differ which needs to be considered.
extcode · Oct 10, 2024 · e079a8b · e079a8b
1 parent fb92dff
commit e079a8b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/Classes/Controller/ProductController.php b/Classes/Controller/ProductController.php
@@ -199,12 +199,11 @@ public function showFormAction(Product $product = null): ResponseInterface
             $product = $this->getProduct();
         }
 
-        $frontendController = $this->request->getAttribute('frontend.controller');
-        $detailPageUid = $frontendController->getRequestedId();
+        $detailLinkData = $this->getDetailLinkData($this->request);
 
         $this->view->assign('product', $product);
         $this->view->assign('cartSettings', $this->cartConfiguration['settings']);
-        $this->view->assign('detailPageUid', $detailPageUid);
+        $this->view->assign('detailLinkData', $detailLinkData);
 
         $this->assignCurrencyTranslationData();
         return $this->htmlResponse();
@@ -342,4 +341,27 @@ protected function restoreSession(): void
         $this->cart = $this->cartUtility->getNewCart($this->cartConfiguration);
         $this->sessionHandler->writeCart($this->cartConfiguration['settings']['cart']['pid'], $this->cart);
     }
+
+    private function getDetailLinkData(Request $request): array
+    {
+        $frontendController = $request->getAttribute('frontend.controller');
+        $requestArguments = $frontendController->getPageArguments()->getArguments();
+
+        $pluginNamespace = preg_grep('/tx_cartproducts_.*/', array_keys($requestArguments));
+        $pluginNamespace = array_shift($pluginNamespace);
+
+        $pluginArguments = $requestArguments[$pluginNamespace];
+        $controller = $pluginArguments['controller'];
+        $action = $pluginArguments['action'];
+        $pluginName = preg_replace('/tx_cartproducts_/', '', $pluginNamespace);
+
+        $detailPageUid = $frontendController->getRequestedId();
+
+        return [
+            'uid' => $detailPageUid,
+            'pluginName' => $pluginName,
+            'controller' => $controller,
+            'action' => $action,
+        ];
+    }
 }
diff --git a/Classes/EventListener/Create/CreateCartProduct.php b/Classes/EventListener/Create/CreateCartProduct.php
@@ -59,8 +59,9 @@ public function __invoke(RetrieveProductsFromRequestEvent $event): void
             $detailPageLink = $this->detailPageLinkFactory->getDetailPageLink(
                 (int)$request->getArgument('detailPageUid'),
                 'cartproducts',
-                'products',
-                'product'
+                $request->getArgument('detailPagePluginName'),
+                $request->getArgument('detailPageController'),
+                $request->getArgument('detailPageAction')
             );
             $cartProduct->setDetailPageLink($detailPageLink);
         }

diff --git a/Resources/Private/Partials/Product/CartForm.html b/Resources/Private/Partials/Product/CartForm.html
@@ -17,7 +17,10 @@
             additionalAttributes="{data-ajax: '{f:if(condition: \'{settings.addToCartByAjax}\', then: \'1\', else: \'0\')}', data-type: 'slot', data-id: '{slot.uid}'}">
         <input type="hidden" name="tx_cart_cart[productType]" value="CartProducts">
         <input type="hidden" name="tx_cart_cart[product]" value="{product.uid}">
-        <input type="hidden" name="tx_cart_cart[detailPageUid]" value="{detailPageUid}">
+        <input type="hidden" name="tx_cart_cart[detailPageUid]" value="{detailLinkData.uid}">
+        <input type="hidden" name="tx_cart_cart[detailPagePluginName]" value="{detailLinkData.pluginName}">
+        <input type="hidden" name="tx_cart_cart[detailPageController]" value="{detailLinkData.controller}">
+        <input type="hidden" name="tx_cart_cart[detailPageAction]" value="{detailLinkData.action}">
 
         <input class="form-control" type="number" value="1" name="tx_cart_cart[quantity]">
         <f:if condition="{product.beVariants}">

diff --git a/Resources/Private/Templates/Product/ShowForm.html b/Resources/Private/Templates/Product/ShowForm.html
@@ -7,7 +7,7 @@
     <f:if condition="{product}">
         <f:if condition="{cartSettings.cart.pid}">
             <f:render partial="Product/CartForm"
-                      arguments="{product: product, pid: cartSettings.cart.pid, detailPageUid: detailPageUid}"/>
+                      arguments="{product: product, pid: cartSettings.cart.pid, detailLinkData: detailLinkData}"/>
         </f:if>
 
         <div id="product-price">