Skip to content

Commit

Permalink
merge magento/2.2-develop into magento-tsg-csl3/2.2-develop-pr18
Browse files Browse the repository at this point in the history
  • Loading branch information
magento-cicd2 authored Jan 17, 2019
2 parents 701d4f0 + 0369e3a commit 8c4aa0e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/code/Magento/Quote/Api/Data/CartInterface.php
Original file line number Diff line number Diff line change
Expand Up @@ -223,14 +223,14 @@ public function setBillingAddress(\Magento\Quote\Api\Data\AddressInterface $bill
/**
* Returns the reserved order ID for the cart.
*
* @return int|null Reserved order ID. Otherwise, null.
* @return string|null Reserved order ID. Otherwise, null.
*/
public function getReservedOrderId();

/**
* Sets the reserved order ID for the cart.
*
* @param int $reservedOrderId
* @param string $reservedOrderId
* @return $this
*/
public function setReservedOrderId($reservedOrderId);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
<severity value="CRITICAL"/>
<testCaseId value="MAGETWO-95524"/>
<group value="sales"/>
<skip>
<issueId value="MAGETWO-97664"/>
</skip>
</annotations>
<before>
<createData entity="_defaultCategory" stepKey="createCategory"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,12 @@
}
}

.page-print {
.nav-toggle {
display: none;
}
}

.page-main {
> .page-title-wrapper {
.page-title + .action {
Expand Down

0 comments on commit 8c4aa0e

Please sign in to comment.