Skip to content

Commit 6ce9366

Browse files
DhruvBasanglo03171
DhruvBasan
authored and
glo03171
committed
Shipping price showing diffrent in printed pdf
1 parent b0c49b2 commit 6ce9366

File tree

6 files changed

+39
-7
lines changed

6 files changed

+39
-7
lines changed

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

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
use Magento\MediaStorage\Helper\File\Storage\Database;
1313
use Magento\Sales\Model\RtlTextHandler;
1414
use Magento\Store\Model\ScopeInterface;
15+
use Magento\Tax\Helper\Data as TaxHelper;
1516

1617
/**
1718
* Sales Order PDF abstract model
@@ -131,6 +132,11 @@ abstract public function getPdf();
131132
*/
132133
protected $addressRenderer;
133134

135+
/**
136+
* @var Magento\Tax\Helper\Data
137+
*/
138+
protected $taxHelper;
139+
134140
/**
135141
* @var array $pageSettings
136142
*/
@@ -152,6 +158,7 @@ abstract public function getPdf();
152158
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
153159
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
154160
* @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
161+
* @param TaxHelper $taxHelper
155162
* @param array $data
156163
* @param Database $fileStorageDatabase
157164
* @param RtlTextHandler|null $rtlTextHandler
@@ -169,6 +176,7 @@ public function __construct(
169176
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
170177
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
171178
\Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
179+
TaxHelper $taxHelper,
172180
array $data = [],
173181
Database $fileStorageDatabase = null,
174182
?RtlTextHandler $rtlTextHandler = null,
@@ -185,6 +193,7 @@ public function __construct(
185193
$this->_pdfTotalFactory = $pdfTotalFactory;
186194
$this->_pdfItemsFactory = $pdfItemsFactory;
187195
$this->inlineTranslation = $inlineTranslation;
196+
$this->taxHelper = $taxHelper;
188197
$this->fileStorageDatabase = $fileStorageDatabase ?: ObjectManager::getInstance()->get(Database::class);
189198
$this->rtlTextHandler = $rtlTextHandler ?: ObjectManager::getInstance()->get(RtlTextHandler::class);
190199
$this->image = $image ?: ObjectManager::getInstance()->get(Image::class);
@@ -604,11 +613,17 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
604613
}
605614

606615
$yShipments = $this->y;
607-
$totalShippingChargesText = "("
608-
. __('Total Shipping Charges')
609-
. " "
610-
. $order->formatPriceTxt($order->getShippingAmount())
611-
. ")";
616+
$totalShippingChargesText = "(" . __('Total Shipping Charges') . " ";
617+
if ($this->taxHelper->displayShippingPriceIncludingTax()) {
618+
$totalShippingChargesText .= $order->formatPriceTxt($order->getShippingInclTax());
619+
} else {
620+
$totalShippingChargesText .= $order->formatPriceTxt($order->getShippingAmount());
621+
}
622+
623+
if($this->taxHelper->displayShippingBothPrices() && $order->getShippingInclTax() != $order->getShippingAmount()) {
624+
$totalShippingChargesText .= "(Incl. Tax " . $order->getShippingInclTax() . ")";
625+
}
626+
$totalShippingChargesText .= ")";
612627

613628
$page->drawText($totalShippingChargesText, 285, $yShipments - $topMargin, 'UTF-8');
614629
$yShipments -= $topMargin + 10;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class Creditmemo extends AbstractPdf
3636
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
3737
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
3838
* @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
39+
* @param \Magento\Tax\Helper\Data $taxHelper
3940
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
4041
* @param \Magento\Store\Model\App\Emulation|null $appEmulation
4142
* @param array $data
@@ -54,6 +55,7 @@ public function __construct(
5455
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
5556
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
5657
\Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
58+
\Magento\Tax\Helper\Data $taxHelper,
5759
\Magento\Store\Model\StoreManagerInterface $storeManager,
5860
\Magento\Store\Model\App\Emulation $appEmulation,
5961
array $data = []
@@ -71,6 +73,7 @@ public function __construct(
7173
$localeDate,
7274
$inlineTranslation,
7375
$addressRenderer,
76+
$taxHelper,
7477
$data
7578
);
7679
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ class Invoice extends AbstractPdf
3434
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
3535
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
3636
* @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
37+
* @param \Magento\Tax\Helper\Data $taxHelper
3738
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
3839
* @param \Magento\Store\Model\App\Emulation $appEmulation
3940
* @param array $data
@@ -51,6 +52,7 @@ public function __construct(
5152
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
5253
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
5354
\Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
55+
\Magento\Tax\Helper\Data $taxHelper,
5456
\Magento\Store\Model\StoreManagerInterface $storeManager,
5557
\Magento\Store\Model\App\Emulation $appEmulation,
5658
array $data = []
@@ -68,6 +70,7 @@ public function __construct(
6870
$localeDate,
6971
$inlineTranslation,
7072
$addressRenderer,
73+
$taxHelper,
7174
$data
7275
);
7376
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class Shipment extends AbstractPdf
3232
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
3333
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
3434
* @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
35+
* @param \Magento\Tax\Helper\Data $taxHelper
3536
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
3637
* @param \Magento\Store\Model\App\Emulation $appEmulation
3738
* @param array $data
@@ -49,6 +50,7 @@ public function __construct(
4950
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
5051
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
5152
\Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
53+
\Magento\Tax\Helper\Data $taxHelper,
5254
\Magento\Store\Model\StoreManagerInterface $storeManager,
5355
\Magento\Store\Model\App\Emulation $appEmulation,
5456
array $data = []
@@ -66,6 +68,7 @@ public function __construct(
6668
$localeDate,
6769
$inlineTranslation,
6870
$addressRenderer,
71+
$taxHelper,
6972
$data
7073
);
7174
}

‎app/code/Magento/Sales/Test/Unit/Model/Order/Pdf/AbstractTest.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
use Magento\Sales\Model\Order\Pdf\ItemsFactory;
2121
use Magento\Sales\Model\Order\Pdf\Total\DefaultTotal;
2222
use Magento\Sales\Model\Order\Pdf\Total\Factory;
23+
use Magento\Tax\Helper\Data as TaxHelper;
2324
use PHPUnit\Framework\TestCase;
2425

2526
/**
@@ -49,6 +50,7 @@ public function testInsertTotals()
4950
$filesystem = $this->createMock(Filesystem::class);
5051
$pdfItemsFactory = $this->createMock(ItemsFactory::class);
5152
$localeMock = $this->getMockForAbstractClass(TimezoneInterface::class);
53+
$taxHelper = $this->createMock(TaxHelper::class);
5254

5355
// Setup config file totals
5456
$configTotals = ['item1' => [''], 'item2' => ['model' => 'custom_class']];
@@ -98,7 +100,8 @@ public function testInsertTotals()
98100
$pdfItemsFactory,
99101
$localeMock,
100102
$translate,
101-
$addressRenderer
103+
$addressRenderer,
104+
$taxHelper
102105
],
103106
'',
104107
true,
@@ -134,6 +137,7 @@ public function testDrawLineBlocks()
134137
$localeMock = $this->getMockForAbstractClass(TimezoneInterface::class);
135138
$translate = $this->getMockForAbstractClass(StateInterface::class);
136139
$addressRenderer = $this->createMock(Renderer::class);
140+
$taxHelper = $this->createMock(TaxHelper::class);
137141

138142
$abstractPdfMock = $this->getMockForAbstractClass(
139143
AbstractPdf::class,
@@ -147,7 +151,8 @@ public function testDrawLineBlocks()
147151
$pdfItemsFactory,
148152
$localeMock,
149153
$translate,
150-
$addressRenderer
154+
$addressRenderer,
155+
$taxHelper
151156
],
152157
'',
153158
true,

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
4545
* @param \Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate
4646
* @param \Magento\Framework\Translate\Inline\StateInterface $inlineTranslation
4747
* @param \Magento\Sales\Model\Order\Address\Renderer $addressRenderer
48+
* @param \Magento\Tax\Helper\Data $taxHelper
4849
* @param Carrier $carrierHelper
4950
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
5051
* @param \Magento\Framework\View\LayoutInterface $layout
@@ -64,6 +65,7 @@ public function __construct(
6465
\Magento\Framework\Stdlib\DateTime\TimezoneInterface $localeDate,
6566
\Magento\Framework\Translate\Inline\StateInterface $inlineTranslation,
6667
\Magento\Sales\Model\Order\Address\Renderer $addressRenderer,
68+
\Magento\Tax\Helper\Data $taxHelper,
6769
Carrier $carrierHelper,
6870
\Magento\Store\Model\StoreManagerInterface $storeManager,
6971
\Magento\Framework\View\LayoutInterface $layout,
@@ -86,6 +88,7 @@ public function __construct(
8688
$localeDate,
8789
$inlineTranslation,
8890
$addressRenderer,
91+
$taxHelper,
8992
$data
9093
);
9194
}

0 commit comments

Comments
 (0)