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

- review fixes

Author: Prabhu Ram

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

@@ -145,7 +145,7 @@ private function getDiscountDetails(OrderInterface $associatedOrder, InvoiceItem
             $discounts [] = [
                 'label' => $associatedOrder->getDiscountDescription() ?? _('Discount'),
                 'amount' => [
-                    'value' => $invoiceItem->getDiscountAmount() ?? 0,
+                    'value' => abs($invoiceItem->getDiscountAmount()) ?? 0,
                     'currency' => $associatedOrder->getOrderCurrencyCode()
                 ]
             ];

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

@@ -14,7 +14,7 @@
 use Magento\Sales\Api\Data\InvoiceInterface;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Tax\Api\OrderTaxManagementInterface;
-use Magento\SalesGraphQl\Model\SalesItem\ShippingTaxHelper;
+use Magento\SalesGraphQl\Model\SalesItem\ShippingTaxCalculator;
 use Magento\Tax\Helper\Data as TaxHelper;
 
 /**
@@ -33,23 +33,23 @@ class InvoiceTotal implements ResolverInterface
     private $orderTaxManagement;
 
     /**
-     * @var ShippingTaxHelper
+     * @var ShippingTaxCalculator
      */
-    private $shippingTaxHelper;
+    private $shippingTaxCalculator;
 
     /**
      * @param OrderTaxManagementInterface $orderTaxManagement
      * @param TaxHelper $taxHelper
-     * @param ShippingTaxHelper $shippingTaxHelper
+     * @param ShippingTaxCalculator $shippingTaxCalculator
      */
     public function __construct(
         OrderTaxManagementInterface $orderTaxManagement,
         TaxHelper $taxHelper,
-        ShippingTaxHelper $shippingTaxHelper
+        ShippingTaxCalculator $shippingTaxCalculator
     ) {
         $this->taxHelper = $taxHelper;
         $this->orderTaxManagement = $orderTaxManagement;
-        $this->shippingTaxHelper = $shippingTaxHelper;
+        $this->shippingTaxCalculator = $shippingTaxCalculator;
     }
 
     /**
@@ -102,7 +102,7 @@ public function resolve(
                 'discounts' => $this->getShippingDiscountDetails($invoiceModel),
                 'taxes' => $this->formatTaxes(
                     $orderModel,
-                    $this->shippingTaxHelper->calculateShippingTaxes($orderModel, $invoiceModel),
+                    $this->shippingTaxCalculator->calculateShippingTaxes($orderModel, $invoiceModel),
                 )
             ]
         ];

app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxHelper.php renamed to app/code/Magento/SalesGraphQl/Model/SalesItem/ShippingTaxCalculator.php

@@ -7,7 +7,7 @@
 use Magento\Tax\Api\Data\OrderTaxDetailsItemInterface;
 use Magento\Tax\Api\OrderTaxManagementInterface;
 
-class ShippingTaxHelper
+class ShippingTaxCalculator
 {
     /**
      * @var OrderTaxManagementInterface

dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/InvoiceTest.php

@@ -38,9 +38,8 @@ protected function setUp(): void
      */
     public function testSingleInvoiceForLoggedInCustomerQuery()
     {
-        $response = $this->getCustomerInvoice();
+        $response = $this->getCustomerInvoices();
         $expectedOrdersData = [
-            'order_number' => '100000001',
             'status' => 'Processing',
             'grand_total' => 100.00
         ];
@@ -103,9 +102,8 @@ public function testSingleInvoiceForLoggedInCustomerQuery()
      */
     public function testMultipleInvoiceForLoggedInCustomerQuery()
     {
-        $response = $this->getCustomerInvoice();
+        $response = $this->getCustomerInvoices();
         $expectedOrdersData = [
-            'order_number' => '100000002',
             'status' => 'Processing',
             'grand_total' => 50.00
         ];
@@ -200,12 +198,11 @@ public function testMultipleCustomersWithInvoicesQuery()
     {
         $query =
             <<<QUERY
-query {
+{
   customer
   {
   orders {
     items {
-      order_number
       grand_total
       status
       invoices {
@@ -248,7 +245,6 @@ public function testMultipleCustomersWithInvoicesQuery()
             $this->customerAuthenticationHeader->execute($currentEmail, $currentPassword)
         );
         $expectedOrdersData = [
-            'order_number' => '100000001',
             'status' => 'Processing',
             'grand_total' => 100.00
         ];
@@ -308,7 +304,7 @@ public function testInvoiceForCustomerWithTaxesAndDiscounts()
 
         $orderNumber = $this->placeOrder($cartId);
         $this->prepareInvoice($orderNumber, 2);
-        $customerOrderResponse = $this->getCustomerOrderQuery($orderNumber);
+        $customerOrderResponse = $this->getCustomerInvoicesBasedOnOrderNumber($orderNumber);
         $customerOrderItem = $customerOrderResponse[0];
         $invoice = $customerOrderItem['invoices'][0];
         $this->assertEquals(3, $invoice['total']['discounts'][0]['amount']['value']);
@@ -342,9 +338,13 @@ public function testPartialInvoiceForCustomerWithTaxesAndDiscounts()
 
         $orderNumber = $this->placeOrder($cartId);
         $this->prepareInvoice($orderNumber, 1);
-        $customerOrderResponse = $this->getCustomerOrderQuery($orderNumber);
+        $customerOrderResponse = $this->getCustomerInvoicesBasedOnOrderNumber($orderNumber);
         $customerOrderItem = $customerOrderResponse[0];
         $invoice = $customerOrderItem['invoices'][0];
+        $invoiceItem = $invoice['items'][0];
+        $this->assertEquals(1, $invoiceItem['discounts'][0]['amount']['value']);
+        $this->assertEquals('USD', $invoiceItem['discounts'][0]['amount']['currency']);
+        $this->assertEquals('Discount Label for 10% off', $invoiceItem['discounts'][0]['label']);
         $this->assertEquals(2, $invoice['total']['discounts'][0]['amount']['value']);
         $this->assertEquals('USD', $invoice['total']['discounts'][0]['amount']['currency']);
         $this->assertEquals(
@@ -356,6 +356,8 @@ public function testPartialInvoiceForCustomerWithTaxesAndDiscounts()
     }
 
     /**
+     * Prepare invoice for the order
+     *
      * @param string $orderNumber
      * @param int|null $qty
      */
@@ -737,7 +739,7 @@ private function placeOrder(string $cartId): string
      * @param string $orderNumber
      * @return array
      */
-    private function getCustomerOrderQuery($orderNumber): array
+    private function getCustomerInvoicesBasedOnOrderNumber($orderNumber): array
     {
         $query =
             <<<QUERY
@@ -747,29 +749,8 @@ private function getCustomerOrderQuery($orderNumber): array
        orders(filter:{number:{eq:"{$orderNumber}"}}) {
          total_count
          items {
-           id
-           number
-           order_date
-           status
-           items{product_name product_sku quantity_ordered discounts {amount{value currency} label}}
-           total {
-             base_grand_total{value currency}
-             grand_total{value currency}
-             total_tax{value currency}
-             subtotal { value currency }
-             taxes {amount{value currency} title rate}
-             discounts {amount{value currency} label}
-             total_shipping{value currency}
-             shipping_handling
-             {
-               amount_including_tax{value}
-               amount_excluding_tax{value}
-               total_amount{value currency}
-               taxes {amount{value} title rate}
-               discounts {amount{value currency} label}
-             }
-           }
            invoices {
+              items{product_sale_price{value currency} quantity_invoiced discounts {amount{value currency} label}}
               total {
              base_grand_total{value currency}
              grand_total{value currency}
@@ -810,33 +791,33 @@ private function getCustomerOrderQuery($orderNumber): array
     private function assertOrdersData($response, $expectedOrdersData): void
     {
         $actualData = $response['customer']['orders']['items'][0];
-        $this->assertEquals(
-            $expectedOrdersData['order_number'],
-            $actualData['order_number'],
-            "order_number is different than the expected for order - " . $expectedOrdersData['order_number']
-        );
         $this->assertEquals(
             $expectedOrdersData['grand_total'],
             $actualData['grand_total'],
-            "grand_total is different than the expected for order - " . $expectedOrdersData['order_number']
+            "grand_total is different than the expected for order"
         );
         $this->assertEquals(
             $expectedOrdersData['status'],
             $actualData['status'],
-            "status is different than the expected for order - " . $expectedOrdersData['order_number']
+            "status is different than the expected for order"
         );
     }
 
-    private function getCustomerInvoice(): array
+    /**
+     * Get invoices for the customer
+     *
+     * @return array
+     * @throws \Magento\Framework\Exception\AuthenticationException
+     */
+    private function getCustomerInvoices(): array
     {
         $query =
             <<<QUERY
-query {
+{
   customer
   {
   orders {
     items {
-      order_number
       grand_total
       status
       invoices {