🔃 [EngCom] Public Pull Requests - 2.2-develop

Accepted Public Pull Requests:
 - #18375: Backport 2.2 - Fix wrong reference in google analytics module layout xml (by @sambolek)
 - #18369: [Backport] Fix throwing error by checkout error processor model (by @ihor-sviziev)
 - #18283: [Backport] Fix for removing the dirs while creating a TAR archive (by @haroldclaus)
 - #18377: [Backport 2.2-develop] Refactor Mass Order Cancel code to use Interface (by @JeroenVanLeusden)
 - #17986: Implemented 17964: Backend Order creation Authorizenet: If invalid cr� (by @passtet)
 - #17882: Do not overwrite URL Key with blank value (by @josephmcdermott)


Fixed GitHub Issues:
 - #16497: Magento 2.2.5: Google Analytics not added to head correctly (reported by @WalterSmulders) has been fixed in #18375 by @sambolek in 2.2-develop branch
   Related commits:
     1. 0189014

 - #18330: Checkout - Infinite loading indicator when server returned error (reported by @ihor-sviziev) has been fixed in #18369 by @ihor-sviziev in 2.2-develop branch
   Related commits:
     1. 74bed69

 - #17023: CSV Import of `sku,attribute` empties `url_key` value (reported by @josephmcdermott) has been fixed in #17882 by @josephmcdermott in 2.2-develop branch
   Related commits:
     1. a021d5f
     2. a02bf03
     3. e48683c
     4. 7df4e12
     5. fffb6ff
     6. 002aa19
     7. 172e2ec
     8. 3a54946
     9. 2fb7183
     10. fda664a
     11. abd95bd
     12. 0f26b52

Author: magento-engcom-team

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -1562,7 +1562,10 @@ protected function _saveProducts()
                 }
                 $rowScope = $this->getRowScope($rowData);
 
-                $rowData[self::URL_KEY] = $this->getUrlKey($rowData);
+                $urlKey = $this->getUrlKey($rowData);
+                if (!empty($urlKey)) {
+                    $rowData[self::URL_KEY] = $urlKey;
+                }
 
                 $rowSku = $rowData[self::COL_SKU];
 
@@ -2452,7 +2455,9 @@ public function validateRow(array $rowData, $rowNum)
      */
     private function isNeedToValidateUrlKey($rowData)
     {
-        return (!empty($rowData[self::URL_KEY]) || !empty($rowData[self::COL_NAME]))
+        $urlKey = $this->getUrlKey($rowData);
+        
+        return (!empty($urlKey))
             && (empty($rowData[self::COL_VISIBILITY])
             || $rowData[self::COL_VISIBILITY]
             !== (string)Visibility::getOptionArray()[Visibility::VISIBILITY_NOT_VISIBLE]);
@@ -2764,8 +2769,14 @@ protected function getUrlKey($rowData)
         if (!empty($rowData[self::URL_KEY])) {
             return $this->productUrl->formatUrlKey($rowData[self::URL_KEY]);
         }
-
-        if (!empty($rowData[self::COL_NAME])) {
+        
+        /**
+         * If the product exists, assume it already has a URL Key and even
+         * if a name is provided in the import data, it should not be used
+         * to overwrite that existing URL Key the product already has.
+         */
+        $isSkuExist = $this->isSkuExist($rowData[self::COL_SKU]);
+        if (!$isSkuExist && !empty($rowData[self::COL_NAME])) {
             return $this->productUrl->formatUrlKey($rowData[self::COL_NAME]);
         }
 

app/code/Magento/Checkout/view/frontend/web/js/model/error-processor.js

@@ -8,8 +8,9 @@
  */
 define([
     'mage/url',
-    'Magento_Ui/js/model/messageList'
-], function (url, globalMessageList) {
+    'Magento_Ui/js/model/messageList',
+    'consoleLogger'
+], function (url, globalMessageList, consoleLogger) {
     'use strict';
 
     return {
@@ -25,8 +26,12 @@ define([
             if (response.status == 401) { //eslint-disable-line eqeqeq
                 window.location.replace(url.build('customer/account/login/'));
             } else {
-                error = JSON.parse(response.responseText);
-                messageContainer.addErrorMessage(error);
+                try {
+                    error = JSON.parse(response.responseText);
+                    messageContainer.addErrorMessage(error);
+                } catch (e) {
+                    consoleLogger.error(e);
+                }
             }
         }
     };

app/code/Magento/GoogleAnalytics/view/frontend/layout/default.xml

@@ -7,8 +7,8 @@
 -->
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
-        <referenceContainer name="head.additional">
+        <referenceBlock name="head.additional">
             <block class="Magento\GoogleAnalytics\Block\Ga" name="google_analytics" as="google_analytics" template="Magento_GoogleAnalytics::ga.phtml"/>
-        </referenceContainer>
+        </referenceBlock>
     </body>
 </page>

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

@@ -11,23 +11,37 @@
 use Magento\Ui\Component\MassAction\Filter;
 use Magento\Sales\Model\ResourceModel\Order\CollectionFactory;
 use Magento\Framework\App\Request\Http as HttpRequest;
+use Magento\Sales\Api\OrderManagementInterface;
 
 class MassCancel extends \Magento\Sales\Controller\Adminhtml\Order\AbstractMassAction
 {
     /**
      * Authorization level of a basic admin session
      */
     const ADMIN_RESOURCE = 'Magento_Sales::cancel';
+    
+    /**
+     * @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
+        );
     }
 
     /**
@@ -54,11 +68,10 @@ protected function massAction(AbstractCollection $collection)
     {
         $countCancelOrder = 0;
         foreach ($collection->getItems() as $order) {
-            if (!$order->canCancel()) {
+            $isCanceled = $this->orderManagement->cancel($order->getEntityId());
+            if ($isCanceled === false) {
                 continue;
             }
-            $order->cancel();
-            $order->save();
             $countCancelOrder++;
         }
         $countNonCancelOrder = $collection->count() - $countCancelOrder;