@graphcommerce/mollie-magento-payment 9.0.1 → 9.0.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## 9.0.2
+
+### Patch Changes
+
+- [`dc70489`](https://github.com/graphcommerce-org/graphcommerce/commit/dc70489c82aaf532bed7a6a500de8eae988e3773) - Support Magento 2.4.7 placeOrder.errors field when placing a Mollie order ([@paales](https://github.com/paales))
+
+## 9.0.2-canary.0
+
+### Patch Changes
+
+- [`dc70489`](https://github.com/graphcommerce-org/graphcommerce/commit/dc70489c82aaf532bed7a6a500de8eae988e3773) - Support Magento 2.4.7 placeOrder.errors field when placing a Mollie order ([@paales](https://github.com/paales))
+
 ## 9.0.1
 
 ## 9.0.1-canary.1

package/components/MolliePlaceOrder/MolliePlaceOrder.graphql

@@ -1,5 +1,10 @@
 mutation MolliePlaceOrder($cartId: String!, $returnUrl: String!) {
   placeOrder(input: { cart_id: $cartId, mollie_return_url: $returnUrl }) {
+    errors {
+      code
+      message
+    }
+
     order {
       order_number
       mollie_redirect_url

package/components/MolliePlaceOrder/MolliePlaceOrder.tsx

@@ -1,9 +1,9 @@
 import { useFormGqlMutationCart } from '@graphcommerce/magento-cart'
-import type { PaymentPlaceOrderProps } from '@graphcommerce/magento-cart-payment-method'
+import { type PaymentPlaceOrderProps } from '@graphcommerce/magento-cart-payment-method'
 import { useFormCompose } from '@graphcommerce/react-hook-form'
-import { t } from '@lingui/macro'
 import { useRouter } from 'next/router'
 import { useCartLockWithToken } from '../../hooks/useCartLockWithToken'
+import { assertMollieOrderPlaced } from './assertMollieOrderPlaced'
 import { MolliePlaceOrderDocument } from './MolliePlaceOrder.gql'
 
 export function MolliePlaceOrder(props: PaymentPlaceOrderProps) {
@@ -27,21 +27,15 @@ export function MolliePlaceOrder(props: PaymentPlaceOrderProps) {
 
       return { ...variables, returnUrl }
     },
-    onComplete: async ({ data, errors }) => {
-      if (!data?.placeOrder?.order || errors) return
+    onComplete: async (result) => {
+      assertMollieOrderPlaced(result)
 
-      const { mollie_redirect_url, mollie_payment_token, order_number } = data.placeOrder.order
+      const { mollie_payment_token, order_number, mollie_redirect_url } =
+        result.data.placeOrder.order
 
-      // When redirecting to the payment gateway
-      if (mollie_redirect_url && mollie_payment_token) {
-        await lock({ mollie_payment_token, method: code, order_number })
-
-        await push(mollie_redirect_url)
-      } else {
-        throw Error(
-          t`An error occurred while processing your payment. Please contact the store owner`,
-        )
-      }
+      // Redirect to the payment gateway
+      await lock({ mollie_payment_token, method: code, order_number })
+      await push(mollie_redirect_url)
     },
   })
 

package/components/MolliePlaceOrder/assertMollieOrderPlaced.ts

@@ -0,0 +1,33 @@
+import { type FetchResult } from '@graphcommerce/graphql'
+import type { AssertedOrderPlaced, PlacedOrder } from '@graphcommerce/magento-cart-payment-method'
+import {
+  assertOrderPlaced,
+  throwGenericPlaceOrderError,
+} from '@graphcommerce/magento-cart-payment-method'
+import type { MolliePlaceOrderMutation } from './MolliePlaceOrder.gql'
+
+/** Assert that the order was place successfully. */
+export function assertMollieOrderPlaced<T extends FetchResult<MolliePlaceOrderMutation>>(
+  result: T,
+): asserts result is AssertedOrderPlaced<T> & {
+  data: {
+    placeOrder: {
+      order: PlacedOrder<T> & {
+        mollie_redirect_url: NonNullable<PlacedOrder<T>['mollie_redirect_url']>
+        mollie_payment_token: NonNullable<PlacedOrder<T>['mollie_payment_token']>
+      }
+    }
+  }
+} {
+  assertOrderPlaced(result)
+
+  const { mollie_redirect_url, mollie_payment_token } = result.data.placeOrder.order
+
+  if (!mollie_redirect_url || !mollie_payment_token) {
+    console.error(
+      'Mollie: Order was placed, but no redirect url or payment token was returned, this is an issue on the Magento Mollie side.',
+      result,
+    )
+    throwGenericPlaceOrderError()
+  }
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/mollie-magento-payment",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.1",
+  "version": "9.0.2",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,21 +12,21 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^9.0.1",
-    "@graphcommerce/eslint-config-pwa": "^9.0.1",
-    "@graphcommerce/graphql": "^9.0.1",
-    "@graphcommerce/graphql-mesh": "^9.0.1",
-    "@graphcommerce/image": "^9.0.1",
-    "@graphcommerce/magento-cart": "^9.0.1",
-    "@graphcommerce/magento-cart-payment-method": "^9.0.1",
-    "@graphcommerce/magento-cart-shipping-address": "^9.0.1",
-    "@graphcommerce/magento-product": "^9.0.1",
-    "@graphcommerce/magento-product-configurable": "^9.0.1",
-    "@graphcommerce/magento-store": "^9.0.1",
-    "@graphcommerce/next-ui": "^9.0.1",
-    "@graphcommerce/prettier-config-pwa": "^9.0.1",
-    "@graphcommerce/react-hook-form": "^9.0.1",
-    "@graphcommerce/typescript-config-pwa": "^9.0.1",
+    "@graphcommerce/ecommerce-ui": "^9.0.2",
+    "@graphcommerce/eslint-config-pwa": "^9.0.2",
+    "@graphcommerce/graphql": "^9.0.2",
+    "@graphcommerce/graphql-mesh": "^9.0.2",
+    "@graphcommerce/image": "^9.0.2",
+    "@graphcommerce/magento-cart": "^9.0.2",
+    "@graphcommerce/magento-cart-payment-method": "^9.0.2",
+    "@graphcommerce/magento-cart-shipping-address": "^9.0.2",
+    "@graphcommerce/magento-product": "^9.0.2",
+    "@graphcommerce/magento-product-configurable": "^9.0.2",
+    "@graphcommerce/magento-store": "^9.0.2",
+    "@graphcommerce/next-ui": "^9.0.2",
+    "@graphcommerce/prettier-config-pwa": "^9.0.2",
+    "@graphcommerce/react-hook-form": "^9.0.2",
+    "@graphcommerce/typescript-config-pwa": "^9.0.2",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",