Merge branch 2.3-develop into ENGCOM-4836-magento-magento2-22526

Author: magento-engcom-team

app/code/Magento/CatalogGraphQl/etc/schema.graphqls

@@ -16,179 +16,6 @@ type Query {
     @resolver(class: "Magento\\CatalogGraphQl\\Model\\Resolver\\CategoryTree") @doc(description: "The category query searches for categories that match the criteria specified in the search and filter attributes") @cache(cacheTag: "cat_c", cacheIdentity: "Magento\\CatalogGraphQl\\Model\\Resolver\\Category\\CategoryTreeIdentity")
 }
 
-enum CurrencyEnum @doc(description: "The list of available currency codes") {
-    AFN
-    ALL
-    AZN
-    DZD
-    AOA
-    ARS
-    AMD
-    AWG
-    AUD
-    BSD
-    BHD
-    BDT
-    BBD
-    BYR
-    BZD
-    BMD
-    BTN
-    BOB
-    BAM
-    BWP
-    BRL
-    GBP
-    BND
-    BGN
-    BUK
-    BIF
-    KHR
-    CAD
-    CVE
-    CZK
-    KYD
-    GQE
-    CLP
-    CNY
-    COP
-    KMF
-    CDF
-    CRC
-    HRK
-    CUP
-    DKK
-    DJF
-    DOP
-    XCD
-    EGP
-    SVC
-    ERN
-    EEK
-    ETB
-    EUR
-    FKP
-    FJD
-    GMD
-    GEK
-    GEL
-    GHS
-    GIP
-    GTQ
-    GNF
-    GYD
-    HTG
-    HNL
-    HKD
-    HUF
-    ISK
-    INR
-    IDR
-    IRR
-    IQD
-    ILS
-    JMD
-    JPY
-    JOD
-    KZT
-    KES
-    KWD
-    KGS
-    LAK
-    LVL
-    LBP
-    LSL
-    LRD
-    LYD
-    LTL
-    MOP
-    MKD
-    MGA
-    MWK
-    MYR
-    MVR
-    LSM
-    MRO
-    MUR
-    MXN
-    MDL
-    MNT
-    MAD
-    MZN
-    MMK
-    NAD
-    NPR
-    ANG
-    YTL
-    NZD
-    NIC
-    NGN
-    KPW
-    NOK
-    OMR
-    PKR
-    PAB
-    PGK
-    PYG
-    PEN
-    PHP
-    PLN
-    QAR
-    RHD
-    RON
-    RUB
-    RWF
-    SHP
-    STD
-    SAR
-    RSD
-    SCR
-    SLL
-    SGD
-    SKK
-    SBD
-    SOS
-    ZAR
-    KRW
-    LKR
-    SDG
-    SRD
-    SZL
-    SEK
-    CHF
-    SYP
-    TWD
-    TJS
-    TZS
-    THB
-    TOP
-    TTD
-    TND
-    TMM
-    USD
-    UGX
-    UAH
-    AED
-    UYU
-    UZS
-    VUV
-    VEB
-    VEF
-    VND
-    CHE
-    CHW
-    XOF
-    WST
-    YER
-    ZMK
-    ZWD
-    TRY
-    AZM
-    ROL
-    TRL
-    XPF
-}
-
 type Price @doc(description: "The Price object defines the price of a product as well as any tax-related adjustments.") {
     amount: Money @doc(description: "The price of a product plus a three-letter currency code")
     adjustments: [PriceAdjustment] @doc(description: "An array that provides information about tax, weee, or weee_tax adjustments")
@@ -214,11 +41,6 @@ enum PriceTypeEnum @doc(description: "This enumeration the price type.") {
     DYNAMIC
 }
 
-type Money @doc(description: "A Money object defines a monetary value, including a numeric value and a currency code.") {
-    value: Float @doc(description: "A number expressing a monetary value")
-    currency: CurrencyEnum @doc(description: "A three-letter currency code, such as USD or EUR")
-}
-
 type ProductPrices @doc(description: "The ProductPrices object contains the regular price of an item, as well as its minimum and maximum prices. Only composite products, which include bundle, configurable, and grouped products, can contain a minimum and maximum price.") {
     minimalPrice: Price @doc(description: "The lowest possible final price for all the options defined within a composite product. If you are specifying a price range, this would be the from value.")
     maximalPrice: Price @doc(description: "The highest possible final price for all the options defined within a composite product. If you are specifying a price range, this would be the to value.")

app/code/Magento/Checkout/view/frontend/web/js/view/payment.js

@@ -66,9 +66,21 @@ define([
         navigate: function () {
             var self = this;
 
-            getPaymentInformation().done(function () {
-                self.isVisible(true);
-            });
+            if (!self.hasShippingMethod()) {
+                this.isVisible(false);
+                stepNavigator.setHash('shipping');
+            } else {
+                getPaymentInformation().done(function () {
+                    self.isVisible(true);
+                });
+            }
+        },
+
+        /**
+         * @return {Boolean}
+         */
+        hasShippingMethod: function () {
+            return window.checkoutConfig.selectedShippingMethod !== null;
         },
 
         /**

app/code/Magento/Config/Model/Config/Source/Locale/Currency.php

@@ -4,12 +4,15 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Locale currency source
- */
 namespace Magento\Config\Model\Config\Source\Locale;
 
+use Magento\Framework\App\Config\ScopeConfigInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Locale\ListsInterface;
+
 /**
+ * Locale currency source.
+ *
  * @api
  * @since 100.0.2
  */
@@ -21,27 +24,70 @@ class Currency implements \Magento\Framework\Option\ArrayInterface
     protected $_options;
 
     /**
-     * @var \Magento\Framework\Locale\ListsInterface
+     * @var ListsInterface
      */
     protected $_localeLists;
 
     /**
-     * @param \Magento\Framework\Locale\ListsInterface $localeLists
+     * @var ScopeConfigInterface
      */
-    public function __construct(\Magento\Framework\Locale\ListsInterface $localeLists)
-    {
+    private $config;
+
+    /**
+     * @var array
+     */
+    private $installedCurrencies;
+
+    /**
+     * @param ListsInterface $localeLists
+     * @param ScopeConfigInterface $config
+     */
+    public function __construct(
+        ListsInterface $localeLists,
+        ScopeConfigInterface $config = null
+    ) {
         $this->_localeLists = $localeLists;
+        $this->config = $config ?: ObjectManager::getInstance()->get(ScopeConfigInterface::class);
     }
 
     /**
-     * @return array
+     * @inheritdoc
      */
     public function toOptionArray()
     {
         if (!$this->_options) {
             $this->_options = $this->_localeLists->getOptionCurrencies();
         }
-        $options = $this->_options;
+
+        $selected = array_flip($this->getInstalledCurrencies());
+
+        $options = array_filter(
+            $this->_options,
+            function ($option) use ($selected) {
+                return isset($selected[$option['value']]);
+            }
+        );
+
         return $options;
     }
+
+    /**
+     * Retrieve Installed Currencies.
+     *
+     * @return array
+     */
+    private function getInstalledCurrencies()
+    {
+        if (!$this->installedCurrencies) {
+            $this->installedCurrencies = explode(
+                ',',
+                $this->config->getValue(
+                    'system/currency/installed',
+                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE
+                )
+            );
+        }
+
+        return $this->installedCurrencies;
+    }
 }

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml

@@ -53,9 +53,6 @@
             <testCaseId value="MC-10930"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MSI-2110"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
@@ -93,10 +90,6 @@
             <useCaseId value="MAGETWO-44165"/>
             <testCaseId value="MAGETWO-29398"/>
             <group value="catalog"/>
-            <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MSI-2110"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
@@ -139,9 +132,6 @@
             <testCaseId value="MAGETWO-29398"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MSI-2110"/>
-            </skip>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>

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

@@ -39,7 +39,6 @@ class DataProviderWithDefaultAddresses extends \Magento\Ui\DataProvider\Abstract
     private static $forbiddenCustomerFields = [
         'password_hash',
         'rp_token',
-        'confirmation',
     ];
 
     /**

app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminEditCustomerAddressesFromActionGroup.xml

@@ -39,4 +39,13 @@
         <click selector="{{AdminEditCustomerAddressesSection.defaultBillingAddressButton}}" stepKey="setDefaultBilling" before="setDefaultShipping"/>
         <click selector="{{AdminEditCustomerAddressesSection.defaultShippingAddressButton}}" stepKey="setDefaultShipping" before="fillPrefixName"/>
     </actionGroup>
+    <actionGroup name="SelectDropdownCustomerAddressAttributeValueActionGroup">
+        <arguments>
+            <argument name="customerAddressAttribute"/>
+            <argument name="optionValue" type="string"/>
+        </arguments>
+        <selectOption selector="{{AdminEditCustomerAddressesSection.dropDownAttribute(customerAddressAttribute.code)}}" userInput="{{optionValue}}" stepKey="selectOptionValue"/>
+        <click selector="{{AdminEditCustomerAddressesSection.save}}" stepKey="saveAddress"/>
+        <waitForPageLoad stepKey="waitForAddressSaved"/>
+    </actionGroup>
 </actionGroups>

app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

@@ -216,4 +216,18 @@
         <data key="store_id">0</data>
         <data key="website_id">0</data>
     </entity>
+    <entity name="Simple_US_Customer_Two_Addresses" type="customer">
+        <data key="group_id">0</data>
+        <data key="default_billing">true</data>
+        <data key="default_shipping">true</data>
+        <data key="email" unique="prefix">John.Doe@example.com</data>
+        <data key="firstname">John</data>
+        <data key="lastname">Doe</data>
+        <data key="fullname">John Doe</data>
+        <data key="password">pwdTest123!</data>
+        <data key="store_id">0</data>
+        <data key="website_id">0</data>
+        <requiredEntity type="address">US_Address_TX</requiredEntity>
+        <requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
+    </entity>
 </entities>

app/code/Magento/Customer/Test/Mftf/Section/AdminEditCustomerAddressesSection.xml

@@ -25,6 +25,7 @@
         <element name="city" type="text" selector="//*[@class='modal-component']//input[@name='city']" />
         <element name="country" type="select" selector="//*[@class='modal-component']//select[@name='country_id']" />
         <element name="state" type="select" selector="//*[@class='modal-component']//select[@name='region_id']" />
+        <element name="dropDownAttribute" type="select" selector="//select[@name='{{var1}}']" parameterized="true"/>
         <element name="zipCode" type="text" selector="//*[@class='modal-component']//input[@name='postcode']" />
         <element name="phone" type="text" selector="//*[@class='modal-component']//input[@name='telephone']" />
         <element name="vat" type="text" selector="input[name='vat_id']" />