Skip to content

Commit 8afcfae

Browse files
Pooja.ManralPooja.Manral
authored andcommitted
AC:11798::Shipping price showing diffrent in printed pdf
1 parent e32928d commit 8afcfae

File tree

5 files changed

+1
-24
lines changed

5 files changed

+1
-24
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,11 @@ abstract public function getPdf();
158158
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
159159
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
160160
* @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
161-
* @param TaxHelper $taxHelper
162161
* @param array $data
163162
* @param Database $fileStorageDatabase
164163
* @param RtlTextHandler|null $rtlTextHandler
165164
* @param Image $image
165+
* @param TaxHelper $taxHelper
166166
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
167167
*/
168168
public function __construct(
@@ -181,7 +181,6 @@ public function __construct(
181181
?RtlTextHandler $rtlTextHandler = null,
182182
?Image $image = null,
183183
?TaxHelper $taxHelper = null
184-
185184
) {
186185
$this->addressRenderer = $addressRenderer;
187186
$this->_paymentData = $paymentData;

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
namespace Magento\Sales\Model\Order\Pdf;
1010

11-
use Magento\Framework\App\ObjectManager;
12-
use Magento\Tax\Helper\Data as TaxHelper;
13-
1411
/**
1512
* Sales Order Creditmemo PDF model
1613
*
@@ -39,7 +36,6 @@ class Creditmemo extends AbstractPdf
3936
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
4037
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
4138
* @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
42-
* @param \Magento\Tax\Helper\Data $taxHelper
4339
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
4440
* @param \Magento\Store\Model\App\Emulation|null $appEmulation
4541
* @param array $data
@@ -58,14 +54,12 @@ public function __construct(
5854
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
5955
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
6056
\Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
61-
TaxHelper $taxHelper = null,
6257
\Magento\Store\Model\StoreManagerInterface $storeManager,
6358
\Magento\Store\Model\App\Emulation $appEmulation,
6459
array $data = []
6560
) {
6661
$this->_storeManager = $storeManager;
6762
$this->appEmulation = $appEmulation;
68-
$this->taxHelper = $taxHelper ?: ObjectManager::getInstance()->get(TaxHelper::class);
6963
parent::__construct(
7064
$paymentData,
7165
$string,

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
namespace Magento\Sales\Model\Order\Pdf;
77

88
use Magento\Sales\Model\ResourceModel\Order\Invoice\Collection;
9-
use Magento\Framework\App\ObjectManager;
10-
use Magento\Tax\Helper\Data as TaxHelper;
119

1210
/**
1311
* Sales Order Invoice PDF model
@@ -36,7 +34,6 @@ class Invoice extends AbstractPdf
3634
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
3735
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
3836
* @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
39-
* @param \Magento\Tax\Helper\Data $taxHelper
4037
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
4138
* @param \Magento\Store\Model\App\Emulation $appEmulation
4239
* @param array $data
@@ -54,14 +51,12 @@ public function __construct(
5451
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
5552
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
5653
\Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
57-
TaxHelper $taxHelper = null,
5854
\Magento\Store\Model\StoreManagerInterface $storeManager,
5955
\Magento\Store\Model\App\Emulation $appEmulation,
6056
array $data = []
6157
) {
6258
$this->_storeManager = $storeManager;
6359
$this->appEmulation = $appEmulation;
64-
$this->taxHelper = $taxHelper ?: ObjectManager::getInstance()->get(TaxHelper::class);
6560
parent::__construct(
6661
$paymentData,
6762
$string,

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
*/
66
namespace Magento\Sales\Model\Order\Pdf;
77

8-
use Magento\Framework\App\ObjectManager;
9-
use Magento\Tax\Helper\Data as TaxHelper;
10-
118
/**
129
* Sales Order Shipment PDF model
1310
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -35,7 +32,6 @@ class Shipment extends AbstractPdf
3532
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
3633
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
3734
* @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
38-
* @param \Magento\Tax\Helper\Data $taxHelper
3935
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
4036
* @param \Magento\Store\Model\App\Emulation $appEmulation
4137
* @param array $data
@@ -53,14 +49,12 @@ public function __construct(
5349
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
5450
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
5551
\Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
56-
TaxHelper $taxHelper = null,
5752
\Magento\Store\Model\StoreManagerInterface $storeManager,
5853
\Magento\Store\Model\App\Emulation $appEmulation,
5954
array $data = []
6055
) {
6156
$this->_storeManager = $storeManager;
6257
$this->appEmulation = $appEmulation;
63-
$this->taxHelper = $taxHelper ?: ObjectManager::getInstance()->get(TaxHelper::class);
6458
parent::__construct(
6559
$paymentData,
6660
$string,

app/code/Magento/Shipping/Model/Order/Pdf/Packaging.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
namespace Magento\Shipping\Model\Order\Pdf;
77

88
use Magento\Shipping\Helper\Carrier;
9-
use Magento\Framework\App\ObjectManager;
10-
use Magento\Tax\Helper\Data as TaxHelper;
119

1210
/**
1311
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -45,7 +43,6 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
4543
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
4644
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
4745
* @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
48-
* @param \Magento\Tax\Helper\Data $taxHelper
4946
* @param Carrier $carrierHelper
5047
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
5148
* @param \Magento\Framework\View\LayoutInterface $layout
@@ -65,7 +62,6 @@ public function __construct(
6562
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
6663
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
6764
\Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
68-
TaxHelper $taxHelper = null,
6965
Carrier $carrierHelper,
7066
\Magento\Store\Model\StoreManagerInterface $storeManager,
7167
\Magento\Framework\View\LayoutInterface $layout,
@@ -76,7 +72,6 @@ public function __construct(
7672
$this->_storeManager = $storeManager;
7773
$this->_layout = $layout;
7874
$this->_localeResolver = $localeResolver;
79-
$this->taxHelper = $taxHelper ?: ObjectManager::getInstance()->get(TaxHelper::class);
8075

8176
parent::__construct(
8277
$paymentData,

0 commit comments

Comments
 (0)