Skip to content

Commit 0ae3d5d

Browse files
magento-engcom-teammagento-engcom-team
authored
🔃 [Magento Community Engineering] Community Contributions - 2.2-develop
Accepted Community Pull Requests: - #23163: [Backport] Replace hardcoded CarierCode from createShippingMethod() (by @speedy008) - #23164: [Backport] Fix missing whitespace in mobile navigation for non-English websites (by @speedy008) - #23158: [Backport] Don't create a new account-nav block - use existing instead. (by @atwixfirster) Fixed GitHub Issues: - #23080: Missing whitespace in mobile navigation for non-English websites (reported by @alexeya-ven) has been fixed in #23164 by @speedy008 in 2.2-develop branch Related commits: 1. 3a02c16
2 parents 7ba965a + e6bb20c commit 0ae3d5d

File tree

3 files changed

+8
-48
lines changed

3 files changed

+8
-48
lines changed

‎app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ private function createShippingMethod($shippingPrice, $cost)
267267
/** @var \Magento\Quote\Model\Quote\Address\RateResult\Method $method */
268268
$method = $this->_resultMethodFactory->create();
269269

270-
$method->setCarrier('tablerate');
270+
$method->setCarrier($this->getCarrierCode());
271271
$method->setCarrierTitle($this->getConfigData('title'));
272272

273273
$method->setMethod('bestway');

‎app/design/frontend/Magento/luma/Magento_Customer/layout/customer_account.xml

Lines changed: 6 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -7,52 +7,12 @@
77
-->
88
<page layout="2columns-left" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
99
<body>
10-
<referenceContainer name="sidebar.main">
11-
<block class="Magento\Framework\View\Element\Template" name="customer_account_navigation_block" template="Magento_Theme::html/collapsible.phtml" before="-">
12-
<arguments>
13-
<argument name="block_title" translate="true" xsi:type="string">My Account</argument>
14-
<argument name="block_css" xsi:type="string">block-collapsible-nav</argument>
15-
</arguments>
16-
<block class="Magento\Customer\Block\Account\Navigation" name="customer_account_navigation" before="-">
17-
<arguments>
18-
<argument name="css_class" xsi:type="string">nav items</argument>
19-
</arguments>
20-
<block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-link">
21-
<arguments>
22-
<argument name="label" xsi:type="string" translate="true">My Account</argument>
23-
<argument name="path" xsi:type="string">customer/account</argument>
24-
<argument name="sortOrder" xsi:type="number">250</argument>
25-
</arguments>
26-
</block>
27-
<block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-1"
28-
template="Magento_Customer::account/navigation-delimiter.phtml">
29-
<arguments>
30-
<argument name="sortOrder" xsi:type="number">200</argument>
31-
</arguments>
32-
</block>
33-
<block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-address-link">
34-
<arguments>
35-
<argument name="label" xsi:type="string" translate="true">Address Book</argument>
36-
<argument name="path" xsi:type="string">customer/address</argument>
37-
<argument name="sortOrder" xsi:type="number">190</argument>
38-
</arguments>
39-
</block>
40-
<block class="Magento\Customer\Block\Account\SortLinkInterface" name="customer-account-navigation-account-edit-link">
41-
<arguments>
42-
<argument name="label" xsi:type="string" translate="true">Account Information</argument>
43-
<argument name="path" xsi:type="string">customer/account/edit</argument>
44-
<argument name="sortOrder" xsi:type="number">180</argument>
45-
</arguments>
46-
</block>
47-
<block class="Magento\Customer\Block\Account\Delimiter" name="customer-account-navigation-delimiter-2"
48-
template="Magento_Customer::account/navigation-delimiter.phtml">
49-
<arguments>
50-
<argument name="sortOrder" xsi:type="number">130</argument>
51-
</arguments>
52-
</block>
53-
</block>
54-
</block>
55-
</referenceContainer>
10+
<referenceBlock name="sidebar.main.account_nav">
11+
<arguments>
12+
<argument name="block_title" translate="true" xsi:type="string">My Account</argument>
13+
<argument name="block_css" xsi:type="string">block-collapsible-nav</argument>
14+
</arguments>
15+
</referenceBlock>
5616
<move element="page.main.title" destination="content.top" before="-"/>
5717
</body>
5818
</page>

‎lib/web/mage/menu.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,7 @@ define([
464464

465465
this.categoryLink = $('<a>')
466466
.attr('href', categoryUrl)
467-
.text($.mage.__('All ') + category);
467+
.text($.mage.__('All %1').replace('%1', category));
468468

469469
this.categoryParent = $('<li>')
470470
.addClass('ui-menu-item all-category')

0 commit comments

Comments
 (0)