Merge pull request #2277 from graphcommerce-org/fix/braintree2

Solve issue where Braintree wouldn't place the order after successfully validating a Credit Card.

.changeset/eight-keys-allow.md

@@ -0,0 +1,6 @@
+---
+"@graphcommerce/magento-cart-payment-method": patch
+"@graphcommerce/magento-payment-braintree": patch
+---
+
+Solve issue where Braintree wouldn't place the order after successfully validating a Credit Card.

packages/magento-cart-payment-method/PaymentMethodPlaceOrderNoop/PaymentMethodPlaceOrderNoop.tsx

@@ -13,6 +13,7 @@ export function PaymentMethodPlaceOrderNoop(props: PaymentPlaceOrderProps) {
       if (!result.data?.placeOrder?.order) return
       await onSuccess(result.data.placeOrder.order.order_number)
     },
+    submitWhileLocked: true,
   })
 
   const { handleSubmit } = form

packages/magento-cart/hooks/useFormGqlMutationCart.ts

@@ -12,7 +12,7 @@ export function useFormGqlMutationCart<
   V extends { cartId: string; [index: string]: unknown },
 >(
   document: TypedDocumentNode<Q, V>,
-  options: UseFormGraphQlOptions<Q, V> = {},
+  options: UseFormGraphQlOptions<Q, V> & { submitWhileLocked?: boolean } = {},
   operationOptions?: MutationHookOptions<Q, V>,
 ): UseFormGqlMutationReturn<Q, V> {
   const cartId = useCartIdCreate()
@@ -26,7 +26,11 @@ export function useFormGqlMutationCart<
         const vars = { ...variables, cartId: await cartId() }
 
         const res = client.cache.readQuery({ query: CurrentCartIdDocument })
-        if (res?.currentCartId?.locked) return false
+        if (!options.submitWhileLocked && res?.currentCartId?.locked) {
+          console.log('Could not submit form, cart is locked', res.currentCartId.locked)
+          return false
+        }
+
         return options.onBeforeSubmit ? options.onBeforeSubmit(vars) : vars
       },
     },

packages/magento-payment-braintree/methods/braintree/index.ts

@@ -1,7 +1,5 @@
-import {
-  PaymentMethodPlaceOrderNoop,
-  PaymentModule,
-} from '@graphcommerce/magento-cart-payment-method'
+import type { PaymentModule } from '@graphcommerce/magento-cart-payment-method'
+import { PaymentMethodPlaceOrderNoop } from '@graphcommerce/magento-cart-payment-method/PaymentMethodPlaceOrderNoop/PaymentMethodPlaceOrderNoop'
 import { PaymentMethodOptions } from './PaymentMethodOptions'
 
 export const braintree: PaymentModule = {