From cccfa217a386ce855850e1a29b75b8256bb497da Mon Sep 17 00:00:00 2001
From: Olga Matviienko <omatviienko@magento.com>
Date: Wed, 4 Jan 2017 15:26:09 +0200
Subject: [PATCH] MAGETWO-54002: [GITHUB] pdf generation errors #4817
---
.../Sales/Model/Order/Pdf/AbstractPdf.php | 47 +++++++++++++------
1 file changed, 32 insertions(+), 15 deletions(-)
diff --git a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
index edd2da3c399..95f2351252f 100644
--- a/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
+++ b/app/code/Magento/Sales/Model/Order/Pdf/AbstractPdf.php
@@ -395,22 +395,39 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
if ($putOrderId) {
$page->drawText(__('Order # ') . $order->getRealOrderId(), 35, $top -= 30, 'UTF-8');
- }
- $page->drawText(
- __('Order Date: ') .
- $this->_localeDate->formatDate(
- $this->_localeDate->scopeDate(
- $order->getStore(),
- $order->getCreatedAt(),
- true
+
+ $page->drawText(
+ __('Order Date: ') .
+ $this->_localeDate->formatDate(
+ $this->_localeDate->scopeDate(
+ $order->getStore(),
+ $order->getCreatedAt(),
+ true
+ ),
+ \IntlDateFormatter::MEDIUM,
+ false
),
- \IntlDateFormatter::MEDIUM,
- false
- ),
- 35,
- $top -= 15,
- 'UTF-8'
- );
+ 35,
+ $top -= 15,
+ 'UTF-8'
+ );
+ } else {
+ $page->drawText(
+ __('Order Date: ') .
+ $this->_localeDate->formatDate(
+ $this->_localeDate->scopeDate(
+ $order->getStore(),
+ $order->getCreatedAt(),
+ true
+ ),
+ \IntlDateFormatter::MEDIUM,
+ false
+ ),
+ 35,
+ $top -= 30,
+ 'UTF-8'
+ );
+ }
$top -= 10;
$page->setFillColor(new \Zend_Pdf_Color_Rgb(0.93, 0.92, 0.92));
--
GitLab