MC-20637: MyAccount :: Order Details :: Invoice Details by Order Number

- fixed review and static failures

Author: Prabhu Ram

app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceTotal.php

@@ -88,15 +88,15 @@ public function resolve(
             ),
             'shipping_handling' => [
                 'amount_excluding_tax' => [
-                    'value' => $invoiceModel->getShippingAmount(),
+                    'value' => $invoiceModel->getShippingAmount() ?? 0,
                     'currency' => $currency
                 ],
                 'amount_including_tax' => [
-                    'value' => $invoiceModel->getShippingInclTax(),
+                    'value' => $invoiceModel->getShippingInclTax() ?? 0,
                     'currency' => $currency
                 ],
                 'total_amount' => [
-                    'value' => $invoiceModel->getShippingAmount(),
+                    'value' => $invoiceModel->getShippingAmount() ?? 0,
                     'currency' => $currency
                 ],
                 'discounts' => $this->getShippingDiscountDetails($invoiceModel),

app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php

@@ -1,11 +1,16 @@
 <?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
 
 namespace Magento\SalesGraphQl\Model\SalesItem;
 
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Model\EntityInterface;
 use Magento\Tax\Api\Data\OrderTaxDetailsItemInterface;
 use Magento\Tax\Api\OrderTaxManagementInterface;
+use \Magento\Quote\Model\Quote\Address;
 
 class ShippingTaxCalculator
 {
@@ -36,7 +41,7 @@ public function calculateShippingTaxes(
         EntityInterface $salesItem
     ) {
         $orderTaxDetails = $this->orderTaxManagement->getOrderTaxDetails($order->getId());
-        $taxClassAmount = [];
+        $taxClassBreakdown = [];
         // Apply any taxes for shipping
         $shippingTaxAmount = $salesItem->getShippingTaxAmount();
         $originalShippingTaxAmount = $order->getShippingTaxAmount();
@@ -48,13 +53,12 @@ public function calculateShippingTaxes(
             $itemTaxDetails = $orderTaxDetails->getItems();
             foreach ($itemTaxDetails as $itemTaxDetail) {
                 //Aggregate taxable items associated with shipping
-                if ($itemTaxDetail->getType() == \Magento\Quote\Model\Quote\Address::TYPE_SHIPPING) {
-                    $taxClassAmount = $this->_aggregateTaxes($taxClassAmount, $itemTaxDetail, $shippingRatio);
+                if ($itemTaxDetail->getType() == Address::TYPE_SHIPPING) {
+                    $taxClassBreakdown = $this->aggregateTaxes($taxClassBreakdown, $itemTaxDetail, $shippingRatio);
                 }
             }
         }
-
-        return $taxClassAmount;
+        return $taxClassBreakdown;
     }
 
     /**
@@ -70,31 +74,31 @@ public function calculateShippingTaxes(
      *  )
      * )
      *
-     * @param  array                        $taxClassAmount
+     * @param  array                        $taxClassBreakdown
      * @param  OrderTaxDetailsItemInterface $itemTaxDetail
-     * @param  float                        $ratio
+     * @param  float                        $taxRatio
      * @return array
      */
-    private function _aggregateTaxes($taxClassAmount, OrderTaxDetailsItemInterface $itemTaxDetail, $ratio)
+    private function aggregateTaxes($taxClassBreakdown, OrderTaxDetailsItemInterface $itemTaxDetail, $taxRatio)
     {
         $itemAppliedTaxes = $itemTaxDetail->getAppliedTaxes();
         foreach ($itemAppliedTaxes as $itemAppliedTax) {
-            $taxAmount = $itemAppliedTax->getAmount() * $ratio;
-            $baseTaxAmount = $itemAppliedTax->getBaseAmount() * $ratio;
+            $taxAmount = $itemAppliedTax->getAmount() * $taxRatio;
+            $baseTaxAmount = $itemAppliedTax->getBaseAmount() * $taxRatio;
             if (0 == $taxAmount && 0 == $baseTaxAmount) {
                 continue;
             }
             $taxCode = $itemAppliedTax->getCode();
-            if (!isset($taxClassAmount[$taxCode])) {
-                $taxClassAmount[$taxCode]['title'] = $itemAppliedTax->getTitle();
-                $taxClassAmount[$taxCode]['percent'] = $itemAppliedTax->getPercent();
-                $taxClassAmount[$taxCode]['tax_amount'] = $taxAmount;
-                $taxClassAmount[$taxCode]['base_tax_amount'] = $baseTaxAmount;
+            if (!isset($taxClassBreakdown[$taxCode])) {
+                $taxClassBreakdown[$taxCode]['title'] = $itemAppliedTax->getTitle();
+                $taxClassBreakdown[$taxCode]['percent'] = $itemAppliedTax->getPercent();
+                $taxClassBreakdown[$taxCode]['tax_amount'] = $taxAmount;
+                $taxClassBreakdown[$taxCode]['base_tax_amount'] = $baseTaxAmount;
             } else {
-                $taxClassAmount[$taxCode]['tax_amount'] += $taxAmount;
-                $taxClassAmount[$taxCode]['base_tax_amount'] += $baseTaxAmount;
+                $taxClassBreakdown[$taxCode]['tax_amount'] += $taxAmount;
+                $taxClassBreakdown[$taxCode]['base_tax_amount'] += $baseTaxAmount;
             }
         }
-        return $taxClassAmount;
+        return $taxClassBreakdown;
     }
 }

app/code/Magento/SalesGraphQl/composer.json

@@ -9,6 +9,7 @@
         "magento/module-store": "*",
         "magento/module-catalog": "*",
         "magento/module-tax": "*",
+        "magento/module-quote": "*",
         "magento/module-graph-ql": "*"
     },
     "suggest": {