🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #20391: Success message is not showing when creating invoice & shipment simultaniously #19942 (by @XxXgeoXxX)
 - #21498: Setting default sorting #21493 (by @Jitheesh)
 - #21534: correct spelling (by @ravi-chandra3197)
 - #21536: Fix type hints and replace deprecated method usage (by @avstudnitz)
 - #21509: Fix: Cart is emptied when enter is pressed after changing product quantity (by @lfluvisotto)
 - #20528: Fix for #20527 [Admin] Configurable product variations table cell labels wrong position (by @vasilii-b)
 - #19376: 19276 - Fixed price renderer issue (by @sarfarazbheda)


Fixed GitHub Issues:
 - #21493: Setting default sorting (reported by @iproger) has been fixed in #21498 by @Jitheesh in 2.3-develop branch
   Related commits:
     1. 50647c4

 - #21499: Cart is emptied when enter is pressed after changing product quantity (reported by @wojtekn) has been fixed in #21509 by @lfluvisotto in 2.3-develop branch
   Related commits:
     1. 539766f
     2. fd3344b

 - #20527: [Admin] Configurable product variations table cell labels wrong position (reported by @vasilii-b) has been fixed in #20528 by @vasilii-b in 2.3-develop branch
   Related commits:
     1. af11e87
     2. ed2a80c
     3. d9c962f
     4. e8adeca

 - #19276: Change different product price on selecting different product swatches on category pages (reported by @ankurverma5540) has been fixed in #19376 by @sarfarazbheda in 2.3-develop branch
   Related commits:
     1. 6c5dd94

Author: magento-engcom-team

app/code/Magento/Catalog/Api/ProductRenderListInterface.php

@@ -4,18 +4,22 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Api;
 
 /**
- * Interface which provides product renders information for products
+ * Interface which provides product renders information for products.
+ *
  * @api
  * @since 101.1.0
  */
 interface ProductRenderListInterface
 {
     /**
-     * Collect and retrieve the list of product render info
-     * This info contains raw prices and formated prices, product name, stock status, store_id, etc
+     * Collect and retrieve the list of product render info.
+     *
+     * This info contains raw prices and formatted prices, product name, stock status, store_id, etc.
+     *
      * @see \Magento\Catalog\Api\Data\ProductRenderInfoDtoInterface
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria

app/code/Magento/Catalog/Block/Product/View/Options/AbstractOptions.php

@@ -9,11 +9,14 @@
  *
  * @author     Magento Core Team <[email protected]>
  */
+
 namespace Magento\Catalog\Block\Product\View\Options;
 
 use Magento\Catalog\Pricing\Price\CustomOptionPriceInterface;
 
 /**
+ * Product aoptions section abstract block.
+ *
  * @api
  * @since 100.0.2
  */
@@ -46,7 +49,7 @@ abstract class AbstractOptions extends \Magento\Framework\View\Element\Template
     /**
      * @param \Magento\Framework\View\Element\Template\Context $context
      * @param \Magento\Framework\Pricing\Helper\Data $pricingHelper
-     * @param \Magento\Catalog\Helper\Data $catalogData,
+     * @param \Magento\Catalog\Helper\Data $catalogData
      * @param array $data
      */
     public function __construct(
@@ -123,6 +126,8 @@ public function getFormattedPrice()
     }
 
     /**
+     * Retrieve formatted price.
+     *
      * @return string
      *
      * @deprecated
@@ -134,7 +139,7 @@ public function getFormatedPrice()
     }
 
     /**
-     * Return formated price
+     * Return formatted price
      *
      * @param array $value
      * @param bool $flag

app/code/Magento/Checkout/Block/Cart/Totals.php

@@ -3,12 +3,15 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Checkout\Block\Cart;
 
 use Magento\Framework\View\Element\BlockInterface;
 use Magento\Checkout\Block\Checkout\LayoutProcessorInterface;
 
 /**
+ * Totals cart block.
+ *
  * @api
  */
 class Totals extends \Magento\Checkout\Block\Cart\AbstractCart
@@ -62,6 +65,8 @@ public function __construct(
     }
 
     /**
+     * Retrieve encoded js layout.
+     *
      * @return string
      */
     public function getJsLayout()
@@ -74,6 +79,8 @@ public function getJsLayout()
     }
 
     /**
+     * Retrieve totals from cache.
+     *
      * @return array
      */
     public function getTotals()
@@ -85,6 +92,8 @@ public function getTotals()
     }
 
     /**
+     * Set totals to cache.
+     *
      * @param array $value
      * @return $this
      * @codeCoverageIgnore
@@ -96,6 +105,8 @@ public function setTotals($value)
     }
 
     /**
+     * Create totals block and set totals.
+     *
      * @param string $code
      * @return BlockInterface
      */
@@ -121,6 +132,8 @@ protected function _getTotalRenderer($code)
     }
 
     /**
+     * Get totals html.
+     *
      * @param mixed $total
      * @param int|null $area
      * @param int $colspan
@@ -177,7 +190,7 @@ public function needDisplayBaseGrandtotal()
     }
 
     /**
-     * Get formated in base currency base grand total value
+     * Get formatted in base currency base grand total value
      *
      * @return string
      */

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

@@ -14,7 +14,11 @@ define([
         _create: function () {
             var items, i, reload;
 
-            $(this.options.emptyCartButton).on('click', $.proxy(function () {
+            $(this.options.emptyCartButton).on('click', $.proxy(function (event) {
+                if (event.detail === 0) {
+                    return;
+                }
+
                 $(this.options.emptyCartButton).attr('name', 'update_cart_action_temp');
                 $(this.options.updateCartActionContainer)
                     .attr('name', 'update_cart_action').attr('value', 'empty_cart');

app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurablePanel.php

@@ -5,14 +5,14 @@
  */
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
+use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Framework\UrlInterface;
 use Magento\Ui\Component\Container;
-use Magento\Ui\Component\Form;
 use Magento\Ui\Component\DynamicRows;
+use Magento\Ui\Component\Form;
 use Magento\Ui\Component\Modal;
-use Magento\Framework\UrlInterface;
-use Magento\Catalog\Model\Locator\LocatorInterface;
 
 /**
  * Data provider for Configurable panel
@@ -90,15 +90,15 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
         return $data;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function modifyMeta(array $meta)
@@ -197,7 +197,7 @@ public function modifyMeta(array $meta)
                                         'autoRender' => false,
                                         'componentType' => 'insertListing',
                                         'component' => 'Magento_ConfigurableProduct/js'
-                                            .'/components/associated-product-insert-listing',
+                                            . '/components/associated-product-insert-listing',
                                         'dataScope' => $this->associatedListingPrefix
                                             . static::ASSOCIATED_PRODUCT_LISTING,
                                         'externalProvider' => $this->associatedListingPrefix
@@ -328,14 +328,12 @@ protected function getButtonSet()
                                 'component' => 'Magento_Ui/js/form/components/button',
                                 'actions' => [
                                     [
-                                        'targetName' =>
-                                            $this->dataScopeName . '.configurableModal',
+                                        'targetName' => $this->dataScopeName . '.configurableModal',
                                         'actionName' => 'trigger',
                                         'params' => ['active', true],
                                     ],
                                     [
-                                        'targetName' =>
-                                            $this->dataScopeName . '.configurableModal',
+                                        'targetName' => $this->dataScopeName . '.configurableModal',
                                         'actionName' => 'openModal',
                                     ],
                                 ],
@@ -471,8 +469,7 @@ protected function getRows()
                         'sku',
                         __('SKU'),
                         [
-                            'validation' =>
-                                [
+                            'validation' => [
                                     'required-entry' => true,
                                     'max_text_length' => Sku::SKU_MAX_LENGTH,
                                 ],
@@ -577,6 +574,7 @@ protected function getColumn(
             'dataType' => Form\Element\DataType\Text::NAME,
             'dataScope' => $name,
             'visibleIfCanEdit' => false,
+            'labelVisible' => false,
             'imports' => [
                 'visible' => '!${$.provider}:${$.parentScope}.canEdit'
             ],
@@ -595,6 +593,7 @@ protected function getColumn(
             'component' => 'Magento_Ui/js/form/components/group',
             'label' => $label,
             'dataScope' => '',
+            'showLabel' => false
         ];
         $container['children'] = [
             $name . '_edit' => $fieldEdit,

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/Orders.php

@@ -63,7 +63,8 @@ protected function _construct()
     {
         parent::_construct();
         $this->setId('customer_orders_grid');
-        $this->setDefaultSort('created_at', 'desc');
+        $this->setDefaultSort('created_at');
+        $this->setDefaultDir('desc');
         $this->setUseAjax(true);
     }
 

app/code/Magento/Customer/Block/Adminhtml/Edit/Tab/View/Cart.php

@@ -77,7 +77,8 @@ protected function _construct()
     {
         parent::_construct();
         $this->setId('customer_view_cart_grid');
-        $this->setDefaultSort('added_at', 'desc');
+        $this->setDefaultSort('added_at');
+        $this->setDefaultDir('desc');
         $this->setSortable(false);
         $this->setPagerVisibility(false);
         $this->setFilterVisibility(false);

app/code/Magento/Customer/Model/Attribute/Data/Postcode.php

@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Customer\Model\Attribute\Data;
 
 use Magento\Directory\Helper\Data as DirectoryHelper;
@@ -13,7 +14,8 @@
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface as MagentoTimezone;
 
 /**
- * Customer Address Postal/Zip Code Attribute Data Model
+ * Customer Address Postal/Zip Code Attribute Data Model.
+ *
  * This Data Model Has to Be Set Up in additional EAV attribute table
  */
 class Postcode extends \Magento\Eav\Model\Attribute\Data\AbstractData
@@ -40,7 +42,8 @@ public function __construct(
     }
 
     /**
-     * Validate postal/zip code
+     * Validate postal/zip code.
+     *
      * Return true and skip validation if country zip code is optional
      *
      * @param array|string $value
@@ -104,7 +107,7 @@ public function restoreValue($value)
     }
 
     /**
-     * Return formated attribute value from entity model
+     * Return formatted attribute value from entity model
      *
      * @param string $format
      * @return string|array

app/code/Magento/Newsletter/Controller/Subscriber/Confirm.php

@@ -4,13 +4,20 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Newsletter\Controller\Subscriber;
 
-class Confirm extends \Magento\Newsletter\Controller\Subscriber
+use Magento\Framework\App\Action\HttpGetActionInterface;
+
+/**
+ * Confirm subscription controller.
+ */
+class Confirm extends \Magento\Newsletter\Controller\Subscriber implements HttpGetActionInterface
 {
     /**
-     * Subscription confirm action
-     * @return void
+     * Subscription confirm action.
+     *
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -23,17 +30,17 @@ public function execute()
 
             if ($subscriber->getId() && $subscriber->getCode()) {
                 if ($subscriber->confirm($code)) {
-                    $this->messageManager->addSuccess(__('Your subscription has been confirmed.'));
+                    $this->messageManager->addSuccessMessage(__('Your subscription has been confirmed.'));
                 } else {
-                    $this->messageManager->addError(__('This is an invalid subscription confirmation code.'));
+                    $this->messageManager->addErrorMessage(__('This is an invalid subscription confirmation code.'));
                 }
             } else {
-                $this->messageManager->addError(__('This is an invalid subscription ID.'));
+                $this->messageManager->addErrorMessage(__('This is an invalid subscription ID.'));
             }
         }
-
-        $resultRedirect = $this->resultRedirectFactory->create();
-        $resultRedirect->setUrl($this->_storeManager->getStore()->getBaseUrl());
-        return $resultRedirect;
+        /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
+        $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
+        $redirectUrl = $this->_storeManager->getStore()->getBaseUrl();
+        return $redirect->setUrl($redirectUrl);
     }
 }

app/code/Magento/Newsletter/Controller/Subscriber/NewAction.php

@@ -4,6 +4,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Newsletter\Controller\Subscriber;
 
 use Magento\Customer\Api\AccountManagementInterface as CustomerAccountManagement;
@@ -131,7 +132,7 @@ protected function validateEmailFormat($email)
     /**
      * New subscription action
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Redirect
      */
     public function execute()
     {
@@ -160,7 +161,10 @@ public function execute()
                 $this->messageManager->addExceptionMessage($e, __('Something went wrong with the subscription.'));
             }
         }
-        $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl());
+        /** @var \Magento\Framework\Controller\Result\Redirect $redirect */
+        $redirect = $this->resultFactory->create(\Magento\Framework\Controller\ResultFactory::TYPE_REDIRECT);
+        $redirectUrl = $this->_redirect->getRedirectUrl();
+        return $redirect->setUrl($redirectUrl);
     }
 
     /**