Merge remote-tracking branch 'origin/MC-37884' into 2.4-develop-pr44

Author: serhii-balko

app/code/Magento/QuoteGraphQl/Model/Resolver/CartPrices.php

@@ -45,6 +45,12 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
 
         /** @var Quote $quote */
         $quote = $value['model'];
+        /**
+         * To calculate a right discount value
+         * before calculate totals
+         * need to reset Cart Fixed Rules in the quote
+         */
+        $quote->setCartFixedRules([]);
         $cartTotals = $this->totalsCollector->collectQuoteTotals($quote);
         $currency = $quote->getQuoteCurrencyCode();
 

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/ApplyCouponsToCartTest.php

@@ -21,6 +21,9 @@ class ApplyCouponsToCartTest extends GraphQlAbstract
      */
     private $getMaskedQuoteIdByReservedOrderId;
 
+    /**
+     * @inheritdoc
+     */
     protected function setUp(): void
     {
         $objectManager = Bootstrap::getObjectManager();
@@ -36,12 +39,17 @@ protected function setUp(): void
     public function testApplyCouponsToCart()
     {
         $couponCode = '2?ds5!2d';
+        $expectedGrandTotal = 15.00;
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $query = $this->getQuery($maskedQuoteId, $couponCode);
         $response = $this->graphQlMutation($query);
 
         self::assertArrayHasKey('applyCouponToCart', $response);
         self::assertEquals($couponCode, $response['applyCouponToCart']['cart']['applied_coupons'][0]['code']);
+        self::assertEquals(
+            $expectedGrandTotal,
+            $response['applyCouponToCart']['cart']['prices']['grand_total']['value']
+        );
     }
 
     /**
@@ -146,6 +154,11 @@ private function getQuery(string $maskedQuoteId, string $couponCode): string
       applied_coupons {
         code
       }
+      prices {
+        grand_total {
+          value
+        }
+      }
     }
   }
 }