ACP2E-31: Free Shipping does not show in totals on invoice page

Author: Jon Doe

app/code/Magento/Sales/Block/Adminhtml/Totals.php

@@ -97,9 +97,9 @@ protected function _initTotals()
             $shippingLabel = __('Shipping & Handling');
 
             if (!isset($this->_totals['discount'])) {
-                if ($order->getCouponCode() ) {
+                if ($order->getCouponCode()) {
                     $shippingLabel .= " ({$order->getCouponCode()})";
-                } else if ($order->getDiscountDescription()) {
+                } elseif ($order->getDiscountDescription()) {
                     $shippingLabel .= " ({$order->getDiscountDescription()})";
                 }
             }

app/code/Magento/Sales/Block/Order/Invoice/Totals.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Sales\Block\Order\Invoice;
 
-use Magento\Sales\Model\Order\Invoice;
+use Magento\Sales\Model\Order;
 
 /**
  * @api
@@ -33,6 +33,8 @@ public function __construct(
     protected $_invoice = null;
 
     /**
+     * Get order
+     *
      * @return Order
      */
     public function getInvoice()
@@ -50,6 +52,8 @@ public function getInvoice()
     }
 
     /**
+     * Set Order
+     *
      * @param Order $invoice
      * @return $this
      */

app/code/Magento/Sales/Block/Order/Totals.php

@@ -142,31 +142,7 @@ protected function _initTotals()
             );
         }
 
-        /**
-         * Add shipping
-         */
-        if (!$source->getIsVirtual()
-            && ($source->getShippingAmount() !== null
-                || $source->getShippingDescription())
-        ) {
-            $shippingLabel = __('Shipping & Handling');
-
-            if (!isset($this->_totals['discount'])) {
-                if ($source->getCouponCode() ) {
-                    $shippingLabel .= " ({$source->getCouponCode()})";
-                } else if ($source->getDiscountDescription()) {
-                    $shippingLabel .= " ({$source->getDiscountDescription()})";
-                }
-            }
-            $this->_totals['shipping'] = new DataObject(
-                [
-                    'code' => 'shipping',
-                    'field' => 'shipping_amount',
-                    'value' => $source->getShippingAmount(),
-                    'label' => $shippingLabel,
-                ]
-            );
-        }
+        $this->addShippingTotal($source);
 
         $this->_totals['grand_total'] = new \Magento\Framework\DataObject(
             [
@@ -194,6 +170,38 @@ protected function _initTotals()
         return $this;
     }
 
+    /**
+     * add shipping total
+     *
+     * @param Order|Order\Invoice $source
+     * @retrurn void
+     */
+    private function addShippingTotal($source)
+    {
+        if (!$source->getIsVirtual()
+            && ($source->getShippingAmount() !== null
+                || $source->getShippingDescription())
+        ) {
+            $shippingLabel = __('Shipping & Handling');
+
+            if (!isset($this->_totals['discount'])) {
+                if ($source->getCouponCode()) {
+                    $shippingLabel .= " ({$source->getCouponCode()})";
+                } elseif ($source->getDiscountDescription()) {
+                    $shippingLabel .= " ({$source->getDiscountDescription()})";
+                }
+            }
+            $this->_totals['shipping'] = new DataObject(
+                [
+                    'code' => 'shipping',
+                    'field' => 'shipping_amount',
+                    'value' => $source->getShippingAmount(),
+                    'label' => $shippingLabel,
+                ]
+            );
+        }
+    }
+
     /**
      * Add new total to totals array after specific total or before last total by default
      *

app/code/Magento/Sales/Model/Order/Invoice/Total/Shipping.php

@@ -13,6 +13,8 @@
 class Shipping extends AbstractTotal
 {
     /**
+     * Collect shipping total
+     *
      * @param \Magento\Sales\Model\Order\Invoice $invoice
      * @return $this
      */
@@ -27,7 +29,7 @@ public function collect(\Magento\Sales\Model\Order\Invoice $invoice)
              * Check shipping amount in previous invoices
              */
             foreach ($invoice->getOrder()->getInvoiceCollection() as $previousInvoice) {
-                if ((double)$previousInvoice->getShippingAmount() !== null && !$previousInvoice->isCanceled()) {
+                if ($previousInvoice->getShippingAmount() !== null && !$previousInvoice->isCanceled()) {
                     return $this;
                 }
             }

dev/tests/integration/testsuite/Magento/Sales/Block/Order/Invoice/TotalsTest.php

@@ -44,7 +44,6 @@ protected function setUp(): void
         $this->orderFactory = $this->objectManager->get(OrderInterfaceFactory::class);
     }
 
-
     /**
      * @magentoDataFixture Magento/Sales/_files/order_with_free_shipping_by_coupon_and_invoice.php
      *

dev/tests/integration/testsuite/Magento/Sales/_files/order_with_free_shipping_by_coupon_and_invoice.php

@@ -28,4 +28,3 @@
 $transactionSave = $objectManager
     ->create(\Magento\Framework\DB\Transaction::class);
 $transactionSave->addObject($invoice)->addObject($order)->save();
-