Merge pull request #7734 from magento-gl/245_regression_issue

245 regression issue
magento · Jun 19, 2022 · 9b50069 · 9b50069
2 parents 315a517 + 9268f0a
commit 9b50069
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AvailablePaymentMethods.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AvailablePaymentMethods.php
@@ -81,12 +81,13 @@ private function getPaymentMethodsData(CartInterface $cart): array
              */
             if ((int)$grandTotal === 0 && $carrierCode === self::FREE_SHIPPING_METHOD
                 && $paymentMethod->getCode() === self::FREE_PAYMENT_METHOD_CODE) {
-                $paymentMethodsData[] = [
-                    'title' => $paymentMethod->getTitle(),
-                    'code' => $paymentMethod->getCode(),
+                return [
+                    [
+                        'title' => $paymentMethod->getTitle(),
+                        'code' => $paymentMethod->getCode(),
+                    ]
                 ];
-            } elseif ((int)$grandTotal >= 0
-                && $carrierCode !== self::FREE_SHIPPING_METHOD) {
+            } elseif ((int)$grandTotal >= 0) {
                 $paymentMethodsData[] = [
                     'title' => $paymentMethod->getTitle(),
                     'code' => $paymentMethod->getCode(),