Merge remote-tracking branch 'upstream/2.4-develop' into B2B-1637

Author: joanhe

.github/stale.yml

@@ -39,8 +39,9 @@ staleLabel: "stale issue"
 # Comment to post when marking as stale. Set to `false` to disable
 markComment: >
   This issue has been automatically marked as stale because it has not had
-  recent activity. It will be closed after 14 days if no further activity occurs. Thank you
-  for your contributions.
+  recent activity. It will be closed after 14 days if no further activity occurs.
+  Is this issue still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?
+  Thank you for your contributions!
 # Comment to post when removing the stale label.
 # unmarkComment: >
 #   Your comment here.

app/code/Magento/Backend/Controller/Adminhtml/System/Store/Save.php

@@ -7,6 +7,9 @@
 namespace Magento\Backend\Controller\Adminhtml\System\Store;
 
 use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Store\Model\Group as StoreGroup;
+use Magento\Store\Model\Store;
+use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Class Save
@@ -33,6 +36,17 @@ private function processWebsiteSave($postData)
             $websiteModel->setId(null);
         }
 
+        $groupModel = $this->_objectManager->create(StoreGroup::class);
+        $groupModel->load($websiteModel->getDefaultGroupId());
+        $storeModel = $this->_objectManager->create(Store::class);
+        $storeModel->load($groupModel->getDefaultStoreId());
+
+        if ($websiteModel->getIsDefault() && !$storeModel->isActive()) {
+            throw new LocalizedException(
+                __('Please enable your Store View before using this Web Site as Default')
+            );
+        }
+
         $websiteModel->save();
         $this->messageManager->addSuccessMessage(__('You saved the website.'));
 
@@ -43,13 +57,13 @@ private function processWebsiteSave($postData)
      * Process Store model save
      *
      * @param array $postData
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @return array
      */
     private function processStoreSave($postData)
     {
-        /** @var \Magento\Store\Model\Store $storeModel */
-        $storeModel = $this->_objectManager->create(\Magento\Store\Model\Store::class);
+        /** @var Store $storeModel */
+        $storeModel = $this->_objectManager->create(Store::class);
         $postData['store']['name'] = $this->filterManager->removeTags($postData['store']['name']);
         if ($postData['store']['store_id']) {
             $storeModel->load($postData['store']['store_id']);
@@ -59,13 +73,13 @@ private function processStoreSave($postData)
             $storeModel->setId(null);
         }
         $groupModel = $this->_objectManager->create(
-            \Magento\Store\Model\Group::class
+            StoreGroup::class
         )->load(
             $storeModel->getGroupId()
         );
         $storeModel->setWebsiteId($groupModel->getWebsiteId());
         if (!$storeModel->isActive() && $storeModel->isDefault()) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __('The default store cannot be disabled')
             );
         }
@@ -79,14 +93,14 @@ private function processStoreSave($postData)
      * Process StoreGroup model save
      *
      * @param array $postData
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @throws LocalizedException
      * @return array
      */
     private function processGroupSave($postData)
     {
         $postData['group']['name'] = $this->filterManager->removeTags($postData['group']['name']);
-        /** @var \Magento\Store\Model\Group $groupModel */
-        $groupModel = $this->_objectManager->create(\Magento\Store\Model\Group::class);
+        /** @var StoreGroup $groupModel */
+        $groupModel = $this->_objectManager->create(StoreGroup::class);
         if ($postData['group']['group_id']) {
             $groupModel->load($postData['group']['group_id']);
         }
@@ -95,10 +109,11 @@ private function processGroupSave($postData)
             $groupModel->setId(null);
         }
         if (!$this->isSelectedDefaultStoreActive($postData, $groupModel)) {
-            throw new \Magento\Framework\Exception\LocalizedException(
+            throw new LocalizedException(
                 __('An inactive store view cannot be saved as default store view')
             );
         }
+
         $groupModel->save();
         $this->messageManager->addSuccessMessage(__('You saved the store.'));
 
@@ -135,7 +150,7 @@ public function execute()
                 }
                 $redirectResult->setPath('adminhtml/*/');
                 return $redirectResult;
-            } catch (\Magento\Framework\Exception\LocalizedException $e) {
+            } catch (LocalizedException $e) {
                 $this->messageManager->addErrorMessage($e->getMessage());
                 $this->_getSession()->setPostData($postData);
             } catch (\Exception $e) {
@@ -156,10 +171,10 @@ public function execute()
      * Verify if selected default store is active
      *
      * @param array $postData
-     * @param \Magento\Store\Model\Group $groupModel
+     * @param StoreGroup $groupModel
      * @return bool
      */
-    private function isSelectedDefaultStoreActive(array $postData, \Magento\Store\Model\Group $groupModel)
+    private function isSelectedDefaultStoreActive(array $postData, StoreGroup $groupModel)
     {
         if (!empty($postData['group']['default_store_id'])) {
             $defaultStoreId = $postData['group']['default_store_id'];

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminClearGridFiltersActionGroup.xml

@@ -0,0 +1,19 @@
+<?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="AdminClearGridFiltersActionGroup">
+        <annotations>
+            <description>Click the Clear filters on the grid.</description>
+        </annotations>
+
+        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickClearFilters"/>
+        <waitForPageLoad stepKey="waitForPageLoaded"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/i18n/en_US.csv

@@ -198,6 +198,7 @@ System,System
 "All Stores","All Stores"
 "You saved the website.","You saved the website."
 "The default store cannot be disabled","The default store cannot be disabled"
+"Please enable your Store View before using this Web Site as Default","Please enable your Store View before using this Web Site as Default"
 "You saved the store view.","You saved the store view."
 "An inactive store view cannot be saved as default store view","An inactive store view cannot be saved as default store view"
 "You saved the store.","You saved the store."

app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php

@@ -184,10 +184,6 @@ public function getJsonConfig()
                 $configValue = $preConfiguredValues->getData('bundle_option/' . $optionId);
                 if ($configValue) {
                     $defaultValues[$optionId] = $configValue;
-                    $configQty = $preConfiguredValues->getData('bundle_option_qty/' . $optionId);
-                    if ($configQty) {
-                        $options[$optionId]['selections'][$configValue]['qty'] = $configQty;
-                    }
                 }
                 $options = $this->processOptions($optionId, $options, $preConfiguredValues);
             }

app/code/Magento/Bundle/Model/CartItemProcessor.php

@@ -51,7 +51,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      */
     public function convertToBuyRequest(CartItemInterface $cartItem)
     {
@@ -73,7 +73,7 @@ public function convertToBuyRequest(CartItemInterface $cartItem)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritDoc
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function processOptions(CartItemInterface $cartItem)
@@ -84,19 +84,21 @@ public function processOptions(CartItemInterface $cartItem)
         $productOptions = [];
         $bundleOptions = $cartItem->getBuyRequest()->getBundleOption();
         $bundleOptionsQty = $cartItem->getBuyRequest()->getBundleOptionQty();
+        $bundleOptionsQty = is_array($bundleOptionsQty) ? $bundleOptionsQty : [];
         if (is_array($bundleOptions)) {
             foreach ($bundleOptions as $optionId => $optionSelections) {
                 if (empty($optionSelections)) {
                     continue;
                 }
                 $optionSelections = is_array($optionSelections) ? $optionSelections : [$optionSelections];
-                $optionQty = isset($bundleOptionsQty[$optionId]) ? $bundleOptionsQty[$optionId] : 1;
 
                 /** @var \Magento\Bundle\Api\Data\BundleOptionInterface $productOption */
                 $productOption = $this->bundleOptionFactory->create();
                 $productOption->setOptionId($optionId);
                 $productOption->setOptionSelections($optionSelections);
-                $productOption->setOptionQty($optionQty);
+                if (isset($bundleOptionsQty[$optionId])) {
+                    $productOption->setOptionQty($bundleOptionsQty[$optionId]);
+                }
                 $productOptions[] = $productOption;
             }
 

app/code/Magento/Bundle/Test/Unit/Block/Catalog/Product/View/Type/BundleTest.php

@@ -214,6 +214,8 @@ public function testGetJsonConfigFixedPriceBundleNoOption()
 
     public function testGetJsonConfigFixedPriceBundle()
     {
+        $optionId = 1;
+        $optionQty = 2;
         $baseAmount = 123;
         $basePriceValue = 123123;
         $selections = [
@@ -230,7 +232,6 @@ public function testGetJsonConfigFixedPriceBundle()
                 true
             )
         ];
-
         $bundleProductPrice = $this->getMockBuilder(Price::class)
             ->disableOriginalConstructor()
             ->setMethods(['getLowestPrice'])
@@ -246,10 +247,8 @@ public function testGetJsonConfigFixedPriceBundle()
         $this->bundleProductPriceFactory->expects($this->once())
             ->method('create')
             ->willReturn($bundleProductPrice);
+        $options = [$this->createOption($optionId, 'Title `1', $selections)];
 
-        $options = [
-            $this->createOption(1, 'Title `1', $selections),
-        ];
         $finalPriceMock = $this->getPriceMock(
             [
                 'getPriceWithoutOption' => new DataObject(
@@ -289,7 +288,10 @@ public function testGetJsonConfigFixedPriceBundle()
         $preconfiguredValues = new DataObject(
             [
                 'bundle_option' => [
-                    1 => 123123111,
+                    $optionId => [123123111],
+                ],
+                'bundle_option_qty' => [
+                    $optionId => $optionQty,
                 ],
             ]
         );
@@ -306,7 +308,8 @@ public function testGetJsonConfigFixedPriceBundle()
         $this->assertEquals(110, $jsonConfig['prices']['oldPrice']['amount']);
         $this->assertEquals(100, $jsonConfig['prices']['basePrice']['amount']);
         $this->assertEquals(100, $jsonConfig['prices']['finalPrice']['amount']);
-        $this->assertEquals([1], $jsonConfig['positions']);
+        $this->assertEquals([$optionId], $jsonConfig['positions']);
+        $this->assertEquals($optionQty, $jsonConfig['options'][$optionId]['selections'][1123]['qty']);
     }
 
     /**

app/code/Magento/Catalog/Test/Mftf/Test/AdminRequiredFieldsHaveRequiredFieldIndicatorTest.xml

@@ -60,7 +60,7 @@
         <!-- Verify that the CMS page have the required field name indicator next to Page Title -->
         <amOnPage url="{{CmsPagesPage.url}}" stepKey="amOnPagePagesGrid"/>
         <waitForPageLoad stepKey="waitForPageLoad1"/>
-        <click selector="{{CmsPagesPageActionsSection.addNewPageButton}}" stepKey="clickAddNewPage"/>
+        <actionGroup ref="AdminClickAddNewPageOnPagesGridActionGroup" stepKey="clickAddNewPage"/>
         <executeJS function="{{CmsNewPagePageBasicFieldsSection.RequiredFieldIndicator}}" stepKey="pageTitleRequiredFieldIndicator"/>
         <assertEquals message="pass" stepKey="assertRequiredFieldIndicator5">
 			<actualResult type="variable">pageTitleRequiredFieldIndicator</actualResult>

app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithNoRedirectTest.xml

@@ -79,8 +79,8 @@
         <see selector="{{AdminUrlRewriteIndexSection.gridCellByColumnRowNumber('1', 'Request Path')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updatedurl.html" stepKey="seeTheRedirectPath"/>
 
         <!-- Verify third level category's old URL path doesn't show redirect path-->
-        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickOnResetButton1"/>
-        <waitForPageLoad stepKey="waitForPageToLoad3"/>
+        <actionGroup ref="AdminClearGridFiltersActionGroup" stepKey="clickOnResetButton1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad3"/>
 
         <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters1"/>
         <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="{{Three_nested_categories.name_lwr}}" stepKey="fillOldUrlInRedirectPathFilter"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateTopCategoryUrlWithRedirectTest.xml

@@ -77,8 +77,8 @@
         <see selector="{{AdminUrlRewriteIndexSection.gridCellByColumnRowNumber('1', 'Request Path')}}" userInput="$$createDefaultCategory.name$$/$$createTwoLevelNestedCategories.name$$/updateredirecturl.html" stepKey="seeTheRedirectPath"/>
 
         <!-- Verify third level category's Redirect path, Target Path and Redirect type for old URL -->
-        <click selector="{{AdminDataGridHeaderSection.clearFilters}}" stepKey="clickOnResetButton1"/>
-        <waitForPageLoad stepKey="waitForPageToLoad4"/>
+        <actionGroup ref="AdminClearGridFiltersActionGroup" stepKey="clickOnResetButton1"/>
+        <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="waitForPageToLoad4"/>
         <click selector="{{AdminDataGridHeaderSection.filters}}" stepKey="openUrlRewriteGridFilters1"/>
         <fillField selector="{{AdminDataGridHeaderSection.filterFieldInput('request_path')}}" userInput="$$createThreeLevelNestedCategories.name$$" stepKey="fillOldUrlInRedirectPathFilter"/>
         <click selector="{{AdminDataGridHeaderSection.applyFilters}}" stepKey="clickOrderApplyFilters1"/>