Skip to content

Commit fda1207

Browse files
committed
Merge branch '2.2-develop-prs' of github.com:magento-engcom/magento2ce into 2.2-develop-prs
2 parents 37ad099 + 1f76c93 commit fda1207

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-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/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)