Merge pull request #5207 from magento-tsg-csl3/2.4-develop-pr7

[TSG-CSL3] For 2.4 (pr7)
magento · Jan 16, 2020 · 6b4a82b · 6b4a82b
2 parents d001f7b + 4bfca16
commit 6b4a82b
Show file tree

Hide file tree

Showing 8 changed files with 276 additions and 38 deletions.
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -262,7 +262,7 @@ protected function _applyTierPrice($product, $qty, $finalPrice)
 
         $tierPrice = $product->getTierPrice($qty);
         if (is_numeric($tierPrice)) {
-            $finalPrice = min($finalPrice, $tierPrice);
+            $finalPrice = min($finalPrice, (float) $tierPrice);
         }
         return $finalPrice;
     }
@@ -645,7 +645,7 @@ public function calculateSpecialPrice(
     ) {
         if ($specialPrice !== null && $specialPrice != false) {
             if ($this->_localeDate->isScopeDateInInterval($store, $specialPriceFrom, $specialPriceTo)) {
-                $finalPrice = min($finalPrice, $specialPrice);
+                $finalPrice = min($finalPrice, (float) $specialPrice);
             }
         }
         return $finalPrice;

diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontProductsDisplayUsingElasticSearchTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StoreFrontProductsDisplayUsingElasticSearchTest.xml
@@ -0,0 +1,222 @@
+<?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="StoreFrontProductsDisplayUsingElasticSearchTest">
+        <annotations>
+            <stories value="Display All Products"/>
+            <title value="Display All Products on a Page"/>
+            <description value="Set Up Elastic Search and Display all Products on Page"/>
+            <testCaseId value="MC-30209"/>
+            <severity value="CRITICAL"/>
+            <group value="Catalog"/>
+        </annotations>
+        <before>
+            <!-- Login Admin -->
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <!--Create Category and Simple Products-->
+            <createData entity="SimpleSubCategory" stepKey="createCategory1"/>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct2">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct3">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct4">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct5">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct6">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct7">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct8">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct9">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct10">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct11">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct12">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct13">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct14">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct15">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct16">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct17">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct18">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct19">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct20">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct21">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct22">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct23">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct24">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct25">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct26">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct27">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct28">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct29">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+            <createData entity="SimpleProduct" stepKey="createSimpleProduct30">
+                <requiredEntity createDataKey="createCategory1"/>
+            </createData>
+
+            <!--Enable ElasticSearch as search engine.-->
+           <magentoCLI command="config:set catalog/search/engine elasticsearch6" stepKey="enableElasticSearchAsSearchEngine"/>
+            <magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchEnable"/>
+            <magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchEnable"/>
+
+        </before>
+       <after>
+           <!--Delete created products, category -->
+          <deleteData createDataKey="createCategory1" stepKey="deleteCategory"/>
+          <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct1"/>
+          <deleteData createDataKey="createSimpleProduct2" stepKey="deleteSimpleProduct2"/>
+          <deleteData createDataKey="createSimpleProduct3" stepKey="deleteSimpleProduct3"/>
+          <deleteData createDataKey="createSimpleProduct4" stepKey="deleteSimpleProduct4"/>
+          <deleteData createDataKey="createSimpleProduct5" stepKey="deleteSimpleProduct5"/>
+          <deleteData createDataKey="createSimpleProduct6" stepKey="deleteSimpleProduct6"/>
+          <deleteData createDataKey="createSimpleProduct7" stepKey="deleteSimpleProduct7"/>
+          <deleteData createDataKey="createSimpleProduct8" stepKey="deleteSimpleProduct8"/>
+          <deleteData createDataKey="createSimpleProduct9" stepKey="deleteSimpleProduct9"/>
+          <deleteData createDataKey="createSimpleProduct10" stepKey="deleteSimpleProduct10"/>
+          <deleteData createDataKey="createSimpleProduct11" stepKey="deleteSimpleProduct11"/>
+          <deleteData createDataKey="createSimpleProduct12" stepKey="deleteSimpleProduct12"/>
+          <deleteData createDataKey="createSimpleProduct13" stepKey="deleteSimpleProduct13"/>
+           <deleteData createDataKey="createSimpleProduct14" stepKey="deleteSimpleProduct14"/>
+           <deleteData createDataKey="createSimpleProduct15" stepKey="deleteSimpleProduct15"/>
+           <deleteData createDataKey="createSimpleProduct16" stepKey="deleteSimpleProduct16"/>
+           <deleteData createDataKey="createSimpleProduct17" stepKey="deleteSimpleProduct17"/>
+           <deleteData createDataKey="createSimpleProduct18" stepKey="deleteSimpleProduct18"/>
+           <deleteData createDataKey="createSimpleProduct19" stepKey="deleteSimpleProduct19"/>
+           <deleteData createDataKey="createSimpleProduct20" stepKey="deleteSimpleProduct20"/>
+           <deleteData createDataKey="createSimpleProduct21" stepKey="deleteSimpleProduct21"/>
+           <deleteData createDataKey="createSimpleProduct22" stepKey="deleteSimpleProduct22"/>
+           <deleteData createDataKey="createSimpleProduct23" stepKey="deleteSimpleProduct23"/>
+           <deleteData createDataKey="createSimpleProduct24" stepKey="deleteSimpleProduct24"/>
+           <deleteData createDataKey="createSimpleProduct25" stepKey="deleteSimpleProduct25"/>
+           <deleteData createDataKey="createSimpleProduct26" stepKey="deleteSimpleProduct26"/>
+           <deleteData createDataKey="createSimpleProduct27" stepKey="deleteSimpleProduct27"/>
+           <deleteData createDataKey="createSimpleProduct28" stepKey="deleteSimpleProduct28"/>
+           <deleteData createDataKey="createSimpleProduct29" stepKey="deleteSimpleProduct29"/>
+           <deleteData createDataKey="createSimpleProduct30" stepKey="deleteSimpleProduct30"/>
+
+
+          <!--Revert ElasticSearch as search engine.-->
+           <actionGroup ref="ResetSearchEngineConfigurationActionGroup" stepKey="resetCatalogSearchConfiguration"/>
+           <magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchDisable"/>
+           <magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchDisable"/>
+           <actionGroup ref="logout" stepKey="logout"/>
+       </after>
+
+        <!--Open Storefront on the myCategory page-->
+        <amOnPage url="/$$createCategory1.name$$.html" stepKey="GoToStorefrontCategory"/>
+        <waitForPageLoad  stepKey="waitForStorefrontCategoryPageLoad"/>
+
+        <!--Select 12 items per page and verify number of products displayed in each page -->
+        <conditionalClick selector="{{StorefrontCategoryTopToolbarSection.gridMode}}" visible="true" dependentSelector="{{StorefrontCategoryTopToolbarSection.gridMode}}" stepKey="seeProductGridIsActive"/>
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToBottomToolbarSection"/>
+        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="12" stepKey="selectPerPageOption"/>
+        <!--Verify number of products displayed in First Page -->
+       <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInFirstPage"/>
+        <!--Verify number of products displayed in Second Page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad4"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsInSecondPage"/>
+        <!--Verify number of products displayed in third  Page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton1"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad2"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="6" stepKey="seeNumberOfProductsInThirdPage"/>
+
+        <!--Select First Page using page number-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.previousPage}}" stepKey="scrollToPreviousPage4"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage"/>
+        <waitForPageLoad stepKey="waitForPageToLoad9"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="12" stepKey="seeNumberOfProductsFirstPage2"/>
+        <!--Select 24 items per page and verify number of products displayed in each page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage"/>
+        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="24" stepKey="selectPerPageOption1"/>
+        <waitForPageLoad stepKey="waitForPageToLoad10"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="24" stepKey="seeNumberOfProductsInFirstPage3"/>
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="scrollToNextButton2"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.nextPage}}" stepKey="clickOnNextPage2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad11"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="6" stepKey="seeNumberOfProductsInSecondPage3"/>
+        <!--Select First Page using page number-->
+        <scrollTo selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="scrollToPreviousPage5"/>
+        <click selector="{{StorefrontCategoryBottomToolbarSection.pageNumber('1')}}" stepKey="clickOnFirstPage2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad13"/>
+        <!--Select 36 items per page  and verify number of products displayed in each page -->
+        <scrollTo  selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" stepKey="scrollToPerPage4"/>
+        <selectOption selector="{{StorefrontCategoryBottomToolbarSection.perPage}}" userInput="36" stepKey="selectPerPageOption2"/>
+        <waitForPageLoad stepKey="waitForPageToLoad12"/>
+        <seeNumberOfElements selector="{{StorefrontCategoryMainSection.productLink}}" userInput="30" stepKey="seeNumberOfProductsInFirstPage4"/>
+    </test>
+</tests>
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/provider.js b/app/code/Magento/Catalog/view/frontend/web/js/product/provider.js
@@ -143,7 +143,8 @@ define([
             _.each(ids, function (id) {
                 if (
                     currentTime - id['added_at'] < ~~this.idsStorage.lifetime &&
-                    !_.contains(currentProductIds, id['product_id'])
+                    !_.contains(currentProductIds, id['product_id']) &&
+                    (!id.hasOwnProperty('website_id') || id['website_id'] === window.checkout.websiteId)
                 ) {
                     _ids[id['product_id']] = id;
 

diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/storage/ids-storage-compare.js b/app/code/Magento/Catalog/view/frontend/web/js/product/storage/ids-storage-compare.js
@@ -72,7 +72,8 @@ define([
             _.each(data, function (item) {
                 result[item.id] = {
                     'added_at': new Date().getTime() / 1000,
-                    'product_id': item.id
+                    'product_id': item.id,
+                    'website_id': window.checkout.websiteId
                 };
             });
 

diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/view/provider.js b/app/code/Magento/Catalog/view/frontend/web/js/product/view/provider.js
@@ -90,7 +90,8 @@ define([
             _.each(this.data.items, function (item, key) {
                 result[key] = {
                     'added_at': new Date().getTime() / 1000,
-                    'product_id': key
+                    'product_id': key,
+                    'website_id': window.checkout.websiteId
                 };
             }, this);