Merge branch '2.4-develop' into refactoring-AdminConfigurableProductR…

…emoveAnOptionTest
magento · Mar 12, 2021 · 1ba52ff · 1ba52ff
2 parents 3831d41 + 7a72b6b
commit 1ba52ff
Show file tree

Hide file tree

Showing 30 changed files with 319 additions and 97 deletions.
diff --git a/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php b/app/code/Magento/Catalog/Block/Ui/ProductViewCounter.php
@@ -153,6 +153,7 @@ public function getCurrentProductData()
         $this->productRenderCollectorComposite
             ->collect($product, $productRender);
         $data = $this->hydrator->extract($productRender);
+        $data['is_available'] = $product->isAvailable();
 
         $currentProductData = [
             'items' => [

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -39,6 +39,10 @@
         <data key="name">TestFooBar</data>
         <data key="sku" unique="suffix">foobar</data>
     </entity>
+    <entity name="ApiSimpleProductWithDoubleSpaces" type="product" extends="ApiSimpleProduct">
+        <data key="name">Simple Product  Double Space</data>
+        <data key="sku" unique="suffix">simple-product  double-space</data>
+    </entity>
     <entity name="ApiSimpleProductWithSpecCharInName" type="product" extends="ApiSimpleProduct">
         <data key="name">Pursuit Lumaflex&#38;trade; Tone Band</data>
         <data key="sku" unique="suffix">x&#38;trade;</data>

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/AdminShowDoubleSpacesInProductGrid.xml b/app/code/Magento/Catalog/Test/Mftf/Test/AdminShowDoubleSpacesInProductGrid.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminShowDoubleSpacesInProductGrid">
+        <annotations>
+            <features value="Catalog"/>
+            <stories value="Edit products"/>
+            <title value="Show double spaces in the product grid"/>
+            <description value="Admin should be able to see double spaces in the Name and Sku fields in the product grid"/>
+            <testCaseId value="MC-40725"/>
+            <useCaseId value="MC-40122"/>
+            <severity value="AVERAGE"/>
+            <group value="Catalog"/>
+        </annotations>
+
+        <before>
+            <createData entity="ApiCategory" stepKey="createCategory"/>
+            <createData entity="ApiSimpleProductWithDoubleSpaces" stepKey="createProduct">
+                <requiredEntity createDataKey="createCategory"/>
+            </createData>
+            <magentoCLI command="cron:run --group=index" stepKey="cronRun"/>
+            <magentoCLI command="cron:run --group=index" stepKey="cronRunSecondTime"/>
+        </before>
+
+        <after>
+            <actionGroup ref="AdminDeleteAllProductsFromGridActionGroup" stepKey="deleteProduct"/>
+            <actionGroup ref="ClearFiltersAdminProductGridActionGroup" stepKey="clearGridFilters"/>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
+        </after>
+
+        <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        <actionGroup ref="AdminOpenCatalogProductPageActionGroup" stepKey="goToProductCatalogPage"/>
+        <actionGroup ref="FilterProductGridBySkuActionGroup" stepKey="searchForProduct">
+            <argument name="product" value="$createProduct$"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="assertProductName">
+            <argument name="column" value="Name"/>
+            <argument name="value" value="$createProduct.name$"/>
+        </actionGroup>
+        <actionGroup ref="AssertAdminProductGridCellActionGroup" stepKey="assertProductSku">
+            <argument name="column" value="SKU"/>
+            <argument name="value" value="$createProduct.sku$"/>
+        </actionGroup>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Ui/ProductViewCounterTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Ui/ProductViewCounterTest.php
@@ -166,14 +166,14 @@ public function testGetCurrentProductDataWithNonEmptyProduct()
     {
         $productMock = $this->getMockBuilder(ProductInterface::class)
             ->disableOriginalConstructor()
+            ->addMethods(['isAvailable'])
             ->getMockForAbstractClass();
         $productRendererMock = $this->getMockBuilder(ProductRenderInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
         $storeMock = $this->getMockBuilder(Store::class)
             ->disableOriginalConstructor()
             ->getMock();
-
         $this->registryMock->expects($this->once())
             ->method('registry')
             ->with('product')

diff --git a/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml b/app/code/Magento/Catalog/view/adminhtml/ui_component/product_listing.xml
@@ -132,7 +132,7 @@
             <settings>
                 <addField>true</addField>
                 <filter>text</filter>
-                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
+                <bodyTmpl>Magento_Catalog/grid/cells/preserved</bodyTmpl>
                 <label translate="true">Name</label>
             </settings>
         </column>
@@ -155,7 +155,7 @@
         <column name="sku" sortOrder="60">
             <settings>
                 <filter>text</filter>
-                <bodyTmpl>ui/grid/cells/html</bodyTmpl>
+                <bodyTmpl>Magento_Catalog/grid/cells/preserved</bodyTmpl>
                 <label translate="true">SKU</label>
             </settings>
         </column>

diff --git a/app/code/Magento/Catalog/view/adminhtml/web/template/grid/cells/preserved.html b/app/code/Magento/Catalog/view/adminhtml/web/template/grid/cells/preserved.html
@@ -0,0 +1,7 @@
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<div class="data-grid-cell-content white-space-preserved" html="$col.getLabel($row())"/>
diff --git a/app/code/Magento/Catalog/view/base/web/js/product/addtocart-button.js b/app/code/Magento/Catalog/view/base/web/js/product/addtocart-button.js
@@ -55,6 +55,16 @@ define([
             return row['is_salable'];
         },
 
+        /**
+         * Depends on this option, stock status text can be "In stock" or "Out Of Stock"
+         *
+         * @param {Object} row
+         * @returns {Boolean}
+         */
+        isAvailable: function (row) {
+            return row['is_available'];
+        },
+
         /**
          * Depends on this option, "Add to cart" button can be shown or hide. Depends on  backend configuration
          *

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/compare/list.phtml
@@ -78,7 +78,7 @@
                                             </button>
                                         </form>
                                     <?php else :?>
-                                        <?php if ($item->getIsSalable()) :?>
+                                        <?php if ($item->isAvailable()) :?>
                                             <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                         <?php else :?>
                                             <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -153,7 +153,7 @@ $_helper = $block->getData('outputHelper');
             <?php endforeach; ?>
         </ol>
     </div>
-    <?= $block->getToolbarHtml() ?>
+    <?= $block->getChildBlock('toolbar')->setIsBottom(true)->toHtml() ?>
     <script type="text/x-magento-init">
     {
         "[data-role=tocart-form], .form.map.checkout": {

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/items.phtml
@@ -287,7 +287,7 @@ $_item = null;
                                                         </form>
                                                     <?php endif; ?>
                                                 <?php else:?>
-                                                    <?php if ($_item->getIsSalable()):?>
+                                                    <?php if ($_item->isAvailable()):?>
                                                         <div class="stock available">
                                                             <span><?= $block->escapeHtml(__('In stock')) ?></span>
                                                         </div>

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list/toolbar.phtml
@@ -10,27 +10,23 @@
  *
  * @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 $widget = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonDecode($block->getWidgetOptionsJson());
         $widgetOptions = $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($widget['productListToolbarForm']);
     ?>
     <div class="toolbar toolbar-products" data-mage-init='{"productListToolbarForm":<?= /* @noEscape */ $widgetOptions ?>}'>
-        <?php if ($block->isExpanded()) :?>
-            <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/viewmode.phtml')) ?>
-        <?php endif; ?>
-
-        <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/amount.phtml')) ?>
-
-        <?= $block->getPagerHtml() ?>
-
-        <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/limiter.phtml')) ?>
-
-        <?php if ($block->isExpanded()) :?>
-            <?php include ($block->getTemplateFile('Magento_Catalog::product/list/toolbar/sorter.phtml')) ?>
-        <?php endif; ?>
+        <?php if ($block->getIsBottom()): ?>
+            <?= $block->getPagerHtml() ?>
+            <?= $block->fetchView($block->getTemplateFile('Magento_Catalog::product/list/toolbar/limiter.phtml')) ?>
+        <?php else: ?>
+            <?php if ($block->isExpanded()): ?>
+                <?= $block->fetchView($block->getTemplateFile('Magento_Catalog::product/list/toolbar/viewmode.phtml')) ?>
+            <?php endif ?>
+            <?= $block->fetchView($block->getTemplateFile('Magento_Catalog::product/list/toolbar/amount.phtml')) ?>
+            <?php if ($block->isExpanded()): ?>
+                <?= $block->fetchView($block->getTemplateFile('Magento_Catalog::product/list/toolbar/sorter.phtml')) ?>
+            <?php endif ?>
+        <?php endif ?>
     </div>
 <?php endif ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/listing.phtml
@@ -63,7 +63,7 @@ $_helper = $this->helper(Magento\Catalog\Helper\Output::class);
                                     . ' data-mage-init=\'{ "redirectUrl": { "event": "click", url: "' . $block->escapeUrl($block->getAddToCartUrl($_product)) . '"} }\'>'
                                     . '<span>' . $block->escapeHtml(__('Add to Cart')) . '</span></button>';
                             } else {
-                                $info['button'] = $_product->getIsSalable() ?   '<div class="stock available"><span>' . $block->escapeHtml(__('In stock')) . '</span></div>' :
+                                $info['button'] = $_product->isAvailable() ?   '<div class="stock available"><span>' . $block->escapeHtml(__('In stock')) . '</span></div>' :
                                     '<div class="stock unavailable"><span>' . $block->escapeHtml(__('Out of stock')) . '</span></div>';
                             }
 

diff --git a/.../Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml b/.../Magento/Catalog/view/frontend/templates/product/widget/new/column/new_default_list.phtml
@@ -52,7 +52,7 @@
                                                 </button>
                                             <?php endif; ?>
                                         <?php else :?>
-                                            <?php if ($_product->getIsSalable()) :?>
+                                            <?php if ($_product->isAvailable()) :?>
                                                 <div class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
                                                     <span><?= $block->escapeHtml(__('In stock')) ?></span>
                                                 </div>

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_grid.phtml
@@ -89,7 +89,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                         </button>
                                                     <?php endif; ?>
                                                 <?php else :?>
-                                                    <?php if ($_item->getIsSalable()) :?>
+                                                    <?php if ($_item->isAvailable()) :?>
                                                         <div class="stock available">
                                                             <span><?= $block->escapeHtml(__('In stock')) ?></span>
                                                         </div>

diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/widget/new/content/new_list.phtml
@@ -88,7 +88,7 @@ if ($exist = ($block->getProductCollection() && $block->getProductCollection()->
                                                             </button>
                                                         <?php endif; ?>
                                                     <?php else :?>
-                                                        <?php if ($_item->getIsSalable()) :?>
+                                                        <?php if ($_item->isAvailable()) :?>
                                                             <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                                         <?php else :?>
                                                             <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>

diff --git a/app/code/Magento/Catalog/view/frontend/web/template/product/addtocart-button.html b/app/code/Magento/Catalog/view/frontend/web/template/product/addtocart-button.html
@@ -15,10 +15,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/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml b/app/code/Magento/CatalogWidget/view/frontend/templates/product/widget/content/grid.phtml
@@ -77,7 +77,7 @@ use Magento\Framework\App\Action\Action;
                                                             </button>
                                                         </form>
                                                     <?php else: ?>
-                                                        <?php if ($_item->getIsSalable()): ?>
+                                                        <?php if ($_item->isAvailable()): ?>
                                                             <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                                         <?php else: ?>
                                                             <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>

diff --git a/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml b/app/code/Magento/Downloadable/view/frontend/templates/catalog/product/type.phtml
@@ -12,7 +12,7 @@
 ?>
 <?php $_product = $block->getProduct() ?>
 
-<?php if ($_product->getIsSalable()) : ?>
+<?php if ($_product->isAvailable()) : ?>
     <div class="stock available" title="<?= $block->escapeHtmlAttr(__('Availability')) ?>">
         <span><?= $block->escapeHtml(__('In stock')) ?></span>
     </div>

diff --git a/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml b/app/code/Magento/Reports/view/frontend/templates/product/widget/viewed/item.phtml
@@ -60,7 +60,7 @@ $rating = 'short';
                                 </button>
                             <?php endif; ?>
                         <?php else : ?>
-                            <?php if ($item->getIsSalable()) : ?>
+                            <?php if ($item->isAvailable()) : ?>
                                 <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                             <?php else : ?>
                                 <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>

diff --git a/...agento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml b/...agento/Reports/view/frontend/templates/widget/compared/column/compared_default_list.phtml
@@ -78,7 +78,7 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                 <?php endif; ?>
                                 </div>
                             <?php else : ?>
-                                <?php if ($_product->getIsSalable()) : ?>
+                                <?php if ($_product->isAvailable()) : ?>
                                     <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                 <?php else : ?>
                                     <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>

diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_grid.phtml
@@ -83,7 +83,7 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                             </button>
                                                         <?php endif; ?>
                                                     <?php else : ?>
-                                                        <?php if ($_item->getIsSalable()) : ?>
+                                                        <?php if ($_item->isAvailable()) : ?>
                                                             <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                                         <?php else : ?>
                                                             <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>

diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/compared/content/compared_list.phtml
@@ -84,7 +84,7 @@ if ($exist = $block->getRecentlyComparedProducts()) {
                                                             </button>
                                                         <?php endif; ?>
                                                     <?php else : ?>
-                                                        <?php if ($_item->getIsSalable()) : ?>
+                                                        <?php if ($_item->isAvailable()) : ?>
                                                             <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                                         <?php else : ?>
                                                             <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>

diff --git a/...de/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml b/...de/Magento/Reports/view/frontend/templates/widget/viewed/column/viewed_default_list.phtml
@@ -81,7 +81,7 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                     <?php endif; ?>
                                 </div>
                                 <?php else : ?>
-                                    <?php if ($_product->getIsSalable()) : ?>
+                                    <?php if ($_product->isAvailable()) : ?>
                                         <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                     <?php else : ?>
                                         <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>

diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_grid.phtml
@@ -86,7 +86,7 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                             </button>
                                                         <?php endif; ?>
                                                     <?php else : ?>
-                                                        <?php if ($_item->getIsSalable()) : ?>
+                                                        <?php if ($_item->isAvailable()) : ?>
                                                             <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                                         <?php else : ?>
                                                             <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>

diff --git a/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml b/app/code/Magento/Reports/view/frontend/templates/widget/viewed/content/viewed_list.phtml
@@ -88,7 +88,7 @@ if ($exist = ($block->getRecentlyViewedProducts() && $block->getRecentlyViewedPr
                                                             </button>
                                                             <?php endif; ?>
                                                     <?php else : ?>
-                                                        <?php if ($_item->getIsSalable()) : ?>
+                                                        <?php if ($_item->isAvailable()) : ?>
                                                             <div class="stock available"><span><?= $block->escapeHtml(__('In stock')) ?></span></div>
                                                         <?php else : ?>
                                                             <div class="stock unavailable"><span><?= $block->escapeHtml(__('Out of stock')) ?></span></div>

diff --git a/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php b/app/code/Magento/Shipping/Model/Carrier/AbstractCarrierOnline.php
@@ -654,7 +654,7 @@ public function getMethodPrice($cost, $method = '')
             'free_shipping_enable'
         ) && $this->getConfigData(
             'free_shipping_subtotal'
-        ) <= $this->_rawRequest->getBaseSubtotalInclTax() ? '0.00' : $this->getFinalPriceWithHandlingFee(
+        ) <= $this->_rawRequest->getValueWithDiscount() ? '0.00' : $this->getFinalPriceWithHandlingFee(
             $cost
         );
     }

diff --git a/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php b/app/code/Magento/Ups/Test/Unit/Model/CarrierTest.php
@@ -226,7 +226,7 @@ public function testGetMethodPrice(
             ->willReturn($freeShippingEnabled);
 
         $request = new RateRequest();
-        $request->setBaseSubtotalInclTax($requestSubtotal);
+        $request->setValueWithDiscount($requestSubtotal);
         $this->model->setRawRequest($request);
         $price = $this->model->getMethodPrice($cost, $shippingMethod);
         $this->assertEquals($expectedPrice, $price);