From e671008cb2a261842823d64dd4ea20040fafcc5f Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Tue, 14 Aug 2018 15:26:27 +0300
Subject: [PATCH 01/50] MAGETWO-67269: Gift Options set to no still show up as
 choices on front end order page

- Template fixed: added checking of all gift options. Also added possibility to change order level options visibility from other modules.
---
 .../GiftMessage/Block/Message/Inline.php      | 21 +++++++++++++++++--
 .../view/frontend/templates/inline.phtml      |  9 +++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php
index e5b80848661fd..1a874cb5ea4ae 100644
--- a/app/code/Magento/GiftMessage/Block/Message/Inline.php
+++ b/app/code/Magento/GiftMessage/Block/Message/Inline.php
@@ -238,7 +238,7 @@ public function getMessage($entity = null)
      */
     public function getItems()
     {
-        if (!$this->getData('items')) {
+        if (!$this->hasData('items')) {
             $items = [];
 
             $entityItems = $this->getEntity()->getAllItems();
@@ -325,6 +325,23 @@ public function getEscaped($value, $defaultValue = '')
         return $this->escapeHtml(trim($value) != '' ? $value : $defaultValue);
     }
 
+    /**
+     * Check availability of order level functionality
+     *
+     * @return bool
+     */
+    public function isOrderLevelAvailable()
+    {
+        $entity = $this->getEntity();
+        if (!$entity->hasIsGiftOptionsAvailable()) {
+            $this->_eventManager->dispatch('gift_options_prepare', ['entity' => $entity]);
+            if (!$entity->getIsGiftOptionsAvailable()) {
+                $entity->setIsGiftOptionsAvailable($this->isMessagesAvailable());
+            }
+        }
+        return $entity->getIsGiftOptionsAvailable();
+    }
+
     /**
      * Check availability of giftmessages on order level
      *
@@ -355,7 +372,7 @@ public function isItemMessagesAvailable($item)
     protected function _toHtml()
     {
         // render HTML when messages are allowed for order or for items only
-        if ($this->isItemsAvailable() || $this->isMessagesAvailable()) {
+        if ($this->isItemsAvailable() || $this->isOrderLevelAvailable()) {
             return parent::_toHtml();
         }
         return '';
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
index dec54cfeb9df9..8c58959be15b7 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
@@ -18,7 +18,7 @@
         </div>
 
         <dl class="options-items" id="allow-gift-options-container">
-            <?php if ($block->isMessagesAvailable()): ?>
+            <?php if ($block->isOrderLevelAvailable()): ?>
             <dt id="add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title">
                 <div class="field choice">
                     <input type="checkbox" name="allow_gift_messages_for_order" id="allow_gift_options_for_order" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
@@ -28,6 +28,7 @@
 
             <dd id="allow-gift-options-for-order-container" class="order-options">
                 <div class="options-order-container" id="options-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></div>
+                <?php if ($block->isMessagesAvailable()): ?>
                     <button class="action action-gift"
                             data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#allow-gift-messages-for-order-container"}}'>
                         <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
@@ -62,8 +63,9 @@
                             });
                         </script>
                     </div>
+                <?php endif; ?>
             </dd>
-            <?php endif ?>
+            <?php endif; ?>
             <?php if ($block->isItemsAvailable()): ?>
             <dt id="add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title individual">
                 <div class="field choice">
@@ -152,6 +154,7 @@
         </div>
 
         <dl class="options-items" id="allow-gift-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>">
+            <?php if ($block->isOrderLevelAvailable()): ?>
             <dt id="add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title">
                 <div class="field choice">
                     <input type="checkbox" name="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" id="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
@@ -192,7 +195,7 @@
                     </div>
                  <?php endif; ?>
             </dd>
-
+            <?php endif; ?>
             <?php if ($block->isItemsAvailable()): ?>
             <dt id="add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title individual">
                 <div class="field choice">

From ddb642c10e70c1acab5683beaf8d7d5b4b5e8ffd Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Mon, 20 Aug 2018 11:05:50 +0300
Subject: [PATCH 02/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Moved saving toolbar params to session from block to model. Save params before generating layout xml.
---
 .../Block/Product/ProductList/Toolbar.php     |  43 ++++-
 .../Catalog/Controller/Category/View.php      |  12 +-
 .../Product/ProductList/ToolbarMemorizer.php  | 161 ++++++++++++++++++
 3 files changed, 208 insertions(+), 8 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php

diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 0b8d2d6c89e72..0e971dcb5b9f5 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -7,6 +7,7 @@
 
 use Magento\Catalog\Helper\Product\ProductList;
 use Magento\Catalog\Model\Product\ProductList\Toolbar as ToolbarModel;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
 
 /**
  * Product list toolbar
@@ -77,6 +78,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
 
     /**
      * @var bool $_paramsMemorizeAllowed
+     * @deprecated
      */
     protected $_paramsMemorizeAllowed = true;
 
@@ -96,6 +98,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * Catalog session
      *
      * @var \Magento\Catalog\Model\Session
+     * @deprecated
      */
     protected $_catalogSession;
 
@@ -104,6 +107,11 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      */
     protected $_toolbarModel;
 
+    /**
+     * @var ToolbarMemorizer
+     */
+    private $toolbarMemorizer;
+
     /**
      * @var ProductList
      */
@@ -119,6 +127,11 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      */
     protected $_postDataHelper;
 
+    /**
+     * @var \Magento\Framework\App\Http\Context
+     */
+    private $httpContext;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Catalog\Model\Session $catalogSession
@@ -127,6 +140,8 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
      * @param ProductList $productListHelper
      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
+     * @param ToolbarMemorizer|null $toolbarMemorizer
+     * @param \Magento\Framework\App\Http\Context|null $httpContext
      * @param array $data
      */
     public function __construct(
@@ -137,6 +152,8 @@ public function __construct(
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         ProductList $productListHelper,
         \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
+        ToolbarMemorizer $toolbarMemorizer = null,
+        \Magento\Framework\App\Http\Context $httpContext = null,
         array $data = []
     ) {
         $this->_catalogSession = $catalogSession;
@@ -145,6 +162,12 @@ public function __construct(
         $this->urlEncoder = $urlEncoder;
         $this->_productListHelper = $productListHelper;
         $this->_postDataHelper = $postDataHelper;
+        $this->toolbarMemorizer = $toolbarMemorizer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            ToolbarMemorizer::class
+        );
+        $this->httpContext = $httpContext ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Framework\App\Http\Context::class
+        );
         parent::__construct($context, $data);
     }
 
@@ -152,6 +175,7 @@ public function __construct(
      * Disable list state params memorizing
      *
      * @return $this
+     * @deprecated
      */
     public function disableParamsMemorizing()
     {
@@ -165,6 +189,7 @@ public function disableParamsMemorizing()
      * @param string $param parameter name
      * @param mixed $value parameter value
      * @return $this
+     * @deprecated
      */
     protected function _memorizeParam($param, $value)
     {
@@ -244,13 +269,13 @@ public function getCurrentOrder()
             $defaultOrder = $keys[0];
         }
 
-        $order = $this->_toolbarModel->getOrder();
+        $order = $this->toolbarMemorizer->getOrder();
         if (!$order || !isset($orders[$order])) {
             $order = $defaultOrder;
         }
 
         if ($order != $defaultOrder) {
-            $this->_memorizeParam('sort_order', $order);
+            $this->httpContext->setValue(ToolbarModel::ORDER_PARAM_NAME, $order, $defaultOrder);
         }
 
         $this->setData('_current_grid_order', $order);
@@ -270,13 +295,13 @@ public function getCurrentDirection()
         }
 
         $directions = ['asc', 'desc'];
-        $dir = strtolower($this->_toolbarModel->getDirection());
+        $dir = strtolower($this->toolbarMemorizer->getDirection());
         if (!$dir || !in_array($dir, $directions)) {
             $dir = $this->_direction;
         }
 
         if ($dir != $this->_direction) {
-            $this->_memorizeParam('sort_direction', $dir);
+            $this->httpContext->setValue(ToolbarModel::DIRECTION_PARAM_NAME, $dir, $this->_direction);
         }
 
         $this->setData('_current_grid_direction', $dir);
@@ -412,11 +437,15 @@ public function getCurrentMode()
             return $mode;
         }
         $defaultMode = $this->_productListHelper->getDefaultViewMode($this->getModes());
-        $mode = $this->_toolbarModel->getMode();
+        $mode = $this->toolbarMemorizer->getMode();
         if (!$mode || !isset($this->_availableMode[$mode])) {
             $mode = $defaultMode;
         }
 
+        if ($mode != $defaultMode) {
+            $this->httpContext->setValue(ToolbarModel::MODE_PARAM_NAME, $mode, $defaultMode);
+        }
+
         $this->setData('_current_grid_mode', $mode);
         return $mode;
     }
@@ -568,13 +597,13 @@ public function getLimit()
             $defaultLimit = $keys[0];
         }
 
-        $limit = $this->_toolbarModel->getLimit();
+        $limit = $this->toolbarMemorizer->getLimit();
         if (!$limit || !isset($limits[$limit])) {
             $limit = $defaultLimit;
         }
 
         if ($limit != $defaultLimit) {
-            $this->_memorizeParam('limit_page', $limit);
+            $this->httpContext->setValue(ToolbarModel::LIMIT_PARAM_NAME, $limit, $defaultLimit);
         }
 
         $this->setData('_current_limit', $limit);
diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index 226e572505076..d451357a7c129 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -8,6 +8,7 @@
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Model\Layer\Resolver;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\View\Result\PageFactory;
 
@@ -69,6 +70,11 @@ class View extends \Magento\Framework\App\Action\Action
      */
     protected $categoryRepository;
 
+    /**
+     * @var ToolbarMemorizer
+     */
+    private $toolbarMemorizer;
+
     /**
      * Constructor
      *
@@ -82,6 +88,7 @@ class View extends \Magento\Framework\App\Action\Action
      * @param \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory
      * @param Resolver $layerResolver
      * @param CategoryRepositoryInterface $categoryRepository
+     * @param ToolbarMemorizer|null $toolbarMemorizer
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -94,7 +101,8 @@ public function __construct(
         PageFactory $resultPageFactory,
         \Magento\Framework\Controller\Result\ForwardFactory $resultForwardFactory,
         Resolver $layerResolver,
-        CategoryRepositoryInterface $categoryRepository
+        CategoryRepositoryInterface $categoryRepository,
+        ToolbarMemorizer $toolbarMemorizer = null
     ) {
         parent::__construct($context);
         $this->_storeManager = $storeManager;
@@ -106,6 +114,7 @@ public function __construct(
         $this->resultForwardFactory = $resultForwardFactory;
         $this->layerResolver = $layerResolver;
         $this->categoryRepository = $categoryRepository;
+        $this->toolbarMemorizer = $toolbarMemorizer ?: $context->getObjectManager()->get(ToolbarMemorizer::class);
     }
 
     /**
@@ -130,6 +139,7 @@ protected function _initCategory()
         }
         $this->_catalogSession->setLastVisitedCategoryId($category->getId());
         $this->_coreRegistry->register('current_category', $category);
+        $this->toolbarMemorizer->memorizeParams();
         try {
             $this->_eventManager->dispatch(
                 'catalog_controller_category_init_after',
diff --git a/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php b/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
new file mode 100644
index 0000000000000..1ff63a0fa3448
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
@@ -0,0 +1,161 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Catalog\Model\Product\ProductList;
+
+use Magento\Catalog\Model\Session as CatalogSession;
+
+/**
+ * Class ToolbarMemorizer
+ *
+ * Responds for saving toolbar settings to catalog session
+ */
+class ToolbarMemorizer
+{
+    /**
+     * @var CatalogSession
+     */
+    private $catalogSession;
+
+    /**
+     * @var Toolbar
+     */
+    private $toolbarModel;
+
+    /**
+     * @var bool
+     */
+    private $paramsMemorizeAllowed = true;
+
+    /**
+     * @var string|bool
+     */
+    private $order;
+
+    /**
+     * @var string|bool
+     */
+    private $direction;
+
+    /**
+     * @var string|bool
+     */
+    private $mode;
+
+    /**
+     * @var string|bool
+     */
+    private $limit;
+
+    /**
+     * @param Toolbar $toolbarModel
+     * @param CatalogSession $catalogSession
+     */
+    public function __construct(
+        Toolbar $toolbarModel,
+        CatalogSession $catalogSession
+    ) {
+        $this->toolbarModel = $toolbarModel;
+        $this->catalogSession = $catalogSession;
+    }
+
+    /**
+     * Get sort order
+     *
+     * @return string|bool
+     */
+    public function getOrder()
+    {
+        if ($this->order === null) {
+            $this->order = $this->toolbarModel->getOrder() ??
+                $this->catalogSession->getData(Toolbar::ORDER_PARAM_NAME);
+        }
+        return $this->order;
+    }
+
+    /**
+     * Get sort direction
+     *
+     * @return string|bool
+     */
+    public function getDirection()
+    {
+        if ($this->direction === null) {
+            $this->direction = $this->toolbarModel->getDirection() ??
+                $this->catalogSession->getData(Toolbar::DIRECTION_PARAM_NAME);
+        }
+        return $this->direction;
+    }
+
+    /**
+     * Get sort mode
+     *
+     * @return string|bool
+     */
+    public function getMode()
+    {
+        if ($this->mode === null) {
+            $this->mode = $this->toolbarModel->getMode() ??
+                $this->catalogSession->getData(Toolbar::MODE_PARAM_NAME);
+        }
+        return $this->mode;
+    }
+
+    /**
+     * Get products per page limit
+     *
+     * @return string|bool
+     */
+    public function getLimit()
+    {
+        if ($this->limit === null) {
+            $this->limit = $this->toolbarModel->getLimit() ??
+                $this->catalogSession->getData(Toolbar::LIMIT_PARAM_NAME);
+        }
+        return $this->limit;
+    }
+
+    /**
+     * Disable list state params memorizing
+     *
+     * @return $this
+     */
+    public function disableParamsMemorizing()
+    {
+        $this->paramsMemorizeAllowed = false;
+        return $this;
+    }
+
+    /**
+     * Method to save all catalog parameters in catalog session
+     *
+     * @return void
+     */
+    public function memorizeParams()
+    {
+        $this->memorizeParam(Toolbar::ORDER_PARAM_NAME, $this->getOrder())
+            ->memorizeParam(Toolbar::DIRECTION_PARAM_NAME, $this->getDirection())
+            ->memorizeParam(Toolbar::MODE_PARAM_NAME, $this->getMode())
+            ->memorizeParam(Toolbar::LIMIT_PARAM_NAME, $this->getLimit());
+    }
+
+    /**
+     * Memorize parameter value for session
+     *
+     * @param string $param parameter name
+     * @param mixed $value parameter value
+     * @return $this
+     */
+    private function memorizeParam($param, $value)
+    {
+        if ($value && $this->paramsMemorizeAllowed &&
+            !$this->catalogSession->getParamsMemorizeDisabled() &&
+            $this->catalogSession->getData($param) != $value
+        ) {
+            $this->catalogSession->setData($param, $value);
+        }
+        return $this;
+    }
+}

From 9ef1afe6ae278615c23c0deb73b9fdd5f16b1b07 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Tue, 28 Aug 2018 17:56:51 +0300
Subject: [PATCH 03/50] MAGETWO-91563: Gift wrapping selection does not display
 in shopping cart

- Used right model to observe gift wrapping options.
---
 .../GiftMessage/view/frontend/web/js/view/gift-message.js    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js b/app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js
index d025f6974f35e..4c455c83a77a9 100644
--- a/app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js
+++ b/app/code/Magento/GiftMessage/view/frontend/web/js/view/gift-message.js
@@ -31,8 +31,9 @@ define([
 
             this.itemId = this.itemId || 'orderLevel';
             model = new GiftMessage(this.itemId);
-            giftOptions.addOption(model);
             this.model = model;
+            this.isResultBlockVisible();
+            giftOptions.addOption(model);
 
             this.model.getObservable('isClear').subscribe(function (value) {
                 if (value == true) { //eslint-disable-line eqeqeq
@@ -40,8 +41,6 @@ define([
                     self.model.getObservable('alreadyAdded')(true);
                 }
             });
-
-            this.isResultBlockVisible();
         },
 
         /**

From f2e053a7d6e87252ae526049b2253566d19ee0a7 Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Tue, 28 Aug 2018 19:23:23 +0400
Subject: [PATCH 04/50] MAGETWO-67269: Gift Options set to no still show up as
 choices on front end order page

- Add automated test
---
 .../Section/StoreFrontShoppingCartSection.xml | 15 +++++
 .../CleanConfigsForGiftOptionsActionGroup.xml | 32 +++++++++++
 ...ftWrappingForOrderItemsOnlyActionGroup.xml | 32 +++++++++++
 .../Mftf/Section/AdminSalesConfigSection.xml  | 16 +++++-
 .../CheckingGiftOptionsActionGroup.xml        | 23 ++++++++
 .../Section/GiftOptionsOnFrontSection.xml     | 13 +++++
 .../StoreFrontCheckingGiftOptionsTest.xml     | 57 +++++++++++++++++++
 7 files changed, 187 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontShoppingCartSection.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/CleanConfigsForGiftOptionsActionGroup.xml
 create mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAllowGiftWrappingForOrderItemsOnlyActionGroup.xml
 create mode 100644 app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml
 create mode 100644 app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml
 create mode 100644 app/code/Magento/GiftMessage/Test/Mftf/Test/StoreFrontCheckingGiftOptionsTest.xml

diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontShoppingCartSection.xml b/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontShoppingCartSection.xml
new file mode 100644
index 0000000000000..303c5e526423f
--- /dev/null
+++ b/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontShoppingCartSection.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="StoreFrontShoppingCartSection">
+        <element name="checkoutWithMultipleAddresses" type="button" selector="//span[text()='Check Out with Multiple Addresses']"/>
+        <element name="goToShippingInformation" type="button" selector="//button[@title='Go to Shipping Information']"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/CleanConfigsForGiftOptionsActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/CleanConfigsForGiftOptionsActionGroup.xml
new file mode 100644
index 0000000000000..72d88b13736cc
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/CleanConfigsForGiftOptionsActionGroup.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CleanConfigsForGiftOptionsActionGroup">
+        <amOnPage url="{{AdminSalesConfigPage.url('')}}" stepKey="amOnSalesConfigPage"/>
+        <waitForPageLoad stepKey="waitForConfigPage" time="5"/>
+        <conditionalClick selector="{{AdminSalesConfigSection.giftOptions}}"
+                          dependentSelector="{{AdminSalesConfigSection.allowGiftWrappingForOrderItems}}" visible="false"
+                          stepKey="openGiftOptionsIfItIsClosed"/>
+        <waitForPageLoad stepKey="waitForGiftOptions" time="2"/>
+        <click stepKey="openOrderLevel" selector="{{AdminSalesConfigSection.allowGiftWrappingOnOrderLevel}}"/>
+        <click stepKey="chooseYesForOrderLevel" selector="{{AdminSalesConfigSection.levelYes}}"/>
+        <click stepKey="openOrderItems" selector="{{AdminSalesConfigSection.allowGiftWrappingForOrderItems}}"/>
+        <click stepKey="chooseYesForOrderItems" selector="{{AdminSalesConfigSection.itemsYes}}"/>
+        <click stepKey="openGiftReceipt" selector="{{AdminSalesConfigSection.allowGiftReceipt}}"/>
+        <click stepKey="chooseYesForReceipt" selector="{{AdminSalesConfigSection.receiptYes}}"/>
+        <click stepKey="openPrintedCard" selector="{{AdminSalesConfigSection.allowPrintedCard}}"/>
+        <click stepKey="chooseYesPrintedCard" selector="{{AdminSalesConfigSection.printedCardYes}}"/>
+        <click stepKey="closeGiftOptions" selector="{{AdminSalesConfigSection.giftOptions}}"/>
+        <click stepKey="save" selector="{{AdminConfigSection.saveButton}}"/>
+        <waitForPageLoad stepKey="waitForSevConfigs" time="5"/>
+        <see stepKey="seeSuccessMessage" userInput="You saved the configuration."/>
+    </actionGroup>
+</actionGroups>
+
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAllowGiftWrappingForOrderItemsOnlyActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAllowGiftWrappingForOrderItemsOnlyActionGroup.xml
new file mode 100644
index 0000000000000..8f5b491575e95
--- /dev/null
+++ b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAllowGiftWrappingForOrderItemsOnlyActionGroup.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="ConfigAllowGiftWrappingForOrderItemsOnlyActionGroup">
+        <amOnPage url="{{AdminSalesConfigPage.url('')}}" stepKey="amOnSalesConfigPage"/>
+        <waitForPageLoad stepKey="waitForConfigPage" time="5"/>
+        <scrollTo stepKey="scrollToGiftOptions" selector="{{AdminSalesConfigSection.giftOptions}}"/>
+        <conditionalClick selector="{{AdminSalesConfigSection.giftOptions}}"
+                          dependentSelector="{{AdminSalesConfigSection.allowGiftWrappingForOrderItems}}" visible="false"
+                          stepKey="openGiftOptionsIfItIsClosed"/>
+        <waitForPageLoad stepKey="waitForGiftOptions" time="2"/>
+        <click stepKey="openOrderLevel" selector="{{AdminSalesConfigSection.allowGiftWrappingOnOrderLevel}}"/>
+        <click stepKey="chooseNoForOrderLevel" selector="{{AdminSalesConfigSection.levelNo}}"/>
+        <click stepKey="openOrderItems" selector="{{AdminSalesConfigSection.allowGiftWrappingForOrderItems}}"/>
+        <click stepKey="chooseYesForOrderItems" selector="{{AdminSalesConfigSection.itemsYes}}"/>
+        <click stepKey="openGiftReceipt" selector="{{AdminSalesConfigSection.allowGiftReceipt}}"/>
+        <click stepKey="chooseNoForReceipt" selector="{{AdminSalesConfigSection.receiptNo}}"/>
+        <click stepKey="openPrintedCard" selector="{{AdminSalesConfigSection.allowPrintedCard}}"/>
+        <click stepKey="chooseNoPrintedCard" selector="{{AdminSalesConfigSection.printedCardNo}}"/>
+        <click stepKey="save" selector="{{AdminConfigSection.saveButton}}"/>
+        <waitForPageLoad stepKey="waitForSevConfigs" time="5"/>
+        <see stepKey="seeSuccessMessage" userInput="You saved the configuration."/>
+    </actionGroup>
+</actionGroups>
+
diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
index 4897e8415c1b8..aefb7c5441c5b 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
@@ -5,9 +5,23 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="AdminSalesConfigSection">
         <element name="enableMAPUseSystemValue" type="checkbox" selector="#sales_msrp_enabled_inherit"/>
         <element name="enableMAPSelect" type="select" selector="#sales_msrp_enabled"/>
+        <element name="giftOptions" type="select" selector="#sales_gift_options-head"/>
+        <element name="allowGiftWrappingOnOrderLevel" type="select" selector="#sales_gift_options_wrapping_allow_order"/>
+        <element name="levelNo" type="select" selector="//select[@id='sales_gift_options_wrapping_allow_order']//option[text()='No']"/>
+        <element name="levelYes" type="select" selector="//select[@id='sales_gift_options_wrapping_allow_order']//option[text()='Yes']"/>
+        <element name="allowGiftWrappingForOrderItems" type="select" selector="#sales_gift_options_wrapping_allow_items"/>
+        <element name="itemsNo" type="select" selector="//select[@id='sales_gift_options_wrapping_allow_items']//option[text()='No']"/>
+        <element name="itemsYes" type="select" selector="//select[@id='sales_gift_options_wrapping_allow_items']//option[text()='Yes']"/>
+        <element name="allowGiftReceipt" type="select" selector="#sales_gift_options_allow_gift_receipt"/>
+        <element name="receiptNo" type="select" selector="//select[@id='sales_gift_options_allow_gift_receipt']//option[text()='No']"/>
+        <element name="receiptYes" type="select" selector="//select[@id='sales_gift_options_allow_gift_receipt']//option[text()='Yes']"/>
+        <element name="allowPrintedCard" type="select" selector="#sales_gift_options_allow_printed_card"/>
+        <element name="printedCardNo" type="select" selector="//select[@id='sales_gift_options_allow_printed_card']//option[text()='No']"/>
+        <element name="printedCardYes" type="select" selector="//select[@id='sales_gift_options_allow_printed_card']//option[text()='Yes']"/>
+        <element name="go" type="select" selector="//a[@id='sales_gift_options-head']/ancestor::div[@class='entry-edit-head admin__collapsible-block']"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml b/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml
new file mode 100644
index 0000000000000..05dad757e287f
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="CheckingGiftOptionsActionGroup">
+        <click stepKey="clickOnCheckoutWithMultipleAddresses" selector="{{StoreFrontShoppingCartSection.checkoutWithMultipleAddresses}}"/>
+        <waitForPageLoad stepKey="waitForShipToMultipleAddresses"/>
+        <click stepKey="goToShippingInformation" selector="{{StoreFrontShoppingCartSection.goToShippingInformation}}"/>
+        <waitForPageLoad stepKey="waitForGiftOption"/>
+        <click stepKey="thickAddGiftOptions" selector="{{GiftOptionsOnFrontSection.giftOptionCheckbox}}"/>
+        <waitForPageLoad stepKey="waitForOptions"/>
+        <see stepKey="seeAddGiftOptionsForIndividualItems" userInput="Add Gift Options for Individual Items"/>
+        <dontSee stepKey="dontSeeOtherElement1" userInput="Send Gift Receipt"/>
+        <dontSee stepKey="dontSeeOtherElement2" userInput="Add Printed Card"/>
+    </actionGroup>
+</actionGroups>
+
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml b/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml
new file mode 100644
index 0000000000000..9856f009197c1
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="GiftOptionsOnFrontSection">
+        <element name="giftOptionCheckbox" type="text" selector="//span[text()='Add Gift Options']"/>
+        <element name="addGiftOptionsForIndividualItems" type="text" selector="//dt[@class='order-title individual']"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Test/StoreFrontCheckingGiftOptionsTest.xml b/app/code/Magento/GiftMessage/Test/Mftf/Test/StoreFrontCheckingGiftOptionsTest.xml
new file mode 100644
index 0000000000000..7b4bd56ae74e8
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Test/StoreFrontCheckingGiftOptionsTest.xml
@@ -0,0 +1,57 @@
+<?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="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
+    <test name="StoreFrontCheckingGiftOptionsTest">
+        <annotations>
+            <features value="Gift"/>
+            <stories value="Checking Gift Options on front end order page"/>
+            <title value="Checking Gift Options on front end order page"/>
+            <description value="Admin should be able to control gift options"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94209"/>
+            <group value="Gift"/>
+        </annotations>
+        <before>
+            <createData stepKey="category" entity="SimpleSubCategory"/>
+            <createData stepKey="product1" entity="SimpleProduct">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData stepKey="product2" entity="SimpleProduct">
+                <requiredEntity createDataKey="category"/>
+            </createData>
+            <createData entity="Simple_US_Customer" stepKey="customer"/>
+            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
+            <actionGroup ref="ConfigAllowGiftWrappingForOrderItemsOnlyActionGroup" stepKey="configureGiftOptions"/>
+            <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
+                <argument name="Customer" value="$$customer$$"/>
+            </actionGroup>
+        </before>
+
+        <amOnPage url="$$product1.name$$.html" stepKey="goToProduct1"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProduct1">
+            <argument name="productName" value="$$product1.name$$"/>
+        </actionGroup>
+        <amOnPage url="$$product2.name$$.html" stepKey="goToProduct2"/>
+        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProduct2">
+            <argument name="productName" value="$$product2.name$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
+        <actionGroup ref="CheckingGiftOptionsActionGroup" stepKey="checkGiftOptions"/>
+
+        <after>
+            <actionGroup ref="CleanConfigsForGiftOptionsActionGroup" stepKey="cleanGiftOptionsConfigs"/>
+            <deleteData stepKey="deleteCategory" createDataKey="category"/>
+            <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
+            <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
+            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
+            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+        </after>
+    </test>
+</tests>

From ea9168570ae0f2d5bcf1911b13b46b760a9cb0eb Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Fri, 31 Aug 2018 14:42:59 +0300
Subject: [PATCH 05/50] MAGETWO-91628: Bundle product price doubled when
 switching currency

- Fixed an issue with quote item options relates to a bundled products.
---
 .../Magento/Bundle/Model/Product/Type.php     |  2 +-
 .../Plugin/UpdatePriceInQuoteItemOptions.php  | 55 +++++++++++++++++++
 app/code/Magento/Bundle/etc/di.xml            |  3 +
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Bundle/Plugin/UpdatePriceInQuoteItemOptions.php

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 17ecba545efad..c5f3aa0a84995 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -735,7 +735,7 @@ protected function _prepareProduct(\Magento\Framework\DataObject $buyRequest, $p
                     $price = $product->getPriceModel()
                         ->getSelectionFinalTotalPrice($product, $selection, 0, $qty);
                     $attributes = [
-                        'price' => $this->priceCurrency->convert($price),
+                        'price' => $price,
                         'qty' => $qty,
                         'option_label' => $selection->getOption()
                             ->getTitle(),
diff --git a/app/code/Magento/Bundle/Plugin/UpdatePriceInQuoteItemOptions.php b/app/code/Magento/Bundle/Plugin/UpdatePriceInQuoteItemOptions.php
new file mode 100644
index 0000000000000..d5aafb8ad2b61
--- /dev/null
+++ b/app/code/Magento/Bundle/Plugin/UpdatePriceInQuoteItemOptions.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Bundle\Plugin;
+
+use Magento\Quote\Model\Quote\Item as OrigQuoteItem;
+use Magento\Quote\Model\Quote\Item\AbstractItem;
+use Magento\Framework\Serialize\SerializerInterface;
+
+/**
+ * Update prices stored in quote item options after calculating quote item's totals
+ */
+class UpdatePriceInQuoteItemOptions
+{
+    /**
+     * @var SerializerInterface
+     */
+    private $serializer;
+
+    /**
+     * @param SerializerInterface $serializer
+     */
+    public function __construct(SerializerInterface $serializer)
+    {
+        $this->serializer = $serializer;
+    }
+
+    /**
+     * Update price on quote item options level
+     *
+     * @param OrigQuoteItem $subject
+     * @param AbstractItem $result
+     * @return AbstractItem
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterCalcRowTotal(OrigQuoteItem $subject, AbstractItem $result)
+    {
+        $bundleAttributes = $result->getProduct()->getCustomOption('bundle_selection_attributes');
+        if ($bundleAttributes !== null) {
+            $actualPrice = $result->getPrice();
+            $parsedValue = $this->serializer->unserialize($bundleAttributes->getValue());
+            if (is_array($parsedValue) && array_key_exists('price', $parsedValue)) {
+                $parsedValue['price'] = $actualPrice;
+            }
+            $bundleAttributes->setValue($this->serializer->serialize($parsedValue));
+        }
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Bundle/etc/di.xml b/app/code/Magento/Bundle/etc/di.xml
index 733b089dccd4b..6f0cc04790cc2 100644
--- a/app/code/Magento/Bundle/etc/di.xml
+++ b/app/code/Magento/Bundle/etc/di.xml
@@ -123,6 +123,9 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Quote\Model\Quote\Item">
+        <plugin name="update_price_for_bundle_in_quote_item_option" type="Magento\Bundle\Plugin\UpdatePriceInQuoteItemOptions"/>
+    </type>
     <type name="Magento\Quote\Model\Quote\Item\ToOrderItem">
         <plugin name="append_bundle_data_to_order" type="Magento\Bundle\Model\Plugin\QuoteItem"/>
     </type>

From 38d5547049a0f2f6bf83b016b1af55961ccd753c Mon Sep 17 00:00:00 2001
From: David Grigoryan <david_grigoryan@epam.com>
Date: Tue, 4 Sep 2018 13:47:33 +0400
Subject: [PATCH 06/50] MAGETWO-67269: Gift Options set to no still show up as
 choices on front end order page

- Updated automated test
---
 .../CleanConfigsForGiftOptionsActionGroup.xml | 32 ---------------
 ...ftWrappingForOrderItemsOnlyActionGroup.xml | 32 ---------------
 .../Test/Mftf/Data/GiftOptionsData.xml        | 40 +++++++++++++++++++
 .../Test/Mftf/Metadata/gift_options-meta.xml  | 31 ++++++++++++++
 .../StoreFrontCheckingGiftOptionsTest.xml     |  6 ++-
 5 files changed, 75 insertions(+), 66 deletions(-)
 delete mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/CleanConfigsForGiftOptionsActionGroup.xml
 delete mode 100644 app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAllowGiftWrappingForOrderItemsOnlyActionGroup.xml
 create mode 100644 app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
 create mode 100644 app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml

diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/CleanConfigsForGiftOptionsActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/CleanConfigsForGiftOptionsActionGroup.xml
deleted file mode 100644
index 72d88b13736cc..0000000000000
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/CleanConfigsForGiftOptionsActionGroup.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="CleanConfigsForGiftOptionsActionGroup">
-        <amOnPage url="{{AdminSalesConfigPage.url('')}}" stepKey="amOnSalesConfigPage"/>
-        <waitForPageLoad stepKey="waitForConfigPage" time="5"/>
-        <conditionalClick selector="{{AdminSalesConfigSection.giftOptions}}"
-                          dependentSelector="{{AdminSalesConfigSection.allowGiftWrappingForOrderItems}}" visible="false"
-                          stepKey="openGiftOptionsIfItIsClosed"/>
-        <waitForPageLoad stepKey="waitForGiftOptions" time="2"/>
-        <click stepKey="openOrderLevel" selector="{{AdminSalesConfigSection.allowGiftWrappingOnOrderLevel}}"/>
-        <click stepKey="chooseYesForOrderLevel" selector="{{AdminSalesConfigSection.levelYes}}"/>
-        <click stepKey="openOrderItems" selector="{{AdminSalesConfigSection.allowGiftWrappingForOrderItems}}"/>
-        <click stepKey="chooseYesForOrderItems" selector="{{AdminSalesConfigSection.itemsYes}}"/>
-        <click stepKey="openGiftReceipt" selector="{{AdminSalesConfigSection.allowGiftReceipt}}"/>
-        <click stepKey="chooseYesForReceipt" selector="{{AdminSalesConfigSection.receiptYes}}"/>
-        <click stepKey="openPrintedCard" selector="{{AdminSalesConfigSection.allowPrintedCard}}"/>
-        <click stepKey="chooseYesPrintedCard" selector="{{AdminSalesConfigSection.printedCardYes}}"/>
-        <click stepKey="closeGiftOptions" selector="{{AdminSalesConfigSection.giftOptions}}"/>
-        <click stepKey="save" selector="{{AdminConfigSection.saveButton}}"/>
-        <waitForPageLoad stepKey="waitForSevConfigs" time="5"/>
-        <see stepKey="seeSuccessMessage" userInput="You saved the configuration."/>
-    </actionGroup>
-</actionGroups>
-
diff --git a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAllowGiftWrappingForOrderItemsOnlyActionGroup.xml b/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAllowGiftWrappingForOrderItemsOnlyActionGroup.xml
deleted file mode 100644
index 8f5b491575e95..0000000000000
--- a/app/code/Magento/Config/Test/Mftf/ActionGroup/ConfigAllowGiftWrappingForOrderItemsOnlyActionGroup.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
-    <actionGroup name="ConfigAllowGiftWrappingForOrderItemsOnlyActionGroup">
-        <amOnPage url="{{AdminSalesConfigPage.url('')}}" stepKey="amOnSalesConfigPage"/>
-        <waitForPageLoad stepKey="waitForConfigPage" time="5"/>
-        <scrollTo stepKey="scrollToGiftOptions" selector="{{AdminSalesConfigSection.giftOptions}}"/>
-        <conditionalClick selector="{{AdminSalesConfigSection.giftOptions}}"
-                          dependentSelector="{{AdminSalesConfigSection.allowGiftWrappingForOrderItems}}" visible="false"
-                          stepKey="openGiftOptionsIfItIsClosed"/>
-        <waitForPageLoad stepKey="waitForGiftOptions" time="2"/>
-        <click stepKey="openOrderLevel" selector="{{AdminSalesConfigSection.allowGiftWrappingOnOrderLevel}}"/>
-        <click stepKey="chooseNoForOrderLevel" selector="{{AdminSalesConfigSection.levelNo}}"/>
-        <click stepKey="openOrderItems" selector="{{AdminSalesConfigSection.allowGiftWrappingForOrderItems}}"/>
-        <click stepKey="chooseYesForOrderItems" selector="{{AdminSalesConfigSection.itemsYes}}"/>
-        <click stepKey="openGiftReceipt" selector="{{AdminSalesConfigSection.allowGiftReceipt}}"/>
-        <click stepKey="chooseNoForReceipt" selector="{{AdminSalesConfigSection.receiptNo}}"/>
-        <click stepKey="openPrintedCard" selector="{{AdminSalesConfigSection.allowPrintedCard}}"/>
-        <click stepKey="chooseNoPrintedCard" selector="{{AdminSalesConfigSection.printedCardNo}}"/>
-        <click stepKey="save" selector="{{AdminConfigSection.saveButton}}"/>
-        <waitForPageLoad stepKey="waitForSevConfigs" time="5"/>
-        <see stepKey="seeSuccessMessage" userInput="You saved the configuration."/>
-    </actionGroup>
-</actionGroups>
-
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml b/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
new file mode 100644
index 0000000000000..b2bc71b5b7a7b
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="ConfigAllowGiftWrappingForOrderItemsOnly" type="gift_options_config_state">
+        <requiredEntity type="wrapping_allow_order">wrappingAllowOrder</requiredEntity>
+        <requiredEntity type="allow_gift_receipt">allowGiftReceipt</requiredEntity>
+        <requiredEntity type="allow_printed_card">allowPrintedCard</requiredEntity>
+    </entity>
+    <entity name="wrappingAllowOrder" type="wrapping_allow_order">
+        <data key="value">0</data>
+    </entity>
+    <entity name="allowGiftReceipt" type="allow_gift_receipt">
+        <data key="value">0</data>
+    </entity>
+    <entity name="allowPrintedCard" type="allow_printed_card">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="DefaultConfigGiftOptions" type="gift_options_config_state">
+        <requiredEntity type="wrapping_allow_order">defaultWrappingAllowOrder</requiredEntity>
+        <requiredEntity type="allow_gift_receipt">defaultAllowGiftReceipt</requiredEntity>
+        <requiredEntity type="allow_printed_card">defaultAllowPrintedCard</requiredEntity>
+    </entity>
+    <entity name="defaultWrappingAllowOrder" type="wrapping_allow_order">
+        <data key="value">1</data>
+    </entity>
+    <entity name="defaultAllowGiftReceipt" type="allow_gift_receipt">
+        <data key="value">1</data>
+    </entity>
+    <entity name="defaultAllowPrintedCard" type="allow_printed_card">
+        <data key="value">1</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml b/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
new file mode 100644
index 0000000000000..a32f5694f2470
--- /dev/null
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
+    <operation name="SalesGiftOptionsConfigState" dataType="gift_options_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST">
+        <object key="groups" dataType="gift_options_config_state">
+            <object key="gift_options" dataType="gift_options_config_state">
+                <object key="fields" dataType="gift_options_config_state">
+                    <object key="wrapping_allow_order" dataType="wrapping_allow_order">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="wrapping_allow_items" dataType="wrapping_allow_items">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="allow_gift_receipt" dataType="allow_gift_receipt">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="allow_printed_card" dataType="allow_printed_card">
+                        <field key="value">string</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Test/StoreFrontCheckingGiftOptionsTest.xml b/app/code/Magento/GiftMessage/Test/Mftf/Test/StoreFrontCheckingGiftOptionsTest.xml
index 7b4bd56ae74e8..0bb5bf0e71fa8 100644
--- a/app/code/Magento/GiftMessage/Test/Mftf/Test/StoreFrontCheckingGiftOptionsTest.xml
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Test/StoreFrontCheckingGiftOptionsTest.xml
@@ -27,11 +27,13 @@
                 <requiredEntity createDataKey="category"/>
             </createData>
             <createData entity="Simple_US_Customer" stepKey="customer"/>
+            <createData entity="ConfigAllowGiftWrappingForOrderItemsOnly" stepKey="configAllowGiftWrappingForOrderItemsOnly"/>
+
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <actionGroup ref="ConfigAllowGiftWrappingForOrderItemsOnlyActionGroup" stepKey="configureGiftOptions"/>
             <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
                 <argument name="Customer" value="$$customer$$"/>
             </actionGroup>
+
         </before>
 
         <amOnPage url="$$product1.name$$.html" stepKey="goToProduct1"/>
@@ -46,7 +48,7 @@
         <actionGroup ref="CheckingGiftOptionsActionGroup" stepKey="checkGiftOptions"/>
 
         <after>
-            <actionGroup ref="CleanConfigsForGiftOptionsActionGroup" stepKey="cleanGiftOptionsConfigs"/>
+            <createData entity="DefaultConfigGiftOptions" stepKey="restoreDefaultConfigGiftOptions"/>
             <deleteData stepKey="deleteCategory" createDataKey="category"/>
             <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
             <deleteData stepKey="deleteProduct2" createDataKey="product2"/>

From 0ff4e4ead023aa878823bc6d28aaf74d7851b98d Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Fri, 7 Sep 2018 13:10:46 +0400
Subject: [PATCH 07/50] MAGETWO-67269: Gift Options set to no still show up as
 choices on front end order page

- Remove test from CE
---
 .../Mftf/Section/AdminSalesConfigSection.xml  | 10 ----
 .../CheckingGiftOptionsActionGroup.xml        |  8 +--
 .../Test/Mftf/Data/GiftOptionsData.xml        | 13 +---
 .../Test/Mftf/Metadata/gift_options-meta.xml  | 31 ----------
 .../StoreFrontCheckingGiftOptionsTest.xml     | 59 -------------------
 .../Mftf/Section/MultishippingSection.xml}    |  5 +-
 ...AdminShipmentAddressInformationSection.xml |  3 +-
 7 files changed, 9 insertions(+), 120 deletions(-)
 delete mode 100644 app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
 delete mode 100644 app/code/Magento/GiftMessage/Test/Mftf/Test/StoreFrontCheckingGiftOptionsTest.xml
 rename app/code/Magento/{Checkout/Test/Mftf/Section/StoreFrontShoppingCartSection.xml => Multishipping/Test/Mftf/Section/MultishippingSection.xml} (51%)

diff --git a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
index aefb7c5441c5b..95a9f75768c62 100644
--- a/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
+++ b/app/code/Magento/Config/Test/Mftf/Section/AdminSalesConfigSection.xml
@@ -10,18 +10,8 @@
         <element name="enableMAPUseSystemValue" type="checkbox" selector="#sales_msrp_enabled_inherit"/>
         <element name="enableMAPSelect" type="select" selector="#sales_msrp_enabled"/>
         <element name="giftOptions" type="select" selector="#sales_gift_options-head"/>
-        <element name="allowGiftWrappingOnOrderLevel" type="select" selector="#sales_gift_options_wrapping_allow_order"/>
-        <element name="levelNo" type="select" selector="//select[@id='sales_gift_options_wrapping_allow_order']//option[text()='No']"/>
-        <element name="levelYes" type="select" selector="//select[@id='sales_gift_options_wrapping_allow_order']//option[text()='Yes']"/>
-        <element name="allowGiftWrappingForOrderItems" type="select" selector="#sales_gift_options_wrapping_allow_items"/>
-        <element name="itemsNo" type="select" selector="//select[@id='sales_gift_options_wrapping_allow_items']//option[text()='No']"/>
-        <element name="itemsYes" type="select" selector="//select[@id='sales_gift_options_wrapping_allow_items']//option[text()='Yes']"/>
         <element name="allowGiftReceipt" type="select" selector="#sales_gift_options_allow_gift_receipt"/>
-        <element name="receiptNo" type="select" selector="//select[@id='sales_gift_options_allow_gift_receipt']//option[text()='No']"/>
-        <element name="receiptYes" type="select" selector="//select[@id='sales_gift_options_allow_gift_receipt']//option[text()='Yes']"/>
         <element name="allowPrintedCard" type="select" selector="#sales_gift_options_allow_printed_card"/>
-        <element name="printedCardNo" type="select" selector="//select[@id='sales_gift_options_allow_printed_card']//option[text()='No']"/>
-        <element name="printedCardYes" type="select" selector="//select[@id='sales_gift_options_allow_printed_card']//option[text()='Yes']"/>
         <element name="go" type="select" selector="//a[@id='sales_gift_options-head']/ancestor::div[@class='entry-edit-head admin__collapsible-block']"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml b/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml
index 05dad757e287f..f81877006c7a6 100644
--- a/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml
+++ b/app/code/Magento/GiftMessage/Test/Mftf/ActionGroup/CheckingGiftOptionsActionGroup.xml
@@ -7,11 +7,11 @@
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-              xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/actionGroupSchema.xsd">
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <actionGroup name="CheckingGiftOptionsActionGroup">
-        <click stepKey="clickOnCheckoutWithMultipleAddresses" selector="{{StoreFrontShoppingCartSection.checkoutWithMultipleAddresses}}"/>
-        <waitForPageLoad stepKey="waitForShipToMultipleAddresses"/>
-        <click stepKey="goToShippingInformation" selector="{{StoreFrontShoppingCartSection.goToShippingInformation}}"/>
+        <click stepKey="clickOnCheckoutWithMultipleAddresses" selector="{{MultishippingSection.checkoutWithMultipleAddresses}}"/>
+        <waitForPageLoad stepKey="waitForPageLoad1"/>
+        <click stepKey="goToShippingInformation" selector="{{AdminShipmentAddressInformationSection.goToShippingInformation}}"/>
         <waitForPageLoad stepKey="waitForGiftOption"/>
         <click stepKey="thickAddGiftOptions" selector="{{GiftOptionsOnFrontSection.giftOptionCheckbox}}"/>
         <waitForPageLoad stepKey="waitForOptions"/>
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml b/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
index b2bc71b5b7a7b..951bbd3b787b7 100644
--- a/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Data/GiftOptionsData.xml
@@ -7,15 +7,7 @@
 -->
 
 <entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
-    <entity name="ConfigAllowGiftWrappingForOrderItemsOnly" type="gift_options_config_state">
-        <requiredEntity type="wrapping_allow_order">wrappingAllowOrder</requiredEntity>
-        <requiredEntity type="allow_gift_receipt">allowGiftReceipt</requiredEntity>
-        <requiredEntity type="allow_printed_card">allowPrintedCard</requiredEntity>
-    </entity>
-    <entity name="wrappingAllowOrder" type="wrapping_allow_order">
-        <data key="value">0</data>
-    </entity>
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <entity name="allowGiftReceipt" type="allow_gift_receipt">
         <data key="value">0</data>
     </entity>
@@ -28,9 +20,6 @@
         <requiredEntity type="allow_gift_receipt">defaultAllowGiftReceipt</requiredEntity>
         <requiredEntity type="allow_printed_card">defaultAllowPrintedCard</requiredEntity>
     </entity>
-    <entity name="defaultWrappingAllowOrder" type="wrapping_allow_order">
-        <data key="value">1</data>
-    </entity>
     <entity name="defaultAllowGiftReceipt" type="allow_gift_receipt">
         <data key="value">1</data>
     </entity>
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml b/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
deleted file mode 100644
index a32f5694f2470..0000000000000
--- a/app/code/Magento/GiftMessage/Test/Mftf/Metadata/gift_options-meta.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
--->
-
-<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataOperation.xsd">
-    <operation name="SalesGiftOptionsConfigState" dataType="gift_options_config_state" type="create" auth="adminFormKey" url="/admin/system_config/save/section/sales/" method="POST">
-        <object key="groups" dataType="gift_options_config_state">
-            <object key="gift_options" dataType="gift_options_config_state">
-                <object key="fields" dataType="gift_options_config_state">
-                    <object key="wrapping_allow_order" dataType="wrapping_allow_order">
-                        <field key="value">string</field>
-                    </object>
-                    <object key="wrapping_allow_items" dataType="wrapping_allow_items">
-                        <field key="value">string</field>
-                    </object>
-                    <object key="allow_gift_receipt" dataType="allow_gift_receipt">
-                        <field key="value">string</field>
-                    </object>
-                    <object key="allow_printed_card" dataType="allow_printed_card">
-                        <field key="value">string</field>
-                    </object>
-                </object>
-            </object>
-        </object>
-    </operation>
-</operations>
diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Test/StoreFrontCheckingGiftOptionsTest.xml b/app/code/Magento/GiftMessage/Test/Mftf/Test/StoreFrontCheckingGiftOptionsTest.xml
deleted file mode 100644
index 0bb5bf0e71fa8..0000000000000
--- a/app/code/Magento/GiftMessage/Test/Mftf/Test/StoreFrontCheckingGiftOptionsTest.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?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="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
-    <test name="StoreFrontCheckingGiftOptionsTest">
-        <annotations>
-            <features value="Gift"/>
-            <stories value="Checking Gift Options on front end order page"/>
-            <title value="Checking Gift Options on front end order page"/>
-            <description value="Admin should be able to control gift options"/>
-            <severity value="MAJOR"/>
-            <testCaseId value="MAGETWO-94209"/>
-            <group value="Gift"/>
-        </annotations>
-        <before>
-            <createData stepKey="category" entity="SimpleSubCategory"/>
-            <createData stepKey="product1" entity="SimpleProduct">
-                <requiredEntity createDataKey="category"/>
-            </createData>
-            <createData stepKey="product2" entity="SimpleProduct">
-                <requiredEntity createDataKey="category"/>
-            </createData>
-            <createData entity="Simple_US_Customer" stepKey="customer"/>
-            <createData entity="ConfigAllowGiftWrappingForOrderItemsOnly" stepKey="configAllowGiftWrappingForOrderItemsOnly"/>
-
-            <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
-            <actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
-                <argument name="Customer" value="$$customer$$"/>
-            </actionGroup>
-
-        </before>
-
-        <amOnPage url="$$product1.name$$.html" stepKey="goToProduct1"/>
-        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProduct1">
-            <argument name="productName" value="$$product1.name$$"/>
-        </actionGroup>
-        <amOnPage url="$$product2.name$$.html" stepKey="goToProduct2"/>
-        <actionGroup ref="addToCartFromStorefrontProductPage" stepKey="addToCartFromStorefrontProduct2">
-            <argument name="productName" value="$$product2.name$$"/>
-        </actionGroup>
-        <actionGroup ref="StorefrontOpenCartFromMinicartActionGroup" stepKey="openCart"/>
-        <actionGroup ref="CheckingGiftOptionsActionGroup" stepKey="checkGiftOptions"/>
-
-        <after>
-            <createData entity="DefaultConfigGiftOptions" stepKey="restoreDefaultConfigGiftOptions"/>
-            <deleteData stepKey="deleteCategory" createDataKey="category"/>
-            <deleteData stepKey="deleteProduct1" createDataKey="product1"/>
-            <deleteData stepKey="deleteProduct2" createDataKey="product2"/>
-            <deleteData stepKey="deleteCustomer" createDataKey="customer"/>
-            <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
-        </after>
-    </test>
-</tests>
diff --git a/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontShoppingCartSection.xml b/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml
similarity index 51%
rename from app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontShoppingCartSection.xml
rename to app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml
index 303c5e526423f..e7d57af1172c6 100644
--- a/app/code/Magento/Checkout/Test/Mftf/Section/StoreFrontShoppingCartSection.xml
+++ b/app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection.xml
@@ -7,9 +7,8 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
-    <section name="StoreFrontShoppingCartSection">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <section name="MultishippingSection">
         <element name="checkoutWithMultipleAddresses" type="button" selector="//span[text()='Check Out with Multiple Addresses']"/>
-        <element name="goToShippingInformation" type="button" selector="//button[@title='Go to Shipping Information']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
index ea4dde8190bc7..10878310c262f 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
@@ -7,11 +7,12 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <section name="AdminShipmentAddressInformationSection">
         <element name="billingAddress" type="text" selector=".order-billing-address address"/>
         <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>
         <element name="shippingAddress" type="text" selector=".order-shipping-address address"/>
         <element name="shippingAddressEdit" type="button" selector=".order-shipping-address .actions a"/>
+        <element name="goToShippingInformation" type="button" selector="//button[@title='Go to Shipping Information']"/>
     </section>
 </sections>

From 10765ab93c5336dbab89c71f80a0fe14db9ca38a Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Fri, 7 Sep 2018 14:35:54 +0300
Subject: [PATCH 08/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Fixes after discussion. Added configuration to enable/disable toolbar memorizing.
---
 .../Block/Product/ProductList/Toolbar.php     | 19 ++++----
 .../Product/ProductList/ToolbarMemorizer.php  | 48 +++++++++++--------
 .../Magento/Catalog/etc/adminhtml/system.xml  |  6 +++
 app/code/Magento/Catalog/etc/config.xml       |  1 +
 4 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 0e971dcb5b9f5..e3ed8ef94b74b 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -274,7 +274,7 @@ public function getCurrentOrder()
             $order = $defaultOrder;
         }
 
-        if ($order != $defaultOrder) {
+        if ($order != $defaultOrder && $this->toolbarMemorizer->isMemorizingAllowed()) {
             $this->httpContext->setValue(ToolbarModel::ORDER_PARAM_NAME, $order, $defaultOrder);
         }
 
@@ -300,7 +300,7 @@ public function getCurrentDirection()
             $dir = $this->_direction;
         }
 
-        if ($dir != $this->_direction) {
+        if ($dir != $this->_direction && $this->toolbarMemorizer->isMemorizingAllowed()) {
             $this->httpContext->setValue(ToolbarModel::DIRECTION_PARAM_NAME, $dir, $this->_direction);
         }
 
@@ -442,7 +442,7 @@ public function getCurrentMode()
             $mode = $defaultMode;
         }
 
-        if ($mode != $defaultMode) {
+        if ($mode != $defaultMode && $this->toolbarMemorizer->isMemorizingAllowed()) {
             $this->httpContext->setValue(ToolbarModel::MODE_PARAM_NAME, $mode, $defaultMode);
         }
 
@@ -602,7 +602,7 @@ public function getLimit()
             $limit = $defaultLimit;
         }
 
-        if ($limit != $defaultLimit) {
+        if ($limit != $defaultLimit && $this->toolbarMemorizer->isMemorizingAllowed()) {
             $this->httpContext->setValue(ToolbarModel::LIMIT_PARAM_NAME, $limit, $defaultLimit);
         }
 
@@ -711,15 +711,18 @@ public function getPagerHtml()
     public function getWidgetOptionsJson(array $customOptions = [])
     {
         $defaultMode = $this->_productListHelper->getDefaultViewMode($this->getModes());
+        $defaultDirection = $this->_direction ?: ProductList::DEFAULT_SORT_DIRECTION;
+        $isMemorizingAllowed = $this->toolbarMemorizer->isMemorizingAllowed();
         $options = [
             'mode' => ToolbarModel::MODE_PARAM_NAME,
             'direction' => ToolbarModel::DIRECTION_PARAM_NAME,
             'order' => ToolbarModel::ORDER_PARAM_NAME,
             'limit' => ToolbarModel::LIMIT_PARAM_NAME,
-            'modeDefault' => $defaultMode,
-            'directionDefault' => $this->_direction ?: ProductList::DEFAULT_SORT_DIRECTION,
-            'orderDefault' => $this->getOrderField(),
-            'limitDefault' => $this->_productListHelper->getDefaultLimitPerPageValue($defaultMode),
+            'modeDefault' => $isMemorizingAllowed ? false : $defaultMode,
+            'directionDefault' => $isMemorizingAllowed ? false : $defaultDirection,
+            'orderDefault' => $isMemorizingAllowed ? false : $this->getOrderField(),
+            'limitDefault' => $isMemorizingAllowed ? false :
+                $this->_productListHelper->getDefaultLimitPerPageValue($defaultMode),
             'url' => $this->getPagerUrl(),
         ];
         $options = array_replace_recursive($options, $customOptions);
diff --git a/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php b/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
index 1ff63a0fa3448..4e65a4f9853e7 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
@@ -3,9 +3,13 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+declare(strict_types=1);
+
 namespace Magento\Catalog\Model\Product\ProductList;
 
 use Magento\Catalog\Model\Session as CatalogSession;
+use Magento\Framework\App\Config\ScopeConfigInterface;
 
 /**
  * Class ToolbarMemorizer
@@ -14,6 +18,11 @@
  */
 class ToolbarMemorizer
 {
+    /**
+     * XML PATH to enable/disable saving toolbar parameters to session
+     */
+    const XML_PATH_CATALOG_REMEMBER_PAGINATION = 'catalog/frontend/remember_pagination';
+
     /**
      * @var CatalogSession
      */
@@ -25,9 +34,9 @@ class ToolbarMemorizer
     private $toolbarModel;
 
     /**
-     * @var bool
+     * @var ScopeConfigInterface
      */
-    private $paramsMemorizeAllowed = true;
+    private $scopeConfig;
 
     /**
      * @var string|bool
@@ -52,13 +61,16 @@ class ToolbarMemorizer
     /**
      * @param Toolbar $toolbarModel
      * @param CatalogSession $catalogSession
+     * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         Toolbar $toolbarModel,
-        CatalogSession $catalogSession
+        CatalogSession $catalogSession,
+        ScopeConfigInterface $scopeConfig
     ) {
         $this->toolbarModel = $toolbarModel;
         $this->catalogSession = $catalogSession;
+        $this->scopeConfig = $scopeConfig;
     }
 
     /**
@@ -118,27 +130,28 @@ public function getLimit()
     }
 
     /**
-     * Disable list state params memorizing
+     * Method to save all catalog parameters in catalog session
      *
-     * @return $this
+     * @return void
      */
-    public function disableParamsMemorizing()
+    public function memorizeParams()
     {
-        $this->paramsMemorizeAllowed = false;
-        return $this;
+        if (!$this->catalogSession->getParamsMemorizeDisabled() && $this->isMemorizingAllowed()) {
+            $this->memorizeParam(Toolbar::ORDER_PARAM_NAME, $this->getOrder())
+                ->memorizeParam(Toolbar::DIRECTION_PARAM_NAME, $this->getDirection())
+                ->memorizeParam(Toolbar::MODE_PARAM_NAME, $this->getMode())
+                ->memorizeParam(Toolbar::LIMIT_PARAM_NAME, $this->getLimit());
+        }
     }
 
     /**
-     * Method to save all catalog parameters in catalog session
+     * Check configuration for enabled/disabled toolbar memorizing
      *
-     * @return void
+     * @return bool
      */
-    public function memorizeParams()
+    public function isMemorizingAllowed()
     {
-        $this->memorizeParam(Toolbar::ORDER_PARAM_NAME, $this->getOrder())
-            ->memorizeParam(Toolbar::DIRECTION_PARAM_NAME, $this->getDirection())
-            ->memorizeParam(Toolbar::MODE_PARAM_NAME, $this->getMode())
-            ->memorizeParam(Toolbar::LIMIT_PARAM_NAME, $this->getLimit());
+        return $this->scopeConfig->isSetFlag(self::XML_PATH_CATALOG_REMEMBER_PAGINATION);
     }
 
     /**
@@ -150,10 +163,7 @@ public function memorizeParams()
      */
     private function memorizeParam($param, $value)
     {
-        if ($value && $this->paramsMemorizeAllowed &&
-            !$this->catalogSession->getParamsMemorizeDisabled() &&
-            $this->catalogSession->getData($param) != $value
-        ) {
+        if ($value && $this->catalogSession->getData($param) != $value) {
             $this->catalogSession->setData($param, $value);
         }
         return $this;
diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
index 71a799fd22427..be35ae2e5549d 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -92,6 +92,12 @@
                     <comment>Whether to show "All" option in the "Show X Per Page" dropdown</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
+                <field id="remember_pagination" translate="label comment" type="select" sortOrder="7" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
+                    <label>Remember Category Pagination</label>
+                    <comment>Note that SEO and performance experience may be negative by this feature enabled.
+                        Also it will increase cache storage consumption.</comment>
+                    <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                </field>
             </group>
             <group id="placeholder" translate="label" sortOrder="300" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Product Image Placeholders</label>
diff --git a/app/code/Magento/Catalog/etc/config.xml b/app/code/Magento/Catalog/etc/config.xml
index 1d92197e390a1..9ede3885f9a78 100644
--- a/app/code/Magento/Catalog/etc/config.xml
+++ b/app/code/Magento/Catalog/etc/config.xml
@@ -30,6 +30,7 @@
                 <flat_catalog_category>0</flat_catalog_category>
                 <default_sort_by>position</default_sort_by>
                 <parse_url_directives>1</parse_url_directives>
+                <remember_pagination>0</remember_pagination>
             </frontend>
             <product>
                 <flat>

From 13fa0d74eb5f5fa980d56cead6729c16177e02bc Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Tue, 11 Sep 2018 11:10:13 +0300
Subject: [PATCH 09/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Add plugin to set toolbar parameters to context before controller dispatch
---
 .../Block/Product/ProductList/Toolbar.php     |  8 +-
 .../Model/App/Action/ContextPlugin.php        | 77 +++++++++++++++++++
 app/code/Magento/Catalog/etc/frontend/di.xml  |  4 +
 3 files changed, 85 insertions(+), 4 deletions(-)
 create mode 100644 app/code/Magento/Catalog/Model/App/Action/ContextPlugin.php

diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index e3ed8ef94b74b..073e3f8f6173e 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -274,7 +274,7 @@ public function getCurrentOrder()
             $order = $defaultOrder;
         }
 
-        if ($order != $defaultOrder && $this->toolbarMemorizer->isMemorizingAllowed()) {
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
             $this->httpContext->setValue(ToolbarModel::ORDER_PARAM_NAME, $order, $defaultOrder);
         }
 
@@ -300,7 +300,7 @@ public function getCurrentDirection()
             $dir = $this->_direction;
         }
 
-        if ($dir != $this->_direction && $this->toolbarMemorizer->isMemorizingAllowed()) {
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
             $this->httpContext->setValue(ToolbarModel::DIRECTION_PARAM_NAME, $dir, $this->_direction);
         }
 
@@ -442,7 +442,7 @@ public function getCurrentMode()
             $mode = $defaultMode;
         }
 
-        if ($mode != $defaultMode && $this->toolbarMemorizer->isMemorizingAllowed()) {
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
             $this->httpContext->setValue(ToolbarModel::MODE_PARAM_NAME, $mode, $defaultMode);
         }
 
@@ -602,7 +602,7 @@ public function getLimit()
             $limit = $defaultLimit;
         }
 
-        if ($limit != $defaultLimit && $this->toolbarMemorizer->isMemorizingAllowed()) {
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
             $this->httpContext->setValue(ToolbarModel::LIMIT_PARAM_NAME, $limit, $defaultLimit);
         }
 
diff --git a/app/code/Magento/Catalog/Model/App/Action/ContextPlugin.php b/app/code/Magento/Catalog/Model/App/Action/ContextPlugin.php
new file mode 100644
index 0000000000000..c5ed81540e29e
--- /dev/null
+++ b/app/code/Magento/Catalog/Model/App/Action/ContextPlugin.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+declare(strict_types=1);
+
+namespace Magento\Catalog\Model\App\Action;
+
+use Magento\Catalog\Model\Product\ProductList\Toolbar as ToolbarModel;
+use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
+use Magento\Catalog\Model\Session as CatalogSession;
+use Magento\Framework\App\Http\Context as HttpContext;
+
+/**
+ * Before dispatch plugin for all frontend controllers to update http context.
+ */
+class ContextPlugin
+{
+    /**
+     * @var ToolbarMemorizer
+     */
+    private $toolbarMemorizer;
+
+    /**
+     * @var CatalogSession
+     */
+    private $catalogSession;
+
+    /**
+     * @var HttpContext
+     */
+    private $httpContext;
+
+    /**
+     * @param ToolbarMemorizer $toolbarMemorizer
+     * @param CatalogSession $catalogSession
+     * @param HttpContext $httpContext
+     */
+    public function __construct(
+        ToolbarMemorizer $toolbarMemorizer,
+        CatalogSession $catalogSession,
+        HttpContext $httpContext
+    ) {
+        $this->toolbarMemorizer = $toolbarMemorizer;
+        $this->catalogSession = $catalogSession;
+        $this->httpContext = $httpContext;
+    }
+
+    /**
+     * Update http context with catalog sensitive information.
+     *
+     * @return void
+     */
+    public function beforeDispatch()
+    {
+        if ($this->toolbarMemorizer->isMemorizingAllowed()) {
+            $order = $this->catalogSession->getData(ToolbarModel::ORDER_PARAM_NAME);
+            if ($order) {
+                $this->httpContext->setValue(ToolbarModel::ORDER_PARAM_NAME, $order, false);
+            }
+            $direction = $this->catalogSession->getData(ToolbarModel::DIRECTION_PARAM_NAME);
+            if ($direction) {
+                $this->httpContext->setValue(ToolbarModel::DIRECTION_PARAM_NAME, $direction, false);
+            }
+            $mode = $this->catalogSession->getData(ToolbarModel::MODE_PARAM_NAME);
+            if ($mode) {
+                $this->httpContext->setValue(ToolbarModel::MODE_PARAM_NAME, $mode, false);
+            }
+            $limit = $this->catalogSession->getData(ToolbarModel::LIMIT_PARAM_NAME);
+            if ($limit) {
+                $this->httpContext->setValue(ToolbarModel::LIMIT_PARAM_NAME, $limit, false);
+            }
+        }
+    }
+}
diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml
index 55098037191e8..a1520b66e83dc 100644
--- a/app/code/Magento/Catalog/etc/frontend/di.xml
+++ b/app/code/Magento/Catalog/etc/frontend/di.xml
@@ -116,4 +116,8 @@
         <plugin name="get_catalog_category_product_index_table_name" type="Magento\Catalog\Model\Indexer\Category\Product\Plugin\TableResolver"/>
         <plugin name="get_catalog_product_price_index_table_name" type="Magento\Catalog\Model\Indexer\Product\Price\Plugin\TableResolver"/>
     </type>
+    <type name="Magento\Framework\App\Action\AbstractAction">
+        <plugin name="catalog_app_action_dispatch_controller_context_plugin"
+                type="Magento\Catalog\Model\App\Action\ContextPlugin" />
+    </type>
 </config>

From dc878446ec83d88080c81ad71ef6fc986806f173 Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Tue, 11 Sep 2018 19:41:28 +0400
Subject: [PATCH 10/50] MAGETWO-67269: Gift Options set to no still show up as
 choices on front end order page

- Add change related to xsd
---
 .../GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml b/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml
index 9856f009197c1..63243030682bf 100644
--- a/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml
+++ b/app/code/Magento/GiftMessage/Test/Mftf/Section/GiftOptionsOnFrontSection.xml
@@ -5,7 +5,7 @@
   * See COPYING.txt for license details.
   */
 -->
-<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="GiftOptionsOnFrontSection">
         <element name="giftOptionCheckbox" type="text" selector="//span[text()='Add Gift Options']"/>
         <element name="addGiftOptionsForIndividualItems" type="text" selector="//dt[@class='order-title individual']"/>

From ca7932ba5e813967018a5052a763bbe65c9abd66 Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <karen_mkhitaryan@epam.com>
Date: Fri, 7 Sep 2018 12:10:46 +0300
Subject: [PATCH 11/50] MAGETWO-67269: Gift Options set to no still show up as
 choices on front end order page

- Remove test from CE
---
 .../Mftf/Section/AdminShipmentAddressInformationSection.xml     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
index 3268a6f288371..10878310c262f 100644
--- a/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
+++ b/app/code/Magento/Shipping/Test/Mftf/Section/AdminShipmentAddressInformationSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <section name="AdminShipmentAddressInformationSection">
         <element name="billingAddress" type="text" selector=".order-billing-address address"/>
         <element name="billingAddressEdit" type="button" selector=".order-billing-address .actions a"/>

From 6d068c79b5bb8fcad3a4b18df2a394fb7beb84f6 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Tue, 11 Sep 2018 18:11:30 +0300
Subject: [PATCH 12/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Post toolbar parameters when using toolbar saving.
---
 .../Block/Product/ProductList/Toolbar.php     | 29 +++++++++----
 .../frontend/web/js/product/list/toolbar.js   | 41 ++++++++++++++++---
 2 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 073e3f8f6173e..9f1514aab9d6f 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -8,6 +8,7 @@
 use Magento\Catalog\Helper\Product\ProductList;
 use Magento\Catalog\Model\Product\ProductList\Toolbar as ToolbarModel;
 use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Product list toolbar
@@ -132,6 +133,11 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      */
     private $httpContext;
 
+    /**
+     * @var \Magento\Framework\Data\Form\FormKey
+     */
+    private $formKey;
+
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Catalog\Model\Session $catalogSession
@@ -142,6 +148,7 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
      * @param ToolbarMemorizer|null $toolbarMemorizer
      * @param \Magento\Framework\App\Http\Context|null $httpContext
+     * @param \Magento\Framework\Data\Form\FormKey|null $formKey
      * @param array $data
      */
     public function __construct(
@@ -154,6 +161,7 @@ public function __construct(
         \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
         ToolbarMemorizer $toolbarMemorizer = null,
         \Magento\Framework\App\Http\Context $httpContext = null,
+        \Magento\Framework\Data\Form\FormKey $formKey = null,
         array $data = []
     ) {
         $this->_catalogSession = $catalogSession;
@@ -162,12 +170,15 @@ public function __construct(
         $this->urlEncoder = $urlEncoder;
         $this->_productListHelper = $productListHelper;
         $this->_postDataHelper = $postDataHelper;
-        $this->toolbarMemorizer = $toolbarMemorizer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+        $this->toolbarMemorizer = $toolbarMemorizer ?: ObjectManager::getInstance()->get(
             ToolbarMemorizer::class
         );
-        $this->httpContext = $httpContext ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+        $this->httpContext = $httpContext ?: ObjectManager::getInstance()->get(
             \Magento\Framework\App\Http\Context::class
         );
+        $this->formKey = $formKey ?: ObjectManager::getInstance()->get(
+            \Magento\Framework\Data\Form\FormKey::class
+        );
         parent::__construct($context, $data);
     }
 
@@ -711,19 +722,19 @@ public function getPagerHtml()
     public function getWidgetOptionsJson(array $customOptions = [])
     {
         $defaultMode = $this->_productListHelper->getDefaultViewMode($this->getModes());
-        $defaultDirection = $this->_direction ?: ProductList::DEFAULT_SORT_DIRECTION;
-        $isMemorizingAllowed = $this->toolbarMemorizer->isMemorizingAllowed();
         $options = [
             'mode' => ToolbarModel::MODE_PARAM_NAME,
             'direction' => ToolbarModel::DIRECTION_PARAM_NAME,
             'order' => ToolbarModel::ORDER_PARAM_NAME,
             'limit' => ToolbarModel::LIMIT_PARAM_NAME,
-            'modeDefault' => $isMemorizingAllowed ? false : $defaultMode,
-            'directionDefault' => $isMemorizingAllowed ? false : $defaultDirection,
-            'orderDefault' => $isMemorizingAllowed ? false : $this->getOrderField(),
-            'limitDefault' => $isMemorizingAllowed ? false :
-                $this->_productListHelper->getDefaultLimitPerPageValue($defaultMode),
+            'modeDefault' => $defaultMode,
+            'directionDefault' => $this->_direction ?: ProductList::DEFAULT_SORT_DIRECTION,
+            'orderDefault' => $this->getOrderField(),
+            'limitDefault' => $this->_productListHelper->getDefaultLimitPerPageValue($defaultMode),
             'url' => $this->getPagerUrl(),
+            'formKey' => $this->formKey->getFormKey(),
+            'pageParam' => ToolbarModel::PAGE_PARM_NAME,
+            'post' => $this->toolbarMemorizer->isMemorizingAllowed() ? true : false
         ];
         $options = array_replace_recursive($options, $customOptions);
         return json_encode(['productListToolbarForm' => $options]);
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
index 88be03a04e71a..aee8933194ab1 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
@@ -27,7 +27,10 @@ define([
             directionDefault: 'asc',
             orderDefault: 'position',
             limitDefault: '9',
-            url: ''
+            url: '',
+            formKey: '',
+            pageParam: 'p',
+            post: false
         },
 
         /** @inheritdoc */
@@ -99,12 +102,38 @@ define([
             }
             paramData[paramName] = paramValue;
 
-            if (paramValue == defaultValue) { //eslint-disable-line eqeqeq
-                delete paramData[paramName];
-            }
-            paramData = $.param(paramData);
+            if (this.options.post) {
+                var form = document.createElement('form');
+
+                var params = [this.options.mode, this.options.direction, this.options.order, this.options.limit];
+                for (var key in paramData) {
+                    if (params.indexOf(key) !== -1) {
+                        var input = document.createElement('input');
+                        input.name = key;
+                        input.value = paramData[key];
+                        form.appendChild(input);
+                        delete paramData[key];
+                    }
+                }
+                var formKey = document.createElement('input');
+                formKey.name = 'form_key';
+                formKey.value = this.options.formKey;
+                form.appendChild(formKey);
+
+                paramData = $.param(paramData);
+                baseUrl = baseUrl + (paramData.length ? '?' + paramData : '');
 
-            location.href = baseUrl + (paramData.length ? '?' + paramData : '');
+                form.action = baseUrl;
+                form.method = 'POST';
+                document.body.appendChild(form);
+                form.submit();
+            } else {
+                if (paramValue == defaultValue) { //eslint-disable-line eqeqeq
+                    delete paramData[paramName];
+                }
+                paramData = $.param(paramData);
+                location.href = baseUrl + (paramData.length ? '?' + paramData : '');
+            }
         }
     });
 

From b2b611107a9988f69ea95db1b09dbfbfa3770c12 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Wed, 12 Sep 2018 19:20:52 +0300
Subject: [PATCH 13/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Fix tests.
---
 .../Block/Product/ProductList/Toolbar.php     |  1 -
 .../Block/Product/ProductList/ToolbarTest.php | 25 ++++++++++++++-----
 .../frontend/web/js/product/list/toolbar.js   |  1 -
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 9f1514aab9d6f..3e3f86cd7de01 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -733,7 +733,6 @@ public function getWidgetOptionsJson(array $customOptions = [])
             'limitDefault' => $this->_productListHelper->getDefaultLimitPerPageValue($defaultMode),
             'url' => $this->getPagerUrl(),
             'formKey' => $this->formKey->getFormKey(),
-            'pageParam' => ToolbarModel::PAGE_PARM_NAME,
             'post' => $this->toolbarMemorizer->isMemorizingAllowed() ? true : false
         ];
         $options = array_replace_recursive($options, $customOptions);
diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
index ac963326dbfa1..8282ffa409f9c 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
@@ -18,6 +18,11 @@ class ToolbarTest extends \PHPUnit\Framework\TestCase
      */
     protected $model;
 
+    /**
+     * @var \Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer | \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $memorizer;
+
     /**
      * @var \Magento\Framework\Url | \PHPUnit_Framework_MockObject_MockObject
      */
@@ -62,6 +67,13 @@ protected function setUp()
                 'getLimit',
                 'getCurrentPage'
             ]);
+        $this->memorizer = $this->createPartialMock(\Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer::class, [
+                'getDirection',
+                'getOrder',
+                'getMode',
+                'getLimit',
+                'isMemorizingAllowed'
+            ]);
         $this->layout = $this->createPartialMock(\Magento\Framework\View\Layout::class, ['getChildName', 'getBlock']);
         $this->pagerBlock = $this->createPartialMock(\Magento\Theme\Block\Html\Pager::class, [
                 'setUseContainer',
@@ -116,6 +128,7 @@ protected function setUp()
                 'context' => $context,
                 'catalogConfig' => $this->catalogConfig,
                 'toolbarModel' => $this->model,
+                'toolbarMemorizer' => $this->memorizer,
                 'urlEncoder' => $this->urlEncoder,
                 'productListHelper' => $this->productListHelper
             ]
@@ -155,7 +168,7 @@ public function testGetPagerEncodedUrl()
     public function testGetCurrentOrder()
     {
         $order = 'price';
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getOrder')
             ->will($this->returnValue($order));
         $this->catalogConfig->expects($this->once())
@@ -169,7 +182,7 @@ public function testGetCurrentDirection()
     {
         $direction = 'desc';
 
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getDirection')
             ->will($this->returnValue($direction));
 
@@ -183,7 +196,7 @@ public function testGetCurrentMode()
         $this->productListHelper->expects($this->once())
             ->method('getAvailableViewMode')
             ->will($this->returnValue(['list' => 'List']));
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getMode')
             ->will($this->returnValue($mode));
 
@@ -232,11 +245,11 @@ public function testGetLimit()
         $mode = 'list';
         $limit = 10;
 
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getMode')
             ->will($this->returnValue($mode));
 
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getLimit')
             ->will($this->returnValue($limit));
         $this->productListHelper->expects($this->once())
@@ -266,7 +279,7 @@ public function testGetPagerHtml()
         $this->productListHelper->expects($this->exactly(2))
             ->method('getAvailableLimit')
             ->will($this->returnValue([10 => 10, 20 => 20]));
-        $this->model->expects($this->once())
+        $this->memorizer->expects($this->once())
             ->method('getLimit')
             ->will($this->returnValue($limit));
         $this->pagerBlock->expects($this->once())
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
index aee8933194ab1..7c47f5bd04d5a 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
@@ -29,7 +29,6 @@ define([
             limitDefault: '9',
             url: '',
             formKey: '',
-            pageParam: 'p',
             post: false
         },
 

From 00cb15e4f59e6a71dd51b08b3553633eebfebeaf Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Fri, 14 Sep 2018 09:14:40 +0300
Subject: [PATCH 14/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Fix bug when memorizing getting disabled after we have params in session already.
---
 .../Product/ProductList/ToolbarMemorizer.php   | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php b/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
index 4e65a4f9853e7..9c1a781d594f7 100644
--- a/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
+++ b/app/code/Magento/Catalog/Model/Product/ProductList/ToolbarMemorizer.php
@@ -58,6 +58,11 @@ class ToolbarMemorizer
      */
     private $limit;
 
+    /**
+     * @var bool
+     */
+    private $isMemorizingAllowed;
+
     /**
      * @param Toolbar $toolbarModel
      * @param CatalogSession $catalogSession
@@ -82,7 +87,7 @@ public function getOrder()
     {
         if ($this->order === null) {
             $this->order = $this->toolbarModel->getOrder() ??
-                $this->catalogSession->getData(Toolbar::ORDER_PARAM_NAME);
+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::ORDER_PARAM_NAME) : null);
         }
         return $this->order;
     }
@@ -96,7 +101,7 @@ public function getDirection()
     {
         if ($this->direction === null) {
             $this->direction = $this->toolbarModel->getDirection() ??
-                $this->catalogSession->getData(Toolbar::DIRECTION_PARAM_NAME);
+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::DIRECTION_PARAM_NAME) : null);
         }
         return $this->direction;
     }
@@ -110,7 +115,7 @@ public function getMode()
     {
         if ($this->mode === null) {
             $this->mode = $this->toolbarModel->getMode() ??
-                $this->catalogSession->getData(Toolbar::MODE_PARAM_NAME);
+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::MODE_PARAM_NAME) : null);
         }
         return $this->mode;
     }
@@ -124,7 +129,7 @@ public function getLimit()
     {
         if ($this->limit === null) {
             $this->limit = $this->toolbarModel->getLimit() ??
-                $this->catalogSession->getData(Toolbar::LIMIT_PARAM_NAME);
+                ($this->isMemorizingAllowed() ? $this->catalogSession->getData(Toolbar::LIMIT_PARAM_NAME) : null);
         }
         return $this->limit;
     }
@@ -151,7 +156,10 @@ public function memorizeParams()
      */
     public function isMemorizingAllowed()
     {
-        return $this->scopeConfig->isSetFlag(self::XML_PATH_CATALOG_REMEMBER_PAGINATION);
+        if ($this->isMemorizingAllowed === null) {
+            $this->isMemorizingAllowed = $this->scopeConfig->isSetFlag(self::XML_PATH_CATALOG_REMEMBER_PAGINATION);
+        }
+        return $this->isMemorizingAllowed;
     }
 
     /**

From 57fe7c19716fbc248fb7679063f2c4cd6281b7e6 Mon Sep 17 00:00:00 2001
From: "Hakobyan, Lusine" <Lusine_Hakobyan@epam.com>
Date: Mon, 17 Sep 2018 17:24:41 +0400
Subject: [PATCH 15/50] MAGETWO-91704: Can't cancel/change payment method after
 chosen Store Credit

- Add locator for automated test
---
 .../Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
index e4d329bc85057..8aaf626edab33 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
@@ -9,9 +9,10 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormPaymentSection">
+        <element name="useCustomerBalance" type="checkbox" selector="#p_method_use_customerbalance"/>
         <element name="header" type="text" selector="#order-methods span.title"/>
         <element name="getShippingMethods" type="text" selector="#order-shipping_method a.action-default" timeout="30"/>
         <element name="flatRateOption" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>
         <element name="shippingError" type="text" selector="#order[has_shipping]-error"/>
     </section>
-</sections>
\ No newline at end of file
+</sections>

From 02ab61cc1a9ac377aca9d7b2d488fcd2a3858da6 Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Sat, 15 Sep 2018 13:32:00 +0300
Subject: [PATCH 16/50] MAGETWO-59265: Import doesn't allow to set default
 value per store view (dropdown fields)

- Changed logic of setting default value of attributes type "select"
---
 .../Model/Import/Product/Type/AbstractType.php   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index afd018f077d20..8b04b7ec3532f 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -195,6 +195,8 @@ public function __construct(
     }
 
     /**
+     * Initialize template for error message.
+     *
      * @param array $templateCollection
      * @return $this
      */
@@ -377,6 +379,8 @@ public function retrieveAttributeFromCache($attributeCode)
     }
 
     /**
+     * Adding attribute option.
+     *
      * In case we've dynamically added new attribute option during import we need to add it to our cache
      * in order to keep it up to date.
      *
@@ -508,8 +512,10 @@ public function isSuitable()
     }
 
     /**
-     * Prepare attributes values for save: exclude non-existent, static or with empty values attributes;
-     * set default values if needed
+     * Adding default attribute to product before save.
+     *
+     * Prepare attributes values for save: exclude non-existent, static or with empty values attributes,
+     * set default values if needed.
      *
      * @param array $rowData
      * @param bool $withDefaultValue
@@ -539,7 +545,8 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
                 }
             } elseif (array_key_exists($attrCode, $rowData)) {
                 $resultAttrs[$attrCode] = $rowData[$attrCode];
-            } elseif ($withDefaultValue && null !== $attrParams['default_value']) {
+            } elseif ($withDefaultValue && null !== $attrParams['default_value']
+                && 'select' == $attrParams['type'] && null === $rowData['_store']) {
                 $resultAttrs[$attrCode] = $attrParams['default_value'];
             }
         }
@@ -611,7 +618,8 @@ protected function getProductEntityLinkField()
     }
 
     /**
-     * Clean cached values
+     * Clean cached values.
+     *
      * @since 100.2.0
      */
     public function __destruct()

From 1b9ae1174da8a34ac898ea2bc69cfa39f75eb252 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Tue, 18 Sep 2018 15:32:37 +0300
Subject: [PATCH 17/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Fixes according to code review.
---
 .../Block/Product/ProductList/Toolbar.php     |  2 ++
 .../Framework}/App/Action/ContextPlugin.php   | 28 ++++++++-----------
 .../Magento/Catalog/etc/adminhtml/system.xml  |  3 +-
 app/code/Magento/Catalog/etc/frontend/di.xml  |  2 +-
 4 files changed, 16 insertions(+), 19 deletions(-)
 rename app/code/Magento/Catalog/{Model => Plugin/Framework}/App/Action/ContextPlugin.php (60%)

diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 3e3f86cd7de01..12c691d1365c3 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -150,6 +150,8 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\App\Http\Context|null $httpContext
      * @param \Magento\Framework\Data\Form\FormKey|null $formKey
      * @param array $data
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Framework\View\Element\Template\Context $context,
diff --git a/app/code/Magento/Catalog/Model/App/Action/ContextPlugin.php b/app/code/Magento/Catalog/Plugin/Framework/App/Action/ContextPlugin.php
similarity index 60%
rename from app/code/Magento/Catalog/Model/App/Action/ContextPlugin.php
rename to app/code/Magento/Catalog/Plugin/Framework/App/Action/ContextPlugin.php
index c5ed81540e29e..6add542b15554 100644
--- a/app/code/Magento/Catalog/Model/App/Action/ContextPlugin.php
+++ b/app/code/Magento/Catalog/Plugin/Framework/App/Action/ContextPlugin.php
@@ -6,7 +6,7 @@
 
 declare(strict_types=1);
 
-namespace Magento\Catalog\Model\App\Action;
+namespace Magento\Catalog\Plugin\Framework\App\Action;
 
 use Magento\Catalog\Model\Product\ProductList\Toolbar as ToolbarModel;
 use Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer;
@@ -56,21 +56,17 @@ public function __construct(
     public function beforeDispatch()
     {
         if ($this->toolbarMemorizer->isMemorizingAllowed()) {
-            $order = $this->catalogSession->getData(ToolbarModel::ORDER_PARAM_NAME);
-            if ($order) {
-                $this->httpContext->setValue(ToolbarModel::ORDER_PARAM_NAME, $order, false);
-            }
-            $direction = $this->catalogSession->getData(ToolbarModel::DIRECTION_PARAM_NAME);
-            if ($direction) {
-                $this->httpContext->setValue(ToolbarModel::DIRECTION_PARAM_NAME, $direction, false);
-            }
-            $mode = $this->catalogSession->getData(ToolbarModel::MODE_PARAM_NAME);
-            if ($mode) {
-                $this->httpContext->setValue(ToolbarModel::MODE_PARAM_NAME, $mode, false);
-            }
-            $limit = $this->catalogSession->getData(ToolbarModel::LIMIT_PARAM_NAME);
-            if ($limit) {
-                $this->httpContext->setValue(ToolbarModel::LIMIT_PARAM_NAME, $limit, false);
+            $params = [
+                ToolbarModel::ORDER_PARAM_NAME,
+                ToolbarModel::DIRECTION_PARAM_NAME,
+                ToolbarModel::MODE_PARAM_NAME,
+                ToolbarModel::LIMIT_PARAM_NAME
+            ];
+            foreach ($params as $param) {
+                $paramValue = $this->catalogSession->getData($param);
+                if ($paramValue) {
+                    $this->httpContext->setValue($param, $paramValue, false);
+                }
             }
         }
     }
diff --git a/app/code/Magento/Catalog/etc/adminhtml/system.xml b/app/code/Magento/Catalog/etc/adminhtml/system.xml
index be35ae2e5549d..adfe4c735201c 100644
--- a/app/code/Magento/Catalog/etc/adminhtml/system.xml
+++ b/app/code/Magento/Catalog/etc/adminhtml/system.xml
@@ -94,8 +94,7 @@
                 </field>
                 <field id="remember_pagination" translate="label comment" type="select" sortOrder="7" showInDefault="1" showInWebsite="0" showInStore="0" canRestore="1">
                     <label>Remember Category Pagination</label>
-                    <comment>Note that SEO and performance experience may be negative by this feature enabled.
-                        Also it will increase cache storage consumption.</comment>
+                    <comment>Changing may affect SEO and cache storage consumption.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
diff --git a/app/code/Magento/Catalog/etc/frontend/di.xml b/app/code/Magento/Catalog/etc/frontend/di.xml
index a1520b66e83dc..ee9c5b29da894 100644
--- a/app/code/Magento/Catalog/etc/frontend/di.xml
+++ b/app/code/Magento/Catalog/etc/frontend/di.xml
@@ -118,6 +118,6 @@
     </type>
     <type name="Magento\Framework\App\Action\AbstractAction">
         <plugin name="catalog_app_action_dispatch_controller_context_plugin"
-                type="Magento\Catalog\Model\App\Action\ContextPlugin" />
+                type="Magento\Catalog\Plugin\Framework\App\Action\ContextPlugin" />
     </type>
 </config>

From 0c7edc5a71a02bcc6df929ac0d0f7518b18a376b Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Tue, 18 Sep 2018 20:35:30 +0400
Subject: [PATCH 18/50] MAGETWO-91617: Ordered Products Report Error for
 restricted scope admin

- Add some helpers for automated test
---
 .../ActionGroup/AdminProductActionGroup.xml   | 17 +++++++-
 ...omerWithWebsiteAndStoreViewActionGroup.xml | 43 +++++++++++++++++++
 .../AdminDeleteCustomerActionGroup.xml        | 23 ++++++++++
 .../Customer/Test/Mftf/Data/AddressData.xml   |  1 +
 ...AdminCustomerAccountInformationSection.xml |  1 +
 .../Section/AdminCustomerAddressesSection.xml | 24 +++++++++++
 .../AdminCustomerGridMainActionsSection.xml   |  2 +
 .../AdminReviewOrderActionGroup.xml           | 24 +++++++++++
 .../Mftf/Section/OrderedProductsSection.xml   | 17 ++++++++
 .../ActionGroup/AdminOrderActionGroup.xml     | 24 +++++++++++
 .../AdminInvoicePaymentShippingSection.xml    |  2 +
 .../AdminOrderStoreScopeTreeSection.xml       |  1 +
 .../Mftf/Section/AdminOrdersGridSection.xml   |  2 +
 .../Test/Mftf/Section/OrdersGridSection.xml   |  3 +-
 .../Store/Test/Mftf/Data/StoreData.xml        | 12 ++++++
 .../AdminCreateUserActionGroup.xml            | 23 ++++++++++
 .../AdminDeleteCreatedUserActionGroup.xml     | 23 ++++++++++
 17 files changed, 240 insertions(+), 2 deletions(-)
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml
 create mode 100644 app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.xml
 create mode 100644 app/code/Magento/Reports/Test/Mftf/Section/OrderedProductsSection.xml
 create mode 100644 app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
index 9f8d827b20849..91141a573cf5b 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductActionGroup.xml
@@ -276,5 +276,20 @@
         <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="acceptStoreSwitchingMessage"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
-
+    <actionGroup name="CreatedProductConnectToWebsite">
+        <arguments>
+            <argument name="website"/>
+            <argument name="product"/>
+        </arguments>
+        <amOnPage url="{{AdminCatalogProductPage.url}}" stepKey="navigateToProductPage"/>
+        <waitForPageLoad stepKey="waitForProductsList"/>
+        <click stepKey="openProduct" selector="{{AdminProductGridActionSection.productName(product.name)}}"/>
+        <waitForPageLoad stepKey="waitForProductPage"/>
+        <scrollTo selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="ScrollToWebsites"/>
+        <click selector="{{ProductInWebsitesSection.sectionHeader}}" stepKey="openWebsitesList"/>
+        <waitForPageLoad stepKey="waitForWebsitesList"/>
+        <click selector="{{ProductInWebsitesSection.website(website.name)}}" stepKey="SelectWebsite"/>
+        <click selector="{{AdminProductFormAdvancedPricingSection.save}}" stepKey="clickSaveProduct"/>
+        <waitForPageLoad stepKey="waitForSave"/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
new file mode 100644
index 0000000000000..0071acf2ef1e0
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCreateCustomerWithWebsiteAndStoreViewActionGroup.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminCreateCustomerWithWebsiteAndStoreViewActionGroup">
+        <arguments>
+            <argument name="customerData"/>
+            <argument name="address"/>
+            <argument name="website" type="string"/>
+            <argument name="storeView" type="string"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="goToCustomersPage"/>
+        <click stepKey="addNewCustomer" selector="{{AdminCustomerGridMainActionsSection.addNewCustomer}}"/>
+        <selectOption stepKey="selectWebSite" selector="{{AdminCustomerAccountInformationSection.associateToWebsite}}" userInput="{{website}}"/>
+        <fillField stepKey="FillFirstName" selector="{{AdminCustomerAccountInformationSection.firstName}}" userInput="{{customerData.firstname}}"/>
+        <fillField stepKey="FillLastName" selector="{{AdminCustomerAccountInformationSection.lastName}}" userInput="{{customerData.lastname}}"/>
+        <fillField stepKey="FillEmail" selector="{{AdminCustomerAccountInformationSection.email}}" userInput="{{customerData.email}}"/>
+        <selectOption stepKey="selectStoreView" selector="{{AdminCustomerAccountInformationSection.storeView}}" userInput="{{storeView}}"/>
+        <scrollToTopOfPage stepKey="scrollToTopOfThePage"/>
+        <click stepKey="goToAddresses" selector="{{AdminCustomerAccountInformationSection.addressesButton}}"/>
+        <waitForPageLoad stepKey="waitForAddresses"/>
+        <click stepKey="clickOnAddNewAddress" selector="{{AdminCustomerAddressesSection.addNewAddress}}"/>
+        <waitForPageLoad stepKey="waitForAddressFields"/>
+        <click stepKey="thickBillingAddress" selector="{{AdminCustomerAddressesSection.defaultBillingAddress}}"/>
+        <click stepKey="thickShippingAddress" selector="{{AdminCustomerAddressesSection.defaultShippingAddress}}"/>
+        <fillField stepKey="fillFirstNameForAddress" selector="{{AdminCustomerAddressesSection.firstNameForAddress}}" userInput="{{address.firstname}}"/>
+        <fillField stepKey="fillLastNameForAddress" selector="{{AdminCustomerAddressesSection.lastNameForAddress}}" userInput="{{address.lastname}}"/>
+        <fillField stepKey="fillStreetAddress" selector="{{AdminCustomerAddressesSection.streetAddress}}" userInput="{{address.street[0]}}"/>
+        <fillField stepKey="fillCity" selector="{{AdminCustomerAddressesSection.city}}" userInput="{{address.city}}"/>
+        <selectOption stepKey="selectCountry" selector="{{AdminCustomerAddressesSection.country}}" userInput="{{address.country}}"/>
+        <selectOption stepKey="selectState" selector="{{AdminCustomerAddressesSection.state}}" userInput="{{address.state}}"/>
+        <fillField stepKey="fillZip" selector="{{AdminCustomerAddressesSection.zip}}" userInput="{{address.postcode}}"/>
+        <fillField stepKey="fillPhoneNumber" selector="{{AdminCustomerAddressesSection.phoneNumber}}" userInput="{{address.telephone}}"/>
+        <click stepKey="save" selector="{{AdminCustomerAccountInformationSection.saveCustomer}}"/>
+        <waitForPageLoad stepKey="waitForCustomersPage"/>
+        <see stepKey="seeSuccessMessage" userInput="You saved the customer."/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml
new file mode 100644
index 0000000000000..68f6b49e80996
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminDeleteCustomerActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteCustomerActionGroup">
+        <arguments>
+            <argument name="customerEmail"/>
+        </arguments>
+        <amOnPage url="{{AdminCustomerPage.url}}" stepKey="navigateToCustomersPage"/>
+        <click stepKey="chooseCustomer" selector="{{AdminCustomerGridMainActionsSection.customerCheckbox(customerEmail)}}"/>
+        <click stepKey="openActions" selector="{{AdminCustomerGridMainActionsSection.actions}}"/>
+        <waitForPageLoad stepKey="waitActions"/>
+        <click stepKey="delete" selector="{{AdminCustomerGridMainActionsSection.delete}}"/>
+        <waitForPageLoad stepKey="waitForConfirmationAlert"/>
+        <click stepKey="accept" selector="{{AdminCustomerGridMainActionsSection.ok}}"/>
+        <see stepKey="seeSuccessMessage" userInput="were deleted."/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
index d090620145105..033add209a4c2 100755
--- a/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml
@@ -65,6 +65,7 @@
         <data key="default_billing">Yes</data>
         <data key="default_shipping">Yes</data>
         <requiredEntity type="region">RegionNY</requiredEntity>
+        <data key="country">United States</data>
     </entity>
     <entity name="US_Address_CA" type="address">
         <data key="firstname">John</data>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
index 32746a66621eb..8510fd385f92b 100644
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAccountInformationSection.xml
@@ -11,6 +11,7 @@
     <section name="AdminCustomerAccountInformationSection">
         <element name="accountInformationTitle" type="text" selector=".admin__page-nav-title"/>
         <element name="accountInformationButton" type="text" selector="//a/span[text()='Account Information']"/>
+        <element name="addressesButton" type="select" selector="//a//span[contains(text(), 'Addresses')]"/>
         <element name="firstName" type="input" selector="input[name='customer[firstname]']"/>
         <element name="lastName" type="input" selector="input[name='customer[lastname]']"/>
         <element name="email" type="input" selector="input[name='customer[email]']"/>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
new file mode 100644
index 0000000000000..175c7ab573d37
--- /dev/null
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerAddressesSection.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminCustomerAddressesSection">
+        <element name="addNewAddress" type="button" selector="//span[text()='Add New Addresses']"/>
+        <element name="defaultBillingAddress" type="button" selector="//label[text()='Default Billing Address']"/>
+        <element name="defaultShippingAddress" type="button" selector="//label[text()='Default Shipping Address']"/>
+        <element name="firstNameForAddress" type="button" selector="//input[contains(@name, 'address')][contains(@name, 'firstname')]"/>
+        <element name="lastNameForAddress" type="button" selector="//input[contains(@name, 'address')][contains(@name, 'lastname')]"/>
+        <element name="streetAddress" type="button" selector="//input[contains(@name, 'street')]"/>
+        <element name="city" type="input" selector="//input[contains(@name, 'city')]"/>
+        <element name="country" type="select" selector="//select[contains(@name, 'country_id')]"/>
+        <element name="state" type="select" selector="//select[contains(@name, 'address[new_0][region_id]')]"/>
+        <element name="zip" type="input" selector="//input[contains(@name, 'postcode')]"/>
+        <element name="phoneNumber" type="input" selector="//input[contains(@name, 'telephone')]"/>
+    </section>
+</sections>
diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
index 1f0c4b4998a9f..d644b581088bc 100755
--- a/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
+++ b/app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerGridMainActionsSection.xml
@@ -13,5 +13,7 @@
         <element name="multicheck" type="checkbox" selector="#container>div>div.admin__data-grid-wrap>table>thead>tr>th.data-grid-multicheck-cell>div>label"/>
         <element name="delete" type="button" selector="//*[contains(@class, 'admin__data-grid-header')]//span[contains(@class,'action-menu-item') and text()='Delete']"/>
         <element name="actions" type="text" selector=".action-select"/>
+        <element name="customerCheckbox" type="button" selector="//*[contains(text(),'{{arg}}')]/parent::td/preceding-sibling::td/label[@class='data-grid-checkbox-cell-inner']//input" parameterized="true"/>
+        <element name="ok" type="button" selector="//button[@data-role='action']//span[text()='OK']"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.xml b/app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.xml
new file mode 100644
index 0000000000000..003a5e6655f34
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/ActionGroup/AdminReviewOrderActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminReviewOrderActionGroup">
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+        <click stepKey="openReports" selector="{{OrderedProductsSection.reports}}"/>
+        <waitForPageLoad stepKey="waitForReports" time="5"/>
+        <click stepKey="openOrdered" selector="{{OrderedProductsSection.ordered}}"/>
+        <waitForPageLoad stepKey="waitForOrdersPage" time="5"/>
+        <click stepKey="refresh" selector="{{OrderedProductsSection.refresh}}"/>
+        <waitForPageLoad stepKey="waitForOrderList" time="5"/>
+        <scrollTo stepKey="scrollTo" selector="{{OrderedProductsSection.total}}"/>
+        <see stepKey="seeOrder" userInput="{{productName}}"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Reports/Test/Mftf/Section/OrderedProductsSection.xml b/app/code/Magento/Reports/Test/Mftf/Section/OrderedProductsSection.xml
new file mode 100644
index 0000000000000..89e8497dddcea
--- /dev/null
+++ b/app/code/Magento/Reports/Test/Mftf/Section/OrderedProductsSection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="OrderedProductsSection">
+        <element name="reports" type="button" selector="//li[@data-ui-id='menu-magento-reports-report']"/>
+        <element name="ordered" type="button" selector="//li[@data-ui-id='menu-magento-reports-report-products-sold']"/>
+        <element name="refresh" type="button" selector="//button[@title='Refresh']" timeout="30"/>
+        <element name="total" type="text" selector="//tfoot//th[contains(text(), 'Total')]"/>
+    </section>
+</sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index c82623632d782..ffa6a2a5f2d99 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -268,4 +268,28 @@
         <see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
         <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
     </actionGroup>
+
+    <actionGroup name="CreateOrderInStoreActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="customer"/>
+            <argument name="storeView"/>
+        </arguments>
+        <amOnPage stepKey="navigateToNewOrderPage" url="{{AdminOrderCreatePage.url}}"/>
+        <click stepKey="chooseCustomer" selector="{{AdminOrdersGridSection.customerInOrdersSection(customer.firstname)}}"/>
+        <waitForPageLoad stepKey="waitForStoresPageOpened"/>
+        <click stepKey="chooseStore" selector="{{AdminOrderStoreScopeTreeSection.storeForOrder(storeView.name)}}"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click selector="{{OrdersGridSection.addProducts}}" stepKey="clickOnAddProducts"/>
+        <waitForPageLoad stepKey="waitForProductsListForOrder"/>
+        <click selector="{{AdminOrdersGridSection.productForOrder(product.sku)}}" stepKey="chooseTheProduct"/>
+        <click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="addSelectedProductToOrder"/>
+        <waitForPageLoad stepKey="waitForProductAddedInOrder"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.getShippingMethodAndRates}}" stepKey="openShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethods"/>
+        <click selector="{{AdminInvoicePaymentShippingSection.shippingMethod}}" stepKey="chooseShippingMethod"/>
+        <waitForPageLoad stepKey="waitForShippingMethodsThickened"/>
+        <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
+        <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
index 918a8e814b555..8d7c64733972e 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminInvoicePaymentShippingSection.xml
@@ -15,5 +15,7 @@
         <element name="ShippingMethod" type="text" selector=".order-shipping-address .shipping-description-title"/>
         <element name="ShippingPrice" type="text" selector=".order-shipping-address .shipping-description-content .price"/>
         <element name="CreateShipment" type="checkbox" selector=".order-shipping-address input[name='invoice[do_shipment]']"/>
+        <element name="getShippingMethodAndRates" type="button" selector="//span[text()='Get shipping methods and rates']"/>
+        <element name="shippingMethod" type="button" selector="//label[contains(text(), 'Fixed')]"/>
     </section>
 </sections>
\ No newline at end of file
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
index 050e1ba8b2df4..cbe17499319f9 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderStoreScopeTreeSection.xml
@@ -11,5 +11,6 @@
     <section name="AdminOrderStoreScopeTreeSection">
         <element name="storeTree" type="text" selector="div.tree-store-scope"/>
         <element name="storeOption" type="radio" selector="//div[contains(@class, 'tree-store-scope')]//label[contains(text(), '{{name}}')]/preceding-sibling::input" parameterized="true" timeout="30"/>
+        <element name="storeForOrder" type="radio" selector="//div[contains(@class, 'tree-store-scope')]//label[contains(text(), '{{arg}}')]" parameterized="true" timeout="30"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
index 7ece18fb863b7..53a6cbffcdac6 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrdersGridSection.xml
@@ -29,5 +29,7 @@
         <element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
         <element name="columnsDropdown" type="button" selector="div.admin__data-grid-action-columns button" timeout="30"/>
         <element name="viewColumnCheckbox" type="checkbox" selector="//div[contains(@class,'admin__data-grid-action-columns')]//div[contains(@class, 'admin__field-option')]//label[text() = '{{column}}']/preceding-sibling::input" parameterized="true"/>
+        <element name="customerInOrdersSection" type="button" selector="(//td[contains(text(),'{{customer}}')])[1]" parameterized="true"/>
+        <element name="productForOrder" type="button" selector="//td[contains(text(),'{{var}}')]" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
index 8d99bf4872d0a..717022322698f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/OrdersGridSection.xml
@@ -18,7 +18,7 @@
         <element name="createNewOrder" type="button" selector="button[title='Create New Order'"/>
 
         <element name="website" type="radio" selector="//label[contains(text(), '{{arg}}')]" parameterized="true"/>
-        <element name="addProducts" type="button" selector="//span[text()='Add Products']"/>
+        <element name="addProducts" type="button" selector="#add_products"/>
         <element name="selectProduct" type="checkbox" selector="//td[contains(text(), '{{arg}}')]/following-sibling::td[contains(@class, 'col-select col-in_products')]" parameterized="true"/>
         <element name="setQuantity" type="checkbox" selector="//td[contains(text(), '{{arg}}')]/following-sibling::td[contains(@class, 'col-qty')]/input" parameterized="true"/>
         <element name="addProductsToOrder" type="button" selector="//span[text()='Add Selected Product(s) to Order']"/>
@@ -29,5 +29,6 @@
         <element name="productPrice" type="text" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td[@class='col-price col-row-subtotal']/span" parameterized="true"/>
         <element name="removeItems" type="select" selector="//span[text()='{{arg}}']/parent::td/following-sibling::td/select[@class='admin__control-select']" parameterized="true"/>
         <element name="applyCoupon" type="input" selector="#coupons:code"/>
+        <element name="submitOrder" type="button" selector="#submit_order_top_button"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
index 2bff20e05435a..b0f04dbe703a9 100644
--- a/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
+++ b/app/code/Magento/Store/Test/Mftf/Data/StoreData.xml
@@ -49,4 +49,16 @@
         <data key="store_type">store</data>
         <requiredEntity type="storeGroup">customStoreGroup</requiredEntity>
     </entity>
+    <entity name="NewStoreData" type="store">
+        <data key="name" unique="suffix">Store</data>
+        <data key="code" unique="suffix">StoreCode</data>
+    </entity>
+    <entity name="NewWebSiteData" type="webSite">
+        <data key="name" unique="suffix">WebSite</data>
+        <data key="code" unique="suffix">WebSiteCode</data>
+    </entity>
+    <entity name="NewStoreViewData">
+        <data key="name" unique="suffix">StoreView</data>
+        <data key="code" unique="suffix">StoreViewCode</data>
+    </entity>
 </entities>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
index de887d2de6704..9a0fa4a205799 100644
--- a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminCreateUserActionGroup.xml
@@ -31,4 +31,27 @@
         <waitForPageLoad stepKey="waitForPageLoad2" />
         <see userInput="You saved the user." stepKey="seeSuccessMessage" />
     </actionGroup>
+
+    <!--Create new user with role-->
+    <actionGroup name="AdminCreateUserWithRoleActionGroup">
+        <arguments>
+            <argument name="role"/>
+            <argument name="user" defaultValue="newAdmin"/>
+        </arguments>
+        <amOnPage url="{{AdminEditUserPage.url}}" stepKey="navigateToNewUser"/>
+        <waitForPageLoad stepKey="waitForUsersPage" />
+        <fillField selector="{{AdminCreateUserSection.usernameTextField}}" userInput="{{user.username}}" stepKey="enterUserName" />
+        <fillField selector="{{AdminCreateUserSection.firstNameTextField}}" userInput="{{user.firstName}}" stepKey="enterFirstName" />
+        <fillField selector="{{AdminCreateUserSection.lastNameTextField}}" userInput="{{user.lastName}}" stepKey="enterLastName" />
+        <fillField selector="{{AdminCreateUserSection.emailTextField}}" userInput="{{user.username}}@magento.com" stepKey="enterEmail" />
+        <fillField selector="{{AdminCreateUserSection.passwordTextField}}" userInput="{{user.password}}" stepKey="enterPassword" />
+        <fillField selector="{{AdminCreateUserSection.pwConfirmationTextField}}" userInput="{{user.password}}" stepKey="confirmPassword" />
+        <fillField selector="{{AdminCreateUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="enterCurrentPassword" />
+        <scrollToTopOfPage stepKey="scrollToTopOfPage" />
+        <click stepKey="clickUserRole" selector="{{AdminCreateUserSection.userRoleTab}}"/>
+        <click stepKey="chooseRole" selector="{{AdminStoreSection.createdRoleInUserPage(role.name)}}"/>
+        <click selector="{{AdminCreateUserSection.saveButton}}" stepKey="clickSaveUser" />
+        <waitForPageLoad stepKey="waitForSaveTheUser" />
+        <see userInput="You saved the user." stepKey="seeSuccessMessage" />
+    </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml
new file mode 100644
index 0000000000000..7f1ed3be1ca57
--- /dev/null
+++ b/app/code/Magento/User/Test/Mftf/ActionGroup/AdminDeleteCreatedUserActionGroup.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminDeleteCreatedUserActionGroup">
+        <arguments>
+            <argument name="user"/>
+        </arguments>
+        <amOnPage stepKey="amOnAdminUsersPage" url="{{AdminUsersPage.url}}"/>
+        <click stepKey="openTheUser" selector="{{AdminDeleteUserSection.role(user.username)}}"/>
+        <fillField stepKey="TypeCurrentPassword" selector="{{AdminDeleteUserSection.password}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+        <click stepKey="clickToDeleteUser" selector="{{AdminDeleteUserSection.delete}}"/>
+        <waitForPageLoad stepKey="waitForConfirmationPopup"/>
+        <click stepKey="clickToConfirm" selector="{{AdminDeleteUserSection.confirm}}"/>
+        <see stepKey="seeDeleteMessageForUser" userInput="You deleted the user."/>
+    </actionGroup>
+</actionGroups>

From f017676c873418b4e87b306e8666f9db39e82b99 Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Wed, 19 Sep 2018 15:45:48 +0400
Subject: [PATCH 19/50] MAGETWO-91617: Ordered Products Report Error for
 restricted scope admin

- Add fixed code
---
 .../ActionGroup/AdminOrderActionGroup.xml     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
index ffa6a2a5f2d99..aa6c10400d48b 100644
--- a/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
+++ b/app/code/Magento/Sales/Test/Mftf/ActionGroup/AdminOrderActionGroup.xml
@@ -259,16 +259,6 @@
         <see selector="{{AdminOrderItemsOrderedSection.productSkuColumn}}" userInput="{{product.sku}}" stepKey="seeSkuInItemsOrdered"/>
     </actionGroup>
 
-    <!--Cancel order that is in pending status-->
-    <actionGroup name="cancelPendingOrder">
-        <click selector="{{AdminOrderDetailsMainActionsSection.cancel}}" stepKey="clickCancelOrder"/>
-        <waitForElement selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForCancelConfirmation"/>
-        <see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to cancel this order?" stepKey="seeConfirmationMessage"/>
-        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmOrderCancel"/>
-        <see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
-        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
-    </actionGroup>
-
     <actionGroup name="CreateOrderInStoreActionGroup">
         <arguments>
             <argument name="product"/>
@@ -292,4 +282,14 @@
         <click selector="{{OrdersGridSection.submitOrder}}" stepKey="submitOrder"/>
         <see stepKey="seeSuccessMessageForOrder" userInput="You created the order."/>
     </actionGroup>
+
+    <!--Cancel order that is in pending status-->
+    <actionGroup name="cancelPendingOrder">
+        <click selector="{{AdminOrderDetailsMainActionsSection.cancel}}" stepKey="clickCancelOrder"/>
+        <waitForElement selector="{{AdminConfirmationModalSection.message}}" stepKey="waitForCancelConfirmation"/>
+        <see selector="{{AdminConfirmationModalSection.message}}" userInput="Are you sure you want to cancel this order?" stepKey="seeConfirmationMessage"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmOrderCancel"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="You canceled the order." stepKey="seeCancelSuccessMessage"/>
+        <see selector="{{AdminOrderDetailsInformationSection.orderStatus}}" userInput="Canceled" stepKey="seeOrderStatusCanceled"/>
+    </actionGroup>
 </actionGroups>

From 5333ca582fcc97c6926df798c96eba3378b7c3e2 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Wed, 19 Sep 2018 15:13:26 +0300
Subject: [PATCH 20/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Fixed statics.
---
 .../Test/Unit/Block/Product/ProductList/ToolbarTest.php    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
index 8282ffa409f9c..884f4c543c8b8 100644
--- a/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
+++ b/app/code/Magento/Catalog/Test/Unit/Block/Product/ProductList/ToolbarTest.php
@@ -67,13 +67,16 @@ protected function setUp()
                 'getLimit',
                 'getCurrentPage'
             ]);
-        $this->memorizer = $this->createPartialMock(\Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer::class, [
+        $this->memorizer = $this->createPartialMock(
+            \Magento\Catalog\Model\Product\ProductList\ToolbarMemorizer::class,
+            [
                 'getDirection',
                 'getOrder',
                 'getMode',
                 'getLimit',
                 'isMemorizingAllowed'
-            ]);
+            ]
+        );
         $this->layout = $this->createPartialMock(\Magento\Framework\View\Layout::class, ['getChildName', 'getBlock']);
         $this->pagerBlock = $this->createPartialMock(\Magento\Theme\Block\Html\Pager::class, [
                 'setUseContainer',

From 949aa6b9ae92153fa7cd0d0453742259c33ee54c Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Wed, 19 Sep 2018 16:17:22 +0300
Subject: [PATCH 21/50] MAGETWO-67269: Gift Options set to no still show up as
 choices on front end order page

- Fixes according to code review.
---
 app/code/Magento/GiftMessage/Block/Message/Inline.php     | 7 ++-----
 .../GiftMessage/view/frontend/templates/inline.phtml      | 8 +++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php
index 1a874cb5ea4ae..f44f967cefdc6 100644
--- a/app/code/Magento/GiftMessage/Block/Message/Inline.php
+++ b/app/code/Magento/GiftMessage/Block/Message/Inline.php
@@ -330,14 +330,11 @@ public function getEscaped($value, $defaultValue = '')
      *
      * @return bool
      */
-    public function isOrderLevelAvailable()
+    public function isMessagesOrderAvailable()
     {
         $entity = $this->getEntity();
         if (!$entity->hasIsGiftOptionsAvailable()) {
             $this->_eventManager->dispatch('gift_options_prepare', ['entity' => $entity]);
-            if (!$entity->getIsGiftOptionsAvailable()) {
-                $entity->setIsGiftOptionsAvailable($this->isMessagesAvailable());
-            }
         }
         return $entity->getIsGiftOptionsAvailable();
     }
@@ -372,7 +369,7 @@ public function isItemMessagesAvailable($item)
     protected function _toHtml()
     {
         // render HTML when messages are allowed for order or for items only
-        if ($this->isItemsAvailable() || $this->isOrderLevelAvailable()) {
+        if ($this->isItemsAvailable() || $this->isMessagesAvailable() || $this->isMessagesOrderAvailable()) {
             return parent::_toHtml();
         }
         return '';
diff --git a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
index 8c58959be15b7..640ef1ba16486 100644
--- a/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
+++ b/app/code/Magento/GiftMessage/view/frontend/templates/inline.phtml
@@ -18,7 +18,7 @@
         </div>
 
         <dl class="options-items" id="allow-gift-options-container">
-            <?php if ($block->isOrderLevelAvailable()): ?>
+            <?php if ($block->isMessagesAvailable()): ?>
             <dt id="add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title">
                 <div class="field choice">
                     <input type="checkbox" name="allow_gift_messages_for_order" id="allow_gift_options_for_order" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />
@@ -28,7 +28,6 @@
 
             <dd id="allow-gift-options-for-order-container" class="order-options">
                 <div class="options-order-container" id="options-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"></div>
-                <?php if ($block->isMessagesAvailable()): ?>
                     <button class="action action-gift"
                             data-mage-init='{"toggleAdvanced": {"selectorsToggleClass":"hidden", "toggleContainers":"#allow-gift-messages-for-order-container"}}'>
                         <span><?= /* @escapeNotVerified */ __('Gift Message') ?></span>
@@ -63,9 +62,8 @@
                             });
                         </script>
                     </div>
-                <?php endif; ?>
             </dd>
-            <?php endif; ?>
+            <?php endif ?>
             <?php if ($block->isItemsAvailable()): ?>
             <dt id="add-gift-options-for-items-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title individual">
                 <div class="field choice">
@@ -154,7 +152,7 @@
         </div>
 
         <dl class="options-items" id="allow-gift-options-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>">
-            <?php if ($block->isOrderLevelAvailable()): ?>
+            <?php if ($block->isMessagesOrderAvailable() || $block->isMessagesAvailable()): ?>
             <dt id="add-gift-options-for-order-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" class="order-title">
                 <div class="field choice">
                     <input type="checkbox" name="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" id="allow_gift_options_for_order_<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>" data-mage-init='{"giftOptions":{}}' value="1" data-selector='{"id":"#allow-gift-options-for-order-container-<?= /* @escapeNotVerified */ $block->getEntity()->getId() ?>"}'<?php if ($block->getEntityHasMessage()): ?> checked="checked"<?php endif; ?> class="checkbox" />

From 8024b4c1c2a5c3a28c42805c3d52edea536f7501 Mon Sep 17 00:00:00 2001
From: "Hakobyan, Lusine" <Lusine_Hakobyan@epam.com>
Date: Thu, 20 Sep 2018 11:24:47 +0400
Subject: [PATCH 22/50] MAGETWO-91704: Can't cancel/change payment method after
 chosen Store Credit

- Update automated test according to review
---
 .../Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
index 8aaf626edab33..24ff30071830f 100644
--- a/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
+++ b/app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml
@@ -9,7 +9,6 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminOrderFormPaymentSection">
-        <element name="useCustomerBalance" type="checkbox" selector="#p_method_use_customerbalance"/>
         <element name="header" type="text" selector="#order-methods span.title"/>
         <element name="getShippingMethods" type="text" selector="#order-shipping_method a.action-default" timeout="30"/>
         <element name="flatRateOption" type="radio" selector="#s_method_flatrate_flatrate" timeout="30"/>

From 1148f85e42022e77817e33a901bef5153a7cf108 Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Fri, 21 Sep 2018 15:11:30 +0300
Subject: [PATCH 23/50] MAGETWO-59265: Import doesn't allow to set default
 value per store view (dropdown fields)

- Changed logic of setting default value of attributes by store view during import
---
 .../Model/Import/Product/Type/AbstractType.php               | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
index 8b04b7ec3532f..3b6caef66ce6c 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product/Type/AbstractType.php
@@ -543,10 +543,9 @@ public function prepareAttributesWithDefaultValueForSave(array $rowData, $withDe
                 } else {
                     $resultAttrs[$attrCode] = $rowData[$attrCode];
                 }
-            } elseif (array_key_exists($attrCode, $rowData)) {
+            } elseif (array_key_exists($attrCode, $rowData) && empty($rowData['_store'])) {
                 $resultAttrs[$attrCode] = $rowData[$attrCode];
-            } elseif ($withDefaultValue && null !== $attrParams['default_value']
-                && 'select' == $attrParams['type'] && null === $rowData['_store']) {
+            } elseif ($withDefaultValue && null !== $attrParams['default_value'] && empty($rowData['_store'])) {
                 $resultAttrs[$attrCode] = $attrParams['default_value'];
             }
         }

From bb949b4f3a0322f1ab73b19c2680d12859294038 Mon Sep 17 00:00:00 2001
From: Aleksey Tsoy <aleksey_tsoy@epam.com>
Date: Fri, 21 Sep 2018 20:50:29 +0600
Subject: [PATCH 24/50] MAGETWO-91745: Product pages load blank page

- Added automated test
---
 .../Mftf/Data/CatalogAttributeSetData.xml     | 16 ++++++++++++
 .../Catalog/Test/Mftf/Data/ProductData.xml    | 14 +++++++++++
 .../Metadata/catalog_attribute_set-meta.xml   | 25 +++++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeSetData.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_attribute_set-meta.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeSetData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeSetData.xml
new file mode 100644
index 0000000000000..d78c03a51dd75
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogAttributeSetData.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="CatalogAttributeSet" type="CatalogAttributeSet">
+        <data key="attribute_set_name" unique="suffix">test_set_</data>
+        <data key="attributeGroupId">7</data>
+        <data key="skeletonId">4</data>
+    </entity>
+</entities>
\ No newline at end of file
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
index 9ae551b69d388..3da3272567c9d 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/ProductData.xml
@@ -301,6 +301,20 @@
         <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
         <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
     </entity>
+    <entity name="SimpleProductWithCustomAttributeSet" type="product">
+        <data key="sku" unique="suffix">testSku</data>
+        <data key="type_id">simple</data>
+        <var key="attribute_set_id" entityKey="attribute_set_id" entityType="CatalogAttributeSet"/>
+        <data key="visibility">4</data>
+        <data key="name" unique="suffix">testProductName</data>
+        <data key="price">123.00</data>
+        <data key="urlKey" unique="suffix">testurlkey</data>
+        <data key="status">1</data>
+        <data key="weight">1</data>
+        <data key="quantity">100</data>
+        <requiredEntity type="product_extension_attribute">EavStockItem</requiredEntity>
+        <requiredEntity type="custom_attribute_array">CustomAttributeCategoryIds</requiredEntity>
+    </entity>
     <entity name="productWithOptions" type="product">
         <var key="sku" entityType="product" entityKey="sku" />
         <data key="file">magento.jpg</data>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_attribute_set-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_attribute_set-meta.xml
new file mode 100644
index 0000000000000..9ef7b507812a0
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_attribute_set-meta.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="AddCatalogAttributeToAttributeSet" dataType="CatalogAttributeSet" type="create" auth="adminOauth" url="/V1/products/attribute-sets" method="POST">
+        <contentType>application/json</contentType>
+        <object key="attributeSet" dataType="CatalogAttributeSet">
+            <field key="attribute_set_name">string</field>
+            <field key="sort_order">integer</field>
+        </object>
+        <field key="skeletonId">integer</field>
+    </operation>
+    <operation name="DeleteCatalogAttributeFromAttributeSet" dataType="CatalogAttributeSet" type="delete" auth="adminOauth" url="/V1/products/attribute-sets/{attribute_set_id}" method="DELETE">
+        <contentType>application/json</contentType>
+    </operation>
+    <operation name="GetCatalogAttributesFromDefaultSet" dataType="CatalogAttributeSet" type="get" auth="adminOauth" url="/V1/products/attribute-sets/{attribute_set_id}" method="GET">
+        <contentType>application/json</contentType>
+    </operation>
+</operations>
\ No newline at end of file

From b35b68130265163f2ed151ff94e0d9f7fc63d44c Mon Sep 17 00:00:00 2001
From: Stsiapan Korf <Stsiapan_Korf@epam.com>
Date: Fri, 21 Sep 2018 18:57:25 +0300
Subject: [PATCH 25/50] MAGETWO-91702: Shipping method Table Rates settings
 gets from wrong store

- Get store id from quote for shipping rates
---
 .../Magento/Quote/Model/Quote/Address.php     | 90 +++++++++----------
 1 file changed, 43 insertions(+), 47 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 3eb5d68885035..11beffe5711b9 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -965,6 +965,7 @@ public function collectShippingRates()
 
     /**
      * Request shipping rates for entire address or specified address item
+     *
      * Returns true if current selected shipping method code corresponds to one of the found rates
      *
      * @param \Magento\Quote\Model\Quote\Item\AbstractItem $item
@@ -1002,7 +1003,7 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
         /**
          * Store and website identifiers specified from StoreManager
          */
-        $request->setStoreId($this->storeManager->getStore()->getId());
+        $request->setStoreId($this->getQuote()->getStoreId() ?? $this->storeManager->getStore()->getId());
         $request->setWebsiteId($this->storeManager->getWebsite()->getId());
         $request->setFreeShipping($this->getFreeShipping());
         /**
@@ -1348,7 +1349,7 @@ public function getAllBaseTotalAmounts()
     /******************************* End Total Collector Interface *******************************************/
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -1356,7 +1357,7 @@ protected function _getValidationRulesBeforeSave()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCountryId()
     {
@@ -1364,7 +1365,7 @@ public function getCountryId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCountryId($countryId)
     {
@@ -1372,7 +1373,7 @@ public function setCountryId($countryId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getStreet()
     {
@@ -1381,7 +1382,7 @@ public function getStreet()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setStreet($street)
     {
@@ -1389,7 +1390,7 @@ public function setStreet($street)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCompany()
     {
@@ -1397,7 +1398,7 @@ public function getCompany()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCompany($company)
     {
@@ -1405,7 +1406,7 @@ public function setCompany($company)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getTelephone()
     {
@@ -1413,7 +1414,7 @@ public function getTelephone()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setTelephone($telephone)
     {
@@ -1421,7 +1422,7 @@ public function setTelephone($telephone)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFax()
     {
@@ -1429,7 +1430,7 @@ public function getFax()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFax($fax)
     {
@@ -1437,7 +1438,7 @@ public function setFax($fax)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPostcode()
     {
@@ -1445,7 +1446,7 @@ public function getPostcode()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPostcode($postcode)
     {
@@ -1453,7 +1454,7 @@ public function setPostcode($postcode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCity()
     {
@@ -1461,7 +1462,7 @@ public function getCity()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCity($city)
     {
@@ -1469,7 +1470,7 @@ public function setCity($city)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getFirstname()
     {
@@ -1477,7 +1478,7 @@ public function getFirstname()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setFirstname($firstname)
     {
@@ -1485,7 +1486,7 @@ public function setFirstname($firstname)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getLastname()
     {
@@ -1493,7 +1494,7 @@ public function getLastname()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setLastname($lastname)
     {
@@ -1501,7 +1502,7 @@ public function setLastname($lastname)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getMiddlename()
     {
@@ -1509,7 +1510,7 @@ public function getMiddlename()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setMiddlename($middlename)
     {
@@ -1517,7 +1518,7 @@ public function setMiddlename($middlename)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPrefix()
     {
@@ -1525,7 +1526,7 @@ public function getPrefix()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setPrefix($prefix)
     {
@@ -1533,7 +1534,7 @@ public function setPrefix($prefix)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSuffix()
     {
@@ -1541,7 +1542,7 @@ public function getSuffix()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSuffix($suffix)
     {
@@ -1549,7 +1550,7 @@ public function setSuffix($suffix)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getVatId()
     {
@@ -1557,7 +1558,7 @@ public function getVatId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setVatId($vatId)
     {
@@ -1565,7 +1566,7 @@ public function setVatId($vatId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerId()
     {
@@ -1573,7 +1574,7 @@ public function getCustomerId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerId($customerId)
     {
@@ -1581,7 +1582,7 @@ public function setCustomerId($customerId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getEmail()
     {
@@ -1594,7 +1595,7 @@ public function getEmail()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setEmail($email)
     {
@@ -1602,7 +1603,7 @@ public function setEmail($email)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegion($region)
     {
@@ -1610,7 +1611,7 @@ public function setRegion($region)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegionId($regionId)
     {
@@ -1618,7 +1619,7 @@ public function setRegionId($regionId)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setRegionCode($regionCode)
     {
@@ -1626,7 +1627,7 @@ public function setRegionCode($regionCode)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getSameAsBilling()
     {
@@ -1634,7 +1635,7 @@ public function getSameAsBilling()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setSameAsBilling($sameAsBilling)
     {
@@ -1642,7 +1643,7 @@ public function setSameAsBilling($sameAsBilling)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getCustomerAddressId()
     {
@@ -1650,7 +1651,7 @@ public function getCustomerAddressId()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function setCustomerAddressId($customerAddressId)
     {
@@ -1681,9 +1682,7 @@ public function setSaveInAddressBook($saveInAddressBook)
     //@codeCoverageIgnoreEnd
 
     /**
-     * {@inheritdoc}
-     *
-     * @return \Magento\Quote\Api\Data\AddressExtensionInterface|null
+     * @inheritdoc
      */
     public function getExtensionAttributes()
     {
@@ -1691,10 +1690,7 @@ public function getExtensionAttributes()
     }
 
     /**
-     * {@inheritdoc}
-     *
-     * @param \Magento\Quote\Api\Data\AddressExtensionInterface $extensionAttributes
-     * @return $this
+     * @inheritdoc
      */
     public function setExtensionAttributes(\Magento\Quote\Api\Data\AddressExtensionInterface $extensionAttributes)
     {
@@ -1712,7 +1708,7 @@ public function getShippingMethod()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function getCustomAttributesCodes()
     {

From aef18a56e212eb0f55c5393c5a814b6bb15c9510 Mon Sep 17 00:00:00 2001
From: Aleksey Tsoy <aleksey_tsoy@epam.com>
Date: Mon, 24 Sep 2018 19:04:00 +0600
Subject: [PATCH 26/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Added automated test
---
 .../StorefrontCategoryActionGroup.xml         |  15 +++
 .../Mftf/Data/CatalogStorefrontConfigData.xml |  41 ++++++
 .../Metadata/catalog_configuration-meta.xml   | 118 ++++++++++++++++++
 .../Section/StorefrontCategoryMainSection.xml |   3 +
 ...orefrontRememberCategoryPaginationTest.xml |  68 ++++++++++
 5 files changed, 245 insertions(+)
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml
 create mode 100644 app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml

diff --git a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
index c980c43b8f3af..e215aa81b3384 100644
--- a/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCategoryActionGroup.xml
@@ -21,6 +21,21 @@
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>
 
+    <actionGroup name="VerifyCategoryPageParameters">
+        <arguments>
+            <argument name="category"/>
+            <argument name="mode" type="string"/>
+            <argument name="numOfProductsPerPage" type="string"/>
+            <argument name="sortBy" type="string" defaultValue="position"/>
+        </arguments>
+        <seeInCurrentUrl url="/{{category.custom_attributes[url_key]}}.html" stepKey="checkUrl"/>
+        <seeInTitle userInput="{{category.name}}" stepKey="assertCategoryNameInTitle"/>
+        <see userInput="{{category.name}}" selector="{{StorefrontCategoryMainSection.CategoryTitle}}" stepKey="assertCategoryName"/>
+        <see userInput="{{mode}}" selector="{{StorefrontCategoryMainSection.modeGridIsActive}}" stepKey="assertViewMode"/>
+        <see userInput="{{numOfProductsPerPage}}" selector="{{StorefrontCategoryMainSection.perPage}}" stepKey="assertNumberOfProductsPerPage"/>
+        <see userInput="{{sortBy}}" selector="{{StorefrontCategoryMainSection.sortedBy}}" stepKey="assertSortedBy"/>
+    </actionGroup>
+
     <!-- Check the category page -->
     <actionGroup name="StorefrontCheckCategoryActionGroup">
         <arguments>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml
new file mode 100644
index 0000000000000..d8ec84013d93b
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Data/CatalogStorefrontConfigData.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="RememberPaginationCatalogStorefrontConfig" type="catalog_storefront_config">
+        <requiredEntity type="grid_per_page_values">GridPerPageValues</requiredEntity>
+        <requiredEntity type="remember_pagination">RememberCategoryPagination</requiredEntity>
+    </entity>
+
+    <entity name="GridPerPageValues" type="grid_per_page_values">
+        <data key="value">9,12,20,24</data>
+    </entity>
+
+    <entity name="RememberCategoryPagination" type="remember_pagination">
+        <data key="value">1</data>
+    </entity>
+
+    <entity name="DefaultCatalogStorefrontConfiguration" type="default_catalog_storefront_config">
+        <requiredEntity type="catalogStorefrontFlagZero">DefaultCatalogStorefrontFlagZero</requiredEntity>
+        <data key="list_allow_all">DefaultListAllowAll</data>
+        <data key="flat_catalog_product">DefaultFlatCatalogProduct</data>
+    </entity>
+
+    <entity name="DefaultCatalogStorefrontFlagZero" type="catalogStorefrontFlagZero">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="DefaultListAllowAll" type="list_allow_all">
+        <data key="value">0</data>
+    </entity>
+
+    <entity name="DefaultFlatCatalogProduct" type="flat_catalog_product">
+        <data key="value">0</data>
+    </entity>
+</entities>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml
new file mode 100644
index 0000000000000..b1f2b43220b36
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Metadata/catalog_configuration-meta.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
+    <operation name="CatalogStorefrontConfiguration" dataType="catalog_storefront_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
+        <object key="groups" dataType="catalog_storefront_config">
+            <object key="frontend" dataType="catalog_storefront_config">
+                <object key="fields" dataType="catalog_storefront_config">
+                    <object key="list_mode" dataType="list_mode">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="grid_per_page_values" dataType="grid_per_page_values">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="grid_per_page" dataType="grid_per_page">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="list_per_page_values" dataType="list_per_page_values">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="list_per_page" dataType="list_per_page">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="default_sort_by" dataType="default_sort_by">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="list_allow_all" dataType="list_allow_all">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="remember_pagination" dataType="remember_pagination">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="flat_catalog_category" dataType="flat_catalog_category">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="flat_catalog_product" dataType="flat_catalog_product">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="swatches_per_product" dataType="swatches_per_product">
+                        <field key="value">string</field>
+                    </object>
+                    <object key="show_swatches_in_product_list" dataType="show_swatches_in_product_list">
+                        <field key="value">integer</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+
+    <operation name="DefaultCatalogStorefrontConfiguration" dataType="default_catalog_storefront_config" type="create" auth="adminFormKey" url="/admin/system_config/save/section/catalog/" method="POST">
+        <object key="groups" dataType="default_catalog_storefront_config">
+            <object key="frontend" dataType="default_catalog_storefront_config">
+                <object key="fields" dataType="default_catalog_storefront_config">
+                    <object key="list_mode" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="grid_per_page_values" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="grid_per_page" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="list_per_page_values" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="list_per_page" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="default_sort_by" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="remember_pagination" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="flat_catalog_category" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="swatches_per_product" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="show_swatches_in_product_list" dataType="default_catalog_storefront_config">
+                        <object key="inherit" dataType="catalogStorefrontFlagZero">
+                            <field key="value">integer</field>
+                        </object>
+                    </object>
+                    <object key="list_allow_all" dataType="list_allow_all">
+                        <field key="value">integer</field>
+                    </object>
+                    <object key="flat_catalog_product" dataType="flat_catalog_product">
+                        <field key="value">integer</field>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </operation>
+</operations>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
index d484abf2069ff..03566be55ad2f 100644
--- a/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
+++ b/app/code/Magento/Catalog/Test/Mftf/Section/StorefrontCategoryMainSection.xml
@@ -9,6 +9,9 @@
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontCategoryMainSection">
+        <element name="perPage" type="select" selector="//*[@id='authenticationPopup']/following-sibling::div[3]//*[@id='limiter']"/>
+        <element name="sortedBy" type="select" selector="//*[@id='authenticationPopup']/following-sibling::div[1]//*[@id='sorter']"/>
+        <element name="modeGridIsActive" type="text" selector="//*[@id='authenticationPopup']/following-sibling::div[1]//*[@class='modes']/strong[@class='modes-mode active mode-grid']/span"/>
         <element name="modeListButton" type="button" selector="#mode-list"/>
         <element name="CategoryTitle" type="text" selector="#page-title-heading span"/>
         <element name="ProductItemInfo" type="button" selector=".product-item-info"/>
diff --git a/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml
new file mode 100644
index 0000000000000..0ed61b8636c4f
--- /dev/null
+++ b/app/code/Magento/Catalog/Test/Mftf/Test/StorefrontRememberCategoryPaginationTest.xml
@@ -0,0 +1,68 @@
+<?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="StorefrontRememberCategoryPaginationTest">
+        <annotations>
+            <title value="Verify that Number of Products per page retained when visiting a different category"/>
+            <stories value="MAGETWO-61478: Number of Products displayed per page not retained when visiting a different category"/>
+            <description value="Verify that Number of Products per page retained when visiting a different category"/>
+            <features value="Catalog"/>
+            <severity value="MAJOR"/>
+            <testCaseId value="MAGETWO-94210"/>
+            <group value="Catalog"/>
+        </annotations>
+
+        <before>
+            <createData entity="_defaultCategory" stepKey="defaultCategory1"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct1">
+                <requiredEntity createDataKey="defaultCategory1"/>
+            </createData>
+
+            <createData entity="_defaultCategory" stepKey="defaultCategory2"/>
+            <createData entity="SimpleProduct" stepKey="simpleProduct2">
+                <requiredEntity createDataKey="defaultCategory2"/>
+            </createData>
+
+            <createData entity="RememberPaginationCatalogStorefrontConfig" stepKey="setRememberPaginationCatalogStorefrontConfig"/>
+        </before>
+
+        <actionGroup ref="GoToStorefrontCategoryPageByParameters" stepKey="GoToStorefrontCategory1Page">
+            <argument name="category" value="$$defaultCategory1.custom_attributes[url_key]$$"/>
+            <argument name="mode" value="grid"/>
+            <argument name="numOfProductsPerPage" value="12"/>
+        </actionGroup>
+
+        <actionGroup ref="VerifyCategoryPageParameters" stepKey="verifyCategory1PageParameters">
+            <argument name="category" value="$$defaultCategory1$$"/>
+            <argument name="mode" value="grid"/>
+            <argument name="numOfProductsPerPage" value="12"/>
+        </actionGroup>
+
+        <amOnPage url="{{StorefrontCategoryPage.url($$defaultCategory2.name$$)}}" stepKey="navigateToCategory2Page"/>
+        <waitForPageLoad stepKey="waitForCategory2PageToLoad"/>
+
+        <actionGroup ref="VerifyCategoryPageParameters" stepKey="verifyCategory2PageParameters">
+            <argument name="category" value="$$defaultCategory2$$"/>
+            <argument name="mode" value="grid"/>
+            <argument name="numOfProductsPerPage" value="12"/>
+        </actionGroup>
+
+        <after>
+            <createData entity="DefaultCatalogStorefrontConfiguration" stepKey="setDefaultCatalogStorefrontConfiguration"/>
+
+            <deleteData createDataKey="simpleProduct1" stepKey="deleteProduct1"/>
+            <deleteData createDataKey="defaultCategory1" stepKey="deleteCategory1"/>
+            <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
+            <deleteData createDataKey="defaultCategory2" stepKey="deleteCategory2"/>
+
+            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
+        </after>
+    </test>
+</tests>

From 68933c1b128f09b74298f81822879e2bee63d68a Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Mon, 24 Sep 2018 17:35:47 +0300
Subject: [PATCH 27/50] MAGETWO-70303: [GITHUB] Anchor categories are showing
 products of disabled subcategories #9002

- Change index table and temporary table
---
 .../Category/Product/AbstractAction.php       | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index 6a499883ac723..d312b78e74059 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -499,7 +499,7 @@ protected function createAnchorSelect(Store $store)
             'cc2.parent_id = cc.entity_id AND cc.entity_id NOT IN (' . implode(
                 ',',
                 $rootCatIds
-            ) . ')',
+            ) . ') AND cc2.store_id = ' . $store->getId(),
             []
         )->joinInner(
             ['ccp' => $this->getTable('catalog_category_product')],
@@ -586,6 +586,8 @@ protected function createAnchorSelect(Store $store)
     }
 
     /**
+     * Get temporary table name
+     *
      * Get temporary table name for concurrent indexing in persistent connection
      * Temp table name is NOT shared between action instances and each action has it's own temp tree index
      *
@@ -629,6 +631,12 @@ protected function makeTempCategoryTreeIndex()
             null,
             ['nullable' => false, 'unsigned' => true]
         );
+        $temporaryTable->addColumn(
+            'store_id',
+            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
+            null,
+            ['nullable' => false, 'unsigned' => true]
+        );
         // Each entry will be unique.
         $temporaryTable->addIndex(
             'idx_primary',
@@ -642,6 +650,11 @@ protected function makeTempCategoryTreeIndex()
             ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX]
         );
 
+        $temporaryTable->addIndex(
+            'store_id',
+            ['store_id'],
+            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX]
+        );
         // Drop the temporary table in case it already exists on this (persistent?) connection.
         $this->connection->dropTemporaryTable($temporaryName);
         $this->connection->createTemporaryTable($temporaryTable);
@@ -659,11 +672,23 @@ protected function makeTempCategoryTreeIndex()
      */
     protected function fillTempCategoryTreeIndex($temporaryName)
     {
+        $isActiveAttributeId = $this->config->getAttribute(
+            \Magento\Catalog\Model\Category::ENTITY,
+            'is_active'
+        )->getId();
+        $categoryMetadata = $this->metadataPool->getMetadata(\Magento\Catalog\Api\Data\CategoryInterface::class);
+        $categoryLinkField = $categoryMetadata->getLinkField();
         $selects = $this->prepareSelectsByRange(
             $this->connection->select()
                 ->from(
                     ['c' => $this->getTable('catalog_category_entity')],
                     ['entity_id', 'path']
+                )->joinInner(
+                    ['ccei' => $this->getTable('catalog_category_entity_int')],
+                    'ccei.' . $categoryLinkField . ' = c.' . $categoryLinkField .
+                    ' AND ccei.attribute_id = ' . $isActiveAttributeId .
+                    ' AND ccei.value = 1',
+                    ['store_id']
                 ),
             'entity_id'
         );
@@ -674,13 +699,13 @@ protected function fillTempCategoryTreeIndex($temporaryName)
             foreach ($this->connection->fetchAll($select) as $category) {
                 foreach (explode('/', $category['path']) as $parentId) {
                     if ($parentId !== $category['entity_id']) {
-                        $values[] = [$parentId, $category['entity_id']];
+                        $values[] = [$parentId, $category['entity_id'], $category['store_id']];
                     }
                 }
             }
 
             if (count($values) > 0) {
-                $this->connection->insertArray($temporaryName, ['parent_id', 'child_id'], $values);
+                $this->connection->insertArray($temporaryName, ['parent_id', 'child_id', 'store_id'], $values);
             }
         }
     }

From 2034958405344006414e44804b914dd4cbdb9e46 Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Tue, 25 Sep 2018 12:58:19 +0400
Subject: [PATCH 28/50] MAGETWO-91628: Bundle product price doubled when
 switching currency

- Add automation test
---
 ...tAddProductToCartFromBundleActionGroup.xml | 24 ++++++
 .../Mftf/Section/StorefrontBundledSection.xml |  5 +-
 ...urrencyChangingBundleProductInCartTest.xml | 77 +++++++++++++++++++
 .../Mftf/Page/ConfigCurrencySetupPage.xml     | 13 ++++
 .../Mftf/Section/CurrencySetupSection.xml     | 14 ++++
 5 files changed, 132 insertions(+), 1 deletion(-)
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/ActionGroup/StoreFrontAddProductToCartFromBundleActionGroup.xml
 create mode 100644 app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
 create mode 100644 app/code/Magento/CurrencySymbol/Test/Mftf/Page/ConfigCurrencySetupPage.xml
 create mode 100644 app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml

diff --git a/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StoreFrontAddProductToCartFromBundleActionGroup.xml b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StoreFrontAddProductToCartFromBundleActionGroup.xml
new file mode 100644
index 0000000000000..441303e8f1b84
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/ActionGroup/StoreFrontAddProductToCartFromBundleActionGroup.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="StoreFrontAddProductToCartFromBundleWithCurrencyActionGroup">
+        <arguments>
+            <argument name="product"/>
+            <argument name="currency" type="string" defaultValue="US Dollar"/>
+        </arguments>
+        <click selector="{{StorefrontBundledSection.currencyTrigger}}" stepKey="openCurrencyTrigger"/>
+        <click selector="{{StorefrontBundledSection.currency(currency)}}" stepKey="chooseCurrency"/>
+        <click selector="{{StorefrontBundledSection.addToCart}}" stepKey="clickCustomize"/>
+        <waitForPageLoad stepKey="waitForBundleOpen"/>
+        <checkOption selector="{{StorefrontBundledSection.productInBundle(product.name)}}" stepKey="chooseProduct"/>
+        <click selector="{{StorefrontBundledSection.addToCartConfigured}}" stepKey="addToCartProduct"/>
+        <scrollToTopOfPage stepKey="scrollToTop"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
index f724f9bbfe1bd..5646ecf812a3f 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="StorefrontBundledSection">
         <element name="nthBundledOption" type="input" selector=".option:nth-of-type({{numOption}}) .choice:nth-of-type({{numOptionSelect}}) input" parameterized="true"/>
         <element name="addToCart" type="button" selector="#bundle-slide" timeout="30"/>
@@ -24,10 +24,13 @@
         <element name="bundleProductName" type="text" selector="//*[@id='maincontent']//span[@itemprop='name']"/>
         <element name="pageNotFound" type="text" selector="//h1[@class='page-title']//span[contains(., 'Whoops, our bad...')]"/>
         <element name="dropDownOptionOneProducts" type="select" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//select" parameterized="true"/>
+        <element name="productInBundle" type="select" selector="//label//span[contains(text(), '{{productName}}')]" parameterized="true"/>
         <element name="dropDownOptionOneQuantity" type="input" selector="//span[contains(text(), '{{productName}}')]/../..//input" parameterized="true"/>
         <element name="radioButtonOptionTwoProducts" type="checkbox" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field choice'][{{productNumber}}]/input" parameterized="true"/>
         <element name="radioButtonOptionTwoQuantity" type="input" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field qty qty-holder']//input" parameterized="true"/>
         <element name="checkboxOptionThreeProducts" type="checkbox" selector="//label//span[contains(text(), '{{productName}}')]/../..//div[@class='control']//div[@class='field choice'][{{productNumber}}]/input" parameterized="true"/>
         <element name="multiselectOptionFourProducts" type="multiselect" selector="//label//span[contains(text(), '{{productName}}')]/../..//select[@multiple='multiple']" parameterized="true"/>
+        <element name="currencyTrigger" type="select" selector="#switcher-currency-trigger" timeout="30"/>
+        <element name="currency" type="select" selector="//a[text()='{{arg}}']" parameterized="true"/>
     </section>
 </sections>
diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
new file mode 100644
index 0000000000000..b7e716dc15ece
--- /dev/null
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
@@ -0,0 +1,77 @@
+<?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="CurrencyChangingBundleProductInCartTest">
+            <annotations>
+                <features value="Bundle"/>
+                <stories value="Check that after changing currency price of cart is correct when the bundle product added to the cart"/>
+                <title value="User should be able change the currency and get right price in cart when the bundle product added to the cart"/>
+                <description value="User should be able change the currency and add one more product in cart and get right price in previous currency"/>
+                <severity value="MAJOR"/>
+                <testCaseId value="MAGETWO-94467"/>
+                <group value="Bundle"/>
+            </annotations>
+            <before>
+                <actionGroup ref="LoginAsAdmin" stepKey="login"/>
+                <createData entity="SimpleProduct2" stepKey="simpleProduct1"/>
+                <createData entity="SimpleProduct2" stepKey="simpleProduct2"/>
+            </before>
+            <after>
+                <!-- Delete the bundled product -->
+                <actionGroup stepKey="deleteBundle" ref="deleteProductUsingProductGrid">
+                    <argument name="product" value="BundleProduct"/>
+                </actionGroup>
+                <actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFiltersAfter"/>
+                <!--Clear Configs-->
+                <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
+                <waitForPageLoad stepKey="waitForAdminLoginPageLoad"/>
+                <amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage"/>
+                <waitForPageLoad stepKey="waitForConfigCurrencySetupPageForUnselectEuroCurrency"/>
+                <unselectOption selector="{{CurrencySetupSection.allowCurrencies}}" userInput="Euro" stepKey="unselectEuro"/>
+                <click stepKey="saveUnselectedConfigs" selector="{{AdminConfigSection.saveButton}}"/>
+                <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
+                <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
+                <deleteData createDataKey="simpleProduct2" stepKey="deleteSimpleProduct2"/>
+            </after>
+            <!--Go to bundle product creation page-->
+            <amOnPage url="{{AdminProductCreatePage.url(BundleProduct.set, BundleProduct.type)}}" stepKey="goToBundleProductCreationPage"/>
+            <waitForPageLoad stepKey="waitForBundleProductCreatePageToLoad"/>
+            <actionGroup ref="fillMainBundleProductForm" stepKey="fillMainFieldsForBundle"/>
+            <!-- Add Option, a "Radio Buttons" type option -->
+            <actionGroup ref="addBundleOptionWithTwoProducts" stepKey="addBundleOptionWithTwoProducts2">
+                <argument name="x" value="0"/>
+                <argument name="n" value="1"/>
+                <argument name="prodOneSku" value="$$simpleProduct1.sku$$"/>
+                <argument name="prodTwoSku" value="$$simpleProduct2.sku$$"/>
+                <argument name="optionTitle" value="Option"/>
+                <argument name="inputType" value="radio"/>
+            </actionGroup>
+            <checkOption selector="{{AdminProductFormBundleSection.userDefinedQuantity('0', '0')}}" stepKey="userDefinedQuantitiyOptionProduct0"/>
+            <checkOption selector="{{AdminProductFormBundleSection.userDefinedQuantity('0', '1')}}" stepKey="userDefinedQuantitiyOptionProduct1"/>
+            <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
+            <amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage"/>
+            <waitForPageLoad stepKey="waitForConfigCurrencySetupPage"/>
+            <selectOption selector="{{CurrencySetupSection.allowCurrencies}}" parameterArray="['Euro', 'US Dollar']" stepKey="selectCurrencies"/>
+            <click stepKey="saveConfigs" selector="{{AdminConfigSection.saveButton}}"/>
+            <!-- Go to storefront BundleProduct -->
+            <amOnPage url="{{BundleProduct.sku}}.html" stepKey="goToStorefront"/>
+            <waitForPageLoad stepKey="waitForStorefront"/>
+            <actionGroup ref="StoreFrontAddProductToCartFromBundleWithCurrencyActionGroup" stepKey="addProduct1ToCartAndChangeCurrencyToEuro">
+                <argument name="product" value="$$simpleProduct1$$"/>
+                <argument name="currency" value="EUR - Euro"/>
+            </actionGroup>
+            <actionGroup ref="StoreFrontAddProductToCartFromBundleWithCurrencyActionGroup" stepKey="addProduct2ToCartAndChangeCurrencyToUSD">
+                <argument name="product" value="$$simpleProduct2$$"/>
+                <argument name="currency" value="USD - US Dollar"/>
+            </actionGroup>
+            <click stepKey="openMiniCart" selector="{{StorefrontMinicartSection.showCart}}"/>
+            <waitForPageLoad stepKey="waitForMiniCart"/>
+            <see stepKey="seeCartSubtotal" userInput="$12,300.00"/>
+        </test>
+</tests>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Page/ConfigCurrencySetupPage.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Page/ConfigCurrencySetupPage.xml
new file mode 100644
index 0000000000000..f523cb58d3bb6
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Page/ConfigCurrencySetupPage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="ConfigCurrencySetupPage" url="admin/system_config/edit/section/currency" area="admin" module="Magento_Config">
+    </page>
+</pages>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml
new file mode 100644
index 0000000000000..16101409ad7e8
--- /dev/null
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="CurrencySetupSection">
+        <element name="allowCurrencies" type="select" selector="#currency_options_allow"/>
+    </section>
+</sections>
\ No newline at end of file

From 25cedef8c15ead70195ec7117f4995fbcd5bddf2 Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Tue, 25 Sep 2018 13:03:19 +0400
Subject: [PATCH 29/50] MAGETWO-91628: Bundle product price doubled when
 switching currency

- Revert xsi
---
 .../Bundle/Test/Mftf/Section/StorefrontBundledSection.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
index 5646ecf812a3f..ad74cfff54bd9 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Section/StorefrontBundledSection.xml
@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
     <section name="StorefrontBundledSection">
         <element name="nthBundledOption" type="input" selector=".option:nth-of-type({{numOption}}) .choice:nth-of-type({{numOptionSelect}}) input" parameterized="true"/>
         <element name="addToCart" type="button" selector="#bundle-slide" timeout="30"/>

From 1b8cd089461f20131a8b5e5784238918138e13ae Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <mikalai_shostka@epam.com>
Date: Tue, 25 Sep 2018 15:25:55 +0300
Subject: [PATCH 30/50] MAGETWO-70303: [GITHUB] Anchor categories are showing
 products of disabled subcategories #9002

- Change index table and temporary table
---
 .../Category/Product/AbstractAction.php       | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index d312b78e74059..a1358c02ce9fc 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -123,6 +123,11 @@ abstract class AbstractAction
      */
     private $queryGenerator;
 
+    /**
+     * @var int
+     */
+    private $currentStoreId = 0;
+
     /**
      * @param ResourceConnection $resource
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
@@ -164,6 +169,7 @@ protected function reindex()
     {
         foreach ($this->storeManager->getStores() as $store) {
             if ($this->getPathFromCategoryId($store->getRootCategoryId())) {
+                $this->currentStoreId = $store->getId();
                 $this->reindexRootCategory($store);
                 $this->reindexAnchorCategories($store);
                 $this->reindexNonAnchorCategories($store);
@@ -499,7 +505,7 @@ protected function createAnchorSelect(Store $store)
             'cc2.parent_id = cc.entity_id AND cc.entity_id NOT IN (' . implode(
                 ',',
                 $rootCatIds
-            ) . ') AND cc2.store_id = ' . $store->getId(),
+            ) . ')',
             []
         )->joinInner(
             ['ccp' => $this->getTable('catalog_category_product')],
@@ -631,12 +637,6 @@ protected function makeTempCategoryTreeIndex()
             null,
             ['nullable' => false, 'unsigned' => true]
         );
-        $temporaryTable->addColumn(
-            'store_id',
-            \Magento\Framework\DB\Ddl\Table::TYPE_INTEGER,
-            null,
-            ['nullable' => false, 'unsigned' => true]
-        );
         // Each entry will be unique.
         $temporaryTable->addIndex(
             'idx_primary',
@@ -649,12 +649,6 @@ protected function makeTempCategoryTreeIndex()
             ['child_id'],
             ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX]
         );
-
-        $temporaryTable->addIndex(
-            'store_id',
-            ['store_id'],
-            ['type' => \Magento\Framework\DB\Adapter\AdapterInterface::INDEX_TYPE_INDEX]
-        );
         // Drop the temporary table in case it already exists on this (persistent?) connection.
         $this->connection->dropTemporaryTable($temporaryName);
         $this->connection->createTemporaryTable($temporaryTable);
@@ -684,11 +678,19 @@ protected function fillTempCategoryTreeIndex($temporaryName)
                     ['c' => $this->getTable('catalog_category_entity')],
                     ['entity_id', 'path']
                 )->joinInner(
-                    ['ccei' => $this->getTable('catalog_category_entity_int')],
-                    'ccei.' . $categoryLinkField . ' = c.' . $categoryLinkField .
-                    ' AND ccei.attribute_id = ' . $isActiveAttributeId .
-                    ' AND ccei.value = 1',
-                    ['store_id']
+                    ['ccacd' => $this->getTable('catalog_category_entity_int')],
+                    'ccacd.' . $categoryLinkField . ' = c.' . $categoryLinkField . ' AND ccacd.store_id = 0' .
+                    ' AND ccacd.attribute_id = ' . $isActiveAttributeId,
+                    []
+                )->joinLeft(
+                    ['ccacs' => $this->getTable('catalog_category_entity_int')],
+                    'ccacs.' . $categoryLinkField . ' = c.' . $categoryLinkField
+                    . ' AND ccacs.attribute_id = ccacd.attribute_id AND ccacs.store_id = ' .
+                    $this->currentStoreId,
+                    []
+                )->where(
+                    $this->connection->getIfNullSql('ccacs.value', 'ccacd.value') . ' = ?',
+                    1
                 ),
             'entity_id'
         );
@@ -699,13 +701,13 @@ protected function fillTempCategoryTreeIndex($temporaryName)
             foreach ($this->connection->fetchAll($select) as $category) {
                 foreach (explode('/', $category['path']) as $parentId) {
                     if ($parentId !== $category['entity_id']) {
-                        $values[] = [$parentId, $category['entity_id'], $category['store_id']];
+                        $values[] = [$parentId, $category['entity_id']];
                     }
                 }
             }
 
             if (count($values) > 0) {
-                $this->connection->insertArray($temporaryName, ['parent_id', 'child_id', 'store_id'], $values);
+                $this->connection->insertArray($temporaryName, ['parent_id', 'child_id'], $values);
             }
         }
     }

From ca3f8ba315ec2c810ee077ba1bacf7bcf371026a Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Tue, 25 Sep 2018 17:07:29 +0300
Subject: [PATCH 31/50] MAGETWO-91628: Bundle product price doubled when
 switching currency

- Fixed unit tests;
---
 .../Bundle/Test/Unit/Model/Product/TypeTest.php      | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
index 4bbf5641c55d3..9819abf62a273 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -513,10 +513,6 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('getSelectionId')
             ->willReturn(314);
 
-        $this->priceCurrency->expects($this->once())
-            ->method('convert')
-            ->willReturn(3.14);
-
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
         $this->assertEquals([$product, $productType], $result);
     }
@@ -737,10 +733,6 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('prepareForCart')
             ->willReturn([]);
 
-        $this->priceCurrency->expects($this->once())
-            ->method('convert')
-            ->willReturn(3.14);
-
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
         $this->assertEquals('We can\'t add this item to your shopping cart right now.', $result);
     }
@@ -961,10 +953,6 @@ function ($key) use ($optionCollection, $selectionCollection) {
             ->method('prepareForCart')
             ->willReturn('string');
 
-        $this->priceCurrency->expects($this->once())
-            ->method('convert')
-            ->willReturn(3.14);
-
         $result = $this->model->prepareForCartAdvanced($buyRequest, $product);
         $this->assertEquals('string', $result);
     }

From 5d5ae032b48280118d8681a30d9d4abd1d2027fb Mon Sep 17 00:00:00 2001
From: Alexey Yakimovich <yakimovich@almagy.com>
Date: Thu, 27 Sep 2018 15:16:51 +0300
Subject: [PATCH 32/50] MAGETWO-91679: Bundled SKUs are being assembled based
 on the product ID number

- Fixed an issue with incorrect genereation of dynamic SKU for bundle products;
---
 app/code/Magento/Bundle/Model/Product/Type.php        |  7 +++++--
 .../Bundle/Test/Unit/Model/Product/TypeTest.php       | 11 +++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 92bada8094c7e..67441cd944c4f 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -308,8 +308,11 @@ public function getSku($product)
                 $selectionIds = $this->serializer->unserialize($customOption->getValue());
                 if (!empty($selectionIds)) {
                     $selections = $this->getSelectionsByIds($selectionIds, $product);
-                    foreach ($selections->getItems() as $selection) {
-                        $skuParts[] = $selection->getSku();
+                    foreach ($selectionIds as $selectionId) {
+                        $entity = $selections->getItemByColumnValue('selection_id', $selectionId);
+                        if ($entity->getEntityId()) {
+                            $skuParts[] = $entity->getSku();
+                        }
                     }
                 }
             }
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
index 4bbf5641c55d3..1b9cafbe8c198 100644
--- a/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
+++ b/app/code/Magento/Bundle/Test/Unit/Model/Product/TypeTest.php
@@ -1595,7 +1595,7 @@ public function testGetSkuWithoutType()
             ->disableOriginalConstructor()
             ->getMock();
         $selectionItemMock = $this->getMockBuilder(\Magento\Framework\DataObject::class)
-            ->setMethods(['getSku', '__wakeup'])
+            ->setMethods(['getSku', 'getEntityId', '__wakeup'])
             ->disableOriginalConstructor()
             ->getMock();
 
@@ -1623,9 +1623,12 @@ public function testGetSkuWithoutType()
             ->will($this->returnValue($serializeIds));
         $selectionMock = $this->getSelectionsByIdsMock($selectionIds, $productMock, 5, 6);
         $selectionMock->expects(($this->any()))
-            ->method('getItems')
-            ->will($this->returnValue([$selectionItemMock]));
-        $selectionItemMock->expects($this->any())
+            ->method('getItemByColumnValue')
+            ->will($this->returnValue($selectionItemMock));
+        $selectionItemMock->expects($this->at(0))
+            ->method('getEntityId')
+            ->will($this->returnValue(1));
+        $selectionItemMock->expects($this->once())
             ->method('getSku')
             ->will($this->returnValue($itemSku));
 

From 5aab5421697039e56993f84d88e2b6db4a2242da Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Wed, 26 Sep 2018 21:12:12 +0300
Subject: [PATCH 33/50] MAGETWO-91517: Cancel and Return link removes billing
 and shipping address

- Provide information from database to set to browser local storage if local storage is empty.
---
 .../Checkout/Model/DefaultConfigProvider.php  | 53 +++++++++++++++++--
 .../web/js/model/checkout-data-resolver.js    | 13 ++++-
 .../web/js/view/form/element/email.js         |  7 +++
 3 files changed, 69 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
index ea6cdd2e51b4a..fd120f0a37a4b 100644
--- a/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
+++ b/app/code/Magento/Checkout/Model/DefaultConfigProvider.php
@@ -14,6 +14,7 @@
 use Magento\Customer\Model\Session as CustomerSession;
 use Magento\Customer\Model\Url as CustomerUrlManager;
 use Magento\Eav\Api\AttributeOptionManagementInterface;
+use Magento\Framework\Api\CustomAttributesDataInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\App\Http\Context as HttpContext;
 use Magento\Framework\App\ObjectManager;
@@ -22,9 +23,11 @@
 use Magento\Framework\UrlInterface;
 use Magento\Quote\Api\CartItemRepositoryInterface as QuoteItemRepository;
 use Magento\Quote\Api\CartTotalRepositoryInterface;
+use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Api\ShippingMethodManagementInterface as ShippingMethodManager;
 use Magento\Quote\Model\QuoteIdMaskFactory;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Ui\Component\Form\Element\Multiline;
 
 /**
  * Default Config Provider
@@ -272,16 +275,28 @@ public function __construct(
      *
      * @return array|mixed
      * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     public function getConfig()
     {
-        $quoteId = $this->checkoutSession->getQuote()->getId();
+        $quote = $this->checkoutSession->getQuote();
+        $quoteId = $quote->getId();
+        $email = $quote->getShippingAddress()->getEmail();
         $output['formKey'] = $this->formKey->getFormKey();
         $output['customerData'] = $this->getCustomerData();
         $output['quoteData'] = $this->getQuoteData();
         $output['quoteItemData'] = $this->getQuoteItemData();
         $output['isCustomerLoggedIn'] = $this->isCustomerLoggedIn();
         $output['selectedShippingMethod'] = $this->getSelectedShippingMethod();
+        if ($email && !$this->isCustomerLoggedIn()) {
+            $shippingAddressFromData = $this->getAddressFromData($quote->getShippingAddress());
+            $billingAddressFromData = $this->getAddressFromData($quote->getBillingAddress());
+            $output['shippingAddressFromData'] = $shippingAddressFromData;
+            if ($shippingAddressFromData != $billingAddressFromData) {
+                $output['billingAddressFromData'] = $billingAddressFromData;
+            }
+            $output['validatedEmailValue'] = $email;
+        }
         $output['storeCode'] = $this->getStoreCode();
         $output['isGuestCheckoutAllowed'] = $this->isGuestCheckoutAllowed();
         $output['isCustomerLoginRequired'] = $this->isCustomerLoginRequired();
@@ -293,11 +308,11 @@ public function getConfig()
         $output['staticBaseUrl'] = $this->getStaticBaseUrl();
         $output['priceFormat'] = $this->localeFormat->getPriceFormat(
             null,
-            $this->checkoutSession->getQuote()->getQuoteCurrencyCode()
+            $quote->getQuoteCurrencyCode()
         );
         $output['basePriceFormat'] = $this->localeFormat->getPriceFormat(
             null,
-            $this->checkoutSession->getQuote()->getBaseCurrencyCode()
+            $quote->getBaseCurrencyCode()
         );
         $output['postCodes'] = $this->postCodesConfig->getPostCodes();
         $output['imageData'] = $this->imageProvider->getImages($quoteId);
@@ -528,6 +543,38 @@ private function getSelectedShippingMethod()
         return $shippingMethodData;
     }
 
+    /**
+     * Create address data appropriate to fill checkout address form
+     *
+     * @param AddressInterface $address
+     * @return array
+     * @throws \Magento\Framework\Exception\LocalizedException
+     */
+    private function getAddressFromData(AddressInterface $address)
+    {
+        $addressData = [];
+        $attributesMetadata = $this->addressMetadata->getAllAttributesMetadata();
+        foreach ($attributesMetadata as $attributeMetadata) {
+            if (!$attributeMetadata->isVisible()) {
+                continue;
+            }
+            $attributeCode = $attributeMetadata->getAttributeCode();
+            $attributeData = $address->getData($attributeCode);
+            if ($attributeData) {
+                if ($attributeMetadata->getFrontendInput() === Multiline::NAME) {
+                    $attributeData = \is_array($attributeData) ? $attributeData : explode("\n", $attributeData);
+                    $attributeData = (object)$attributeData;
+                }
+                if ($attributeMetadata->isUserDefined()) {
+                    $addressData[CustomAttributesDataInterface::CUSTOM_ATTRIBUTES][$attributeCode] = $attributeData;
+                    continue;
+                }
+                $addressData[$attributeCode] = $attributeData;
+            }
+        }
+        return $addressData;
+    }
+
     /**
      * Retrieve store code
      *
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
index 73f4df567903c..25abe3c4ed3a0 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
@@ -60,13 +60,18 @@ define([
                     this.resolveBillingAddress();
                 }
             }
-
         },
 
         /**
          * Resolve shipping address. Used local storage
          */
         resolveShippingAddress: function () {
+            if (!checkoutData.getShippingAddressFromData() &&
+                window.checkoutConfig.shippingAddressFromData
+            ) {
+                checkoutData.setShippingAddressFromData(window.checkoutConfig.shippingAddressFromData);
+            }
+
             var newCustomerShippingAddress = checkoutData.getNewCustomerShippingAddress();
 
             if (newCustomerShippingAddress) {
@@ -196,6 +201,12 @@ define([
          * Resolve billing address. Used local storage
          */
         resolveBillingAddress: function () {
+            if (!checkoutData.getBillingAddressFromData() &&
+                window.checkoutConfig.billingAddressFromData
+            ) {
+                checkoutData.setBillingAddressFromData(window.checkoutConfig.billingAddressFromData);
+            }
+
             var selectedBillingAddress = checkoutData.getSelectedBillingAddress(),
                 newCustomerBillingAddressData = checkoutData.getNewCustomerBillingAddress();
 
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
index 4a25778e754c7..6c0075fca6d51 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
@@ -17,6 +17,13 @@ define([
 ], function ($, Component, ko, customer, checkEmailAvailability, loginAction, quote, checkoutData, fullScreenLoader) {
     'use strict';
 
+    if (!checkoutData.getValidatedEmailValue() &&
+        window.checkoutConfig.validatedEmailValue
+    ) {
+        checkoutData.setInputFieldEmailValue(window.checkoutConfig.validatedEmailValue);
+        checkoutData.setValidatedEmailValue(window.checkoutConfig.validatedEmailValue);
+    }
+
     var validatedEmail = checkoutData.getValidatedEmailValue();
 
     if (validatedEmail && !customer.isLoggedIn()) {

From 77ec759a758eb80aceb28a67ab65d46846e38d78 Mon Sep 17 00:00:00 2001
From: Nikita Chubukov <nikita_chubukov@epam.com>
Date: Thu, 27 Sep 2018 21:14:23 +0300
Subject: [PATCH 34/50] MAGETWO-91640: Scheduled Import of Products fails on
 error when errors should be skipped

- Changed behaviour for "skip-errors" processing during import shceduling
---
 .../CatalogImportExport/Model/Import/Product.php    |  7 +++++--
 app/code/Magento/ImportExport/Model/Import.php      | 13 +++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
index b755d91e403ff..d85c64327be60 100644
--- a/app/code/Magento/CatalogImportExport/Model/Import/Product.php
+++ b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -1623,8 +1623,11 @@ protected function _saveProducts()
                     continue;
                 }
                 if ($this->getErrorAggregator()->hasToBeTerminated()) {
-                    $this->getErrorAggregator()->addRowToSkip($rowNum);
-                    continue;
+                    $validationStrategy = $this->_parameters[Import::FIELD_NAME_VALIDATION_STRATEGY];
+                    if (ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS !== $validationStrategy) {
+                        $this->getErrorAggregator()->addRowToSkip($rowNum);
+                        continue;
+                    }
                 }
                 $rowScope = $this->getRowScope($rowData);
 
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
index b5e8220e0e9b0..064c696ad0a84 100644
--- a/app/code/Magento/ImportExport/Model/Import.php
+++ b/app/code/Magento/ImportExport/Model/Import.php
@@ -181,7 +181,7 @@ class Import extends \Magento\ImportExport\Model\AbstractModel
      * @param Source\Import\Behavior\Factory $behaviorFactory
      * @param \Magento\Framework\Indexer\IndexerRegistry $indexerRegistry
      * @param History $importHistoryModel
-     * @param \Magento\Framework\Stdlib\DateTime\DateTime
+     * @param \Magento\Framework\Stdlib\DateTime\DateTime $localeDate
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -443,6 +443,8 @@ public function importSource()
     }
 
     /**
+     * Processing of import.
+     *
      * @return bool
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -462,6 +464,8 @@ public function isImportAllowed()
     }
 
     /**
+     * Get error aggregator instance.
+     *
      * @return ProcessingErrorAggregatorInterface
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -585,6 +589,11 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
         $this->addLogComment($messages);
 
         $result = !$errorAggregator->getErrorsCount();
+        $validationStrategy = $this->getData(self::FIELD_NAME_VALIDATION_STRATEGY);
+        if ($validationStrategy === ProcessingErrorAggregatorInterface::VALIDATION_STRATEGY_SKIP_ERRORS) {
+            $result = true;
+        }
+
         if ($result) {
             $this->addLogComment(__('Import data validation is complete.'));
         }
@@ -710,9 +719,9 @@ public function isReportEntityType($entity = null)
     /**
      * Create history report
      *
+     * @param string $sourceFileRelative
      * @param string $entity
      * @param string $extension
-     * @param string $sourceFileRelative
      * @param array $result
      * @return $this
      * @throws \Magento\Framework\Exception\LocalizedException

From cc00197d13d6244e32201e4c6bf00287e54747c5 Mon Sep 17 00:00:00 2001
From: Stsiapan Korf <Stsiapan_Korf@epam.com>
Date: Mon, 1 Oct 2018 13:49:26 +0300
Subject: [PATCH 35/50] MAGETWO-91702: Shipping method Table Rates settings
 gets from wrong store

- Fix website id for shipping
---
 app/code/Magento/Quote/Model/Quote/Address.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Quote/Model/Quote/Address.php b/app/code/Magento/Quote/Model/Quote/Address.php
index 11beffe5711b9..140ace42afae1 100644
--- a/app/code/Magento/Quote/Model/Quote/Address.php
+++ b/app/code/Magento/Quote/Model/Quote/Address.php
@@ -1003,8 +1003,14 @@ public function requestShippingRates(\Magento\Quote\Model\Quote\Item\AbstractIte
         /**
          * Store and website identifiers specified from StoreManager
          */
-        $request->setStoreId($this->getQuote()->getStoreId() ?? $this->storeManager->getStore()->getId());
-        $request->setWebsiteId($this->storeManager->getWebsite()->getId());
+        if ($this->getQuote()->getStoreId()) {
+            $storeId = $this->getQuote()->getStoreId();
+            $request->setStoreId($storeId);
+            $request->setWebsiteId($this->storeManager->getStore($storeId)->getWebsiteId());
+        } else {
+            $request->setStoreId($this->storeManager->getStore()->getId());
+            $request->setWebsiteId($this->storeManager->getWebsite()->getId());
+        }
         $request->setFreeShipping($this->getFreeShipping());
         /**
          * Currencies need to convert in free shipping

From ce0cb8c76c31545d3527243cbef1bd77947caf49 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Thu, 4 Oct 2018 13:39:59 +0300
Subject: [PATCH 36/50] MAGETWO-67269: Gift Options set to no still show up as
 choices on front end order page

- Fix statics.
---
 app/code/Magento/GiftMessage/Block/Message/Inline.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/GiftMessage/Block/Message/Inline.php b/app/code/Magento/GiftMessage/Block/Message/Inline.php
index f44f967cefdc6..4a9311c1b4ba2 100644
--- a/app/code/Magento/GiftMessage/Block/Message/Inline.php
+++ b/app/code/Magento/GiftMessage/Block/Message/Inline.php
@@ -139,7 +139,7 @@ public function getType()
     /**
      * Define checkout type
      *
-     * @param $type string
+     * @param string $type
      * @return $this
      * @codeCoverageIgnore
      */
@@ -278,6 +278,8 @@ public function countItems()
     }
 
     /**
+     * Call method getItemsHasMessages
+     *
      * @deprecated Misspelled method
      * @see getItemsHasMessages
      */

From 8cf76a56cb7d4eb43489e223240f17868a2b8ca4 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Fri, 5 Oct 2018 16:30:57 +0300
Subject: [PATCH 37/50] MAGETWO-91517: Cancel and Return link removes billing
 and shipping address

- Fix statics.
---
 .../frontend/web/js/model/checkout-data-resolver.js | 13 ++++++++-----
 .../view/frontend/web/js/view/form/element/email.js |  5 +++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
index 25abe3c4ed3a0..4abb4c4d61700 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
@@ -66,14 +66,15 @@ define([
          * Resolve shipping address. Used local storage
          */
         resolveShippingAddress: function () {
+            var newCustomerShippingAddress;
+
             if (!checkoutData.getShippingAddressFromData() &&
                 window.checkoutConfig.shippingAddressFromData
             ) {
                 checkoutData.setShippingAddressFromData(window.checkoutConfig.shippingAddressFromData);
             }
 
-            var newCustomerShippingAddress = checkoutData.getNewCustomerShippingAddress();
-
+            newCustomerShippingAddress = checkoutData.getNewCustomerShippingAddress();
             if (newCustomerShippingAddress) {
                 createShippingAddress(newCustomerShippingAddress);
             }
@@ -201,15 +202,17 @@ define([
          * Resolve billing address. Used local storage
          */
         resolveBillingAddress: function () {
+            var selectedBillingAddress,
+                newCustomerBillingAddressData;
+
             if (!checkoutData.getBillingAddressFromData() &&
                 window.checkoutConfig.billingAddressFromData
             ) {
                 checkoutData.setBillingAddressFromData(window.checkoutConfig.billingAddressFromData);
             }
 
-            var selectedBillingAddress = checkoutData.getSelectedBillingAddress(),
-                newCustomerBillingAddressData = checkoutData.getNewCustomerBillingAddress();
-
+            selectedBillingAddress = checkoutData.getSelectedBillingAddress();
+            newCustomerBillingAddressData = checkoutData.getNewCustomerBillingAddress();
             if (selectedBillingAddress) {
                 if (selectedBillingAddress == 'new-customer-address' && newCustomerBillingAddressData) { //eslint-disable-line
                     selectBillingAddress(createBillingAddress(newCustomerBillingAddressData));
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
index 6c0075fca6d51..37a785e292365 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
@@ -17,6 +17,8 @@ define([
 ], function ($, Component, ko, customer, checkEmailAvailability, loginAction, quote, checkoutData, fullScreenLoader) {
     'use strict';
 
+    var validatedEmail;
+
     if (!checkoutData.getValidatedEmailValue() &&
         window.checkoutConfig.validatedEmailValue
     ) {
@@ -24,8 +26,7 @@ define([
         checkoutData.setValidatedEmailValue(window.checkoutConfig.validatedEmailValue);
     }
 
-    var validatedEmail = checkoutData.getValidatedEmailValue();
-
+    validatedEmail = checkoutData.getValidatedEmailValue();
     if (validatedEmail && !customer.isLoggedIn()) {
         quote.guestEmail = validatedEmail;
     }

From d921849d060864994249f387487d743dce85fc06 Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Mon, 8 Oct 2018 14:12:59 +0300
Subject: [PATCH 38/50] MAGETWO-91517: Cancel and Return link removes billing
 and shipping address

- Fix statics.
---
 .../view/frontend/web/js/model/checkout-data-resolver.js         | 1 +
 .../Checkout/view/frontend/web/js/view/form/element/email.js     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
index 4abb4c4d61700..cd4c59df51187 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
@@ -75,6 +75,7 @@ define([
             }
 
             newCustomerShippingAddress = checkoutData.getNewCustomerShippingAddress();
+
             if (newCustomerShippingAddress) {
                 createShippingAddress(newCustomerShippingAddress);
             }
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
index 37a785e292365..4d883fb1373bd 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/view/form/element/email.js
@@ -27,6 +27,7 @@ define([
     }
 
     validatedEmail = checkoutData.getValidatedEmailValue();
+
     if (validatedEmail && !customer.isLoggedIn()) {
         quote.guestEmail = validatedEmail;
     }

From 02bdadd38cd023840ed85cca43b6091c3457d94a Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Tue, 9 Oct 2018 11:33:27 +0300
Subject: [PATCH 39/50] MAGETWO-91517: Cancel and Return link removes billing
 and shipping address

- Fix statics.
---
 .../view/frontend/web/js/model/checkout-data-resolver.js         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
index cd4c59df51187..1c2438889c170 100644
--- a/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
+++ b/app/code/Magento/Checkout/view/frontend/web/js/model/checkout-data-resolver.js
@@ -214,6 +214,7 @@ define([
 
             selectedBillingAddress = checkoutData.getSelectedBillingAddress();
             newCustomerBillingAddressData = checkoutData.getNewCustomerBillingAddress();
+
             if (selectedBillingAddress) {
                 if (selectedBillingAddress == 'new-customer-address' && newCustomerBillingAddressData) { //eslint-disable-line
                     selectBillingAddress(createBillingAddress(newCustomerBillingAddressData));

From 3370c8110ef6c479a1886722c447593b0437340a Mon Sep 17 00:00:00 2001
From: Karen_Mkhitaryan <Karen_Mkhitaryan@epam.com>
Date: Tue, 9 Oct 2018 17:28:12 +0400
Subject: [PATCH 40/50] MAGETWO-91628: Bundle product price doubled when
 switching currency

- Add minor changes in test
---
 .../Mftf/Test/CurrencyChangingBundleProductInCartTest.xml   | 6 ++++++
 .../Test/Mftf/Section/CurrencySetupSection.xml              | 1 +
 2 files changed, 7 insertions(+)

diff --git a/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
index b7e716dc15ece..ded8bb3c83337 100644
--- a/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
+++ b/app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml
@@ -28,12 +28,16 @@
                     <argument name="product" value="BundleProduct"/>
                 </actionGroup>
                 <actionGroup ref="AdminClearFiltersActionGroup" stepKey="ClearFiltersAfter"/>
+                <waitForPageLoad stepKey="waitForClearFilter"/>
                 <!--Clear Configs-->
                 <amOnPage url="{{AdminLoginPage.url}}" stepKey="navigateToAdmin"/>
                 <waitForPageLoad stepKey="waitForAdminLoginPageLoad"/>
                 <amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage"/>
                 <waitForPageLoad stepKey="waitForConfigCurrencySetupPageForUnselectEuroCurrency"/>
                 <unselectOption selector="{{CurrencySetupSection.allowCurrencies}}" userInput="Euro" stepKey="unselectEuro"/>
+                <scrollToTopOfPage stepKey="scrollToTopOfPage"/>
+                <click selector="{{CurrencySetupSection.currencyOptions}}" stepKey="closeOptions"/>
+                <waitForPageLoad stepKey="waitForCloseOptions"/>
                 <click stepKey="saveUnselectedConfigs" selector="{{AdminConfigSection.saveButton}}"/>
                 <amOnPage url="{{AdminLogoutPage.url}}" stepKey="logout"/>
                 <deleteData createDataKey="simpleProduct1" stepKey="deleteSimpleProduct1"/>
@@ -57,6 +61,8 @@
             <actionGroup ref="saveProductForm" stepKey="saveProduct"/>
             <amOnPage url="{{ConfigCurrencySetupPage.url}}" stepKey="navigateToConfigCurrencySetupPage"/>
             <waitForPageLoad stepKey="waitForConfigCurrencySetupPage"/>
+            <conditionalClick selector="{{CurrencySetupSection.currencyOptions}}" dependentSelector="{{CurrencySetupSection.allowCurrencies}}" visible="false" stepKey="openOptions"/>
+            <waitForPageLoad stepKey="waitForOptions"/>
             <selectOption selector="{{CurrencySetupSection.allowCurrencies}}" parameterArray="['Euro', 'US Dollar']" stepKey="selectCurrencies"/>
             <click stepKey="saveConfigs" selector="{{AdminConfigSection.saveButton}}"/>
             <!-- Go to storefront BundleProduct -->
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml
index 16101409ad7e8..20fcd1e89360c 100644
--- a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml
+++ b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/CurrencySetupSection.xml
@@ -10,5 +10,6 @@
           xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CurrencySetupSection">
         <element name="allowCurrencies" type="select" selector="#currency_options_allow"/>
+        <element name="currencyOptions" type="select" selector="#currency_options-head"/>
     </section>
 </sections>
\ No newline at end of file

From dd560f3c985e890fd21cb97b3fd6b5f5b190a312 Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Tue, 9 Oct 2018 16:32:45 +0300
Subject: [PATCH 41/50] MAGETWO-91640: Scheduled Import of Products fails on
 error when errors should be skipped

- Integration test fix
---
 .../integration/testsuite/Magento/Catalog/_files/categories.php | 2 +-
 .../Magento/CatalogImportExport/Model/Import/ProductTest.php    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
index a903274793c34..9a1a6f24dffc8 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
@@ -84,7 +84,7 @@
 $category = $objectManager->create(\Magento\Catalog\Model\Category::class);
 $category->isObjectNew(true);
 $category->setId(6)
-    ->setName('Category 2')
+    ->setName('Category 2.1')
     ->setParentId(2)
     ->setPath('1/2/6')
     ->setLevel(2)
diff --git a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
index 237d7660da9bd..296c36caed5a0 100644
--- a/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
+++ b/dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php
@@ -958,6 +958,7 @@ public function testInvalidSkuLink()
         $errors = $this->_model->setParameters(
             [
                 'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_APPEND,
+                Import::FIELD_NAME_VALIDATION_STRATEGY => null,
                 'entity' => 'catalog_product'
             ]
         )->setSource(

From b0d7a268162d57f3f30a3488fca1afac104ae322 Mon Sep 17 00:00:00 2001
From: Yauhen_Lyskavets <yauhen_lyskavets@epam.com>
Date: Wed, 10 Oct 2018 13:53:30 +0300
Subject: [PATCH 42/50] MAGETWO-91679: Bundled SKUs are being assembled based
 on the product ID number

- Integration test fix
---
 app/code/Magento/Bundle/Model/Product/Type.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Bundle/Model/Product/Type.php b/app/code/Magento/Bundle/Model/Product/Type.php
index 67441cd944c4f..3729cd945758f 100644
--- a/app/code/Magento/Bundle/Model/Product/Type.php
+++ b/app/code/Magento/Bundle/Model/Product/Type.php
@@ -310,7 +310,7 @@ public function getSku($product)
                     $selections = $this->getSelectionsByIds($selectionIds, $product);
                     foreach ($selectionIds as $selectionId) {
                         $entity = $selections->getItemByColumnValue('selection_id', $selectionId);
-                        if ($entity->getEntityId()) {
+                        if (isset($entity) && $entity->getEntityId()) {
                             $skuParts[] = $entity->getSku();
                         }
                     }

From 41cb4685fc24b296de837ddf8c39ab377e7347a9 Mon Sep 17 00:00:00 2001
From: Mikalai Shostka <Mikalai_Shostka@epam.com>
Date: Thu, 11 Oct 2018 10:24:11 +0300
Subject: [PATCH 43/50] MAGETWO-91563: Gift wrapping selection does not display
 in shopping cart

- Add GET interface
---
 app/code/Magento/Checkout/Controller/Cart/UpdatePost.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
index 9f0dcc6d9c18f..b49635a951e39 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
@@ -8,8 +8,9 @@
 
 use Magento\Checkout\Model\Cart\RequestQuantityProcessor;
 use Magento\Framework\App\Action\HttpPostActionInterface;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
-class UpdatePost extends \Magento\Checkout\Controller\Cart implements HttpPostActionInterface
+class UpdatePost extends \Magento\Checkout\Controller\Cart implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * @var RequestQuantityProcessor

From f03ed7a2e6292f58cc5859422d660e85ec9d5cdb Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 11 Oct 2018 15:00:48 +0300
Subject: [PATCH 44/50] MAGETWO-91563: Gift wrapping selection does not display
 in shopping cart

- Fix static test
---
 app/code/Magento/Checkout/Controller/Cart/UpdatePost.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
index b49635a951e39..bfc408d920ad3 100644
--- a/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
+++ b/app/code/Magento/Checkout/Controller/Cart/UpdatePost.php
@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -10,6 +9,9 @@
 use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
 
+/**
+ * Post update shopping cart.
+ */
 class UpdatePost extends \Magento\Checkout\Controller\Cart implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**

From d3a62b1c8bcdad89d564b0a41f53a08cc81a4fa0 Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Thu, 11 Oct 2018 15:32:13 +0300
Subject: [PATCH 45/50] MAGETWO-91640: Scheduled Import of Products fails on
 error when errors should be skipped

- Fix integration test
---
 .../integration/testsuite/Magento/Catalog/_files/categories.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
index 9a1a6f24dffc8..a903274793c34 100644
--- a/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
+++ b/dev/tests/integration/testsuite/Magento/Catalog/_files/categories.php
@@ -84,7 +84,7 @@
 $category = $objectManager->create(\Magento\Catalog\Model\Category::class);
 $category->isObjectNew(true);
 $category->setId(6)
-    ->setName('Category 2.1')
+    ->setName('Category 2')
     ->setParentId(2)
     ->setPath('1/2/6')
     ->setLevel(2)

From 93b8f297f0890a88deb52e8baefb09af1bed8abf Mon Sep 17 00:00:00 2001
From: Veronika Kurochkina <veronika_kurochkina@epam.com>
Date: Fri, 12 Oct 2018 14:03:11 +0300
Subject: [PATCH 46/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Fix static tests
---
 .../Block/Product/ProductList/Toolbar.php        | 14 ++++++++++++++
 .../view/frontend/web/js/product/list/toolbar.js | 16 ++++++++--------
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index 12c691d1365c3..c7a9fcce7bf7a 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -430,6 +430,8 @@ public function getPagerUrl($params = [])
     }
 
     /**
+     * Get pager encoded url.
+     *
      * @param array $params
      * @return string
      */
@@ -624,6 +626,8 @@ public function getLimit()
     }
 
     /**
+     * Check if limit is current used in toolbar.
+     *
      * @param int $limit
      * @return bool
      */
@@ -633,6 +637,8 @@ public function isLimitCurrent($limit)
     }
 
     /**
+     * Pager number of items from which products started on current page.
+     *
      * @return int
      */
     public function getFirstNum()
@@ -642,6 +648,8 @@ public function getFirstNum()
     }
 
     /**
+     * Pager number of items products finished on current page.
+     *
      * @return int
      */
     public function getLastNum()
@@ -651,6 +659,8 @@ public function getLastNum()
     }
 
     /**
+     * Total number of products in current category.
+     *
      * @return int
      */
     public function getTotalNum()
@@ -659,6 +669,8 @@ public function getTotalNum()
     }
 
     /**
+     * Check if current page is the first.
+     *
      * @return bool
      */
     public function isFirstPage()
@@ -667,6 +679,8 @@ public function isFirstPage()
     }
 
     /**
+     * Return last page number.
+     *
      * @return int
      */
     public function getLastPageNum()
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
index 7c47f5bd04d5a..b8b6ff65be2b4 100644
--- a/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
+++ b/app/code/Magento/Catalog/view/frontend/web/js/product/list/toolbar.js
@@ -91,7 +91,7 @@ define([
                 baseUrl = urlPaths[0],
                 urlParams = urlPaths[1] ? urlPaths[1].split('&') : [],
                 paramData = {},
-                parameters, i;
+                parameters, i, form, params, key, input, formKey;
 
             for (i = 0; i < urlParams.length; i++) {
                 parameters = urlParams[i].split('=');
@@ -102,25 +102,25 @@ define([
             paramData[paramName] = paramValue;
 
             if (this.options.post) {
-                var form = document.createElement('form');
+                form = document.createElement('form');
+                params = [this.options.mode, this.options.direction, this.options.order, this.options.limit];
 
-                var params = [this.options.mode, this.options.direction, this.options.order, this.options.limit];
-                for (var key in paramData) {
-                    if (params.indexOf(key) !== -1) {
-                        var input = document.createElement('input');
+                for (key in paramData) {
+                    if (params.indexOf(key) !== -1) { //eslint-disable-line max-depth
+                        input = document.createElement('input');
                         input.name = key;
                         input.value = paramData[key];
                         form.appendChild(input);
                         delete paramData[key];
                     }
                 }
-                var formKey = document.createElement('input');
+                formKey = document.createElement('input');
                 formKey.name = 'form_key';
                 formKey.value = this.options.formKey;
                 form.appendChild(formKey);
 
                 paramData = $.param(paramData);
-                baseUrl = baseUrl + (paramData.length ? '?' + paramData : '');
+                baseUrl += paramData.length ? '?' + paramData : '';
 
                 form.action = baseUrl;
                 form.method = 'POST';

From ea661055fc94c1f5a3c7399463915491acc8c0a5 Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 2 Nov 2018 11:41:20 +0300
Subject: [PATCH 47/50] MAGETWO-70303: [GITHUB] Anchor categories are showing
 products of disabled subcategories #9002

- Fix comments
---
 .../Catalog/Model/Indexer/Category/Product/AbstractAction.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
index a1358c02ce9fc..178f4172ce6fa 100644
--- a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
+++ b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -605,7 +605,7 @@ protected function getTemporaryTreeIndexTableName()
         if (empty($this->tempTreeIndexTableName)) {
             $this->tempTreeIndexTableName = $this->connection->getTableName('temp_catalog_category_tree_index')
                 . '_'
-                . substr(md5(time() . random_int(0, 999999999)), 0, 8);
+                . substr(sha1(time() . random_int(0, 999999999)), 0, 8);
         }
 
         return $this->tempTreeIndexTableName;

From 480aa38783f28951ed10f16177aaf3f295818f9e Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 2 Nov 2018 11:53:15 +0300
Subject: [PATCH 48/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Fix comments
---
 .../Magento/Catalog/Block/Product/ProductList/Toolbar.php     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index c7a9fcce7bf7a..a2cbc5087cd12 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -161,10 +161,10 @@ public function __construct(
         \Magento\Framework\Url\EncoderInterface $urlEncoder,
         ProductList $productListHelper,
         \Magento\Framework\Data\Helper\PostHelper $postDataHelper,
+        array $data = [],
         ToolbarMemorizer $toolbarMemorizer = null,
         \Magento\Framework\App\Http\Context $httpContext = null,
-        \Magento\Framework\Data\Form\FormKey $formKey = null,
-        array $data = []
+        \Magento\Framework\Data\Form\FormKey $formKey = null
     ) {
         $this->_catalogSession = $catalogSession;
         $this->_catalogConfig = $catalogConfig;

From 12e0c534e70632deff7e177fa716b79dfbbf83ba Mon Sep 17 00:00:00 2001
From: Yuliya Labudova <Yuliya_Labudova@epam.com>
Date: Fri, 2 Nov 2018 16:55:05 +0300
Subject: [PATCH 49/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Fix static test
---
 app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
index a2cbc5087cd12..c530ba4785ad9 100644
--- a/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
+++ b/app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php
@@ -146,10 +146,10 @@ class Toolbar extends \Magento\Framework\View\Element\Template
      * @param \Magento\Framework\Url\EncoderInterface $urlEncoder
      * @param ProductList $productListHelper
      * @param \Magento\Framework\Data\Helper\PostHelper $postDataHelper
+     * @param array $data
      * @param ToolbarMemorizer|null $toolbarMemorizer
      * @param \Magento\Framework\App\Http\Context|null $httpContext
      * @param \Magento\Framework\Data\Form\FormKey|null $formKey
-     * @param array $data
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */

From c8941f1d13a82e0c3d1c65dbf262a5e295933f3f Mon Sep 17 00:00:00 2001
From: Aliaksei_Manenak <Aliaksei_Manenak@epam.com>
Date: Fri, 2 Nov 2018 18:47:41 +0300
Subject: [PATCH 50/50] MAGETWO-61478: Number of Products displayed per page
 not retained when visiting a different category

- Fix statics.
---
 app/code/Magento/Catalog/Controller/Category/View.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/code/Magento/Catalog/Controller/Category/View.php b/app/code/Magento/Catalog/Controller/Category/View.php
index 43f25c58a70dd..2088bb5ea77cd 100644
--- a/app/code/Magento/Catalog/Controller/Category/View.php
+++ b/app/code/Magento/Catalog/Controller/Category/View.php
@@ -208,7 +208,7 @@ public function execute()
             if ($layoutUpdates && is_array($layoutUpdates)) {
                 foreach ($layoutUpdates as $layoutUpdate) {
                     $page->addUpdate($layoutUpdate);
-                    $page->addPageLayoutHandles(['layout_update' => md5($layoutUpdate)], null, false);
+                    $page->addPageLayoutHandles(['layout_update' => sha1($layoutUpdate)], null, false);
                 }
             }