Merge branch 'release/2.12.0'

SnowdogApps · Jan 19, 2021 · 07cb30f · 07cb30f · vercel · Jan 19, 2021
2 parents fb86eb6 + b50ade2
commit 07cb30f
Show file tree

Hide file tree

Showing 41 changed files with 514 additions and 115 deletions.
diff --git a/AuthorizeNet_PayPalExpress/styles/_module.scss b/AuthorizeNet_PayPalExpress/styles/_module.scss
@@ -0,0 +1 @@
+@import 'modules/paypal-express-checkout';
diff --git a/AuthorizeNet_PayPalExpress/styles/modules/_paypal-express-checkout.scss b/AuthorizeNet_PayPalExpress/styles/modules/_paypal-express-checkout.scss
@@ -0,0 +1,10 @@
+$paypal-express-checkout__z-index: $z-index-normal !default;
+$zoid-outlet__z-index            : $z-index-normal !default;
+
+.paypal-express-checkout {
+    z-index: $paypal-express-checkout__z-index;
+
+    .zoid-outlet {
+        z-index: $zoid-outlet__z-index;
+    }
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 
 ## [Released]
+
+## [2.12.0] - 2021-01-19
+### Updated
+- theme to Magento 2.3.6 (#72223)
+### Fixed
+- paypal button covers popups on PDP and cart (#73943)
+- message in review section requires spaces bewteen links in text (#73943)
+- image width in requisition list (#73942)
+- search result pages (#68876)
+- scss variable for grid on PDP (#71511)
+- order details in user dashboard (#73940)
+- conatiner top space on PDP, category, home (#74745)
+### Added
+- option to customize number of slides to show in templates with sliders (#70261)
+### Removed
+- duplicated stock status for configurable products (#73939)
+### Changed
+- payment method template in customer dashboard (#73941)
+
 ## [2.11.0] - 2020-12-10
 
 ### Added
@@ -91,6 +110,7 @@ All notable changes to this project will be documented in this file.
 - error on company profle page (#72234)
 - tab content in quote view - removed escaping (#72243)
 - loading state/province options (#72291)
+
 ### Added
 - adjust sliders loading time + add slider widget template (#65842)
 - scroll-to.js file and added it for reviews on product page (#71248); Affects: Reviews buttons on PDP

diff --git a/Magento_Bundle/templates/catalog/product/view/type/bundle/option/checkbox.phtml b/Magento_Bundle/templates/catalog/product/view/type/bundle/option/checkbox.phtml
@@ -3,10 +3,12 @@
 $_option = $block->getOption();
 $_optionId = $_option->getId();
 $_selections = $_option->getSelections();
+$_inputId = 'bundle-option-' . $block->escapeHtmlAttr($_optionId);
+$_inputName = 'bundle_option[' . $_optionId . ']';
 ?>
-
+<?php $dataValidation = 'data-validate="{\'validate-one-required-by-name\':\'input[name^=&quot;bundle_option[' .
+    $block->escapeHtmlAttr($_option->getId()) . ']&quot;]:checked\'}"' ?>
 <div class="bundle-option <?= ($_option->getRequired()) ? ' required': '' ?>">
-
     <h2
         class="
             bundle-option__title
@@ -42,7 +44,7 @@ $_selections = $_option->getSelections();
                         bundle
                         option
                     "
-                    id="bundle-option-<?= $block->escapeHtmlAttr($_optionId) ?>-<?= $block->escapeHtmlAttr($_selectionId) ?>"
+                    id="<?= /* @noEscape */ $_inputId . '-' . $block->escapeHtmlAttr($_selectionId) ?>"
                     type="checkbox"
                     <?php if ($_option->getRequired()): ?>
                         data-validate="
@@ -51,15 +53,16 @@ $_selections = $_option->getSelections();
                             }
                         "
                     <?php endif; ?>
-                    name="bundle_option[<?= $block->escapeHtmlAttr($_optionId) ?>][<?= $block->escapeHtmlAttr($_selection->getId()) ?>]"
-                    data-selector="bundle_option[<?= $block->escapeHtmlAttr($_optionId) ?>][<?= $block->escapeHtmlAttr($_selection->getId()) ?>]"
+                    name="<?= /* @noEscape */ $_inputName . '[' . $block->escapeHtmlAttr($_selectionId) ?>]"
+                    data-selector="<?= /* @noEscape */ $_inputName.'['.$block->escapeHtmlAttr($_selectionId)?>]"
                     <?php if ($block->isSelected($_selection)): ?>
                         checked="checked"
                     <?php endif; ?>
                     <?php if (!$_selection->isSaleable()): ?>
                         disabled="disabled"
                     <?php endif; ?>
                     value="<?= $block->escapeHtmlAttr($_selectionId) ?>"
+                    data-errors-message-box="#validation-message-box"
                 >
                 <svg
                     class="
@@ -83,13 +86,14 @@ $_selections = $_option->getSelections();
                 </svg>
                 <label
                     class="checkbox__label"
-                    for="bundle-option-<?= $block->escapeHtmlAttr($_optionId) ?>-<?= $block->escapeHtmlAttr($_selectionId) ?>"
+                    for="<?=/* @noEscape */ $_inputId . '-' . $block->escapeHtmlAttr($_selectionId) ?>"
                 >
                     <?= /* @noEscape */ $block->getSelectionQtyTitlePrice($_selection) ?>
                     <?= /* @noEscape */ $block->getTierPriceRenderer()->renderTierPrice($_selection) ?>
                 </label>
             </div>
         <?php endforeach; ?>
          <div id="bundle-option-<?= $block->escapeHtmlAttr($_optionId) ?>-container"></div>
+         <div id="validation-message-box"></div>
     <?php endif; ?>
 </div>
diff --git a/Magento_Bundle/templates/sales/order/items/renderer.phtml b/Magento_Bundle/templates/sales/order/items/renderer.phtml
@@ -90,21 +90,21 @@ $prevOptionId = '';
             <?php if (($item->getParentItem() && $block->isChildCalculated()) ||
                 (!$item->getParentItem() && !$block->isChildCalculated())) : ?>
                 <?php if ($item->getQtyOrdered() > 0) : ?>
-                    <?= $block->escapeHtmlAttr(__('Ordered')) ?>:&nbsp;<?= /* @noEscape */ $item->getQtyOrdered() * 1; ?>
+                    <?= $block->escapeHtml(__('Ordered')) ?>:&nbsp;<?= /* @noEscape */ $item->getQtyOrdered() * 1; ?>
                 <?php endif; ?>
                 <?php if ($item->getQtyShipped() > 0 && !$block->isShipmentSeparately()) : ?>
-                    <?= $block->escapeHtmlAttr(__('Shipped')) ?>:&nbsp;<?= /* @noEscape */ $item->getQtyShipped() * 1; ?>
+                    <?= $block->escapeHtml(__('Shipped')) ?>:&nbsp;<?= /* @noEscape */ $item->getQtyShipped() * 1; ?>
                 <?php endif; ?>
                 <?php if ($item->getQtyCanceled() > 0) : ?>
-                    <?= $block->escapeHtmlAttr(__('Canceled')) ?>:&nbsp;<?= /* @noEscape */ $item->getQtyCanceled() * 1; ?>
+                    <?= $block->escapeHtml(__('Canceled')) ?>:&nbsp;<?= /* @noEscape */ $item->getQtyCanceled() * 1; ?>
                 <?php endif; ?>
                 <?php if ($item->getQtyRefunded() > 0) : ?>
-                    <?= $block->escapeHtmlAttr(__('Refunded')) ?>:&nbsp;<?= /* @noEscape */ $item->getQtyRefunded() * 1; ?>
+                    <?= $block->escapeHtml(__('Refunded')) ?>:&nbsp;<?= /* @noEscape */ $item->getQtyRefunded() * 1; ?>
                 <?php endif; ?>
             <?php elseif ($item->getQtyShipped() > 0 && $item->getParentItem() && $block->isShipmentSeparately()) : ?>
-                <?= $block->escapeHtmlAttr(__('Shipped')) ?>:&nbsp;<?= /* @noEscape */ $item->getQtyShipped() * 1; ?>
+                <?= $block->escapeHtml(__('Shipped')) ?>:&nbsp;<?= /* @noEscape */ $item->getQtyShipped() * 1; ?>
             <?php else : ?>
-                <?= /* @noEscape */ $parentItem->getQtyOrdered() * 1; ?>
+                <?= $block->escapeHtml(__('Ordered')) ?>:&nbsp;<?= /* @noEscape */ $parentItem->getQtyOrdered() * 1; ?>
             <?php endif; ?>
         </td>
         <td

diff --git a/Magento_Catalog/templates/category/image.phtml b/Magento_Catalog/templates/category/image.phtml
@@ -12,10 +12,9 @@
 <?php
     /** @var \Snowdog\CategoryAttributes\ViewModel\ImageSize $categoryImageViewModel */
     $categoryImageViewModel = $block->getCategoryImageViewModel();
-    $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
     $_category = $block->getCurrentCategory();
     $_imgHtml = '';
-    if ($_imgUrl = $_category->getImageUrl()) {
+    if ($_imgUrl = $block->getImage()->getUrl($_category)) {
         $imgSize = $categoryImageViewModel->get($_category);
         $imgWidth = $imgSize['width'];
         $imgHeight = $imgSize['height'];
@@ -41,7 +40,7 @@
                 />
             </div>
         ';
-        $_imgHtml = $_helper->categoryAttribute($_category, $_imgHtml, 'image');
+        $_imgHtml = $block->getOutput()->categoryAttribute($_category, $_imgHtml, 'image');
         /* @noEscape */ echo $_imgHtml;
     }
 ?>
diff --git a/Magento_Catalog/templates/product/list/items.phtml b/Magento_Catalog/templates/product/list/items.phtml
@@ -152,26 +152,32 @@ switch ($type = $block->getType()) {
 }
 ?>
 <?php
+$sliderSlidesToShow = $block->getSliderSlidesToShow();
+$sliderSlidesToShow767 = $block->getSliderSlidesToShow767();
+$sliderSlidesToShow1023 = $block->getSliderSlidesToShow1023();
+
 //slider config
 $sliderArrows           = true;
 $sliderItemClass        = 'slider__item';
 $sliderClass            = 'slider--products';
 $sliderInfinite         = 'no';
-$sliderSlidesToShow     = '2';
+$sliderSlidesToShow     = $sliderSlidesToShow ? $sliderSlidesToShow : '2';
+$sliderSlidesToShow767  = $sliderSlidesToShow767 ? $sliderSlidesToShow767 : '3';
+$sliderSlidesToShow1023 = $sliderSlidesToShow1023 ? $sliderSlidesToShow1023 : '4';
 $sliderSlidesToScroll   = '1';
 $sliderResponsiveConfig = '[
     {
         "breakpoint": 767,
         "settings": {
-            "slidesToShow": 3,
+            "slidesToShow":' . $sliderSlidesToShow767 . ',
             "slidesToScroll": 1,
             "dots": false
         }
     },
     {
         "breakpoint": 1023,
         "settings": {
-            "slidesToShow": 4,
+            "slidesToShow":' . $sliderSlidesToShow1023 . ',
             "slidesToScroll": 1,
             "dots": false
         }

diff --git a/Magento_Catalog/templates/product/widget/viewed/grid.phtml b/Magento_Catalog/templates/product/widget/viewed/grid.phtml
@@ -29,26 +29,32 @@
         </div>
 
         <?php
+        $sliderSlidesToShow = $block->getSliderSlidesToShow();
+        $sliderSlidesToShow767 = $block->getSliderSlidesToShow767();
+        $sliderSlidesToShow1023 = $block->getSliderSlidesToShow1023();
+
         //slider config
         $sliderIsAjax           = true;
         $sliderArrows           = true;
         $sliderClass            = 'slider--products slider--nested';
         $sliderInfinite         = 'no';
-        $sliderSlidesToShow     = '2';
+        $sliderSlidesToShow     = $sliderSlidesToShow ? $sliderSlidesToShow : '2';
+        $sliderSlidesToShow767  = $sliderSlidesToShow767 ? $sliderSlidesToShow767 : '3';
+        $sliderSlidesToShow1023 = $sliderSlidesToShow1023 ? $sliderSlidesToShow1023 : '4';
         $sliderSlidesToScroll   = '1';
         $sliderResponsiveConfig = '[
             {
                 "breakpoint": 767,
                 "settings": {
-                    "slidesToShow": 3,
+                    "slidesToShow":' . $sliderSlidesToShow767 . ',
                     "slidesToScroll": 1,
                     "dots": false
                 }
             },
             {
                 "breakpoint": 1023,
                 "settings": {
-                    "slidesToShow": 4,
+                    "slidesToShow":' . $sliderSlidesToShow1023 . ',
                     "slidesToScroll": 1,
                     "dots": false
                 }

diff --git a/Magento_Catalog/templates/product/widget/viewed/list.phtml b/Magento_Catalog/templates/product/widget/viewed/list.phtml
@@ -31,26 +31,32 @@
         </div>
 
         <?php
+        $sliderSlidesToShow = $block->getSliderSlidesToShow();
+        $sliderSlidesToShow767 = $block->getSliderSlidesToShow767();
+        $sliderSlidesToShow1023 = $block->getSliderSlidesToShow1023();
+
         //slider config
         $sliderIsAjax           = true;
         $sliderArrows           = true;
         $sliderClass            = 'slider--products slider--nested';
         $sliderInfinite         = 'no';
-        $sliderSlidesToShow     = '2';
+        $sliderSlidesToShow     = $sliderSlidesToShow ? $sliderSlidesToShow : '2';
+        $sliderSlidesToShow767  = $sliderSlidesToShow767 ? $sliderSlidesToShow767 : '3';
+        $sliderSlidesToShow1023 = $sliderSlidesToShow1023 ? $sliderSlidesToShow1023 : '4';
         $sliderSlidesToScroll   = '1';
         $sliderResponsiveConfig = '[
             {
                 "breakpoint": 767,
                 "settings": {
-                    "slidesToShow": 3,
+                    "slidesToShow":' . $sliderSlidesToShow767 . ',
                     "slidesToScroll": 1,
                     "dots": false
                 }
             },
             {
                 "breakpoint": 1023,
                 "settings": {
-                    "slidesToShow": 4,
+                    "slidesToShow":' . $sliderSlidesToShow1023 . ',
                     "slidesToScroll": 1,
                     "dots": false
                 }

diff --git a/Magento_CatalogWidget/templates/product/widget/content/grid.phtml b/Magento_CatalogWidget/templates/product/widget/content/grid.phtml
@@ -16,26 +16,32 @@ use Magento\Framework\App\Action\Action;
     $templateType = \Magento\Catalog\Block\Product\ReviewRendererInterface::SHORT_VIEW;
     $description = false;
 
+    $sliderSlidesToShow = $block->getSliderSlidesToShow();
+    $sliderSlidesToShow767 = $block->getSliderSlidesToShow767();
+    $sliderSlidesToShow1023 = $block->getSliderSlidesToShow1023();
+
     //slider config
     $sliderArrows           = true;
     $sliderItemClass        = 'slider__item';
     $sliderClass            = 'slider--products';
     $sliderInfinite         = 'no';
-    $sliderSlidesToShow     = '2';
+    $sliderSlidesToShow     = $sliderSlidesToShow ? $sliderSlidesToShow : '2';
+    $sliderSlidesToShow767  = $sliderSlidesToShow767 ? $sliderSlidesToShow767 : '3';
+    $sliderSlidesToShow1023 = $sliderSlidesToShow1023 ? $sliderSlidesToShow1023 : '4';
     $sliderSlidesToScroll   = '1';
     $sliderResponsiveConfig = '[
         {
             "breakpoint": 767,
             "settings": {
-                "slidesToShow": 3,
+                "slidesToShow":' . $sliderSlidesToShow767 . ',
                 "slidesToScroll": 1,
                 "dots": false
             }
         },
         {
             "breakpoint": 1023,
             "settings": {
-                "slidesToShow": 4,
+                "slidesToShow":' . $sliderSlidesToShow1023 . ',
                 "slidesToScroll": 1,
                 "dots": false
             }

diff --git a/Magento_Checkout/web/template/form/element/email.html b/Magento_Checkout/web/template/form/element/email.html
@@ -56,7 +56,8 @@
                         type="email"
                         data-bind="
                             textInput: email,
-                            hasFocus: emailFocused
+                            hasFocus: emailFocused,
+                            afterRender: emailHasChanged
                         "
                         name="username"
                         data-validate="{

diff --git a/Magento_Checkout/web/template/minicart/item/default.html b/Magento_Checkout/web/template/minicart/item/default.html
@@ -271,4 +271,10 @@ <h3 class="minicart-product__name">
             </div>
         </div>
     </div>
+    <div
+        class="message notice"
+        if="$data.message"
+    >
+        <div data-bind="text: $data.message"></div>
+    </div>
 </div>
diff --git a/Magento_Checkout/web/template/payment.html b/Magento_Checkout/web/template/payment.html
@@ -32,6 +32,10 @@
                 >
                     <span data-bind="i18n: 'Payment Information'"></span>
                 </legend>
+                <!-- ko foreach: getRegion('place-order-captcha') -->
+                    <!-- ko template: getTemplate() --><!-- /ko -->
+                <!-- /ko -->
+                <br />
                 <!-- ko foreach: getRegion('beforeMethods') -->
                     <!-- ko template: getTemplate() --><!-- /ko -->
                 <!-- /ko -->

diff --git a/Magento_ConfigurableProduct/layout/catalog_product_view_type_configurable.xml b/Magento_ConfigurableProduct/layout/catalog_product_view_type_configurable.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+<page
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
+>
+    <body>
+        <referenceBlock name="product.info.configurable" remove="true" />
+    </body>
+</page>
diff --git a/Magento_Contact/templates/form.phtml b/Magento_Contact/templates/form.phtml
@@ -1,4 +1,7 @@
 <?php
+// phpcs:disable Magento2.Templates.ThisInTemplate
+// phpcs:disable Generic.Files.LineLength.TooLong
+
 /** @var \Magento\Contact\Block\ContactForm $block */
 ?>
 <div class="row center-xs">
@@ -112,3 +115,12 @@
         </form>
     </div>
 </div>
+<script type="text/x-magento-init">
+    {
+        "*": {
+            "Magento_Customer/js/block-submit-on-send": {
+                "formId": "contact-form"
+            }
+        }
+    }
+</script>