Skip to content

Commit fc6b651

Browse files
committed
AC:11798::Shipping price showing diffrent in printed pdf
1 parent b1ee919 commit fc6b651

File tree

1 file changed

+50
-51
lines changed

1 file changed

+50
-51
lines changed

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

Lines changed: 50 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,18 @@
66

77
namespace Magento\Sales\Model\Order\Pdf;
88

9+
910
use Magento\Framework\App\Config\ScopeConfigInterface;
11+
use Magento\Framework\App\Filesystem\DirectoryList;
12+
use Magento\Framework\App\ObjectManager;
1013
use Magento\Framework\Exception\FileSystemException;
14+
use Magento\Framework\File\Pdf\Image;
1115
use Magento\Framework\Filesystem;
12-
use Magento\Framework\Filesystem\Directory\ReadInterface;
13-
use Magento\Framework\Filesystem\Directory\WriteInterface;
1416
use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
15-
use Magento\Framework\Translate\Inline\StateInterface;
16-
use Magento\Payment\Helper\Data;
1717
use Magento\Framework\Stdlib\StringUtils;
18-
use Magento\Framework\App\Filesystem\DirectoryList;
19-
use Magento\Framework\App\ObjectManager;
20-
use Magento\Framework\File\Pdf\Image;
18+
use Magento\Framework\Translate\Inline\StateInterface;
2119
use Magento\MediaStorage\Helper\File\Storage\Database;
20+
use Magento\Payment\Helper\Data;
2221
use Magento\Sales\Model\Order\Address\Renderer;
2322
use Magento\Sales\Model\Order\Pdf\Total\Factory;
2423
use Magento\Sales\Model\RtlTextHandler;
@@ -67,17 +66,17 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
6766
*
6867
* @var \Zend_Pdf
6968
*/
70-
protected \Zend_Pdf $_pdf;
69+
protected $_pdf;
7170

7271
/**
7372
* @var RtlTextHandler
7473
*/
75-
private mixed $rtlTextHandler;
74+
private $rtlTextHandler;
7675

7776
/**
78-
* @var Image
77+
* @var \Magento\Framework\File\Pdf\Image
7978
*/
80-
private mixed $image;
79+
private $image;
8180

8281
/**
8382
* Retrieve PDF
@@ -87,76 +86,76 @@ abstract class AbstractPdf extends \Magento\Framework\DataObject
8786
abstract public function getPdf();
8887

8988
/**
90-
* @var Data
89+
* @var \Magento\Payment\Helper\Data
9190
*/
92-
protected Data $_paymentData;
91+
protected $_paymentData;
9392

9493
/**
95-
* @var StringUtils
94+
* @var \Magento\Framework\Stdlib\StringUtils
9695
*/
97-
protected StringUtils $string;
96+
protected $string;
9897

9998
/**
100-
* @var TimezoneInterface
99+
* @var \Magento\Framework\Stdlib\DateTime\TimezoneInterface
101100
*/
102-
protected TimezoneInterface $_localeDate;
101+
protected $_localeDate;
103102

104103
/**
105104
* Core store config
106105
*
107-
* @var ScopeConfigInterface
106+
* @var \Magento\Framework\App\Config\ScopeConfigInterface
108107
*/
109-
protected ScopeConfigInterface $_scopeConfig;
108+
protected $_scopeConfig;
110109

111110
/**
112-
* @var WriteInterface
111+
* @var \Magento\Framework\Filesystem\Directory\WriteInterface
113112
*/
114-
protected WriteInterface $_mediaDirectory;
113+
protected $_mediaDirectory;
115114

116115
/**
117-
* @var ReadInterface
116+
* @var \Magento\Framework\Filesystem\Directory\ReadInterface
118117
*/
119-
protected ReadInterface $_rootDirectory;
118+
protected $_rootDirectory;
120119

121120
/**
122121
* @var Config
123122
*/
124-
protected Config $_pdfConfig;
123+
protected $_pdfConfig;
125124

126125
/**
127-
* @var Factory
126+
* @var \Magento\Sales\Model\Order\Pdf\Total\Factory
128127
*/
129-
protected Factory $_pdfTotalFactory;
128+
protected $_pdfTotalFactory;
130129

131130
/**
132-
* @var ItemsFactory
131+
* @var \Magento\Sales\Model\Order\Pdf\ItemsFactory
133132
*/
134-
protected ItemsFactory $_pdfItemsFactory;
133+
protected $_pdfItemsFactory;
135134

136135
/**
137-
* @var StateInterface
136+
* @var \Magento\Framework\Translate\Inline\StateInterface
138137
*/
139-
protected StateInterface $inlineTranslation;
138+
protected $inlineTranslation;
140139

141140
/**
142-
* @var Renderer
141+
* @var \Magento\Sales\Model\Order\Address\Renderer
143142
*/
144-
protected Renderer $addressRenderer;
143+
protected $addressRenderer;
145144

146145
/**
147-
* @var TaxHelper|Data
146+
* @var Magento\Tax\Helper\Data
148147
*/
149-
protected TaxHelper|Data $taxHelper;
148+
private $taxHelper;
150149

151150
/**
152151
* @var array $pageSettings
153152
*/
154-
private array $pageSettings;
153+
private $pageSettings;
155154

156155
/**
157156
* @var Database
158157
*/
159-
private mixed $fileStorageDatabase;
158+
private $fileStorageDatabase;
160159

161160
/**
162161
* @param Data $paymentData
@@ -178,21 +177,21 @@ abstract public function getPdf();
178177
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
179178
*/
180179
public function __construct(
181-
Data $paymentData,
182-
StringUtils $string,
183-
ScopeConfigInterface $scopeConfig,
184-
Filesystem $filesystem,
185-
Config $pdfConfig,
186-
Factory $pdfTotalFactory,
187-
ItemsFactory $pdfItemsFactory,
188-
TimezoneInterface $localeDate,
189-
StateInterface $inlineTranslation,
190-
Renderer $addressRenderer,
191-
array $data = [],
192-
?TaxHelper $taxHelper = null,
193-
Database $fileStorageDatabase = null,
194-
?RtlTextHandler $rtlTextHandler = null,
195-
?Image $image = null
180+
\Magento\Payment\Helper\Data $paymentData,
181+
\Magento\Framework\Stdlib\StringUtils $string,
182+
\Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
183+
\Magento\Framework\Filesystem $filesystem,
184+
Config $pdfConfig,
185+
\Magento\Sales\Model\Order\Pdf\Total\Factory $pdfTotalFactory,
186+
\Magento\Sales\Model\Order\Pdf\ItemsFactory $pdfItemsFactory,
187+
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
188+
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
189+
\Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
190+
array $data = [],
191+
?TaxHelper $taxHelper = null,
192+
Database $fileStorageDatabase = null,
193+
?RtlTextHandler $rtlTextHandler = null,
194+
?Image $image = null
196195
) {
197196
$this->addressRenderer = $addressRenderer;
198197
$this->_paymentData = $paymentData;

0 commit comments

Comments
 (0)