Skip to content

Commit ff103b2

Browse files
VladimirZaetsVladimirZaets
committed
MC-36526: Revert public PR:27340
1 parent 1452016 commit ff103b2

File tree

12 files changed

+27
-36
lines changed

12 files changed

+27
-36
lines changed

‎app/code/Magento/Customer/Block/Account/Navigation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ public function getLinks()
4747
*/
4848
private function compare(SortLinkInterface $firstLink, SortLinkInterface $secondLink): int
4949
{
50-
return $firstLink->getSortOrder() <=> $secondLink->getSortOrder();
50+
return $secondLink->getSortOrder() <=> $firstLink->getSortOrder();
5151
}
5252
}

‎app/code/Magento/Customer/Test/Unit/Block/Account/NavigationTest.php

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@
1818

1919
class NavigationTest extends TestCase
2020
{
21-
/**
22-
* Stub name top links
23-
*/
24-
private const STUB_TOP_LINKS_NAME_IN_LAYOUT = 'top.links';
25-
2621
/**
2722
* @var ObjectManagerHelper
2823
*/
@@ -67,7 +62,7 @@ protected function setUp(): void
6762
*
6863
* @return void
6964
*/
70-
public function testGetLinksWithCustomerAndWishList(): void
65+
public function testGetLinksWithCustomerAndWishList()
7166
{
7267
$wishListLinkMock = $this->getMockBuilder(WishListLink::class)
7368
->disableOriginalConstructor()
@@ -81,30 +76,30 @@ public function testGetLinksWithCustomerAndWishList(): void
8176

8277
$wishListLinkMock->expects($this->any())
8378
->method('getSortOrder')
84-
->willReturn(30);
79+
->willReturn(100);
8580

8681
$customerAccountLinkMock->expects($this->any())
8782
->method('getSortOrder')
88-
->willReturn(0);
83+
->willReturn(20);
8984

90-
$topLinksNameInLayout = self::STUB_TOP_LINKS_NAME_IN_LAYOUT;
85+
$nameInLayout = 'top.links';
9186

9287
$blockChildren = [
93-
'customerAccountLink' => $customerAccountLinkMock,
94-
'wishListLink' => $wishListLinkMock
88+
'wishListLink' => $wishListLinkMock,
89+
'customerAccountLink' => $customerAccountLinkMock
9590
];
9691

97-
$this->navigation->setNameInLayout($topLinksNameInLayout);
92+
$this->navigation->setNameInLayout($nameInLayout);
9893
$this->layoutMock->expects($this->any())
9994
->method('getChildBlocks')
100-
->with($topLinksNameInLayout)
95+
->with($nameInLayout)
10196
->willReturn($blockChildren);
10297

10398
/* Assertion */
10499
$this->assertEquals(
105100
[
106-
0 => $customerAccountLinkMock,
107-
1 => $wishListLinkMock
101+
0 => $wishListLinkMock,
102+
1 => $customerAccountLinkMock
108103
],
109104
$this->navigation->getLinks()
110105
);

‎app/code/Magento/Customer/view/frontend/layout/customer_account.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,31 +24,31 @@
2424
<arguments>
2525
<argument name="label" xsi:type="string" translate="true">My Account</argument>
2626
<argument name="path" xsi:type="string">customer/account</argument>
27-
<argument name="sortOrder" xsi:type="number">1</argument>
27+
<argument name="sortOrder" xsi:type="number">250</argument>
2828
</arguments>
2929
</block>
3030
<block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-1" template="Magento_Customer::account/navigation-delimiter.phtml">
3131
<arguments>
32-
<argument name="sortOrder" xsi:type="number">40</argument>
32+
<argument name="sortOrder" xsi:type="number">200</argument>
3333
</arguments>
3434
</block>
3535
<block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-address-link">
3636
<arguments>
3737
<argument name="label" xsi:type="string" translate="true">Address Book</argument>
3838
<argument name="path" xsi:type="string">customer/address</argument>
39-
<argument name="sortOrder" xsi:type="number">50</argument>
39+
<argument name="sortOrder" xsi:type="number">190</argument>
4040
</arguments>
4141
</block>
4242
<block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-edit-link">
4343
<arguments>
4444
<argument name="label" xsi:type="string" translate="true">Account Information</argument>
4545
<argument name="path" xsi:type="string">customer/account/edit</argument>
46-
<argument name="sortOrder" xsi:type="number">60</argument>
46+
<argument name="sortOrder" xsi:type="number">180</argument>
4747
</arguments>
4848
</block>
4949
<block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-2" template="Magento_Customer::account/navigation-delimiter.phtml">
5050
<arguments>
51-
<argument name="sortOrder" xsi:type="number">90</argument>
51+
<argument name="sortOrder" xsi:type="number">130</argument>
5252
</arguments>
5353
</block>
5454
</block>

‎app/code/Magento/Customer/view/frontend/layout/default.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
1010
<referenceBlock name="top.links">
11-
<block class="Magento\Customer\Block\Account\Link" name="my-account-link" template="Magento_Customer::account/link/my-account.phtml">
11+
<block class="Magento\Customer\Block\Account\Link" name="my-account-link">
1212
<arguments>
1313
<argument name="label" xsi:type="string" translate="true">My Account</argument>
14-
<argument name="sortOrder" xsi:type="number">1</argument>
14+
<argument name="sortOrder" xsi:type="number">110</argument>
1515
</arguments>
1616
</block>
1717
<block class="Magento\Customer\Block\Account\RegisterLink" name="register-link">
@@ -20,11 +20,7 @@
2020
</arguments>
2121
</block>
2222
<block class="Magento\Customer\Block\Account\AuthorizationLink" name="authorization-link"
23-
template="Magento_Customer::account/link/authorization.phtml">
24-
<arguments>
25-
<argument name="sortOrder" xsi:type="number">30</argument>
26-
</arguments>
27-
</block>
23+
template="Magento_Customer::account/link/authorization.phtml"/>
2824
</referenceBlock>
2925
<referenceContainer name="content">
3026
<block class="Magento\Customer\Block\Account\AuthenticationPopup" name="authentication-popup" as="authentication-popup" template="Magento_Customer::account/authentication-popup.phtml">

‎app/code/Magento/Downloadable/view/frontend/layout/customer_account.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<arguments>
1313
<argument name="path" xsi:type="string">downloadable/customer/products</argument>
1414
<argument name="label" xsi:type="string" translate="true">My Downloadable Products</argument>
15-
<argument name="sortOrder" xsi:type="number">20</argument>
15+
<argument name="sortOrder" xsi:type="number">217</argument>
1616
</arguments>
1717
</block>
1818
</referenceBlock>

‎app/code/Magento/Newsletter/view/frontend/layout/customer_account.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<arguments>
1313
<argument name="path" xsi:type="string">newsletter/manage</argument>
1414
<argument name="label" xsi:type="string" translate="true">Newsletter Subscriptions</argument>
15-
<argument name="sortOrder" xsi:type="number">110</argument>
15+
<argument name="sortOrder" xsi:type="number">40</argument>
1616
</arguments>
1717
</block>
1818
</referenceBlock>

‎app/code/Magento/Paypal/view/frontend/layout/customer_account.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<arguments>
1717
<argument name="path" xsi:type="string">paypal/billing_agreement</argument>
1818
<argument name="label" xsi:type="string" translate="true">Billing Agreements</argument>
19-
<argument name="sortOrder" xsi:type="number">80</argument>
19+
<argument name="sortOrder" xsi:type="number">140</argument>
2020
</arguments>
2121
</block>
2222
</referenceBlock>

‎app/code/Magento/Review/view/frontend/layout/customer_account.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<arguments>
1313
<argument name="path" xsi:type="string">review/customer</argument>
1414
<argument name="label" xsi:type="string" translate="true">My Product Reviews</argument>
15-
<argument name="sortOrder" xsi:type="number">100</argument>
15+
<argument name="sortOrder" xsi:type="number">50</argument>
1616
</arguments>
1717
</block>
1818
</referenceBlock>

‎app/code/Magento/Sales/view/frontend/layout/customer_account.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<arguments>
1313
<argument name="path" xsi:type="string">sales/order/history</argument>
1414
<argument name="label" xsi:type="string" translate="true">My Orders</argument>
15-
<argument name="sortOrder" xsi:type="number">10</argument>
15+
<argument name="sortOrder" xsi:type="number">230</argument>
1616
</arguments>
1717
</block>
1818
</referenceBlock>

‎app/code/Magento/Vault/view/frontend/layout/customer_account.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<arguments>
1616
<argument name="path" xsi:type="string">vault/cards/listaction</argument>
1717
<argument name="label" xsi:type="string" translate="true">Stored Payment Methods</argument>
18-
<argument name="sortOrder" xsi:type="number">70</argument>
18+
<argument name="sortOrder" xsi:type="number">160</argument>
1919
</arguments>
2020
</block>
2121
</referenceBlock>

0 commit comments

Comments
 (0)