ACP2E-2615: Bundle products added via the Page Builder > Products widget break the cart

- grid list widget template now incorporates product options

Author: aplapana

app/code/Magento/CatalogWidget/Block/Product/ProductsList.php

@@ -15,6 +15,7 @@
 use Magento\Catalog\Model\ResourceModel\Product\Collection;
 use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
 use Magento\Catalog\Pricing\Price\FinalPrice;
+use Magento\Catalog\ViewModel\Product\OptionsData;
 use Magento\CatalogWidget\Model\Rule;
 use Magento\Framework\App\ActionInterface;
 use Magento\Framework\App\Http\Context as HttpContext;
@@ -130,6 +131,11 @@ class ProductsList extends AbstractProduct implements BlockInterface, IdentityIn
      */
     private $categoryRepository;
 
+    /**
+     * @var OptionsData
+     */
+    private OptionsData $optionsData;
+
     /**
      * @param Context $context
      * @param CollectionFactory $productCollectionFactory
@@ -143,6 +149,7 @@ class ProductsList extends AbstractProduct implements BlockInterface, IdentityIn
      * @param LayoutFactory|null $layoutFactory
      * @param EncoderInterface|null $urlEncoder
      * @param CategoryRepositoryInterface|null $categoryRepository
+     * @param OptionsData|null $optionsData
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -158,7 +165,8 @@ public function __construct(
         Json $json = null,
         LayoutFactory $layoutFactory = null,
         EncoderInterface $urlEncoder = null,
-        CategoryRepositoryInterface $categoryRepository = null
+        CategoryRepositoryInterface $categoryRepository = null,
+        OptionsData $optionsData = null
     ) {
         $this->productCollectionFactory = $productCollectionFactory;
         $this->catalogProductVisibility = $catalogProductVisibility;
@@ -171,6 +179,7 @@ public function __construct(
         $this->urlEncoder = $urlEncoder ?: ObjectManager::getInstance()->get(EncoderInterface::class);
         $this->categoryRepository = $categoryRepository ?? ObjectManager::getInstance()
                 ->get(CategoryRepositoryInterface::class);
+        $this->optionsData = $optionsData ?: ObjectManager::getInstance()->get(OptionsData::class);
         parent::__construct(
             $context,
             $data
@@ -306,6 +315,17 @@ public function getAddToCartPostParams(Product $product)
         ];
     }
 
+    /**
+     * Return product options
+     *
+     * @param Product $product
+     * @return array
+     */
+    public function getOptionsData(Product $product): array
+    {
+        return $this->optionsData->getOptionsData($product);
+    }
+
     /**
      * @inheritdoc
      */

app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml

@@ -74,6 +74,12 @@ use Magento\Wishlist\Helper\Data;
                                                     <?php if ($_item->isSaleable()): ?>
                                                         <?php $postParams = $block->getAddToCartPostParams($_item); ?>
                                                         <form data-role="tocart-form" data-product-sku="<?= $escaper->escapeHtml($_item->getSku()) ?>" action="<?= $escaper->escapeUrl($postParams['action']) ?>" method="post">
+                                                            <?php $options = $block->getOptionsData($_item); ?>
+                                                            <?php foreach ($options as $optionItem): ?>
+                                                                <input type="hidden"
+                                                                       name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
+                                                                       value="<?= $escaper->escapeHtml($optionItem['value']) ?>">
+                                                            <?php endforeach; ?>
                                                             <input type="hidden" name="product" value="<?= $escaper->escapeHtmlAttr($postParams['data']['product']) ?>">
                                                             <input type="hidden" name="<?= /* @noEscape */ Action::PARAM_NAME_URL_ENCODED ?>" value="<?= /* @noEscape */ $postParams['data'][Action::PARAM_NAME_URL_ENCODED] ?>">
                                                             <?= $block->getBlockHtml('formkey') ?>