Merge remote-tracking branch 'origin/2.3-develop' into MC-14938

# Conflicts:
#	app/code/Magento/Customer/Test/Mftf/ActionGroup/OpenEditCustomerFromAdminActionGroup.xml

Author: zakdma

app/code/Magento/AdvancedPricingImportExport/Model/Import/AdvancedPricing.php

@@ -408,6 +408,7 @@ protected function saveAndReplaceAdvancedPrices()
             } elseif (\Magento\ImportExport\Model\Import::BEHAVIOR_APPEND == $behavior) {
                 $this->processCountExistingPrices($tierPrices, self::TABLE_TIER_PRICE)
                     ->processCountNewPrices($tierPrices);
+
                 $this->saveProductPrices($tierPrices, self::TABLE_TIER_PRICE);
                 if ($listSku) {
                     $this->setUpdatedAt($listSku);
@@ -562,11 +563,14 @@ protected function processCountExistingPrices($prices, $table)
 
         $tableName = $this->_resourceFactory->create()->getTable($table);
         $productEntityLinkField = $this->getProductEntityLinkField();
-        $existingPrices = $this->_connection->fetchAssoc(
+        $existingPrices = $this->_connection->fetchAll(
             $this->_connection->select()->from(
                 $tableName,
-                ['value_id', $productEntityLinkField, 'all_groups', 'customer_group_id']
-            )->where($productEntityLinkField . ' IN (?)', $existProductIds)
+                [$productEntityLinkField, 'all_groups', 'customer_group_id', 'qty']
+            )->where(
+                $productEntityLinkField . ' IN (?)',
+                $existProductIds
+            )
         );
         foreach ($existingPrices as $existingPrice) {
             foreach ($prices as $sku => $skuPrices) {
@@ -591,8 +595,10 @@ protected function incrementCounterUpdated($prices, $existingPrice)
         foreach ($prices as $price) {
             if ($existingPrice['all_groups'] == $price['all_groups']
                 && $existingPrice['customer_group_id'] == $price['customer_group_id']
+                && (int) $existingPrice['qty'] === (int) $price['qty']
             ) {
                 $this->countItemsUpdated++;
+                continue;
             }
         }
     }

app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

@@ -921,7 +921,7 @@ public function testProcessCountExistingPrices(
         );
         $dbSelectMock = $this->createMock(\Magento\Framework\DB\Select::class);
         $this->connection->expects($this->once())
-            ->method('fetchAssoc')
+            ->method('fetchAll')
             ->willReturn($existingPrices);
         $this->connection->expects($this->once())
             ->method('select')
@@ -930,7 +930,7 @@ public function testProcessCountExistingPrices(
             ->method('from')
             ->with(
                 self::TABLE_NAME,
-                ['value_id', self::LINK_FIELD, 'all_groups', 'customer_group_id']
+                [self::LINK_FIELD, 'all_groups', 'customer_group_id', 'qty']
             )->willReturnSelf();
         $this->advancedPricing->expects($this->once())
             ->method('retrieveOldSkus')

app/code/Magento/AdvancedSearch/etc/adminhtml/system.xml

@@ -48,18 +48,18 @@
                     </depends>
                 </field>
                 <!--<group id="suggestions">-->
-                    <field id="search_suggestion_enabled" translate="label comment" type="select" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="search_suggestion_enabled" translate="label comment" type="select" sortOrder="90" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Enable Search Suggestions</label>
                         <comment>When you enable this option your site may slow down.</comment>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     </field>
-                    <field id="search_suggestion_count" translate="label" type="text" sortOrder="71" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="search_suggestion_count" translate="label" type="text" sortOrder="91" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Search Suggestions Count</label>
                         <depends>
                             <field id="search_suggestion_enabled">1</field>
                         </depends>
                     </field>
-                    <field id="search_suggestion_count_results_enabled" translate="label" type="select" sortOrder="72" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <field id="search_suggestion_count_results_enabled" translate="label" type="select" sortOrder="92" showInDefault="1" showInWebsite="1" showInStore="1">
                         <label>Show Results Count for Each Suggestion</label>
                         <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         <comment>When you enable this option your site may slow down.</comment>

app/code/Magento/Analytics/Test/Mftf/Section/AdminAdvancedReportingSection.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="AdminAdvancedReportingSection">
+        <element name="goToAdvancedReporting" type="text" selector="//div[@class='dashboard-advanced-reports-actions']/a[@title='Go to Advanced Reporting']" timeout="30"/>
+    </section>
+</sections>

app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminAdvancedReportingButtonTest">
+        <annotations>
+            <stories value="AdvancedReporting"/>
+            <title value="AdvancedReportingButtonTest"/>
+            <description value="Test log in to AdvancedReporting and tests AdvancedReportingButtonTest"/>
+            <testCaseId value="MC-14800"/>
+            <severity value="CRITICAL"/>
+            <group value="analytics"/>
+            <group value="mtf_migrated"/>
+        </annotations>
+
+        <before>
+            <actionGroup ref = "LoginAsAdmin" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="logout" stepKey="logout"/>
+        </after>
+
+        <!--Navigate through Advanced Reporting button on dashboard to Sign Up page-->
+        <amOnPage url="{{AdminDashboardPage.url}}" stepKey="amOnDashboardPage"/>
+        <waitForPageLoad stepKey="waitForDashboardPageLoad"/>
+        <click selector="{{AdminAdvancedReportingSection.goToAdvancedReporting}}" stepKey="clickGoToAdvancedReporting"/>
+        <switchToNextTab stepKey="switchToNewTab"/>
+        <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
+    </test>
+</tests>

app/code/Magento/Backend/App/Request/BackendValidator.php

@@ -146,8 +146,9 @@ private function createException(
                 $exception = new InvalidRequestException($response);
             } else {
                 //For regular requests.
+                $startPageUrl = $this->backendUrl->getStartupPageUrl();
                 $response = $this->redirectFactory->create()
-                    ->setUrl($this->backendUrl->getStartupPageUrl());
+                    ->setUrl($this->backendUrl->getUrl($startPageUrl));
                 $exception = new InvalidRequestException(
                     $response,
                     [

app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php

@@ -6,6 +6,9 @@
 
 namespace Magento\Backend\Block\System\Design\Edit\Tab;
 
+/**
+ * General system tab block.
+ */
 class General extends \Magento\Backend\Block\Widget\Form\Generic
 {
     /**
@@ -90,7 +93,7 @@ protected function _prepareForm()
             ]
         );
 
-        $dateFormat = $this->_localeDate->getDateFormat(\IntlDateFormatter::SHORT);
+        $dateFormat = $this->_localeDate->getDateFormatWithLongYear();
         $fieldset->addField(
             'date_from',
             'date',

app/code/Magento/Backend/Model/Session/Quote.php

@@ -24,6 +24,7 @@
  * @method Quote setOrderId($orderId)
  * @method int getOrderId()
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  * @since 100.0.2
  */
 class Quote extends \Magento\Framework\Session\SessionManager
@@ -149,7 +150,8 @@ public function getQuote()
             $this->_quote = $this->quoteFactory->create();
             if ($this->getStoreId()) {
                 if (!$this->getQuoteId()) {
-                    $this->_quote->setCustomerGroupId($this->groupManagement->getDefaultGroup()->getId());
+                    $customerGroupId = $this->groupManagement->getDefaultGroup($this->getStoreId())->getId();
+                    $this->_quote->setCustomerGroupId($customerGroupId);
                     $this->_quote->setIsActive(false);
                     $this->_quote->setStoreId($this->getStoreId());
 

app/code/Magento/Backend/Test/Unit/Model/Session/QuoteTest.php

@@ -267,7 +267,10 @@ public function testGetQuoteWithoutQuoteId()
         $cartInterfaceMock->expects($this->atLeastOnce())->method('getId')->willReturn($quoteId);
         $defaultGroup = $this->getMockBuilder(\Magento\Customer\Api\Data\GroupInterface::class)->getMock();
         $defaultGroup->expects($this->any())->method('getId')->will($this->returnValue($customerGroupId));
-        $this->groupManagementMock->expects($this->any())->method('getDefaultGroup')->willReturn($defaultGroup);
+        $this->groupManagementMock
+            ->method('getDefaultGroup')
+            ->with($storeId)
+            ->willReturn($defaultGroup);
 
         $dataCustomerMock = $this->getMockBuilder(\Magento\Customer\Api\Data\CustomerInterface::class)
             ->disableOriginalConstructor()

app/code/Magento/Backend/etc/adminhtml/system.xml

@@ -112,7 +112,7 @@
             <group id="debug" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Debug</label>
                 <field id="template_hints_storefront" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <label>Enabled Template Path Hints for Storefront</label>
+                    <label>Enable Template Path Hints for Storefront</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="template_hints_storefront_show_with_parameter" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -132,7 +132,7 @@
                     <comment>Add the following parameter to the URL to show template hints ?templatehints=[parameter_value]</comment>
                 </field>
                 <field id="template_hints_admin" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
-                    <label>Enabled Template Path Hints for Admin</label>
+                    <label>Enable Template Path Hints for Admin</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="template_hints_blocks" translate="label" type="select" sortOrder="21" showInDefault="1" showInWebsite="1" showInStore="1">

app/code/Magento/Backup/Model/Db.php

@@ -6,6 +6,8 @@
 namespace Magento\Backup\Model;
 
 use Magento\Backup\Helper\Data as Helper;
+use Magento\Backup\Model\ResourceModel\Table\GetListTables;
+use Magento\Backup\Model\ResourceModel\View\CreateViewsBackup;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Exception\RuntimeException;
 
@@ -44,18 +46,35 @@ class Db implements \Magento\Framework\Backup\Db\BackupDbInterface
     private $helper;
 
     /**
-     * @param \Magento\Backup\Model\ResourceModel\Db $resourceDb
+     * @var GetListTables
+     */
+    private $getListTables;
+
+    /**
+     * @var CreateViewsBackup
+     */
+    private $getViewsBackup;
+
+    /**
+     * Db constructor.
+     * @param ResourceModel\Db $resourceDb
      * @param \Magento\Framework\App\ResourceConnection $resource
      * @param Helper|null $helper
+     * @param GetListTables|null $getListTables
+     * @param CreateViewsBackup|null $getViewsBackup
      */
     public function __construct(
-        \Magento\Backup\Model\ResourceModel\Db $resourceDb,
+        ResourceModel\Db $resourceDb,
         \Magento\Framework\App\ResourceConnection $resource,
-        ?Helper $helper = null
+        ?Helper $helper = null,
+        ?GetListTables $getListTables = null,
+        ?CreateViewsBackup $getViewsBackup = null
     ) {
         $this->_resourceDb = $resourceDb;
         $this->_resource = $resource;
         $this->helper = $helper ?? ObjectManager::getInstance()->get(Helper::class);
+        $this->getListTables = $getListTables ?? ObjectManager::getInstance()->get(GetListTables::class);
+        $this->getViewsBackup = $getViewsBackup ?? ObjectManager::getInstance()->get(CreateViewsBackup::class);
     }
 
     /**
@@ -161,7 +180,7 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
 
         $this->getResource()->beginTransaction();
 
-        $tables = $this->getResource()->getTables();
+        $tables = $this->getListTables->execute();
 
         $backup->write($this->getResource()->getHeader());
 
@@ -198,6 +217,8 @@ public function createBackup(\Magento\Framework\Backup\Db\BackupInterface $backu
                 $backup->write($this->getResource()->getTableDataAfterSql($table));
             }
         }
+        $this->getViewsBackup->execute($backup);
+
         $backup->write($this->getResource()->getTableForeignKeysSql());
         $backup->write($this->getResource()->getTableTriggersSql());
         $backup->write($this->getResource()->getFooter());

app/code/Magento/Backup/Model/ResourceModel/Table/GetListTables.php

@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Backup\Model\ResourceModel\Table;
+
+use Magento\Framework\App\ResourceConnection;
+
+/**
+ * Provides full list of tables in the database. This list excludes views, to allow different backup process.
+ */
+class GetListTables
+{
+    private const TABLE_TYPE = 'BASE TABLE';
+
+    /**
+     * @var ResourceConnection
+     */
+    private $resource;
+
+    /**
+     * @param ResourceConnection $resource
+     */
+    public function __construct(ResourceConnection $resource)
+    {
+        $this->resource = $resource;
+    }
+
+    /**
+     * Get list of database tables excluding views.
+     *
+     * @return array
+     */
+    public function execute(): array
+    {
+        return $this->resource->getConnection('backup')->fetchCol(
+            "SHOW FULL TABLES WHERE `Table_type` = ?",
+            self::TABLE_TYPE
+        );
+    }
+}