Merge remote-tracking branch 'origin/2.4-develop' into 2.4-develop-pr83

zakdma · zakdma · commit 73da2772651e · 2020-09-10T09:51:07.000+03:00
diff --git a/app/code/Magento/Bundle/Model/Product/LinksList.php b/app/code/Magento/Bundle/Model/Product/LinksList.php
@@ -39,6 +39,8 @@ public function __construct(
     }
 
     /**
+     * Bundle Product Items Data
+     *
      * @param \Magento\Catalog\Api\Data\ProductInterface $product
      * @param int $optionId
      * @return \Magento\Bundle\Api\Data\LinkInterface[]
@@ -50,8 +52,12 @@ public function getItems(\Magento\Catalog\Api\Data\ProductInterface $product, $o
         $productLinks = [];
         /** @var \Magento\Catalog\Model\Product $selection */
         foreach ($selectionCollection as $selection) {
+            $bundledProductPrice = $selection->getSelectionPriceValue();
+            if ($bundledProductPrice <= 0) {
+                $bundledProductPrice = $selection->getPrice();
+            }
             $selectionPriceType = $product->getPriceType() ? $selection->getSelectionPriceType() : null;
-            $selectionPrice = $product->getPriceType() ? $selection->getSelectionPriceValue() : null;
+            $selectionPrice = $bundledProductPrice ? $bundledProductPrice : null;
 
             /** @var \Magento\Bundle\Api\Data\LinkInterface $productLink */
             $productLink = $this->linkFactory->create();
diff --git a/app/code/Magento/Bundle/Test/Unit/Model/Product/LinksListTest.php b/app/code/Magento/Bundle/Test/Unit/Model/Product/LinksListTest.php
@@ -91,7 +91,7 @@ public function testLinksList()
             ->method('getSelectionsCollection')
             ->with([$optionId], $this->productMock)
             ->willReturn([$this->selectionMock]);
-        $this->productMock->expects($this->exactly(2))->method('getPriceType')->willReturn('price_type');
+        $this->productMock->expects($this->once())->method('getPriceType')->willReturn('price_type');
         $this->selectionMock->expects($this->once())
             ->method('getSelectionPriceType')
             ->willReturn('selection_price_type');
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/list.phtml
@@ -98,7 +98,8 @@ $_helper = $block->getData('outputHelper');
                                             <?= $block->getBlockHtml('formkey') ?>
                                             <button type="submit"
                                                     title="<?= $escaper->escapeHtmlAttr(__('Add to Cart')) ?>"
-                                                    class="action tocart primary">
+                                                    class="action tocart primary"
+                                                    disabled>
                                                 <span><?= $escaper->escapeHtml(__('Add to Cart')) ?></span>
                                             </button>
                                         </form>
diff --git a/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js b/app/code/Magento/Catalog/view/frontend/web/js/catalog-add-to-cart.js
@@ -34,6 +34,7 @@ define([
             if (this.options.bindSubmit) {
                 this._bindSubmit();
             }
+            $(this.options.addToCartButtonSelector).attr('disabled', false);
         },
 
         /**
diff --git a/app/code/Magento/Contact/view/frontend/templates/form.phtml b/app/code/Magento/Contact/view/frontend/templates/form.phtml
@@ -69,8 +69,8 @@ $viewModel = $block->getViewModel();
                           class="input-text"
                           cols="5"
                           rows="3"
-                          data-validate="{required:true}"><?= $block->escapeHtml($viewModel->getUserComment()) ?>
-                </textarea>
+                          data-validate="{required:true}"
+                ><?= $block->escapeHtml($viewModel->getUserComment()) ?></textarea>
             </div>
         </div>
         <?= $block->getChildHtml('form.additional.info') ?>
diff --git a/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php b/app/code/Magento/CurrencySymbol/Block/Adminhtml/System/Currency.php
@@ -41,7 +41,14 @@ protected function _prepareLayout()
             ]
         );
 
-        $onClick = "setLocation('" . $this->getUrl('adminhtml/system_config/edit/section/currency') . "')";
+        $currencyOptionPath = $this->getUrl(
+            'adminhtml/system_config/edit',
+            [
+                'section' => 'currency',
+                '_fragment' => 'currency_options-link'
+            ]
+        );
+        $onClick = "setLocation('$currencyOptionPath')";
 
         $this->getToolbar()->addChild(
             'options_button',
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminNavigateToCurrencyRatesOptionActionGroup.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/ActionGroup/AdminNavigateToCurrencyRatesOptionActionGroup.xml
@@ -0,0 +1,15 @@
+<?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="AdminNavigateToCurrencyRatesOptionActionGroup">
+        <click selector="{{AdminCurrencyRatesSection.options}}" stepKey="clickOptionsButton"/>
+        <waitForPageLoad stepKey="waitForPageLoad"/>
+    </actionGroup>
+</actionGroups>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Section/AdminCurrencyRatesSection.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Section/AdminCurrencyRatesSection.xml
@@ -11,6 +11,7 @@
     <section name="AdminCurrencyRatesSection">
         <element name="import" type="button" selector="//button[@title='Import']"/>
         <element name="saveCurrencyRates" type="button" selector="//button[@title='Save Currency Rates']"/>
+        <element name="options" type="button" selector="//button[@title='Options']"/>
         <element name="oldRate" type="text" selector="//div[contains(@class, 'admin__field-note') and contains(text(), 'Old rate:')]/strong"/>
         <element name="rateService" type="select" selector="#rate_services"/>
         <element name="currencyRate" type="input" selector="input[name='rate[{{fistCurrency}}][{{secondCurrency}}]']" parameterized="true"/>
diff --git a/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminCurrencyOptionsSystemConfigExpandedTabTest.xml b/app/code/Magento/CurrencySymbol/Test/Mftf/Test/AdminCurrencyOptionsSystemConfigExpandedTabTest.xml
@@ -0,0 +1,37 @@
+<?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="AdminCurrencyOptionsSystemConfigExpandedTabTest">
+        <annotations>
+            <features value="Expanded tab on Currency Option page"/>
+            <stories value="Expanded tab"/>
+            <title value=" Verify the Currency Option tab expands automatically."/>
+            <description value="Check auto open the collapse on Currency Option page."/>
+            <severity value="MINOR"/>
+            <testCaseId value="MC-37425"/>
+        </annotations>
+        <before>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+        </after>
+        <actionGroup ref="AdminNavigateMenuActionGroup" stepKey="navigateToStoresCurrencyRatesPage">
+            <argument name="menuUiId" value="{{AdminMenuStores.dataUiId}}"/>
+            <argument name="submenuUiId" value="{{AdminMenuStoresCurrencyCurrencyRates.dataUiId}}"/>
+        </actionGroup>
+        <actionGroup ref="AdminNavigateToCurrencyRatesOptionActionGroup" stepKey="navigateToOptions" />
+        <grabAttributeFrom selector="{{CurrencySetupSection.currencyOptions}}" userInput="class" stepKey="grabClass"/>
+        <assertStringContainsString stepKey="assertClass">
+            <actualResult type="string">{$grabClass}</actualResult>
+            <expectedResult type="string">open</expectedResult>
+        </assertStringContainsString>
+    </test>
+</tests>
diff --git a/app/code/Magento/CurrencySymbol/Test/Unit/Block/Adminhtml/System/CurrencyTest.php b/app/code/Magento/CurrencySymbol/Test/Unit/Block/Adminhtml/System/CurrencyTest.php
@@ -7,15 +7,22 @@
 
 namespace Magento\CurrencySymbol\Test\Unit\Block\Adminhtml\System;
 
+use Magento\Backend\Block\Template\Context;
 use Magento\Backend\Block\Widget\Button;
 use Magento\CurrencySymbol\Block\Adminhtml\System\Currency;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\View\Element\BlockInterface;
 use Magento\Framework\View\LayoutInterface;
 use PHPUnit\Framework\TestCase;
+use Magento\Framework\UrlInterface;
 
 class CurrencyTest extends TestCase
 {
+    /**
+     * Stub currency option link url
+     */
+    const STUB_OPTION_LINK_URL = 'https://localhost/admin/system_config/edit/section/currency#currency_options-link';
+
     /**
      * Object manager helper
      *
@@ -70,12 +77,25 @@ public function testPrepareLayout()
                 ]
             );
 
+        $contextMock = $this->createMock(Context::class);
+        $urlBuilderMock = $this->createMock(UrlInterface::class);
+
+        $contextMock->expects($this->once())->method('getUrlBuilder')->willReturn($urlBuilderMock);
+
+        $urlBuilderMock->expects($this->once())->method('getUrl')->with(
+            'adminhtml/system_config/edit',
+            [
+                'section' => 'currency',
+                '_fragment' => 'currency_options-link'
+            ]
+        )->willReturn(self::STUB_OPTION_LINK_URL);
+
         $childBlockMock->expects($this->at(1))
             ->method('addChild')
             ->with(
                 'options_button',
                 Button::class,
-                ['label' => __('Options'), 'onclick' => 'setLocation(\'\')']
+                ['label' => __('Options'), 'onclick' => 'setLocation(\''.self::STUB_OPTION_LINK_URL.'\')']
             );
 
         $childBlockMock->expects($this->at(2))
@@ -90,7 +110,8 @@ public function testPrepareLayout()
         $block = $this->objectManagerHelper->getObject(
             Currency::class,
             [
-                'layout' => $layoutMock
+                'layout' => $layoutMock,
+                'context' => $contextMock
             ]
         );
         $block->setLayout($layoutMock);
diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php
@@ -626,6 +626,8 @@ protected function _isApplicableAttribute($object, $attribute)
     public function walkAttributes($partMethod, array $args = [], $collectExceptionMessages = null)
     {
         $methodArr = explode('/', $partMethod);
+        $part = '';
+        $method = '';
         switch (count($methodArr)) {
             case 1:
                 $part = 'attribute';
@@ -642,6 +644,7 @@ public function walkAttributes($partMethod, array $args = [], $collectExceptionM
         }
         $results = [];
         $suffix = $this->getAttributesCacheSuffix($args[0]);
+        $instance = null;
         foreach ($this->getAttributesByScope($suffix) as $attrCode => $attribute) {
             if (isset($args[0]) && is_object($args[0]) && !$this->_isApplicableAttribute($args[0], $attribute)) {
                 continue;
@@ -1337,7 +1340,9 @@ protected function _collectSaveData($newObject)
             if ($this->_canUpdateAttribute($attribute, $v, $origData)) {
                 if ($this->_isAttributeValueEmpty($attribute, $v)) {
                     $this->_aggregateDeleteData($delete, $attribute, $newObject);
-                } elseif (!is_numeric($v) && $v !== $origData[$k] || is_numeric($v) && $v != $origData[$k]) {
+                } elseif (!is_numeric($v) && $v !== $origData[$k]
+                    || is_numeric($v) && ($v != $origData[$k] || strlen($v) !== strlen($origData[$k]))
+                ) {
                     $update[$attrId] = [
                         'value_id' => $attribute->getBackend()->getEntityValueId($newObject),
                         'value' => is_array($v) ? array_shift($v) : $v,//@TODO: MAGETWO-44182,
@@ -1739,6 +1744,7 @@ public function delete($object)
     {
         try {
             $connection = $this->transactionManager->start($this->getConnection());
+            $id = 0;
             if (is_numeric($object)) {
                 $id = (int) $object;
             } elseif ($object instanceof \Magento\Framework\Model\AbstractModel) {
diff --git a/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php b/app/code/Magento/Elasticsearch/Model/Adapter/Elasticsearch.php
@@ -497,6 +497,12 @@ protected function prepareIndex($storeId, $indexName, $mappedIndexerId)
      */
     private function getMappingTotalFieldsLimit(array $allAttributeTypes): int
     {
-        return count($allAttributeTypes) + self::MAPPING_TOTAL_FIELDS_BUFFER_LIMIT;
+        $count = count($allAttributeTypes);
+        foreach ($allAttributeTypes as $attributeType) {
+            if (isset($attributeType['fields'])) {
+                $count += count($attributeType['fields']);
+            }
+        }
+        return $count + self::MAPPING_TOTAL_FIELDS_BUFFER_LIMIT;
     }
 }
diff --git a/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php b/app/code/Magento/Elasticsearch/Test/Unit/Model/Adapter/ElasticsearchTest.php
@@ -174,7 +174,14 @@ protected function setUp(): void
             ->method('getAllAttributesTypes')
             ->willReturn(
                 [
-                    'name' => 'string',
+                    'name' => [
+                        'type' => 'string',
+                        'fields' => [
+                            'keyword' => [
+                                'type' => "keyword",
+                            ],
+                        ],
+                    ],
                 ]
             );
         $this->clientConfig->expects($this->any())
@@ -564,6 +571,28 @@ public function testUpdateIndexMappingWithAliasDefinition(): void
         $this->model->updateIndexMapping($storeId, $mappedIndexerId, $attributeCode);
     }
 
+    /**
+     * Test for get mapping total fields limit
+     *
+     * @return void
+     */
+    public function testGetMappingTotalFieldsLimit(): void
+    {
+        $settings = [
+            'index' => [
+                    'mapping' => [
+                        'total_fields' => [
+                            'limit'  => 1002
+                        ]
+                    ]
+            ]
+        ];
+        $this->client->expects($this->at(1))
+            ->method('createIndex')
+            ->with(null, ['settings' => $settings]);
+        $this->model->cleanIndex(1, 'product');
+    }
+
     /**
      * Get elasticsearch client options
      *
diff --git a/app/code/Magento/Sales/Model/ResourceModel/Order.php b/app/code/Magento/Sales/Model/ResourceModel/Order.php
@@ -53,12 +53,12 @@ protected function _construct()
 
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
-     * @param Attribute $attribute
-     * @param Manager $sequenceManager
      * @param Snapshot $entitySnapshot
      * @param RelationComposite $entityRelationComposite
+     * @param Attribute $attribute
+     * @param Manager $sequenceManager
      * @param StateHandler $stateHandler
-     * @param string $connectionName
+     * @param string|null $connectionName
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
@@ -137,6 +137,8 @@ protected function calculateItems(\Magento\Sales\Model\Order $object)
     }
 
     /**
+     * Before save
+     *
      * @param \Magento\Framework\Model\AbstractModel $object
      * @return $this
      */
@@ -152,15 +154,15 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
             ];
             $object->setStoreName(implode(PHP_EOL, $name));
             $object->setTotalItemCount($this->calculateItems($object));
+            $object->setData(
+                'protect_code',
+                substr(
+                    hash('sha256', uniqid(Random::getRandomNumber(), true) . ':' . microtime(true)),
+                    5,
+                    32
+                )
+            );
         }
-        $object->setData(
-            'protect_code',
-            substr(
-                hash('sha256', uniqid(Random::getRandomNumber(), true) . ':' . microtime(true)),
-                5,
-                32
-            )
-        );
         $isNewCustomer = !$object->getCustomerId() || $object->getCustomerId() === true;
         if ($isNewCustomer && $object->getCustomer()) {
             $object->setCustomerId($object->getCustomer()->getId());
@@ -169,7 +171,7 @@ protected function _beforeSave(\Magento\Framework\Model\AbstractModel $object)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function save(\Magento\Framework\Model\AbstractModel $object)
     {
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsCsv.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsCsv.php
@@ -15,13 +15,14 @@
 use Magento\Framework\View\Result\Layout;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Export Coupons to csv file
  *
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\ExportCouponsCsv
  */
-class ExportCouponsCsv extends Quote implements HttpGetActionInterface
+class ExportCouponsCsv extends Quote implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Export coupon codes as CSV file
diff --git a/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsXml.php b/app/code/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCouponsXml.php
@@ -15,13 +15,14 @@
 use Magento\Framework\View\Result\Layout;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\App\Action\HttpGetActionInterface;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
 /**
  * Export coupons to xml file
  *
  * Class \Magento\SalesRule\Controller\Adminhtml\Promo\Quote\ExportCouponsXml
  */
-class ExportCouponsXml extends Quote implements HttpGetActionInterface
+class ExportCouponsXml extends Quote implements HttpGetActionInterface, HttpPostActionInterface
 {
     /**
      * Export coupon codes as excel xml file
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js b/app/code/Magento/Ui/view/base/web/js/form/element/ui-select.js
@@ -668,7 +668,7 @@ define([
          * @returns {Object} Chainable
          */
         toggleListVisible: function () {
-            this.listVisible(!this.listVisible());
+            this.listVisible(!this.disabled() && !this.listVisible());
 
             return this;
         },
diff --git a/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js b/app/code/Magento/Ui/view/base/web/js/grid/url-filter-applier.js
diff --git a/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less b/app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/components/_currency-addon.less
diff --git a/app/design/frontend/Magento/blank/web/css/source/_navigation.less b/app/design/frontend/Magento/blank/web/css/source/_navigation.less
diff --git a/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductServiceTest.php b/dev/tests/api-functional/testsuite/Magento/Bundle/Api/ProductServiceTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php b/dev/tests/integration/testsuite/Magento/Sales/Controller/Adminhtml/Order/Invoice/SaveTest.php
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCoupons/ExportCouponsCsvTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCoupons/ExportCouponsCsvTest.php
diff --git a/dev/tests/integration/testsuite/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCoupons/ExportCouponsXmlTest.php b/dev/tests/integration/testsuite/Magento/SalesRule/Controller/Adminhtml/Promo/Quote/ExportCoupons/ExportCouponsXmlTest.php
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/form/ui-select.test.js

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ define([`
`34`	`34`	`if (this.options.bindSubmit) {`
`35`	`35`	`this._bindSubmit();`
`36`	`36`	`}`
	`37`	`+ $(this.options.addToCartButtonSelector).attr('disabled', false);`
`37`	`38`	`},`
`38`	`39`
`39`	`40`	`/**`