🔃 [EngCom] Public Pull Requests - 2.3-develop

Accepted Public Pull Requests:
 - #14787: Update Readme file for magento2 repository (by @sidolov)
 - #14782: [Forwardport] #13765 Excess requests 'customer data' on checkout cart page were fixed (by @andrewbess)
 - #14779: [Forwardport] Refactor Code for Mass Order Unhold (by @rostyslav-hymon)


Fixed GitHub Issues:
 - #13765: "cart" section data gets loaded 3 times on cart page (2.2.2) (reported by @erikhansen) has been fixed in #14782 by @andrewbess in 2.3-develop branch
   Related commits:
     1. c442f76
     2. 5befa84

Author: magento-engcom-team

README.md

@@ -6,13 +6,12 @@
 Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
 
 ## Magento system requirements
-[Magento system requirements](http://devdocs.magento.com/guides/v2.2/install-gde/system-requirements2.html)
+[Magento system requirements](http://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html)
 
 ## Install Magento
 To install Magento, see either:
 
-*	[Magento DevBox](https://magento.com/tech-resources/download), the easiest way to get started with Magento.
-*	[Installation guide](http://devdocs.magento.com/guides/v2.2/install-gde/bk-install-guide.html)
+*	[Installation guide](http://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html)
 
 <h2>Contributing to the Magento 2 code base</h2>
 Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
@@ -23,11 +22,24 @@ To learn about issues, click [here][2]. To open an issue, click [here][3].
 
 To suggest documentation improvements, click [here][4].
 
-[1]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html>
-[2]: <http://devdocs.magento.com/guides/v2.2/contributor-guide/contributing.html#report>
+[1]: <http://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html>
+[2]: <http://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#report>
 [3]: <https://github.com/magento/magento2/issues>
 [4]: <http://devdocs.magento.com>
 
+<h3>Community Maintainers</h3>
+The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
+
+<a href="https://magento.com/magento-contributors#maintainers">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>
+</a>
+
+<h3>Top Contributors</h3>
+Magento team thanks for any contribution that can improve our code base, documentation or increase test coverage. We always recognize our most active members, your contributions are the foundation of the Magento open source platform.
+<a href="https://magento.com/magento-contributors">
+    <img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
+</a>
+
 <h3>Labels applied by the Magento team</h3>
 
 | Label        | Description           | 

app/code/Magento/Checkout/view/frontend/web/js/model/totals.js

@@ -14,17 +14,20 @@ define([
     'use strict';
 
     var quoteItems = ko.observable(quote.totals().items),
-        cartData = customerData.get('cart'),
-        quoteSubtotal = parseFloat(quote.totals().subtotal),
-        subtotalAmount = parseFloat(cartData().subtotalAmount);
+        cartData = customerData.get('cart');
 
     quote.totals.subscribe(function (newValue) {
         quoteItems(newValue.items);
     });
 
-    if (quoteSubtotal !== subtotalAmount) {
-        customerData.reload(['cart'], false);
-    }
+    cartData.subscribe(function () {
+        var quoteSubtotal = parseFloat(quote.totals().subtotal),
+            subtotalAmount = parseFloat(cartData().subtotalAmount);
+
+        if (quoteSubtotal !== subtotalAmount) {
+            customerData.reload(['cart'], false);
+        }
+    }, this);
 
     return {
         totals: quote.totals,

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

@@ -94,17 +94,17 @@ define([
                 this.isLoading(addToCartCalls > 0);
                 sidebarInitialized = false;
                 this.update(updatedCart);
+
+                if (cartData()['website_id'] !== window.checkout.websiteId) {
+                    customerData.reload(['cart'], false);
+                }
                 initSidebar();
             }, this);
             $('[data-block="minicart"]').on('contentLoading', function () {
                 addToCartCalls++;
                 self.isLoading(true);
             });
 
-            if (cartData()['website_id'] !== window.checkout.websiteId) {
-                customerData.reload(['cart'], false);
-            }
-
             return this._super();
         },
         isLoading: ko.observable(false),

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -232,9 +232,11 @@ define([
             if (!_.isEmpty(privateContent)) {
                 countryData = this.get('directory-data');
 
-                if (_.isEmpty(countryData())) {
-                    customerData.reload(['directory-data'], false);
-                }
+                countryData.subscribe(function () {
+                    if (_.isEmpty(countryData())) {
+                        customerData.reload(['directory-data'], false);
+                    }
+                }, this);
             }
         },
 

app/code/Magento/Sales/Controller/Adminhtml/Order/MassUnhold.php

@@ -9,23 +9,37 @@
 use Magento\Backend\App\Action\Context;
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
+use Magento\Sales\Api\OrderManagementInterface;
 
 class MassUnhold extends AbstractMassAction
 {
     /**
      * Authorization level of a basic admin session
      */
     const ADMIN_RESOURCE = 'Magento_Sales::unhold';
+    
+    /**
+     * @var OrderManagementInterface
+     */
+    private $orderManagement;
 
     /**
      * @param Context $context
      * @param Filter $filter
      * @param CollectionFactory $collectionFactory
+     * @param OrderManagementInterface|null $orderManagement
      */
-    public function __construct(Context $context, Filter $filter, CollectionFactory $collectionFactory)
-    {
+    public function __construct(
+        Context $context,
+        Filter $filter,
+        CollectionFactory $collectionFactory,
+        OrderManagementInterface $orderManagement = null
+    ) {
         parent::__construct($context, $filter);
         $this->collectionFactory = $collectionFactory;
+        $this->orderManagement = $orderManagement ?: \Magento\Framework\App\ObjectManager::getInstance()->get(
+            \Magento\Sales\Api\OrderManagementInterface::class
+        );
     }
 
     /**
@@ -40,12 +54,10 @@ protected function massAction(AbstractCollection $collection)
 
         /** @var \Magento\Sales\Model\Order $order */
         foreach ($collection->getItems() as $order) {
-            $order->load($order->getId());
             if (!$order->canUnhold()) {
                 continue;
             }
-            $order->unhold();
-            $order->save();
+            $this->orderManagement->unHold($order->getEntityId());
             $countUnHoldOrder++;
         }
 

app/code/Magento/Sales/Test/Unit/Controller/Adminhtml/Order/MassUnholdTest.php

@@ -85,6 +85,11 @@ class MassUnholdTest extends \PHPUnit\Framework\TestCase
      */
     protected $filterMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderManagementMock;
+
     protected function setUp()
     {
         $objectManagerHelper = new ObjectManagerHelper($this);
@@ -146,12 +151,15 @@ protected function setUp()
             ->method('create')
             ->willReturn($this->orderCollectionMock);
 
+        $this->orderManagementMock = $this->createMock(\Magento\Sales\Api\OrderManagementInterface::class);
+
         $this->massAction = $objectManagerHelper->getObject(
             \Magento\Sales\Controller\Adminhtml\Order\MassUnhold::class,
             [
                 'context' => $this->contextMock,
                 'filter' => $this->filterMock,
-                'collectionFactory' => $this->orderCollectionFactoryMock
+                'collectionFactory' => $this->orderCollectionFactoryMock,
+                'orderManagement' => $this->orderManagementMock
             ]
         );
     }
@@ -175,9 +183,7 @@ public function testExecuteOneOrdersReleasedFromHold()
             ->method('canUnhold')
             ->willReturn(true);
         $order1->expects($this->once())
-            ->method('unhold');
-        $order1->expects($this->once())
-            ->method('save');
+            ->method('getEntityId');
 
         $this->orderCollectionMock->expects($this->once())
             ->method('count')
@@ -187,6 +193,8 @@ public function testExecuteOneOrdersReleasedFromHold()
             ->method('canUnhold')
             ->willReturn(false);
 
+        $this->orderManagementMock->expects($this->atLeastOnce())->method('unHold')->willReturn(true);
+
         $this->messageManagerMock->expects($this->once())
             ->method('addError')
             ->with('1 order(s) were not released from on hold status.');