From 54fa256fff3711199b8c5cc3b27995ace481205b Mon Sep 17 00:00:00 2001
From: Bhoopat Parmar <bpa@salecto.in>
Date: Thu, 11 Apr 2024 10:36:38 +0530
Subject: [PATCH 1/5] Fixed bundle product issue in product carousel

---
 .../templates/catalog/product/widget/content/carousel.phtml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
index 16843d499fd..576cbc5e278 100644
--- a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
+++ b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
@@ -61,6 +61,12 @@ use Magento\Framework\App\Action\Action;
                                         <?php if ($_item->isSaleable()): ?>
                                             <?php $postParams = $block->getAddToCartPostParams($_item); ?>
                                             <form data-role="tocart-form" data-product-sku="<?= $block->escapeHtml($_item->getSku()) ?>" action="<?= $block->escapeUrl($postParams['action']) ?>" method="post">
+                                                <?php $options = $block->getViewModel()->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="<?= $block->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') ?>

From b1202f084bfe605cd349fe6954afade3522030d2 Mon Sep 17 00:00:00 2001
From: Bhoopat Parmar <bpa@salecto.in>
Date: Thu, 11 Apr 2024 12:28:23 +0530
Subject: [PATCH 2/5] prevented nullable (not defined) viewModel

---
 .../templates/catalog/product/widget/content/carousel.phtml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
index 576cbc5e278..e54491743f4 100644
--- a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
+++ b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
@@ -61,7 +61,7 @@ use Magento\Framework\App\Action\Action;
                                         <?php if ($_item->isSaleable()): ?>
                                             <?php $postParams = $block->getAddToCartPostParams($_item); ?>
                                             <form data-role="tocart-form" data-product-sku="<?= $block->escapeHtml($_item->getSku()) ?>" action="<?= $block->escapeUrl($postParams['action']) ?>" method="post">
-                                                <?php $options = $block->getViewModel()->getOptionsData($_item); ?>
+                                                <?php $options = $block->getViewModel()?->getOptionsData($_item); ?>
                                                 <?php foreach ($options as $optionItem): ?>
                                                     <input type="hidden"
                                                         name="<?= $escaper->escapeHtml($optionItem['name']) ?>"

From d30fe1fb5fec41eca229cd72f3ea63d3a001c92f Mon Sep 17 00:00:00 2001
From: Bhoopat Parmar <bpa@salecto.in>
Date: Thu, 11 Apr 2024 12:32:15 +0530
Subject: [PATCH 3/5] prevented nullable (not defined) viewModel

---
 .../catalog/product/widget/content/carousel.phtml   | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
index e54491743f4..4929a9f32f3 100644
--- a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
+++ b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
@@ -61,12 +61,13 @@ use Magento\Framework\App\Action\Action;
                                         <?php if ($_item->isSaleable()): ?>
                                             <?php $postParams = $block->getAddToCartPostParams($_item); ?>
                                             <form data-role="tocart-form" data-product-sku="<?= $block->escapeHtml($_item->getSku()) ?>" action="<?= $block->escapeUrl($postParams['action']) ?>" method="post">
-                                                <?php $options = $block->getViewModel()?->getOptionsData($_item); ?>
-                                                <?php foreach ($options as $optionItem): ?>
-                                                    <input type="hidden"
-                                                        name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
-                                                        value="<?= $escaper->escapeHtml($optionItem['value']) ?>">
-                                                <?php endforeach; ?>
+                                                <?php if($options = $block->getViewModel()?->getOptionsData($_item)) : ?>
+                                                    <?php foreach ($options as $optionItem): ?>
+                                                        <input type="hidden"
+                                                            name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
+                                                            value="<?= $escaper->escapeHtml($optionItem['value']) ?>">
+                                                    <?php endforeach; ?>
+                                                <?php endif; ?>
                                                 <input type="hidden" name="product" value="<?= $block->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') ?>

From ab2fcdac572b1c7d61d7846a8441f445a6c2c9e3 Mon Sep 17 00:00:00 2001
From: Bhoopat Parmar <bpa@salecto.in>
Date: Thu, 16 May 2024 13:27:57 +0530
Subject: [PATCH 4/5] Fixed static tests

---
 .../product/widget/content/carousel.phtml     | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
index 4929a9f32f3..1cf8e9f9f76 100644
--- a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
+++ b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
@@ -34,15 +34,15 @@ use Magento\Framework\App\Action\Action;
         <?php foreach ($items as $_item): ?>
             <?= /* @noEscape */ ($iterator++ == 1) ? '<li class="product-item">' : '</li><li class="product-item">' ?>
             <div class="product-item-info">
-                <a href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
+                <a href="<?= $escaper->escapeUrl($block->getProductUrl($_item)) ?>" class="product-item-photo">
                     <?= $block->getImage($_item, $image)->toHtml() ?>
                 </a>
                 <div class="product-item-details">
                     <strong class="product-item-name">
-                        <a title="<?= $block->escapeHtml($_item->getName()) ?>"
-                           href="<?= $block->escapeUrl($block->getProductUrl($_item)) ?>"
+                        <a title="<?= $escaper->escapeHtml($_item->getName()) ?>"
+                           href="<?= $escaper->escapeUrl($block->getProductUrl($_item)) ?>"
                            class="product-item-link">
-                            <?= $block->escapeHtml($_item->getName()) ?>
+                            <?= $escaper->escapeHtml($_item->getName()) ?>
                         </a>
                     </strong>
                     <?php if ($templateType): ?>
@@ -60,21 +60,21 @@ use Magento\Framework\App\Action\Action;
                                     <div class="actions-primary">
                                         <?php if ($_item->isSaleable()): ?>
                                             <?php $postParams = $block->getAddToCartPostParams($_item); ?>
-                                            <form data-role="tocart-form" data-product-sku="<?= $block->escapeHtml($_item->getSku()) ?>" action="<?= $block->escapeUrl($postParams['action']) ?>" method="post">
-                                                <?php if($options = $block->getViewModel()?->getOptionsData($_item)) : ?>
+                                            <form data-role="tocart-form" data-product-sku="<?= $escaper->escapeHtml($_item->getSku()) ?>" action="<?= $escaper->escapeUrl($postParams['action']) ?>" method="post">
+                                                <?php if ($options = $block->getViewModel()?->getOptionsData($_item)): ?>
                                                     <?php foreach ($options as $optionItem): ?>
                                                         <input type="hidden"
                                                             name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
                                                             value="<?= $escaper->escapeHtml($optionItem['value']) ?>">
                                                     <?php endforeach; ?>
                                                 <?php endif; ?>
-                                                <input type="hidden" name="product" value="<?= $block->escapeHtmlAttr($postParams['data']['product']) ?>">
+                                                <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') ?>
                                                 <button type="submit"
-                                                        title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
+                                                        title="<?= $escaper->escapeHtml(__('Add to Cart')) ?>"
                                                         class="action tocart primary">
-                                                    <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                                                    <span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                                 </button>
                                             </form>
                                             <script type="text/x-magento-init">
@@ -88,9 +88,9 @@ use Magento\Framework\App\Action\Action;
                                             </script>
                                         <?php else: ?>
                                             <?php if ($_item->getIsSalable()): ?>
-                                                <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
+                                                <div class="stock available"><span><?= $escaper->escapeHtml(__('In stock')) ?></span></div>
                                             <?php else: ?>
-                                                <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>
+                                                <div class="stock unavailable"><span><?= $escaper->escapeHtml(__('Out of stock')) ?></span></div>
                                             <?php endif; ?>
                                         <?php endif; ?>
                                     </div>
@@ -99,14 +99,14 @@ use Magento\Framework\App\Action\Action;
                                     <div class="actions-secondary" data-role="add-to-links">
                                         <?php if ($this->helper(\Magento\Wishlist\Helper\Data::class)->isAllow() && $showWishlist): ?>
                                             <a href="#"
-                                               data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $block->escapeHtmlAttr(__('Add to Wish List')) ?>">
-                                                <span><?= $block->escapeHtml(__('Add to Wish List')) ?></span>
+                                               data-post='<?= /* @noEscape */ $block->getAddToWishlistParams($_item) ?>' class="action towishlist" data-action="add-to-wishlist" title="<?= $escaper->escapeHtmlAttr(__('Add to Wish List')) ?>">
+                                                <span><?= $escaper->escapeHtml(__('Add to Wish List')) ?></span>
                                             </a>
                                         <?php endif; ?>
                                         <?php if ($block->getAddToCompareUrl() && $showCompare): ?>
                                             <?php $compareHelper = $this->helper(\Magento\Catalog\Helper\Product\Compare::class);?>
-                                            <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $block->escapeHtmlAttr(__('Add to Compare')) ?>">
-                                                <span><?= $block->escapeHtml(__('Add to Compare')) ?></span>
+                                            <a href="#" class="action tocompare" data-post='<?= /* @noEscape */ $compareHelper->getPostDataParams($_item) ?>' title="<?= $escaper->escapeHtmlAttr(__('Add to Compare')) ?>">
+                                                <span><?= $escaper->escapeHtml(__('Add to Compare')) ?></span>
                                             </a>
                                         <?php endif; ?>
                                     </div>

From e5302d737d77879f1ac86eb77d4275d182fc60d9 Mon Sep 17 00:00:00 2001
From: Bhoopat Parmar <bpa@salecto.in>
Date: Wed, 10 Jul 2024 11:52:57 +0530
Subject: [PATCH 5/5] fixed optiondata issue

---
 .../catalog/product/widget/content/carousel.phtml   | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
index 1cf8e9f9f76..e6c42d4f90a 100644
--- a/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
+++ b/app/code/Magento/PageBuilder/view/frontend/templates/catalog/product/widget/content/carousel.phtml
@@ -61,13 +61,12 @@ use Magento\Framework\App\Action\Action;
                                         <?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 if ($options = $block->getViewModel()?->getOptionsData($_item)): ?>
-                                                    <?php foreach ($options as $optionItem): ?>
-                                                        <input type="hidden"
-                                                            name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
-                                                            value="<?= $escaper->escapeHtml($optionItem['value']) ?>">
-                                                    <?php endforeach; ?>
-                                                <?php endif; ?>
+                                                <?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') ?>