Skip to content

Commit e79290e

Browse files
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #14711: added GNU Free Font to be used by sales PDFs (by @rossmc) Fixed GitHub Issues: - #9666: Magento 2.1.6 - Invoice PDF doesn't support Thai (reported by @jsdupuis) has been fixed in #14711 by @rossmc in 2.1-develop branch Related commits: 1. 6165e36 - #12323: Magento 2.1.3 - Invoice and shipment PDF doesn't support Arabic (reported by @Avinashsain) has been fixed in #14711 by @rossmc in 2.1-develop branch Related commits: 1. 6165e36
2 parents f7e8421 + 386b571 commit e79290e

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,7 @@ protected function _drawItem(\Magento\Framework\DataObject $item, \Zend_Pdf_Page
851851
protected function _setFontRegular($object, $size = 7)
852852
{
853853
$font = \Zend_Pdf_Font::fontWithPath(
854-
$this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Re-4.4.1.ttf')
854+
$this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerif.ttf')
855855
);
856856
$object->setFont($font, $size);
857857
return $font;
@@ -867,7 +867,7 @@ protected function _setFontRegular($object, $size = 7)
867867
protected function _setFontBold($object, $size = 7)
868868
{
869869
$font = \Zend_Pdf_Font::fontWithPath(
870-
$this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Bd-2.8.1.ttf')
870+
$this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerifBold.ttf')
871871
);
872872
$object->setFont($font, $size);
873873
return $font;
@@ -883,7 +883,7 @@ protected function _setFontBold($object, $size = 7)
883883
protected function _setFontItalic($object, $size = 7)
884884
{
885885
$font = \Zend_Pdf_Font::fontWithPath(
886-
$this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_It-2.8.2.ttf')
886+
$this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerifItalic.ttf')
887887
);
888888
$object->setFont($font, $size);
889889
return $font;

app/code/Magento/Sales/Model/Order/Pdf/Items/AbstractItems.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@ public function getItemOptions()
335335
protected function _setFontRegular($size = 7)
336336
{
337337
$font = \Zend_Pdf_Font::fontWithPath(
338-
$this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Re-4.4.1.ttf')
338+
$this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerif.ttf')
339339
);
340340
$this->getPage()->setFont($font, $size);
341341
return $font;
@@ -350,7 +350,7 @@ protected function _setFontRegular($size = 7)
350350
protected function _setFontBold($size = 7)
351351
{
352352
$font = \Zend_Pdf_Font::fontWithPath(
353-
$this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_Bd-2.8.1.ttf')
353+
$this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerifBold.ttf')
354354
);
355355
$this->getPage()->setFont($font, $size);
356356
return $font;
@@ -365,7 +365,7 @@ protected function _setFontBold($size = 7)
365365
protected function _setFontItalic($size = 7)
366366
{
367367
$font = \Zend_Pdf_Font::fontWithPath(
368-
$this->_rootDirectory->getAbsolutePath('lib/internal/LinLibertineFont/LinLibertine_It-2.8.2.ttf')
368+
$this->_rootDirectory->getAbsolutePath('lib/internal/GnuFreeFont/FreeSerifItalic.ttf')
369369
);
370370
$this->getPage()->setFont($font, $size);
371371
return $font;
3.15 MB
Binary file not shown.
1.25 MB
Binary file not shown.
900 KB
Binary file not shown.

0 commit comments

Comments
 (0)