Skip to content
Snippets Groups Projects
Commit f34bf41a authored by vpaladiychuk's avatar vpaladiychuk
Browse files

Merge remote-tracking branch 'mainline/develop' into MAGETWO-39986

parents 21685b35 c36b15cf
Branches
No related merge requests found
...@@ -40,10 +40,10 @@ ...@@ -40,10 +40,10 @@
<action name="checkout/onepage/saveOrder"> <action name="checkout/onepage/saveOrder">
<section name="last-ordered-items"/> <section name="last-ordered-items"/>
</action> </action>
<action name="rest/*/V1/carts/*/order"> <action name="rest/*/V1/carts/*/payment-information">
<section name="cart"/> <section name="cart"/>
</action> </action>
<action name="rest/*/V1/guest-carts/*/order"> <action name="rest/*/V1/guest-carts/*/payment-information">
<section name="cart"/> <section name="cart"/>
</action> </action>
</config> </config>
...@@ -1413,7 +1413,7 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract ...@@ -1413,7 +1413,7 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract
*/ */
protected function _processSaveData($saveData) protected function _processSaveData($saveData)
{ {
extract($saveData); extract($saveData, EXTR_SKIP);
/** /**
* Import variables into the current symbol table from save data array * Import variables into the current symbol table from save data array
* *
......
...@@ -40,7 +40,8 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress ...@@ -40,7 +40,8 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress
$order = $this->_checkout->getOrder(); $order = $this->_checkout->getOrder();
if ($order) { if ($order) {
$this->_getCheckoutSession()->setLastOrderId($order->getId()) $this->_getCheckoutSession()->setLastOrderId($order->getId())
->setLastRealOrderId($order->getIncrementId()); ->setLastRealOrderId($order->getIncrementId())
->setLastOrderStatus($order->getStatus());
} }
$this->_eventManager->dispatch( $this->_eventManager->dispatch(
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment