diff --git a/app/code/Magento/Checkout/etc/frontend/sections.xml b/app/code/Magento/Checkout/etc/frontend/sections.xml index 22817f7d6197073c69c5caabc6686a11dcab588d..30546be368a766207fdafcf68a14f2d2695730a0 100644 --- a/app/code/Magento/Checkout/etc/frontend/sections.xml +++ b/app/code/Magento/Checkout/etc/frontend/sections.xml @@ -40,10 +40,10 @@ <action name="checkout/onepage/saveOrder"> <section name="last-ordered-items"/> </action> - <action name="rest/*/V1/carts/*/order"> + <action name="rest/*/V1/carts/*/payment-information"> <section name="cart"/> </action> - <action name="rest/*/V1/guest-carts/*/order"> + <action name="rest/*/V1/guest-carts/*/payment-information"> <section name="cart"/> </action> </config> diff --git a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php index c4969c8a280d0373513797e8ee6c34ca1f6a210e..cad13566790df2a0385c7394e5bbc04d84db9c39 100755 --- a/app/code/Magento/Eav/Model/Entity/AbstractEntity.php +++ b/app/code/Magento/Eav/Model/Entity/AbstractEntity.php @@ -1413,7 +1413,7 @@ abstract class AbstractEntity extends \Magento\Framework\Model\Resource\Abstract */ protected function _processSaveData($saveData) { - extract($saveData); + extract($saveData, EXTR_SKIP); /** * Import variables into the current symbol table from save data array * diff --git a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php index f760294d0ca6c6b8f36c214ed2efc47ed618f34f..44cd56531af469e2b8a80a734fcfeaa9400b27fc 100644 --- a/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php +++ b/app/code/Magento/Paypal/Controller/Express/AbstractExpress/PlaceOrder.php @@ -40,7 +40,8 @@ class PlaceOrder extends \Magento\Paypal\Controller\Express\AbstractExpress $order = $this->_checkout->getOrder(); if ($order) { $this->_getCheckoutSession()->setLastOrderId($order->getId()) - ->setLastRealOrderId($order->getIncrementId()); + ->setLastRealOrderId($order->getIncrementId()) + ->setLastOrderStatus($order->getStatus()); } $this->_eventManager->dispatch(