MCP-412: Checkout enhancements in CE

Author: andimov

app/code/Magento/Quote/Model/QuoteManagement.php

@@ -553,6 +553,7 @@ protected function submitQuote(QuoteEntity $quote, $orderData = [])
         $order->setCustomerFirstname($quote->getCustomerFirstname());
         $order->setCustomerMiddlename($quote->getCustomerMiddlename());
         $order->setCustomerLastname($quote->getCustomerLastname());
+        $order->setEntityId($quote->getOrigOrderId());
         $this->submitQuoteValidator->validateOrder($order);
 
         $this->eventManager->dispatch(

app/code/Magento/Sales/Model/OrderRepository.php

@@ -186,7 +186,13 @@ private function setPaymentAdditionalInfo(OrderInterface $order): void
         if ($extensionAttributes === null) {
             $extensionAttributes = $this->orderExtensionFactory->create();
         }
-        $paymentAdditionalInformation = $order->getPayment()->getAdditionalInformation();
+
+        $paymentAdditionalInformation = [];
+        $payment = $order->getPayment();
+
+        if ($payment) {
+            $paymentAdditionalInformation = $payment->getAdditionalInformation();
+        }
 
         $objects = [];
         foreach ($paymentAdditionalInformation as $key => $value) {