Merge remote-tracking branch 'origin/AC-11798' into spartans_pr_04072024

Author: glo60612

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

@@ -12,6 +12,7 @@
 use Magento\MediaStorage\Helper\File\Storage\Database;
 use Magento\Sales\Model\RtlTextHandler;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Tax\Helper\Data as TaxHelper;
 
 /**
  * Sales Order PDF abstract model
@@ -131,6 +132,11 @@ abstract public function getPdf();
      */
     protected $addressRenderer;
 
+    /**
+     * @var Magento\Tax\Helper\Data
+     */
+    private $taxHelper;
+
     /**
      * @var array $pageSettings
      */
@@ -156,6 +162,7 @@ abstract public function getPdf();
      * @param Database $fileStorageDatabase
      * @param RtlTextHandler|null $rtlTextHandler
      * @param Image $image
+     * @param TaxHelper $taxHelper
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -172,7 +179,8 @@ public function __construct(
         array $data = [],
         Database $fileStorageDatabase = null,
         ?RtlTextHandler $rtlTextHandler = null,
-        ?Image $image = null
+        ?Image $image = null,
+        ?TaxHelper $taxHelper = null
     ) {
         $this->addressRenderer = $addressRenderer;
         $this->_paymentData = $paymentData;
@@ -185,6 +193,7 @@ public function __construct(
         $this->_pdfTotalFactory = $pdfTotalFactory;
         $this->_pdfItemsFactory = $pdfItemsFactory;
         $this->inlineTranslation = $inlineTranslation;
+        $this->taxHelper = $taxHelper ?: ObjectManager::getInstance()->get(TaxHelper::class);
         $this->fileStorageDatabase = $fileStorageDatabase ?: ObjectManager::getInstance()->get(Database::class);
         $this->rtlTextHandler = $rtlTextHandler ?: ObjectManager::getInstance()->get(RtlTextHandler::class);
         $this->image = $image ?: ObjectManager::getInstance()->get(Image::class);
@@ -604,11 +613,18 @@ protected function insertOrder(&$page, $obj, $putOrderId = true)
             }
 
             $yShipments = $this->y;
-            $totalShippingChargesText = "("
-                . __('Total Shipping Charges')
-                . " "
-                . $order->formatPriceTxt($order->getShippingAmount())
-                . ")";
+            $totalShippingChargesText = "(" . __('Total Shipping Charges') . " ";
+            if ($this->taxHelper->displayShippingPriceIncludingTax()) {
+                $totalShippingChargesText .= $order->formatPriceTxt($order->getShippingInclTax());
+            } else {
+                $totalShippingChargesText .= $order->formatPriceTxt($order->getShippingAmount());
+            }
+
+            if ($this->taxHelper->displayShippingBothPrices()
+                && $order->getShippingInclTax() != $order->getShippingAmount()) {
+                $totalShippingChargesText .= "(Incl. Tax " . $order->getShippingInclTax() . ")";
+            }
+            $totalShippingChargesText .= ")";
 
             $page->drawText($totalShippingChargesText, 285, $yShipments - $topMargin, 'UTF-8');
             $yShipments -= $topMargin + 10;

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

@@ -20,6 +20,7 @@
 use Magento\Sales\Model\Order\Pdf\ItemsFactory;
 use Magento\Sales\Model\Order\Pdf\Total\DefaultTotal;
 use Magento\Sales\Model\Order\Pdf\Total\Factory;
+use Magento\Tax\Helper\Data as TaxHelper;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -49,6 +50,7 @@ public function testInsertTotals()
         $filesystem = $this->createMock(Filesystem::class);
         $pdfItemsFactory = $this->createMock(ItemsFactory::class);
         $localeMock = $this->getMockForAbstractClass(TimezoneInterface::class);
+        $taxHelper = $this->createMock(TaxHelper::class);
 
         // Setup config file totals
         $configTotals = ['item1' => [''], 'item2' => ['model' => 'custom_class']];
@@ -98,7 +100,12 @@ public function testInsertTotals()
                 $pdfItemsFactory,
                 $localeMock,
                 $translate,
-                $addressRenderer
+                $addressRenderer,
+                [],
+                null,
+                null,
+                null,
+                $taxHelper
             ],
             '',
             true,
@@ -134,6 +141,7 @@ public function testDrawLineBlocks()
         $localeMock = $this->getMockForAbstractClass(TimezoneInterface::class);
         $translate = $this->getMockForAbstractClass(StateInterface::class);
         $addressRenderer = $this->createMock(Renderer::class);
+        $taxHelper = $this->createMock(TaxHelper::class);
 
         $abstractPdfMock = $this->getMockForAbstractClass(
             AbstractPdf::class,
@@ -147,7 +155,12 @@ public function testDrawLineBlocks()
                 $pdfItemsFactory,
                 $localeMock,
                 $translate,
-                $addressRenderer
+                $addressRenderer,
+                [],
+                null,
+                null,
+                null,
+                $taxHelper
             ],
             '',
             true,

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

@@ -13,8 +13,6 @@
 class Packaging extends \Magento\Sales\Model\Order\Pdf\AbstractPdf
 {
     /**
-     * Carrier helper
-     *
      * @var \Magento\Shipping\Helper\Carrier
      */
     protected $_carrierHelper;
@@ -93,7 +91,7 @@ public function __construct(
     /**
      * Format pdf file
      *
-     * @param  null $shipment
+     * @param  void $shipment
      * @return \Zend_Pdf
      */
     public function getPdf($shipment = null)