Merge branch '2.4-develop' of https://github.com/magento-l3/magento2ce into ACP2E-1155

Author: Anna Bukatar

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -424,8 +424,9 @@ public function placeOrder($cartId, PaymentInterface $paymentMethod = null)
                 }
             }
             $quote->setCustomerIsGuest(true);
-            $groupId = $customer ? $customer->getGroupId() : GroupInterface::NOT_LOGGED_IN_ID;
-            $quote->setCustomerGroupId($groupId);
+            $quote->setCustomerGroupId(
+                $quote->getCustomerId() ? $customer->getGroupId() : GroupInterface::NOT_LOGGED_IN_ID
+            );
         }
 
         $remoteAddress = $this->remoteAddress->getRemoteAddress();

app/code/Magento/Quote/Test/Unit/Model/QuoteManagementTest.php

@@ -240,7 +240,16 @@ protected function setUp(): void
         );
 
         $this->quoteMock = $this->getMockBuilder(Quote::class)
-            ->addMethods(['setCustomerEmail', 'setCustomerGroupId', 'setCustomerId', 'setRemoteIp', 'setXForwardedFor'])
+            ->addMethods(
+                [
+                    'setCustomerEmail',
+                    'setCustomerGroupId',
+                    'setCustomerId',
+                    'getCustomerId',
+                    'setRemoteIp',
+                    'setXForwardedFor',
+                ]
+            )
             ->onlyMethods(
                 [
                     'assignCustomer',
@@ -853,6 +862,7 @@ public function testPlaceOrderIfCustomerIsGuest(): void
         $this->quoteMock->expects($this->any())->method('getBillingAddress')->with()->willReturn($addressMock);
 
         $this->quoteMock->expects($this->once())->method('setCustomerIsGuest')->with(true)->willReturnSelf();
+        $this->quoteMock->expects($this->once())->method('getCustomerId')->willReturn(null);
         $this->quoteMock->expects($this->once())
             ->method('setCustomerGroupId')
             ->with(GroupInterface::NOT_LOGGED_IN_ID);

app/code/Magento/Tax/Pricing/Render/Adjustment.php

@@ -183,8 +183,7 @@ public function displayPriceExcludingTax()
      */
     public function getDataPriceType(): string
     {
-        return $this->amountRender->getPriceType() === 'finalPrice'
-            ? 'basePrice'
-            : 'base' . ucfirst($this->amountRender->getPriceType());
+        $priceType = $this->amountRender->getPriceType();
+        return $priceType === 'finalPrice' ? 'basePrice' : ($priceType ? 'base' . ucfirst($priceType) : '');
     }
 }

app/code/Magento/Tax/Test/Unit/Pricing/Render/AdjustmentTest.php

@@ -29,8 +29,6 @@
 class AdjustmentTest extends TestCase
 {
     /**
-     * Context mock
-     *
      * @var \Magento\Framework\View\Element\Template\Context
      */
     protected $contextMock;
@@ -54,6 +52,11 @@ class AdjustmentTest extends TestCase
      */
     protected $model;
 
+    /**
+     * @var AmountRenderInterface
+     */
+    protected $amountRender;
+
     /**
      * Init mocks and model
      */
@@ -350,4 +353,33 @@ public function testGetHtmlBoth()
 
         $this->model->render($amountRender, $arguments);
     }
+
+    /**
+     * test for method getDataPriceType
+     * @dataProvider dataPriceTypeDataProvider
+     */
+    public function testGetDataPriceType(?string $priceType, string $priceTypeValue): void
+    {
+        $amountRender = $this->getMockBuilder(Amount::class)
+            ->addMethods(['getPriceType'])
+            ->disableOriginalConstructor()
+            ->getMock();
+        $amountRender->expects($this->atLeastOnce())
+            ->method('getPriceType')
+            ->willReturn($priceType);
+        $this->model->render($amountRender, []);
+        //no exception is thrown
+        $this->assertEquals($priceTypeValue, $this->model->getDataPriceType());
+        $this->assertIsString($this->model->getDataPriceType());
+    }
+
+    /**
+     * data provider for testGetDataPriceType
+     *
+     * @return array
+     */
+    public function dataPriceTypeDataProvider(): array
+    {
+        return [['finalPrice', 'basePrice'], [null, '']];
+    }
 }

app/code/Magento/Ui/view/base/web/js/dynamic-rows/dynamic-rows.js

@@ -801,7 +801,7 @@ define([
             var max = 0,
                 pos;
 
-            this.elems.each(function (record) {
+            this.recordData.each(function (record) {
                 pos = ~~record.position;
                 pos > max ? max = pos : false;
             });

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteManagementTest.php

@@ -132,7 +132,7 @@ public function testSubmitGuestCustomer(): void
         $quote = $this->getQuoteByReservedOrderId->execute('guest_quote');
         $this->cartManagement->placeOrder($quote->getId());
         $quoteAfterOrderPlaced = $this->getQuoteByReservedOrderId->execute('guest_quote');
-        self::assertEquals(2, $quoteAfterOrderPlaced->getCustomerGroupId());
+        self::assertEquals(0, $quoteAfterOrderPlaced->getCustomerGroupId());
         self::assertEquals(3, $quoteAfterOrderPlaced->getCustomerTaxClassId());
     }
 

setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Xml.php

@@ -16,17 +16,20 @@
 class Xml extends AbstractAdapter
 {
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _parse()
     {
-        foreach ($this->_getNodes($this->_file) as $element) {
+        foreach ($this->_getNodes($this->_file) as $key => $element) {
             if (!$element instanceof \SimpleXMLElement) {
                 continue;
             }
+
             $attributes = $element->attributes();
             if ((string)$attributes['translate'] === 'true' || (string)$attributes['translatable'] === 'true') {
                 $this->_addPhrase((string)$element);
+            } elseif ($key === 'title') {
+                $this->_addPhrase((string)$element->title);
             } else {
                 $this->parseTranslatableNodes($attributes, $element);
             }
@@ -46,8 +49,12 @@ protected function _getNodes($file)
         libxml_use_internal_errors(false);
         if ($xml) {
             $nodes = $xml->xpath('//*[@translate|@translatable]');
-            unset($xml);
+            /* To add title of all xml files in translation csv */
+            if ($xml->head) {
+                $nodes['title'] =  $xml->head;
+            }
 
+            unset($xml);
             return is_array($nodes) ? $nodes : [];
         }
 

setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/XmlTest.php

@@ -60,6 +60,7 @@ public function parseDataProvider()
                     ['phrase' => 'Phrase 3', 'file' => $default, 'line' => '', 'quote' => ''],
                     ['phrase' => 'Phrase 1', 'file' => $default, 'line' => '', 'quote' => ''],
                     ['phrase' => 'Comment from new line.', 'file' => $default, 'line' => '', 'quote' => ''],
+                    ['phrase' => 'Title', 'file' => $default, 'line' => '', 'quote' => ''],
                 ],
             ],
             [

setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/_files/default.xml

@@ -7,6 +7,9 @@
 -->
 
 <layout>
+    <head>
+        <title>Title</title>
+    </head>
     <node1 translate="description, label">
         <description>Phrase 1</description>
         <label>Phrase 2</label>