MC:32658:MyAccount :: Order Details :: Order Details by Order Number Taxes and Discounts

- Added new test changes for discounts descriptions

Author: avattam06

app/code/Magento/SalesGraphQl/Model/Resolver/OrderItem/DataProvider.php

@@ -227,7 +227,7 @@ private function getDiscountDetails(OrderInterface $associatedOrder, OrderItemIn
             $discounts [] = [
                 'label' => $associatedOrder->getDiscountDescription() ?? __('Discount'),
                 'amount' => [
-                    'value' => $orderItem->getDiscountAmount() ?? 0,
+                    'value' => abs($orderItem->getDiscountAmount()) ?? 0,
                     'currency' => $associatedOrder->getOrderCurrencyCode()
                 ]
             ];

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

@@ -157,7 +157,7 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscounts()
         // Asserting discounts on order item level
         $this->assertEquals(4, $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['value']);
         $this->assertEquals('USD', $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']);
-        $this->assertEquals('Discount', $customerOrderResponse[0]['items'][0]['discounts'][0]['label']);
+        $this->assertEquals('Discount Label for 10% off', $customerOrderResponse[0]['items'][0]['discounts'][0]['label']);
         $customerOrderItem = $customerOrderResponse[0];
         $this->assertTotalsWithTaxesAndDiscounts($customerOrderItem['total']);
         $this->deleteOrder();
@@ -188,7 +188,7 @@ private function assertTotalsWithTaxesAndDiscounts(array $customerOrderItemTotal
                 'total_amount' => ['value' => 20, 'currency' =>'USD'],
                 'discounts' => [
                     0 => ['amount'=>['value'=> 2, 'currency' =>'USD'],
-                        'label' => 'Discount'
+                        'label' => 'Discount Label for 10% off'
                     ]
                 ],
                 'taxes'=> [
@@ -201,7 +201,7 @@ private function assertTotalsWithTaxesAndDiscounts(array $customerOrderItemTotal
             ],
             'discounts' => [
                 0 => ['amount' => [ 'value' => 6, 'currency' =>'USD'],
-                    'label' => 'Discount'
+                    'label' => 'Discount Label for 10% off'
                 ]
             ]
         ];
@@ -233,7 +233,7 @@ public function testCustomerOrdersSimpleProductWithTaxesAndDiscountsWithTwoRules
         // Asserting discounts on order item level
         $this->assertEquals(4, $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['value']);
         $this->assertEquals('USD', $customerOrderResponse[0]['items'][0]['discounts'][0]['amount']['currency']);
-        $this->assertEquals('Discount', $customerOrderResponse[0]['items'][0]['discounts'][0]['label']);
+        $this->assertEquals('Discount Label for 10% off', $customerOrderResponse[0]['items'][0]['discounts'][0]['label']);
         $customerOrderItem = $customerOrderResponse[0];
         $this->assertTotalsWithTaxesAndDiscountsWithTwoRules($customerOrderItem['total']);
         $this->deleteOrder();
@@ -270,7 +270,7 @@ private function assertTotalsWithTaxesAndDiscountsWithTwoRules(array $customerOr
                 'total_amount' => ['value' => 20, 'currency' =>'USD'],
                 'discounts' => [
                     0 => ['amount'=>['value'=> 2, 'currency' =>'USD'],
-                        'label' => 'Discount'
+                        'label' => 'Discount Label for 10% off'
                     ]
                 ],
                 'taxes'=> [
@@ -288,7 +288,7 @@ private function assertTotalsWithTaxesAndDiscountsWithTwoRules(array $customerOr
             ],
             'discounts' => [
                 0 => ['amount' => [ 'value' => 6, 'currency' =>'USD'],
-                    'label' => 'Discount'
+                    'label' => 'Discount Label for 10% off'
                 ]
             ]
         ];

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

@@ -145,6 +145,11 @@ public function testGetCustomerOrderBundleProductWithTaxesAndDiscounts()
             'bundle-product-two-dropdown-options-simple1-simple2',
             $bundledItemInTheOrder['product_sku']
         );
+        $this->assertEquals(6, $bundledItemInTheOrder['discounts'][0]['amount']['value']);
+        $this->assertEquals(
+            'Discount Label for 10% off',
+            $bundledItemInTheOrder["discounts"][0]['label']
+        );
         $this->assertArrayHasKey('bundle_options', $bundledItemInTheOrder);
         $childItemsInTheOrder = $bundledItemInTheOrder['bundle_options'];
         $this->assertNotEmpty($childItemsInTheOrder);
@@ -183,7 +188,7 @@ private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $custome
                 'total_amount' => ['value' => 20],
                 'discounts' => [
                     0 => ['amount'=>['value'=> 2],
-                        'label' => 'Discount'
+                        'label' => 'Discount Label for 10% off'
                     ]
                 ],
                 'taxes'=> [
@@ -196,7 +201,7 @@ private function assertTotalsOnBundleProductWithTaxesAndDiscounts(array $custome
             ],
             'discounts' => [
                 0 => ['amount' => [ 'value' => 8, 'currency' =>'USD'],
-                    'label' => 'Discount'
+                    'label' => 'Discount Label for 10% off'
                 ]
             ]
         ];

dev/tests/integration/testsuite/Magento/SalesRule/_files/cart_rule_10_percent_off_with_discount_on_shipping.php

@@ -27,7 +27,11 @@
         'discount_step' => 0,
         'apply_to_shipping' => 1,
         'stop_rules_processing' => 1,
-        'website_ids' => [$websiteId]
+        'website_ids' => [$websiteId],
+         'store_labels' => [
+            'store_id' => 0,
+            'store_label' => 'Discount Label for 10% off',
+         ]
     ]
 );