Merge pull request #6448 from magento-tsg-csl3/2.4-develop-pr47

zakdma · web-flow · commit b55e1f2054d7 · 2020-12-18T15:40:56.000+02:00
[TSG-CSL3] For 2.4 (pr47)
diff --git a/app/code/Magento/Backend/Block/Widget/Button.php b/app/code/Magento/Backend/Block/Widget/Button.php
@@ -5,9 +5,9 @@
  */
 namespace Magento\Backend\Block\Widget;
 
+use Magento\Backend\Block\Template\Context;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Math\Random;
-use Magento\Backend\Block\Template\Context;
 use Magento\Framework\View\Helper\SecureHtmlRenderer;
 
 /**
@@ -125,6 +125,9 @@ protected function _prepareAttributes($title, $classes, $disabled)
             'value' => $this->getValue(),
             'disabled' => $disabled,
         ];
+        if ($this->hasData('onclick_attribute')) {
+            $attributes['onclick'] = $this->getData('onclick_attribute');
+        }
         if ($this->hasData('backend_button_widget_hook_id')) {
             $attributes['backend-button-widget-hook-id'] = $this->getData('backend_button_widget_hook_id');
         }
diff --git a/app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php b/app/code/Magento/Backend/Test/Unit/Block/Widget/ButtonTest.php
@@ -94,4 +94,16 @@ public function getAttributesHtmlDataProvider()
             ]
         ];
     }
+
+    /**
+     * Verifies ability of adding button onclick attribute
+     *
+     * @return void
+     */
+    public function testOnClickAttribute(): void
+    {
+        $this->_blockMock->setData(['onclick_attribute' => 'value']);
+        $attributes = $this->_blockMock->getAttributesHtml();
+        $this->assertStringContainsString('onclick', $attributes);
+    }
 }
diff --git a/app/code/Magento/Catalog/Model/Product/Type/Price.php b/app/code/Magento/Catalog/Model/Product/Type/Price.php
@@ -379,7 +379,7 @@ public function getTierPrices($product)
             if (array_key_exists('website_price', $price)) {
                 $value = $price['website_price'];
             } else {
-                $value = $price['price'];
+                $value = $price['price'] ?? 0;
             }
             $tierPrice->setValue($value);
             $tierPrice->setQty($price['price_qty']);
diff --git a/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php b/app/code/Magento/Catalog/Test/Unit/Model/Product/Type/PriceTest.php
@@ -263,4 +263,40 @@ function () {
             );
         }
     }
+
+    /**
+     * Get tier price with percent value type
+     *
+     * @return void
+     */
+    public function testGetPricesWithPercentType(): void
+    {
+        $tierPrices = [
+            0 => [
+                'record_id' => 0,
+                'cust_group' => 3200,
+                'price_qty' => 3,
+                'website_id' => 0,
+                'value_type' => 'percent',
+                'percentage_value' => 10,
+                ],
+        ];
+        $this->product->setData('tier_price', $tierPrices);
+        $this->tpFactory->expects($this->any())
+            ->method('create')
+            ->willReturnCallback(
+                function () {
+                    return $this->objectManagerHelper->getObject(TierPrice::class);
+                }
+            );
+        $tierPriceExtensionMock = $this->getMockBuilder(ProductTierPriceExtensionInterface::class)
+            ->onlyMethods(['getPercentageValue', 'setPercentageValue'])
+            ->getMockForAbstractClass();
+        $tierPriceExtensionMock->method('getPercentageValue')
+            ->willReturn(50);
+        $this->tierPriceExtensionFactoryMock->method('create')
+            ->willReturn($tierPriceExtensionMock);
+
+        $this->assertInstanceOf(TierPrice::class, $this->model->getTierPrices($this->product)[0]);
+    }
 }
diff --git a/app/code/Magento/CatalogGraphQl/Plugin/Search/Request/ConfigReader.php b/app/code/Magento/CatalogGraphQl/Plugin/Search/Request/ConfigReader.php
@@ -106,6 +106,9 @@ private function getSearchableAttributes(): array
         $productAttributes->addFieldToFilter(
             ['is_searchable', 'is_visible_in_advanced_search', 'is_filterable', 'is_filterable_in_search'],
             [1, 1, [1, 2], 1]
+        )->setOrder(
+            'position',
+            'ASC'
         );
 
         /** @var Attribute $attribute */
diff --git a/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html b/app/code/Magento/Checkout/view/frontend/web/template/billing-address/details.html
@@ -7,7 +7,7 @@
 <div if="isAddressDetailsVisible() && currentBillingAddress()" class="billing-address-details">
     <text args="currentBillingAddress().prefix"/> <text args="currentBillingAddress().firstname"/> <text args="currentBillingAddress().middlename"/>
     <text args="currentBillingAddress().lastname"/> <text args="currentBillingAddress().suffix"/><br/>
-    <text args="_.values(currentBillingAddress().street).join(', ')"/><br/>
+    <text args="currentBillingAddress().street.join(', ')"/><br/>
     <text args="currentBillingAddress().city "/>, <span text="currentBillingAddress().region"></span> <text args="currentBillingAddress().postcode"/><br/>
     <text args="getCountryName(currentBillingAddress().countryId)"/><br/>
     <a if="currentBillingAddress().telephone" attr="'href': 'tel:' + currentBillingAddress().telephone" text="currentBillingAddress().telephone"></a><br/>
diff --git a/app/code/Magento/Quote/Model/Quote/Plugin/UpdateQuoteStoreId.php b/app/code/Magento/Quote/Model/Quote/Plugin/UpdateQuoteStoreId.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Quote\Model\Quote\Plugin;
+
+use Magento\Quote\Model\Quote;
+use Magento\Store\Model\StoreManagerInterface;
+
+/**
+ * Updates quote store id.
+ */
+class UpdateQuoteStoreId
+{
+    /**
+     * @var StoreManagerInterface
+     */
+    private $storeManager;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager
+    ) {
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Update store id in requested quote by store id from request.
+     *
+     * @param Quote $subject
+     * @param Quote $result
+     * @return Quote
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     */
+    public function afterLoadByIdWithoutStore(Quote $subject, Quote $result): Quote
+    {
+        $storeId = $this->storeManager->getStore()
+            ->getId() ?: $this->storeManager->getDefaultStoreView()
+                ->getId();
+        $result->setStoreId($storeId);
+
+        return $result;
+    }
+}
diff --git a/app/code/Magento/Quote/etc/webapi_rest/di.xml b/app/code/Magento/Quote/etc/webapi_rest/di.xml
@@ -16,4 +16,7 @@
     <type name="Magento\Quote\Api\GuestCartItemRepositoryInterface">
         <plugin name="updateCartIdFromRequest" type="Magento\Quote\Plugin\UpdateCartId" />
     </type>
+    <type name="Magento\Quote\Model\Quote">
+        <plugin name="updateQuoteStoreId" type="Magento\Quote\Model\Quote\Plugin\UpdateQuoteStoreId" />
+    </type>
 </config>
diff --git a/app/code/Magento/Quote/etc/webapi_soap/di.xml b/app/code/Magento/Quote/etc/webapi_soap/di.xml
@@ -13,4 +13,7 @@
         <plugin name="accessControl" type="Magento\Quote\Model\QuoteRepository\Plugin\AccessChangeQuoteControl" />
         <plugin name="authorization" type="Magento\Quote\Model\QuoteRepository\Plugin\Authorization" />
     </type>
+    <type name="Magento\Quote\Model\Quote">
+        <plugin name="updateQuoteStoreId" type="Magento\Quote\Model\Quote\Plugin\UpdateQuoteStoreId" />
+    </type>
 </config>
diff --git a/app/code/Magento/Sales/Test/Mftf/Test/AdminSaveInAddressBookCheckboxStateTest.xml b/app/code/Magento/Sales/Test/Mftf/Test/AdminSaveInAddressBookCheckboxStateTest.xml
@@ -47,6 +47,8 @@
         <actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addSimpleProductToOrder">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>
+        <!-- By default checkbox 'Add to address book' must be unchecked -->
+        <dontSeeCheckboxIsChecked selector="{{AdminOrderFormBillingAddressSection.SaveAddress}}"  stepKey="checkBoxAddBillingAddressIsUnchecked"/>
         <!-- Just in case uncheck and check 'Same as Billing Address checkbox' -->
         <comment userInput="Just in case uncheck and check 'Same as Billing Address checkbox'" stepKey="uncheckAndCheckAgain"/>
         <uncheckOption selector="{{AdminOrderFormShippingAddressSection.SameAsBilling}}" stepKey="unCheckSameAsShippingAddressCheckbox"/>
diff --git a/app/code/Magento/Sales/i18n/en_US.csv b/app/code/Magento/Sales/i18n/en_US.csv
@@ -804,3 +804,4 @@ If set YES Email field will be required during Admin order creation for new Cust
 "Please enter a coupon code!","Please enter a coupon code!"
 "Reorder is not available.","Reorder is not available."
 "The coupon code has been removed.","The coupon code has been removed."
+"Add to address book","Add to address book"
diff --git a/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml b/app/code/Magento/Sales/view/adminhtml/templates/order/create/form/address.phtml
@@ -125,7 +125,7 @@ endif; ?>
                 <?php endif; ?>
                    class="admin__control-checkbox"/>
             <label for="<?= $block->escapeHtmlAttr($block->getForm()->getHtmlIdPrefix()) ?>save_in_address_book"
-                   class="admin__field-label"><?= $block->escapeHtml(__('Save in address book')) ?></label>
+                   class="admin__field-label"><?= $block->escapeHtml(__('Add to address book')) ?></label>
         </div>
     </div>
     <?php $hideElement = 'address-' . ($block->getIsShipping() ? 'shipping' : 'billing') . '-overlay'; ?>
diff --git a/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAssertFixedCartDiscountAmountForBundleProductTest.xml b/app/code/Magento/SalesRule/Test/Mftf/Test/StorefrontAssertFixedCartDiscountAmountForBundleProductTest.xml
@@ -20,6 +20,9 @@
         <before>
             <createData entity="SalesRuleNoCouponWithFixedDiscountWholeCart" stepKey="createSalesRule"/>
             <actionGroup ref="AdminCreateApiDynamicBundleProductAllOptionTypesActionGroup" stepKey="createBundleProduct"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexCatalogInventory">
+                <argument name="indices" value="cataloginventory_stock"/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="createSalesRule" stepKey="deleteSalesRule"/>
diff --git a/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php b/app/code/Magento/Widget/Block/Adminhtml/Widget/Instance/Edit/Tab/Main/Layout.php
@@ -327,7 +327,7 @@ public function getRemoveLayoutButtonHtml()
         )->setData(
             [
                 'label' => $this->escapeHtmlAttr(__('Remove Layout Update')),
-                'onclick' => 'WidgetInstance.removePageGroup(this)',
+                'onclick_attribute' => 'WidgetInstance.removePageGroup(this)',
                 'class' => 'action-delete',
             ]
         );
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryAggregationsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/CategoriesQuery/CategoryAggregationsTest.php
@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\GraphQl\Catalog\CategoriesQuery;
+
+use Magento\TestFramework\TestCase\GraphQlAbstract;
+
+/**
+ * Test to return category aggregations
+ */
+class CategoryAggregationsTest extends GraphQlAbstract
+{
+    /**
+     * Test to return category aggregations in sorting by position
+     *
+     * @magentoApiDataFixture Magento/Catalog/_files/products_with_layered_navigation_attributes.php
+     */
+    public function testCategoryAggregationSorting(): void
+    {
+        $categoryId = 3334;
+        $query = <<<QUERY
+{
+  products(filter: {category_id: {eq: "{$categoryId}"}}) {
+    aggregations{
+      label
+      attribute_code
+      count
+      options{
+        label
+        value
+        count
+      }
+    }
+  }
+}
+QUERY;
+        $response = $this->graphQlQuery($query);
+        $this->assertArrayNotHasKey('errors', $response);
+        $this->assertArrayHasKey('products', $response);
+        $this->assertArrayHasKey('aggregations', $response['products']);
+
+        $customAggregation = array_values(array_filter(
+            $response['products']['aggregations'],
+            function ($a) {
+                return in_array($a['attribute_code'], ['test_attribute_1', 'test_attribute_2']);
+            }
+        ));
+        $this->assertCount(2, $customAggregation);
+        $this->assertEquals('test_attribute_2', $customAggregation[0]['attribute_code']);
+        $this->assertEquals('test_attribute_1', $customAggregation[1]['attribute_code']);
+    }
+}
diff --git a/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartItemRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Quote/Api/GuestCartItemRepositoryTest.php
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attributes.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attributes.php
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attributes_rollback.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/products_with_layered_navigation_attributes_rollback.php

Original file line number	Diff line number	Diff line change
`@@ -94,4 +94,16 @@ public function getAttributesHtmlDataProvider()`
`94`	`94`	`]`
`95`	`95`	`];`
`96`	`96`	`}`
	`97`	`+`
	`98`	`+ /**`
	`99`	`+ * Verifies ability of adding button onclick attribute`
	`100`	`+ *`
	`101`	`+ * @return void`
	`102`	`+ */`
	`103`	`+ public function testOnClickAttribute(): void`
	`104`	`+ {`
	`105`	`+ $this->_blockMock->setData(['onclick_attribute' => 'value']);`
	`106`	`+ $attributes = $this->_blockMock->getAttributesHtml();`
	`107`	`+ $this->assertStringContainsString('onclick', $attributes);`
	`108`	`+ }`
`97`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -379,7 +379,7 @@ public function getTierPrices($product)`
`379`	`379`	`if (array_key_exists('website_price', $price)) {`
`380`	`380`	`$value = $price['website_price'];`
`381`	`381`	`} else {`
`382`		`- $value = $price['price'];`
	`382`	`+ $value = $price['price'] ?? 0;`
`383`	`383`	`}`
`384`	`384`	`$tierPrice->setValue($value);`
`385`	`385`	`$tierPrice->setQty($price['price_qty']);`