issue/26526 Fix orderRepository does not check if there are no extens…

…ionAttributes
magento · Jan 24, 2020 · 7a04c04 · 7a04c04
1 parent dbf2d34
commit 7a04c04
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/app/code/Magento/Sales/Model/OrderRepository.php b/app/code/Magento/Sales/Model/OrderRepository.php
@@ -157,6 +157,9 @@ public function get($id)
     private function setOrderTaxDetails(OrderInterface $order)
     {
         $extensionAttributes = $order->getExtensionAttributes();
+        if ($extensionAttributes === null) {
+            $extensionAttributes = $this->orderExtensionFactory->create();
+        }
         $orderTaxDetails = $this->orderTaxManagement->getOrderTaxDetails($order->getEntityId());
         $appliedTaxes = $orderTaxDetails->getAppliedTaxes();
 
@@ -180,6 +183,9 @@ private function setOrderTaxDetails(OrderInterface $order)
     private function setPaymentAdditionalInfo(OrderInterface $order): void
     {
         $extensionAttributes = $order->getExtensionAttributes();
+        if ($extensionAttributes === null) {
+            $extensionAttributes = $this->orderExtensionFactory->create();
+        }
         $paymentAdditionalInformation = $order->getPayment()->getAdditionalInformation();
 
         $objects = [];