Skip to content

Commit 0369e3a

Browse files
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - #20219: Changes-Hamburger-Icon-was-available-on-a-page (by @amol2jcommerce) - #20208: magento/magento2:#19101 - API REST and Reserved Order Id (by @saphaljha) Fixed GitHub Issues: - #20210: Hamburger Icon was available on a page where menu was not present. Issue in responsive view (reported by @swetacedcoss) has been fixed in #20219 by @amol2jcommerce in 2.2-develop branch Related commits: 1. 8ddc45b - #19101: API REST and Reserved Order Id (reported by @davidlhoumaud) has been fixed in #20208 by @saphaljha in 2.2-develop branch Related commits: 1. e3ec0f6
2 parents d20f927 + fda1207 commit 0369e3a

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

app/code/Magento/Quote/Api/Data/CartInterface.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,14 +223,14 @@ public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $bill
223223
/**
224224
* Returns the reserved order ID for the cart.
225225
*
226-
* @return int|null Reserved order ID. Otherwise, null.
226+
* @return string|null Reserved order ID. Otherwise, null.
227227
*/
228228
public function getReservedOrderId();
229229

230230
/**
231231
* Sets the reserved order ID for the cart.
232232
*
233-
* @param int $reservedOrderId
233+
* @param string $reservedOrderId
234234
* @return $this
235235
*/
236236
public function setReservedOrderId($reservedOrderId);

app/code/Magento/Sales/Test/Mftf/Test/AdminAbleToShipPartiallyInvoicedItemsTest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
<severity value="CRITICAL"/>
1515
<testCaseId value="MAGETWO-95524"/>
1616
<group value="sales"/>
17+
<skip>
18+
<issueId value="MAGETWO-97664"/>
19+
</skip>
1720
</annotations>
1821
<before>
1922
<createData entity="_defaultCategory" stepKey="createCategory"/>

app/design/frontend/Magento/luma/Magento_Theme/web/css/source/_module.less

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,12 @@
151151
}
152152
}
153153

154+
.page-print {
155+
.nav-toggle {
156+
display: none;
157+
}
158+
}
159+
154160
.page-main {
155161
> .page-title-wrapper {
156162
.page-title + .action {

0 commit comments

Comments
 (0)