Merge branch '2.3-develop' into MC-19421

Author: Yevhen Miroshnychenko

app/code/Magento/Catalog/Model/Product.php

@@ -832,12 +832,14 @@ public function getStoreIds()
         if (!$this->hasStoreIds()) {
             $storeIds = [];
             if ($websiteIds = $this->getWebsiteIds()) {
-                if ($this->_storeManager->isSingleStoreMode()) {
+                if (!$this->isObjectNew() && $this->_storeManager->isSingleStoreMode()) {
                     $websiteIds = array_keys($websiteIds);
                 }
                 foreach ($websiteIds as $websiteId) {
                     $websiteStores = $this->_storeManager->getWebsite($websiteId)->getStoreIds();
-                    $storeIds = array_merge($storeIds, $websiteStores);
+                    foreach ($websiteStores as $websiteStore) {
+                        $storeIds []= $websiteStore;
+                    }
                 }
             }
             $this->setStoreIds($storeIds);
@@ -920,9 +922,9 @@ public function beforeSave()
         //Validate changing of design.
         $userType = $this->getUserContext()->getUserType();
         if ((
-                $userType === UserContextInterface::USER_TYPE_ADMIN
+            $userType === UserContextInterface::USER_TYPE_ADMIN
                 || $userType === UserContextInterface::USER_TYPE_INTEGRATION
-            )
+        )
             && !$this->getAuthorization()->isAllowed('Magento_Catalog::edit_product_design')
         ) {
             $this->setData('custom_design', $this->getOrigData('custom_design'));

app/code/Magento/Catalog/Model/Product/TierPriceManagement.php

@@ -182,16 +182,19 @@ public function getList($sku, $customerGroupId)
             : $customerGroupId);
 
         $prices = [];
-        foreach ($product->getData('tier_price') as $price) {
-            if ((is_numeric($customerGroupId) && (int) $price['cust_group'] === (int) $customerGroupId)
-                || ($customerGroupId === 'all' && $price['all_groups'])
-            ) {
-                /** @var \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice */
-                $tierPrice = $this->priceFactory->create();
-                $tierPrice->setValue($price[$priceKey])
-                    ->setQty($price['price_qty'])
-                    ->setCustomerGroupId($cgi);
-                $prices[] = $tierPrice;
+        $tierPrices = $product->getData('tier_price');
+        if ($tierPrices !== null) {
+            foreach ($tierPrices as $price) {
+                if ((is_numeric($customerGroupId) && (int) $price['cust_group'] === (int) $customerGroupId)
+                    || ($customerGroupId === 'all' && $price['all_groups'])
+                ) {
+                    /** @var \Magento\Catalog\Api\Data\ProductTierPriceInterface $tierPrice */
+                    $tierPrice = $this->priceFactory->create();
+                    $tierPrice->setValue($price[$priceKey])
+                        ->setQty($price['price_qty'])
+                        ->setCustomerGroupId($cgi);
+                    $prices[] = $tierPrice;
+                }
             }
         }
         return $prices;

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Api\ExtensibleDataInterface;
 use Magento\Framework\Api\ExtensionAttributesFactory;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Product Test
@@ -207,6 +208,11 @@ class ProductTest extends \PHPUnit\Framework\TestCase
      */
     private $eavConfig;
 
+    /**
+     * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $storeManager;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -303,13 +309,13 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
 
-        $storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+        $this->storeManager = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
-        $storeManager->expects($this->any())
+        $this->storeManager->expects($this->any())
             ->method('getStore')
             ->will($this->returnValue($this->store));
-        $storeManager->expects($this->any())
+        $this->storeManager->expects($this->any())
             ->method('getWebsite')
             ->will($this->returnValue($this->website));
         $this->indexerRegistryMock = $this->createPartialMock(
@@ -394,7 +400,7 @@ protected function setUp()
                 'extensionFactory' => $this->extensionAttributesFactory,
                 'productPriceIndexerProcessor' => $this->productPriceProcessor,
                 'catalogProductOptionFactory' => $optionFactory,
-                'storeManager' => $storeManager,
+                'storeManager' => $this->storeManager,
                 'resource' => $this->resource,
                 'registry' => $this->registry,
                 'moduleManager' => $this->moduleManager,
@@ -450,6 +456,48 @@ public function testGetStoreIds()
         $this->assertEquals($expectedStoreIds, $this->model->getStoreIds());
     }
 
+    /**
+     * @dataProvider getSingleStoreIds
+     * @param bool $isObjectNew
+     */
+    public function testGetStoreSingleSiteModelIds(
+        bool $isObjectNew
+    ) {
+        $websiteIDs = [0 => 2];
+        $this->model->setWebsiteIds(
+            !$isObjectNew ? $websiteIDs : array_flip($websiteIDs)
+        );
+
+        $this->model->isObjectNew($isObjectNew);
+
+        $this->storeManager->expects(
+            $this->exactly(
+                (int) !$isObjectNew
+            )
+        )
+            ->method('isSingleStoreMode')
+            ->will($this->returnValue(true));
+
+        $this->website->expects(
+            $this->once()
+        )->method('getStoreIds')
+            ->will($this->returnValue($websiteIDs));
+
+        $this->assertEquals($websiteIDs, $this->model->getStoreIds());
+    }
+
+    public function getSingleStoreIds()
+    {
+        return [
+          [
+              false
+          ],
+          [
+              true
+          ],
+        ];
+    }
+
     public function testGetStoreId()
     {
         $this->model->setStoreId(3);
@@ -1221,8 +1269,7 @@ public function testGetMediaGalleryImagesMerging()
     {
         $mediaEntries =
             [
-            'images' =>
-                [
+            'images' => [
                 [
                     'value_id' => 1,
                     'file' => 'imageFile.jpg',

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontAddBundleDynamicProductToShoppingCartWithDisableMiniCartSidebarTest.xml

@@ -109,7 +109,7 @@
             <argument name="total" value="110.00"/>
         </actionGroup>
 
-        <!--Enabled Shopping Cart Sidebar -->
+        <!--Enabled Mini Cart -->
         <magentoCLI stepKey="enableShoppingCartSidebar" command="config:set checkout/sidebar/display 1"/>
         <magentoCLI command="cache:flush" stepKey="flushCache"/>
         <reloadPage stepKey="reloadThePage"/>

app/code/Magento/Checkout/etc/adminhtml/system.xml

@@ -57,9 +57,9 @@
                 </field>
             </group>
             <group id="sidebar" translate="label" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Shopping Cart Sidebar</label>
+                <label>Mini Cart</label>
                 <field id="display" translate="label" type="select" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
-                    <label>Display Shopping Cart Sidebar</label>
+                    <label>Display Mini Cart</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="count" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">

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

@@ -156,8 +156,8 @@ Shipping,Shipping
 "Number of Items to Display Pager","Number of Items to Display Pager"
 "My Cart Link","My Cart Link"
 "Display Cart Summary","Display Cart Summary"
-"Shopping Cart Sidebar","Shopping Cart Sidebar"
-"Display Shopping Cart Sidebar","Display Shopping Cart Sidebar"
+"Mini Cart","Mini Cart"
+"Display Mini Cart","Display Mini Cart"
 "Number of Items to Display Scrollbar","Number of Items to Display Scrollbar"
 "Maximum Number of Items to Display","Maximum Number of Items to Display"
 "Payment Failed Emails","Payment Failed Emails"

app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml

@@ -56,7 +56,7 @@
                 <span><?= $block->escapeHtml(__('Continue Shopping')) ?></span>
             </a>
         <?php endif; ?>
-        <button type="submit"
+        <button type="button"
                 name="update_cart_action"
                 data-cart-empty=""
                 value="empty_cart"

app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml

@@ -104,6 +104,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
                                value="<?= $block->escapeHtmlAttr($block->getQty()) ?>"
                                type="number"
                                size="4"
+                               step="any"
                                title="<?= $block->escapeHtmlAttr(__('Qty')) ?>"
                                class="input-text qty"
                                data-validate="{required:true,'validate-greater-than-zero':true}"

app/code/Magento/Checkout/view/frontend/web/js/shopping-cart.js

@@ -14,14 +14,14 @@ define([
         _create: function () {
             var items, i, reload;
 
-            $(this.options.emptyCartButton).on('click', $.proxy(function (event) {
-                if (event.detail === 0) {
-                    return;
-                }
-
+            $(this.options.emptyCartButton).on('click', $.proxy(function () {
                 $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
                 $(this.options.updateCartActionContainer)
                     .attr('name', 'update_cart_action').attr('value', 'empty_cart');
+
+                if ($(this.options.emptyCartButton).parents('form').length > 0) {
+                    $(this.options.emptyCartButton).parents('form').submit();
+                }
             }, this));
             items = $.find('[data-role="cart-item-qty"]');
 

app/code/Magento/Customer/Model/AttributeMetadataConverter.php

@@ -3,18 +3,36 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Customer\Model;
 
 use Magento\Customer\Api\Data\OptionInterfaceFactory;
 use Magento\Customer\Api\Data\ValidationRuleInterfaceFactory;
 use Magento\Customer\Api\Data\AttributeMetadataInterfaceFactory;
 use Magento\Eav\Api\Data\AttributeDefaultValueInterface;
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Converter for AttributeMetadata
  */
 class AttributeMetadataConverter
 {
+    /**
+     * Attribute Code get options from system config
+     *
+     * @var array
+     */
+    private const ATTRIBUTE_CODE_LIST_FROM_SYSTEM_CONFIG = ['prefix', 'suffix'];
+
+    /**
+     * XML Path to get address config
+     *
+     * @var string
+     */
+    private const XML_CUSTOMER_ADDRESS = 'customer/address/';
+
     /**
      * @var OptionInterfaceFactory
      */
@@ -35,24 +53,32 @@ class AttributeMetadataConverter
      */
     protected $dataObjectHelper;
 
+    /**
+     * @var ScopeConfigInterface
+     */
+    private $scopeConfig;
+
     /**
      * Initialize the Converter
      *
      * @param OptionInterfaceFactory $optionFactory
      * @param ValidationRuleInterfaceFactory $validationRuleFactory
      * @param AttributeMetadataInterfaceFactory $attributeMetadataFactory
      * @param \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+     * @param ScopeConfigInterface $scopeConfig
      */
     public function __construct(
         OptionInterfaceFactory $optionFactory,
         ValidationRuleInterfaceFactory $validationRuleFactory,
         AttributeMetadataInterfaceFactory $attributeMetadataFactory,
-        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper
+        \Magento\Framework\Api\DataObjectHelper $dataObjectHelper,
+        ScopeConfigInterface $scopeConfig = null
     ) {
         $this->optionFactory = $optionFactory;
         $this->validationRuleFactory = $validationRuleFactory;
         $this->attributeMetadataFactory = $attributeMetadataFactory;
         $this->dataObjectHelper = $dataObjectHelper;
+        $this->scopeConfig = $scopeConfig ?? ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
@@ -64,28 +90,34 @@ public function __construct(
     public function createMetadataAttribute($attribute)
     {
         $options = [];
-        if ($attribute->usesSource()) {
-            foreach ($attribute->getSource()->getAllOptions() as $option) {
-                $optionDataObject = $this->optionFactory->create();
-                if (!is_array($option['value'])) {
-                    $optionDataObject->setValue($option['value']);
-                } else {
-                    $optionArray = [];
-                    foreach ($option['value'] as $optionArrayValues) {
-                        $optionObject = $this->optionFactory->create();
-                        $this->dataObjectHelper->populateWithArray(
-                            $optionObject,
-                            $optionArrayValues,
-                            \Magento\Customer\Api\Data\OptionInterface::class
-                        );
-                        $optionArray[] = $optionObject;
+
+        if (in_array($attribute->getAttributeCode(), self::ATTRIBUTE_CODE_LIST_FROM_SYSTEM_CONFIG)) {
+            $options = $this->getOptionFromConfig($attribute->getAttributeCode());
+        } else {
+            if ($attribute->usesSource()) {
+                foreach ($attribute->getSource()->getAllOptions() as $option) {
+                    $optionDataObject = $this->optionFactory->create();
+                    if (!is_array($option['value'])) {
+                        $optionDataObject->setValue($option['value']);
+                    } else {
+                        $optionArray = [];
+                        foreach ($option['value'] as $optionArrayValues) {
+                            $optionObject = $this->optionFactory->create();
+                            $this->dataObjectHelper->populateWithArray(
+                                $optionObject,
+                                $optionArrayValues,
+                                \Magento\Customer\Api\Data\OptionInterface::class
+                            );
+                            $optionArray[] = $optionObject;
+                        }
+                        $optionDataObject->setOptions($optionArray);
                     }
-                    $optionDataObject->setOptions($optionArray);
+                    $optionDataObject->setLabel($option['label']);
+                    $options[] = $optionDataObject;
                 }
-                $optionDataObject->setLabel($option['label']);
-                $options[] = $optionDataObject;
             }
         }
+
         $validationRules = [];
         foreach ((array)$attribute->getValidateRules() as $name => $value) {
             $validationRule = $this->validationRuleFactory->create()
@@ -122,4 +154,26 @@ public function createMetadataAttribute($attribute)
             ->setIsFilterableInGrid($attribute->getIsFilterableInGrid())
             ->setIsSearchableInGrid($attribute->getIsSearchableInGrid());
     }
+
+    /**
+     * Get option from System Config instead of Use Source (Prefix, Suffix)
+     *
+     * @param string $attributeCode
+     * @return \Magento\Customer\Api\Data\OptionInterface[]
+     */
+    private function getOptionFromConfig($attributeCode)
+    {
+        $result = [];
+        $value = $this->scopeConfig->getValue(self::XML_CUSTOMER_ADDRESS . $attributeCode . '_options');
+        if ($value) {
+            $optionArray = explode(';', $value);
+            foreach ($optionArray as $value) {
+                $optionObject = $this->optionFactory->create();
+                $optionObject->setLabel($value);
+                $optionObject->setValue($value);
+                $result[] = $optionObject;
+            }
+        }
+        return $result;
+    }
 }