magento/graphql-ce#683: Add discount information to Cart

magento · Jun 11, 2019 · 382d41f · 382d41f
1 parent fe708a2
commit 382d41f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php
@@ -96,8 +96,8 @@ private function getAppliedTaxes(Total $total, string $currency): array
     private function getDiscount(Total $total, string $currency)
     {
         return [
-            'label' => $total->getDiscountDescription(),
-            'amount' => ['value' => $total->getDiscountAmount(), "currency" => $currency]
+            'label' => explode(', ', $total->getDiscountDescription()),
+            'amount' => ['value' => $total->getDiscountAmount(), 'currency' => $currency]
         ];
     }
 }
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -142,7 +142,7 @@ type CartPrices {
     grand_total: Money
     subtotal_including_tax: Money
     subtotal_excluding_tax: Money
-    discount: CartDiscountItem
+    discount: CartDiscount
     subtotal_with_discount_excluding_tax: Money
     applied_taxes: [CartTaxItem]
 }
@@ -152,9 +152,9 @@ type CartTaxItem {
     label: String!
 }
 
-type CartDiscountItem {
+type CartDiscount {
     amount: Money!
-    label: String!
+    label: [String!]!
 }
 
 type SetPaymentMethodOnCartOutput {

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/CartTotalsTest.php
@@ -168,7 +168,7 @@ public function testGetDiscountInformation()
 
         $discountResponse = $response['cart']['prices']['discount'];
         self::assertEquals(-10, $discountResponse['amount']['value']);
-        self::assertEquals('50% Off for all orders', $discountResponse['label']);
+        self::assertEquals(['50% Off for all orders'], $discountResponse['label']);
     }
 
     /**
@@ -188,7 +188,7 @@ public function testGetDiscountInformationWithTwoRulesApplied()
 
         $discountResponse = $response['cart']['prices']['discount'];
         self::assertEquals(-11, $discountResponse['amount']['value']);
-        self::assertEquals('50% Off for all orders, Test Coupon for General', $discountResponse['label']);
+        self::assertEquals(['50% Off for all orders', 'Test Coupon for General'], $discountResponse['label']);
     }
 
     /**

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/CartTotalsTest.php
@@ -138,7 +138,7 @@ public function testGetDiscountInformation()
 
         $discountResponse = $response['cart']['prices']['discount'];
         self::assertEquals(-10, $discountResponse['amount']['value']);
-        self::assertEquals('50% Off for all orders', $discountResponse['label']);
+        self::assertEquals(['50% Off for all orders'], $discountResponse['label']);
     }
 
     /**
@@ -157,7 +157,7 @@ public function testGetDiscountInformationWithTwoRulesApplied()
 
         $discountResponse = $response['cart']['prices']['discount'];
         self::assertEquals(-15, $discountResponse['amount']['value']);
-        self::assertEquals('50% Off for all orders, 5$ fixed discount on whole cart', $discountResponse['label']);
+        self::assertEquals(['50% Off for all orders', '5$ fixed discount on whole cart'], $discountResponse['label']);
     }
 
     /**