Merge branch 'release/2.25.0'

SnowdogApps · Oct 19, 2021 · 858a465 · 858a465 · vercel · Oct 19, 2021
2 parents 79b58a6 + da50dfa
commit 858a465
Show file tree

Hide file tree

Showing 43 changed files with 917 additions and 239 deletions.
diff --git a/Amasty_Gdpr/templates/settings.phtml b/Amasty_Gdpr/templates/settings.phtml
@@ -12,13 +12,13 @@ $settings = $block->getPrivacySettings();
             <?php if (isset($setting['action'])): ?>
                 <form
                     method="post"
-                    action="<?= $escaper->escapeHtmlAttr($setting['action']) ?>"
+                    action="<?= $escaper->escapeUrl($setting['action']) ?>"
                     data-mage-init='{"validation":{}}'
                 >
                     <input
                         name="form_key"
                         type="hidden"
-                        value="<?= $escaper->escapeHtmlAttr($block->getFormKey()) ?>"
+                        value="<?= /** @noEscape */ $block->getFormKey() ?>"
                     />
                     <input
                         name="order_increment_id"

diff --git a/Amasty_Gdpr/web/template/checkout/gdpr-consent.html b/Amasty_Gdpr/web/template/checkout/gdpr-consent.html
@@ -12,6 +12,7 @@
             }
         "
     >
+        <!-- data-checkbox-code as fallback to previous gdpr versions -->
         <input
             type="checkbox"
             value="1"
@@ -21,6 +22,8 @@
                     'name': name,
                     'id': checkbox_code + $parent.getUniqId(),
                     'data-checkbox-code': checkbox_code,
+                    'data-gdpr-checkbox-code': checkbox_code,
+                    'data-consent-id': consent_id,
                     'data-validate': $data.required ? '{required:true}' : null,
                     class: $data.required ? 'checkbox__field required-entry' : 'checkbox__field'
             }"
@@ -60,5 +63,5 @@
         hidden
         name="am-gdpr-checkboxes-from"
         data-bind="attr: {'value': metaInfo.where}"
-    >
+    />
 <!-- /ko -->
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,13 +8,18 @@ All notable changes to this project will be documented in this file.
 ### Updated
 ### Removed
 
+## [Released]
+## [2.25.0] - 2021-10-19
+### Fixed
+- Filters position on category view (#83483)
+### Updated
+- Update requisition list button on product view (#83517)
+- Update to Magento 2.4.3 (#81212)
 ## [2.24.1] - 2021-10-13
 ### Changed
 - Frontools dependency removed
 ### Fixed
 - Asterix position in required checkboxes (#80129)
-
-## [Released]
 ## [2.24.0] - 2021-09-09
 ### Added
 - column template variables for catalog grid styles (#81732)

diff --git a/Magento_Catalog/templates/product/compare/list.phtml b/Magento_Catalog/templates/product/compare/list.phtml
@@ -133,7 +133,7 @@ $compareHelper = $this->helper(Magento\Catalog\Helper\Product\Compare::class);
                                                     </button>
                                                 </form>
                                             <?php else: ?>
-                                                <?php if ($item->getIsSalable()): ?>
+                                                <?php if ($item->isAvailable()): ?>
                                                     <div class="stock available">
                                                         <?= $block->escapeHtml(__('In stock')) ?>
                                                     </div>
@@ -193,15 +193,13 @@ $compareHelper = $this->helper(Magento\Catalog\Helper\Product\Compare::class);
             </table>
         </div>
     </div>
-    <?php if (!$block->isRedirectToCartEnabled()): ?>
-        <script type="text/x-magento-init">
-            {
-                "[data-role=tocart-form]": {
-                    "catalogAddToCart": {}
-                }
+    <script type="text/x-magento-init">
+        {
+            "[data-role=tocart-form]": {
+                "catalogAddToCart": {}
             }
-        </script>
-    <?php endif; ?>
+        }
+    </script>
 <?php else: ?>
     <div class="message">
         <?= $block->escapeHtml(__('You have no items to compare.')) ?>

diff --git a/Magento_Catalog/templates/product/list.phtml b/Magento_Catalog/templates/product/list.phtml
@@ -267,6 +267,14 @@ use Magento\Framework\App\Action\Action;
                                         action="<?= $escaper->escapeUrl($postParams['action']) ?>"
                                         method="post"
                                     >
+                                    <?php $optionsData = $block->getData('viewModel')->getOptionsData($_product); ?>
+                                        <?php foreach ($optionsData as $optionItem): ?>
+                                            <input
+                                                type="hidden"
+                                                name="<?= $escaper->escapeHtml($optionItem['name']) ?>"
+                                                value="<?= $escaper->escapeHtml($optionItem['value']) ?>"
+                                            >
+                                        <?php endforeach; ?>
                                         <input
                                             type="hidden"
                                             name="product"
@@ -501,17 +509,15 @@ use Magento\Framework\App\Action\Action;
         </ul>
     <?php endif; ?>
 
-    <?= $block->getToolbarHtml() ?>
+    <?= $block->getChildBlock('toolbar')->setIsBottom(true)->toHtml() ?>
 
-    <?php if (!$block->isRedirectToCartEnabled()): ?>
-        <script type="text/x-magento-init">
+    <script type="text/x-magento-init">
         {
             "[data-role=tocart-form], .form.map.checkout": {
                 "catalogAddToCart": {
                     "product_sku": "<?= $escaper->escapeJs($_product->getSku()) ?>"
                 }
             }
         }
-        </script>
-    <?php endif; ?>
+    </script>
 <?php endif; ?>
diff --git a/Magento_Catalog/templates/product/list/items.phtml b/Magento_Catalog/templates/product/list/items.phtml
@@ -452,7 +452,7 @@ $sliderResponsiveConfig = '[
                                                     <?php endif; ?>
                                                 </div>
                                             <?php else: ?>
-                                                <?php if ($_item->getIsSalable()): ?>
+                                                <?php if ($_item->isAvailable()): ?>
                                                     <div class="stock available">
                                                         <?= $block->escapeHtml(__('In stock')) ?>
                                                     </div>

diff --git a/Magento_Catalog/templates/product/list/toolbar.phtml b/Magento_Catalog/templates/product/list/toolbar.phtml
@@ -5,8 +5,6 @@
  * @var $block \Magento\Catalog\Block\Product\ProductList\Toolbar
  */
 
-// phpcs:disable Magento2.Security.IncludeFile.FoundIncludeFile
-// phpcs:disable PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket
 ?>
 <?php if ($block->getCollection()->getSize()): ?>
     <?php
@@ -30,7 +28,6 @@
             include($block->getTemplateFile('Magento_Catalog::product/list/toolbar/amount.phtml'));
             include($block->getTemplateFile('Magento_Catalog::product/list/toolbar/limiter.phtml'));
         ?>
-
         <?= $block->getPagerHtml() ?>
     </div>
 <?php endif ?>
diff --git a/Magento_Catalog/web/template/product/addtocart-button.html b/Magento_Catalog/web/template/product/addtocart-button.html
@@ -24,10 +24,10 @@
         </button>
     </if>
 
-    <ifnot args="isSalable($row())">
+    <if args="isAvailable($row()) === false">
         <div class="stock unavailable">
             <text args="$t('Availability')" />
             <span translate="'Out of stock'" />
         </div>
-    </ifnot>
+    </if>
 </if>
diff --git a/Magento_Checkout/templates/onepage/link.phtml b/Magento_Checkout/templates/onepage/link.phtml
@@ -1,11 +1,17 @@
+<?php
+/**
+ * @var Magento\Checkout\Block\Onepage\Link $block
+ * @var Magento\Framework\Escaper $escaper
+ */
+?>
 <?php if ($block->isPossibleOnepageCheckout()): ?>
     <button
         type="button"
         data-role="proceed-to-checkout"
-        title="<?= $block->escapeHtmlAttr(__('Proceed to Checkout')) ?>"
+        title="<?= $escaper->escapeHtmlAttr(__('Proceed to Checkout')) ?>"
         data-mage-init='{
             "Magento_Checkout/js/proceed-to-checkout": {
-                "checkoutUrl":"<?= $block->escapeUrl($block->escapeUrl($block->getCheckoutUrl())) ?>"
+                "checkoutUrl":"<?= $escaper->escapeUrl($block->escapeUrl($block->getCheckoutUrl())) ?>"
             }
         }'
         class="
@@ -17,6 +23,6 @@
         "
         <?= ($block->isDisabled()) ? 'disabled="disabled"' : ''; ?>
     >
-        <?= $block->escapeHtml(__('Proceed to Checkout')) ?>
+        <?= $escaper->escapeHtml(__('Proceed to Checkout')) ?>
     </button>
 <?php endif; ?>
diff --git a/Magento_Checkout/web/template/billing-address.html b/Magento_Checkout/web/template/billing-address.html
@@ -57,7 +57,7 @@
         </label>
     </div>
 
-    <render args="detailsTemplate"/>
+    <render args="detailsTemplate"></render>
 
     <fieldset
         class="fieldset"
@@ -66,12 +66,12 @@
         <each
             args="getRegion('billing-address-list')"
             render=""
-        />
+        ></each>
 
         <div data-bind="fadeVisible: isAddressFormVisible">
-            <render args="formTemplate"/>
+            <render args="formTemplate"></render>
         </div>
 
-        <render args="actionsTemplate"/>
+        <render args="actionsTemplate"></render>
     </fieldset>
 </div>