Skip to content

Commit f34bf41

Browse files
author
vpaladiychuk
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-39986
2 parents 21685b3 + c36b15c commit f34bf41

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

app/code/Magento/Checkout/etc/frontend/sections.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@
4040
<action name="checkout/onepage/saveOrder">
4141
<section name="last-ordered-items"/>
4242
</action>
43-
<action name="rest/*/V1/carts/*/order">
43+
<action name="rest/*/V1/carts/*/payment-information">
4444
<section name="cart"/>
4545
</action>
46-
<action name="rest/*/V1/guest-carts/*/order">
46+
<action name="rest/*/V1/guest-carts/*/payment-information">
4747
<section name="cart"/>
4848
</action>
4949
</config>

app/code/Magento/Eav/Model/Entity/AbstractEntity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1413,7 +1413,7 @@ protected function _prepareStaticValue($key, $value)
14131413
*/
14141414
protected function _processSaveData($saveData)
14151415
{
1416-
extract($saveData);
1416+
extract($saveData, EXTR_SKIP);
14171417
/**
14181418
* Import variables into the current symbol table from save data array
14191419
*

app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public function execute()
4040
$order = $this->_checkout->getOrder();
4141
if ($order) {
4242
$this->_getCheckoutSession()->setLastOrderId($order->getId())
43-
->setLastRealOrderId($order->getIncrementId());
43+
->setLastRealOrderId($order->getIncrementId())
44+
->setLastOrderStatus($order->getStatus());
4445
}
4546

4647
$this->_eventManager->dispatch(

0 commit comments

Comments
 (0)