Merge remote-tracking branch 'origin/2.3.3-develop' into MC-19089

Author: viktorpetryk

app/code/Magento/AdminAnalytics/etc/config.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
+    <default>
+        <admin>
+            <usage>
+                <enabled>
+                    1
+                </enabled>
+            </usage>
+        </admin>
+    </default>
+</config>

app/code/Magento/Checkout/view/frontend/templates/onepage/review/item.phtml

@@ -28,9 +28,9 @@ $taxDataHelper = $this->helper(Magento\Tax\Helper\Data::class);
                             <dt><?= $block->escapeHtml($_option['label']) ?></dt>
                             <dd>
                                 <?php if (isset($_formatedOptionValue['full_view'])) :?>
-                                    <?= $block->escapeHtml($_formatedOptionValue['full_view']) ?>
+                                    <?= /* @noEscape */ $_formatedOptionValue['full_view'] ?>
                                 <?php else :?>
-                                    <?= $block->escapeHtml($_formatedOptionValue['value']) ?>
+                                    <?= /* @noEscape */ $_formatedOptionValue['value'] ?>
                                 <?php endif; ?>
                             </dd>
                         <?php endforeach; ?>

app/code/Magento/Checkout/view/frontend/web/js/action/select-payment-method.js

@@ -12,10 +12,11 @@ define([
     'use strict';
 
     return function (paymentMethod) {
-        paymentMethod.__disableTmpl = {
-            title: true
-        };
-
+        if (paymentMethod) {
+            paymentMethod.__disableTmpl = {
+                title: true
+            };
+        }
         quote.paymentMethod(paymentMethod);
     };
 });

app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js

@@ -13,14 +13,33 @@ define([
     'Magento_Checkout/js/model/error-processor',
     'Magento_Customer/js/model/customer',
     'Magento_Checkout/js/action/get-totals',
-    'Magento_Checkout/js/model/full-screen-loader'
-], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader) {
+    'Magento_Checkout/js/model/full-screen-loader',
+    'underscore'
+], function (quote, urlBuilder, storage, errorProcessor, customer, getTotalsAction, fullScreenLoader, _) {
     'use strict';
 
+    /**
+     * Filter template data.
+     *
+     * @param {Object|Array} data
+     */
+    var filterTemplateData = function (data) {
+        return _.each(data, function (value, key, list) {
+            if (_.isArray(value) || _.isObject(value)) {
+                list[key] = filterTemplateData(value);
+            }
+
+            if (key === '__disableTmpl') {
+                delete list[key];
+            }
+        });
+    };
+
     return function (messageContainer, paymentData, skipBilling) {
         var serviceUrl,
             payload;
 
+        paymentData = filterTemplateData(paymentData);
         skipBilling = skipBilling || false;
         payload = {
             cartId: quote.getQuoteId(),

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

@@ -13,7 +13,8 @@ define([
     'jquery-ui-modules/widget',
     'mage/decorate',
     'mage/collapsible',
-    'mage/cookies'
+    'mage/cookies',
+    'jquery-ui-modules/effect-fade'
 ], function ($, authenticationPopup, customerData, alert, confirm, _) {
     'use strict';
 

app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php

@@ -151,7 +151,7 @@ public function getMessages($queueName, $limit = null)
                 'queue_message_status.status IN (?)',
                 [QueueManagement::MESSAGE_STATUS_NEW, QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED]
             )->where('queue.name = ?', $queueName)
-            ->order('queue_message_status.updated_at ASC');
+            ->order(['queue_message_status.updated_at ASC', 'queue_message_status.id ASC']);
 
         if ($limit) {
             $select->limit($limit);

app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php

@@ -206,7 +206,9 @@ public function testGetMessages()
             ]
         )->willReturnSelf();
         $select->expects($this->once())
-            ->method('order')->with('queue_message_status.updated_at ASC')->willReturnSelf();
+            ->method('order')
+            ->with(['queue_message_status.updated_at ASC', 'queue_message_status.id ASC'])
+            ->willReturnSelf();
         $select->expects($this->once())->method('limit')->with($limit)->willReturnSelf();
         $connection->expects($this->once())->method('fetchAll')->with($select)->willReturn($messages);
         $this->assertEquals($messages, $this->queue->getMessages($queueName, $limit));

app/code/Magento/Persistent/Observer/CheckExpirePersistentQuoteObserver.php

@@ -6,6 +6,9 @@
 namespace Magento\Persistent\Observer;
 
 use Magento\Framework\Event\ObserverInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Model\Quote;
 
 /**
@@ -74,6 +77,11 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      */
     private $quote;
 
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $quoteRepository;
+
     /**
      * @param \Magento\Persistent\Helper\Session $persistentSession
      * @param \Magento\Persistent\Helper\Data $persistentData
@@ -82,6 +90,7 @@ class CheckExpirePersistentQuoteObserver implements ObserverInterface
      * @param \Magento\Customer\Model\Session $customerSession
      * @param \Magento\Checkout\Model\Session $checkoutSession
      * @param \Magento\Framework\App\RequestInterface $request
+     * @param CartRepositoryInterface $quoteRepository
      */
     public function __construct(
         \Magento\Persistent\Helper\Session $persistentSession,
@@ -90,7 +99,8 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         \Magento\Customer\Model\Session $customerSession,
         \Magento\Checkout\Model\Session $checkoutSession,
-        \Magento\Framework\App\RequestInterface $request
+        \Magento\Framework\App\RequestInterface $request,
+        CartRepositoryInterface $quoteRepository
     ) {
         $this->_persistentSession = $persistentSession;
         $this->quoteManager = $quoteManager;
@@ -99,6 +109,7 @@ public function __construct(
         $this->_eventManager = $eventManager;
         $this->_persistentData = $persistentData;
         $this->request = $request;
+        $this->quoteRepository = $quoteRepository;
     }
 
     /**
@@ -146,9 +157,11 @@ public function execute(\Magento\Framework\Event\Observer $observer)
      */
     private function isPersistentQuoteOutdated(): bool
     {
-        if ((!$this->_persistentData->isEnabled() || !$this->_persistentData->isShoppingCartPersist())
+        if (!($this->_persistentData->isEnabled() && $this->_persistentData->isShoppingCartPersist())
             && !$this->_customerSession->isLoggedIn()
-            && $this->_checkoutSession->getQuoteId()) {
+            && $this->_checkoutSession->getQuoteId()
+            && $this->isActiveQuote()
+        ) {
             return (bool)$this->getQuote()->getIsPersistent();
         }
         return false;
@@ -181,6 +194,21 @@ private function getQuote(): Quote
         return $this->quote;
     }
 
+    /**
+     * Check if quote is active.
+     *
+     * @return bool
+     */
+    private function isActiveQuote(): bool
+    {
+        try {
+            $this->quoteRepository->getActive($this->_checkoutSession->getQuoteId());
+            return true;
+        } catch (NoSuchEntityException $e) {
+            return false;
+        }
+    }
+
     /**
      * Check current request is coming from onepage checkout page.
      *

app/code/Magento/Persistent/Test/Unit/Observer/CheckExpirePersistentQuoteObserverTest.php

@@ -6,6 +6,8 @@
 
 namespace Magento\Persistent\Test\Unit\Observer;
 
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Model\Quote;
 
 /**
@@ -63,6 +65,11 @@ class CheckExpirePersistentQuoteObserverTest extends \PHPUnit\Framework\TestCase
      */
     private $quoteMock;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject|CartRepositoryInterface
+     */
+    private $quoteRepositoryMock;
+
     /**
      * @inheritdoc
      */
@@ -82,6 +89,7 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->setMethods(['getRequestUri', 'getServer'])
             ->getMockForAbstractClass();
+        $this->quoteRepositoryMock = $this->createMock(CartRepositoryInterface::class);
 
         $this->model = new \Magento\Persistent\Observer\CheckExpirePersistentQuoteObserver(
             $this->sessionMock,
@@ -90,7 +98,8 @@ protected function setUp()
             $this->eventManagerMock,
             $this->customerSessionMock,
             $this->checkoutSessionMock,
-            $this->requestMock
+            $this->requestMock,
+            $this->quoteRepositoryMock
         );
         $this->quoteMock = $this->getMockBuilder(Quote::class)
         ->setMethods(['getCustomerIsGuest', 'getIsPersistent'])
@@ -111,12 +120,19 @@ public function testExecuteWhenCanNotApplyPersistentData()
 
     public function testExecuteWhenPersistentIsNotEnabled()
     {
+        $quoteId = 'quote_id_1';
+
         $this->persistentHelperMock
             ->expects($this->once())
             ->method('canProcess')
             ->with($this->observerMock)
             ->willReturn(true);
         $this->persistentHelperMock->expects($this->exactly(2))->method('isEnabled')->willReturn(false);
+        $this->checkoutSessionMock->expects($this->exactly(2))->method('getQuoteId')->willReturn($quoteId);
+        $this->quoteRepositoryMock->expects($this->once())
+            ->method('getActive')
+            ->with($quoteId)
+            ->willThrowException(new NoSuchEntityException());
         $this->eventManagerMock->expects($this->never())->method('dispatch');
         $this->model->execute($this->observerMock);
     }

app/code/Magento/QuoteGraphQl/Model/Cart/UpdateCartItem.php

@@ -93,8 +93,6 @@ public function execute(Quote $cart, int $cartItemId, float $quantity, array $cu
                 )
             );
         }
-
-        $this->quoteRepository->save($cart);
     }
 
     /**
@@ -105,7 +103,7 @@ public function execute(Quote $cart, int $cartItemId, float $quantity, array $cu
      * @param float $quantity
      * @throws GraphQlNoSuchEntityException
      * @throws NoSuchEntityException
-     * @throws GraphQlNoSuchEntityException
+     * @throws GraphQlInputException
      */
     private function updateItemQuantity(int $itemId, Quote $cart, float $quantity)
     {