MAGETWO-54002: [GITHUB] pdf generation errors #4817

Author: zanilee

app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php

@@ -395,39 +395,25 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
 
         if ($putOrderId) {
             $page->drawText(__('Order # ') . $order->getRealOrderId(), 35, $top -= 30, 'UTF-8');
+            $top +=15;
+        }
 
-            $page->drawText(
-                __('Order Date: ') .
-                $this->_localeDate->formatDate(
-                    $this->_localeDate->scopeDate(
-                        $order->getStore(),
-                        $order->getCreatedAt(),
-                        true
-                    ),
-                    \IntlDateFormatter::MEDIUM,
-                    false
-                ),
-                35,
-                $top -= 15,
-                'UTF-8'
-            );
-        } else {
-            $page->drawText(
-                __('Order Date: ') .
-                $this->_localeDate->formatDate(
-                    $this->_localeDate->scopeDate(
-                        $order->getStore(),
-                        $order->getCreatedAt(),
-                        true
-                    ),
-                    \IntlDateFormatter::MEDIUM,
-                    false
+        $top -=30;
+        $page->drawText(
+            __('Order Date: ') .
+            $this->_localeDate->formatDate(
+                $this->_localeDate->scopeDate(
+                    $order->getStore(),
+                    $order->getCreatedAt(),
+                    true
                 ),
-                35,
-                $top -= 30,
-                'UTF-8'
-            );
-        }
+                \IntlDateFormatter::MEDIUM,
+                false
+            ),
+            35,
+            $top,
+            'UTF-8'
+        );
 
         $top -= 10;
         $page->setFillColor(new \Zend_Pdf_Color_Rgb(0.93, 0.92, 0.92));