Merge branch '2.3-develop' into MAGETWO-94241

Author: Yevhen Miroshnychenko

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

@@ -18,6 +18,9 @@
             <testCaseId value="MAGETWO-58718"/>
             <group value="product"/>
             <group value="WYSIWYGDisabled"/>
+            <skip>
+                <issueId value="MC-13841"/>
+            </skip>
         </annotations>
         <before>
             <!-- Login Admin -->

app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js

@@ -165,6 +165,16 @@ define([
                     self.enableAddToCartButton(form);
                 },
 
+                /** @inheritdoc */
+                error: function (res) {
+                    $(document).trigger('ajax:addToCart:error', {
+                        'sku': form.data().productSku,
+                        'productIds': productIds,
+                        'form': form,
+                        'response': res
+                    });
+                },
+
                 /** @inheritdoc */
                 complete: function (res) {
                     if (res.state() === 'rejected') {

app/code/Magento/Checkout/Block/QuoteShortcutButtons.php

@@ -8,6 +8,8 @@
 use Magento\Framework\View\Element\Template;
 
 /**
+ * Displays buttons on shopping cart page
+ *
  * @api
  */
 class QuoteShortcutButtons extends \Magento\Catalog\Block\ShortcutButtons
@@ -45,7 +47,8 @@ protected function _beforeToHtml()
                 'container' => $this,
                 'is_catalog_product' => $this->_isCatalogProduct,
                 'or_position' => $this->_orPosition,
-                'checkout_session' => $this->_checkoutSession
+                'checkout_session' => $this->_checkoutSession,
+                'is_shopping_cart' => true
             ]
         );
         return $this;

app/code/Magento/Checkout/view/frontend/web/js/model/payment/additional-validators.js

@@ -35,15 +35,17 @@ define([], function () {
          *
          * @returns {Boolean}
          */
-        validate: function () {
+        validate: function (hideError) {
             var validationResult = true;
 
+            hideError = hideError || false;
+
             if (validators.length <= 0) {
                 return validationResult;
             }
 
             validators.forEach(function (item) {
-                if (item.validate() == false) { //eslint-disable-line eqeqeq
+                if (item.validate(hideError) == false) { //eslint-disable-line eqeqeq
                     validationResult = false;
 
                     return false;

app/code/Magento/CheckoutAgreements/view/frontend/web/js/model/agreement-validator.js

@@ -19,7 +19,7 @@ define([
          *
          * @returns {Boolean}
          */
-        validate: function () {
+        validate: function (hideError) {
             var isValid = true;
 
             if (!agreementsConfig.isEnabled || $(agreementsInputPath).length === 0) {
@@ -28,7 +28,8 @@ define([
 
             $(agreementsInputPath).each(function (index, element) {
                 if (!$.validator.validateSingleElement(element, {
-                    errorElement: 'div'
+                    errorElement: 'div',
+                    hideError: hideError || false
                 })) {
                     isValid = false;
                 }

app/code/Magento/Cms/Test/Mftf/Test/CheckStaticBlocksTest.xml

@@ -19,6 +19,7 @@
             <group value="Cms"/>
         </annotations>
         <before>
+            <magentoCLI command="config:set cms/wysiwyg/enabled disabled" stepKey="disableWYSIWYG"/>
             <actionGroup ref="LoginAsAdmin" stepKey="LoginAsAdmin"/>
             <actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="AdminCreateWebsite">
                 <argument name="newWebsiteName" value="secondWebsite"/>
@@ -67,6 +68,7 @@
                 <argument name="websiteName" value="secondWebsite"/>
             </actionGroup>
             <actionGroup ref="DeleteCMSBlockActionGroup" stepKey="DeleteCMSBlockActionGroup"/>
+            <magentoCLI command="config:set cms/wysiwyg/enabled enabled" stepKey="enableWYSIWYG"/>
         </after>
     </test>
 </tests>

app/code/Magento/Config/etc/adminhtml/di.xml

@@ -6,7 +6,6 @@
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\Config\Model\Config\Structure\SearchInterface" type="Magento\Config\Model\Config\Structure" />
     <preference for="Magento\Config\Model\Config\Backend\File\RequestData\RequestDataInterface" type="Magento\Config\Model\Config\Backend\File\RequestData" />
     <preference for="Magento\Config\Model\Config\Structure\ElementVisibilityInterface" type="Magento\Config\Model\Config\Structure\ElementVisibilityComposite" />
     <type name="Magento\Config\Model\Config\Structure\Element\Iterator\Tab" shared="false" />

app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Depends/ButtonStylesLabel.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Block\Adminhtml\System\Config\Field\Depends;
+
+use Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable;
+
+/**
+ * Class ButtonStylesLabel
+ */
+class ButtonStylesLabel extends AbstractEnable
+{
+    /**
+     * Getting the name of a UI attribute
+     *
+     * @return string
+     */
+    protected function getDataAttributeName()
+    {
+        return 'button-label';
+    }
+}

app/code/Magento/Paypal/Block/Adminhtml/System/Config/Field/Enable/BmlApi.php

@@ -7,6 +7,8 @@
 
 /**
  * Class Bml
+ * @deprecated
+ * "Enable PayPal Credit" setting was removed. Please @see "Disable Funding Options"
  */
 class BmlApi extends AbstractEnable
 {

app/code/Magento/Paypal/Block/Adminhtml/System/Config/MultiSelect/DisabledFundingOptions.php

@@ -0,0 +1,91 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Paypal\Block\Adminhtml\System\Config\MultiSelect;
+
+use Magento\Paypal\Block\Adminhtml\System\Config\Field\Enable\AbstractEnable;
+use Magento\Paypal\Model\Config\StructurePlugin;
+use Magento\Backend\Block\Template\Context;
+use Magento\Paypal\Model\Config;
+use Magento\Framework\Data\Form\Element\AbstractElement;
+
+/**
+ * Class DisabledFundingOptions
+ */
+class DisabledFundingOptions extends AbstractEnable
+{
+    /**
+     * @var Config
+     */
+    private $config;
+
+    /**
+     * DisabledFundingOptions constructor.
+     * @param Context $context
+     * @param Config $config
+     * @param array $data
+     */
+    public function __construct(
+        Context $context,
+        Config $config,
+        $data = []
+    ) {
+        $this->config = $config;
+        parent::__construct($context, $data);
+    }
+
+    /**
+     * Render country field considering request parameter
+     *
+     * @param AbstractElement $element
+     * @return string
+     */
+    public function render(AbstractElement $element)
+    {
+        if (!$this->isSelectedMerchantCountry('US')) {
+            $fundingOptions = $element->getValues();
+            $element->setValues($this->filterValuesForPaypalCredit($fundingOptions));
+        }
+        return parent::render($element);
+    }
+
+    /**
+     * Getting the name of a UI attribute
+     *
+     * @return string
+     */
+    protected function getDataAttributeName(): string
+    {
+        return 'disable-funding-options';
+    }
+
+    /**
+     * Filters array for CREDIT
+     *
+     * @param array $options
+     * @return array
+     */
+    private function filterValuesForPaypalCredit($options): array
+    {
+        return array_filter($options, function ($opt) {
+            return ($opt['value'] !== 'CREDIT');
+        });
+    }
+
+    /**
+     * Checks for chosen Merchant country from the config/url
+     *
+     * @param string $country
+     * @return bool
+     */
+    private function isSelectedMerchantCountry(string $country): bool
+    {
+        $merchantCountry = $this->getRequest()->getParam(StructurePlugin::REQUEST_PARAM_COUNTRY)
+            ?: $this->config->getMerchantCountry();
+        return $merchantCountry === $country;
+    }
+}