Merge branch 'MC-18402' of github.com:magento-honey-badgers/magento2ce into MC-18402

dthampy · dthampy · commit 5b30c6354208 · 2019-09-18T16:47:52.000-05:00
# Conflicts:
#	dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CartPromotionsTest.php
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemPrices.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemPrices.php
@@ -70,7 +70,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
                 'currency' => $currencyCode,
                 'value' => $cartItem->getRowTotalInclTax(),
             ],
-            'discount' => [
+            'total_item_discount' => [
                 'currency' => $currencyCode,
                 'value' => $cartItem->getDiscountAmount(),
             ],
diff --git a/app/code/Magento/QuoteGraphQl/etc/schema.graphqls b/app/code/Magento/QuoteGraphQl/etc/schema.graphqls
@@ -333,7 +333,7 @@ type CartItemPrices {
     row_total: Money!
     row_total_including_tax: Money!
     discounts: [Discount] @doc(description:"An array of discounts to be applied to the cart item")
-    discount: Money @doc(description:"The total of all discounts applied to the item")
+    total_item_discount: Money @doc(description:"The total of all discounts applied to the item")
 }
 
 type SelectedCustomizableOption {
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CartPromotionsTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/CartPromotionsTest.php
@@ -90,7 +90,7 @@ private function assertLineItemDiscountPrices($response, $productsInCart, $qty,
                     'prices' => [
                         'row_total' => ['value' => $productsInCart[$itemIndex]->getSpecialPrice()*$qty],
                         'row_total_including_tax' => ['value' => $productsInCart[$itemIndex]->getSpecialPrice()*$qty],
-                        'discount' => ['value' => $productsInCart[$itemIndex]->getSpecialPrice()*$qty*0.5],
+                        'total_item_discount' => ['value' => $productsInCart[$itemIndex]->getSpecialPrice()*$qty*0.5],
                         'discounts' => [
                             0 =>[
                                 'amount' =>
@@ -171,7 +171,7 @@ public function testCartPromotionsMultipleCartRules()
 
             //removing the elements from the response so that the rest of the response values can be compared
             unset($productsInResponse[$itemIndex][0]['prices']['discounts']);
-            unset($productsInResponse[$itemIndex][0]['prices']['discount']);
+            unset($productsInResponse[$itemIndex][0]['prices']['total_item_discount']);
             $this->assertResponseFields(
                 $productsInResponse[$itemIndex][0],
                 [
@@ -257,7 +257,7 @@ public function testCartPromotionsSingleCartRulesWithTaxes()
                         // row_total including tax is the price + price * tax rate
                         'row_total_including_tax' => ['value' => $rowTotalIncludingTax],
                         // discount from cart rule after tax is applied : 50% of row_total_including_tax
-                        'discount' => ['value' => round($rowTotalIncludingTax/2, 2)],
+                        'total_item_discount' => ['value' => round($rowTotalIncludingTax/2, 2)],
                         'discounts' => [
                             0 =>[
                                 'amount' =>
@@ -319,7 +319,7 @@ public function testCartPromotionsWithCoupons()
                     'prices' => [
                         'row_total' => ['value' => $productsInCart[$itemIndex]->getSpecialPrice()*$qty],
                         'row_total_including_tax' => ['value' => $productsInCart[$itemIndex]->getSpecialPrice()*$qty],
-                        'discount' => ['value' => round(($rowTotal/$sumOfPricesForBothProducts)*5, 2)],
+                        'total_item_discount' => ['value' => round(($rowTotal/$sumOfPricesForBothProducts)*5, 2)],
                         'discounts' => [
                             0 =>[
                                 'amount' =>
@@ -388,25 +388,20 @@ private function getCartItemPricesQuery(string $cartId): string
     {
         return <<<QUERY
 {
-  cart(cart_id:"$cartId"){
+  cart(cart_id:"{$cartId}"){
     items{
       quantity
-      
       prices{
         row_total{
           value
-          
         }
         row_total_including_tax{
           value
         }
-        discount{
-          value
-        }
+        total_item_discount{value}
         discounts{
           amount{value}
           label
-          
         }
       }
       }
diff --git a/setup/performance-toolkit/benchmark.jmx b/setup/performance-toolkit/benchmark.jmx
@@ -41934,7 +41934,7 @@ vars.put("product_sku", product.get("sku"));
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      prices {\n        row_total{\n          value\n        }\n        row_total_including_tax{\n          value\n        }\n        discount{value}\n        discounts{\n          amount{value}\n          label\n        }\n      }\n      product {\n        sku\n      }\n    }\n    prices {\n      applied_taxes {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      discounts {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      grand_total {\n        currency\n        value\n      }\n      subtotal_excluding_tax {\n        value\n        currency\n      }\n      subtotal_including_tax {\n        value\n        currency\n      }\n      subtotal_with_discount_excluding_tax {\n        value\n        currency\n      }\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      prices {\n        row_total{\n          value\n        }\n        row_total_including_tax{\n          value\n        }\n        total_item_discount{value}\n        discounts{\n          amount{value}\n          label\n        }\n      }\n      product {\n        sku\n      }\n    }\n    prices {\n      applied_taxes {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      discounts {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      grand_total {\n        currency\n        value\n      }\n      subtotal_excluding_tax {\n        value\n        currency\n      }\n      subtotal_including_tax {\n        value\n        currency\n      }\n      subtotal_with_discount_excluding_tax {\n        value\n        currency\n      }\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -42240,7 +42240,7 @@ vars.put("product_sku", product.get("sku"));
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      prices {\n        row_total{\n          value\n        }\n        row_total_including_tax{\n          value\n        }\n        discount{value}\n        discounts{\n          amount{value}\n          label\n        }\n      }\n      product {\n        sku\n      }\n    }\n    prices {\n      applied_taxes {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      discounts {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      grand_total {\n        currency\n        value\n      }\n      subtotal_excluding_tax {\n        value\n        currency\n      }\n      subtotal_including_tax {\n        value\n        currency\n      }\n      subtotal_with_discount_excluding_tax {\n        value\n        currency\n      }\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      prices {\n        row_total{\n          value\n        }\n        row_total_including_tax{\n          value\n        }\n        total_item_discount{value}\n        discounts{\n          amount{value}\n          label\n        }\n      }\n      product {\n        sku\n      }\n    }\n    prices {\n      applied_taxes {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      discounts {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      grand_total {\n        currency\n        value\n      }\n      subtotal_excluding_tax {\n        value\n        currency\n      }\n      subtotal_including_tax {\n        value\n        currency\n      }\n      subtotal_with_discount_excluding_tax {\n        value\n        currency\n      }\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -42498,7 +42498,7 @@ vars.put("product_sku", product.get("sku"));
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      prices {\n        row_total{\n          value\n        }\n        row_total_including_tax{\n          value\n        }\n        discount{value}\n        discounts{\n          amount{value}\n          label\n        }\n      }\n      product {\n        sku\n      }\n    }\n    prices {\n      applied_taxes {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      discounts {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      grand_total {\n        currency\n        value\n      }\n      subtotal_excluding_tax {\n        value\n        currency\n      }\n      subtotal_including_tax {\n        value\n        currency\n      }\n      subtotal_with_discount_excluding_tax {\n        value\n        currency\n      }\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      prices {\n        row_total{\n          value\n        }\n        row_total_including_tax{\n          value\n        }\n        total_item_discount{value}\n        discounts{\n          amount{value}\n          label\n        }\n      }\n      product {\n        sku\n      }\n    }\n    prices {\n      applied_taxes {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      discounts {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      grand_total {\n        currency\n        value\n      }\n      subtotal_excluding_tax {\n        value\n        currency\n      }\n      subtotal_including_tax {\n        value\n        currency\n      }\n      subtotal_with_discount_excluding_tax {\n        value\n        currency\n      }\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>
@@ -42804,7 +42804,7 @@ vars.put("product_sku", product.get("sku"));
         <collectionProp name="Arguments.arguments">
           <elementProp name="" elementType="HTTPArgument">
             <boolProp name="HTTPArgument.always_encode">false</boolProp>
-            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      prices {\n        row_total{\n          value\n        }\n        row_total_including_tax{\n          value\n        }\n        discount{value}\n        discounts{\n          amount{value}\n          label\n        }\n      }\n      product {\n        sku\n      }\n    }\n    prices {\n      applied_taxes {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      discounts {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      grand_total {\n        currency\n        value\n      }\n      subtotal_excluding_tax {\n        value\n        currency\n      }\n      subtotal_including_tax {\n        value\n        currency\n      }\n      subtotal_with_discount_excluding_tax {\n        value\n        currency\n      }\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
+            <stringProp name="Argument.value">{"query":"{\n  cart(cart_id: \"${quote_id}\") {\n    items {\n      id\n      quantity\n      prices {\n        row_total{\n          value\n        }\n        row_total_including_tax{\n          value\n        }\n        total_item_discount{value}\n        discounts{\n          amount{value}\n          label\n        }\n      }\n      product {\n        sku\n      }\n    }\n    prices {\n      applied_taxes {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      discounts {\n        amount {\n          currency\n          value\n        }\n        label\n      }\n      grand_total {\n        currency\n        value\n      }\n      subtotal_excluding_tax {\n        value\n        currency\n      }\n      subtotal_including_tax {\n        value\n        currency\n      }\n      subtotal_with_discount_excluding_tax {\n        value\n        currency\n      }\n    }\n  }\n}\n","variables":null,"operationName":null}</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
         </collectionProp>

Original file line number	Diff line number	Diff line change
`@@ -333,7 +333,7 @@ type CartItemPrices {`
`333`	`333`	`row_total: Money!`
`334`	`334`	`row_total_including_tax: Money!`
`335`	`335`	`discounts: [Discount] @doc(description:"An array of discounts to be applied to the cart item")`
`336`		`- discount: Money @doc(description:"The total of all discounts applied to the item")`
	`336`	`+ total_item_discount: Money @doc(description:"The total of all discounts applied to the item")`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`type SelectedCustomizableOption {`