Skip to content

Commit 2a86029

Browse files
committed
AC:11798::Shipping price showing diffrent in printed pdf
1 parent 6ce9366 commit 2a86029

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,9 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
620620
$totalShippingChargesText .= $order->formatPriceTxt($order->getShippingAmount());
621621
}
622622

623-
if($this->taxHelper->displayShippingBothPrices() && $order->getShippingInclTax() != $order->getShippingAmount()) {
623+
if ($this->taxHelper->displayShippingBothPrices()
624+
&& $order->getShippingInclTax() != $order->getShippingAmount()
625+
) {
624626
$totalShippingChargesText .= "(Incl. Tax " . $order->getShippingInclTax() . ")";
625627
}
626628
$totalShippingChargesText .= ")";

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
1414
{
1515
/**
16-
* Carrier helper
17-
*
1816
* @var \Magento\Shipping\Helper\Carrier
1917
*/
2018
protected $_carrierHelper;
@@ -96,7 +94,7 @@ public function __construct(
9694
/**
9795
* Format pdf file
9896
*
99-
* @param null $shipment
97+
* @param void $shipment
10098
* @return \Zend_Pdf
10199
*/
102100
public function getPdf($shipment = null)

0 commit comments

Comments
 (0)