Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion Classes/Controller/ProductController.php
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public function showAction(Product $product = null): ResponseInterface
{
if ((int)$GLOBALS['TSFE']->page['doktype'] === 183) {
$productUid = (int)$GLOBALS['TSFE']->page['cart_products_product'];
$product = $this->productRepository->findByUid($productUid);
$product = $this->productRepository->findByUid($productUid);
}

$this->view->assign('product', $product);
Expand All @@ -203,8 +203,11 @@ public function showFormAction(Product $product = null): ResponseInterface
$product = $this->getProduct();
}

$detailLinkData = $this->getDetailLinkData($this->request);

$this->view->assign('product', $product);
$this->view->assign('cartSettings', $this->cartConfiguration['settings']);
$this->view->assign('detailLinkData', $detailLinkData);

$this->assignCurrencyTranslationData();
return $this->htmlResponse();
Expand Down Expand Up @@ -342,4 +345,33 @@ 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');
$detailPageUid = $frontendController->getRequestedId();

$requestArguments = $frontendController->getPageArguments()->getArguments();

$pluginNamespace = preg_grep('/tx_cartproducts_.*/', array_keys($requestArguments));
$pluginNamespace = array_shift($pluginNamespace);

if (!$pluginNamespace) {
return [
'uid' => $detailPageUid,
];
}

$pluginArguments = $requestArguments[$pluginNamespace];
$controller = $pluginArguments['controller'];
$action = $pluginArguments['action'];
$pluginName = preg_replace('/tx_cartproducts_/', '', $pluginNamespace);

return [
'uid' => $detailPageUid,
'pluginName' => $pluginName,
'controller' => $controller,
'action' => $action,
];
}
}
13 changes: 13 additions & 0 deletions Classes/EventListener/Create/CreateCartProduct.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,13 @@
* LICENSE file that was distributed with this source code.
*/

use Extcode\Cart\Domain\Model\Cart\DetailPageLinkFactoryInterface;
use Extcode\Cart\Domain\Model\Cart\Product;
use Extcode\CartProducts\Event\RetrieveProductsFromRequestEvent;

class CreateCartProduct
{
public function __construct(protected DetailPageLinkFactoryInterface $detailPageLinkFactory) {}
public function __invoke(RetrieveProductsFromRequestEvent $event): void
{
$request = $event->getRequest();
Expand Down Expand Up @@ -53,6 +55,17 @@ public function __invoke(RetrieveProductsFromRequestEvent $event): void
$cartProduct->setIsVirtualProduct(true);
}

if ($request->getArgument('detailPageUid')) {
$detailPageLink = $this->detailPageLinkFactory->getDetailPageLink(
(int)$request->getArgument('detailPageUid'),
'cartproducts',
$request->getArgument('detailPagePluginName'),
$request->getArgument('detailPageController'),
$request->getArgument('detailPageAction')
);
$cartProduct->setDetailPageLink($detailPageLink);
}

$event->setCartProduct($cartProduct);
}
}
4 changes: 4 additions & 0 deletions Resources/Private/Partials/Product/CartForm.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +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="{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}">
Expand Down
5 changes: 3 additions & 2 deletions Resources/Private/Templates/Product/ShowForm.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
<f:section name="main">
<f:if condition="{product}">
<f:if condition="{cartSettings.cart.pid}">
<f:render partial="Product/CartForm" arguments="{product: product, pid: cartSettings.cart.pid}"/>
<f:render partial="Product/CartForm"
arguments="{product: product, pid: cartSettings.cart.pid, detailLinkData: detailLinkData}"/>
</f:if>

<div id="product-price">
Expand All @@ -18,4 +19,4 @@
</f:if>
</f:if>
</f:section>
</html>
</html>