@graphcommerce/magento-payment-paypal 4.13.3 → 4.14.0-canary.10

package/CHANGELOG.md

@@ -1,8 +1,44 @@
 # @graphcommerce/magento-payment-paypal
 
-## 4.13.3
+## 4.14.0-canary.10
 
-## 4.13.2
+## 4.14.0-canary.9
+
+## 4.14.0-canary.8
+
+## 4.14.0-canary.7
+
+### Patch Changes
+
+- [#1738](https://github.com/graphcommerce-org/graphcommerce/pull/1738) [`52882a63e`](https://github.com/graphcommerce-org/graphcommerce/commit/52882a63e96c0d3ba9641c3714d288fa4f420c82) - Do not forward the Prev prop in plugins ([@paales](https://github.com/paales))
+
+## 4.14.0-canary.6
+
+## 4.14.0-canary.5
+
+## 4.14.0-canary.4
+
+### Patch Changes
+
+- [#1733](https://github.com/graphcommerce-org/graphcommerce/pull/1733) [`b2d73c726`](https://github.com/graphcommerce-org/graphcommerce/commit/b2d73c726fa123435fa6c54b4e0fd0db2df7c4ab) - Move to <Prev/> instead of <Component/> to call the plugin component ([@paales](https://github.com/paales))
+
+- [#1733](https://github.com/graphcommerce-org/graphcommerce/pull/1733) [`be10e8cd1`](https://github.com/graphcommerce-org/graphcommerce/commit/be10e8cd1dce172a914ee9e5f65fdca4d0929fc8) - Migrated payment methods to use the new `onSuccess` method from `PaymentMethodContextProvider` instead of redirecting manually, makes sure the onSuccess method can be used by plugins. ([@paales](https://github.com/paales))
+
+## 4.14.0-canary.3
+
+### Patch Changes
+
+- [#1729](https://github.com/graphcommerce-org/graphcommerce/pull/1729) [`4f85e4878`](https://github.com/graphcommerce-org/graphcommerce/commit/4f85e4878e4ad0dd528d60ad35826da0677059a9) - Add the ability to specificy plugins on the package name (e.g. `@graphcommerce/magento-cart-payment-method`) ([@paales](https://github.com/paales))
+
+## 4.14.0-canary.2
+
+### Minor Changes
+
+- [#1718](https://github.com/graphcommerce-org/graphcommerce/pull/1718) [`f08bffd63`](https://github.com/graphcommerce-org/graphcommerce/commit/f08bffd63780cb626f072b25c2fd4da37543b6f7) - Add payment methods with a plugin ([@paales](https://github.com/paales))
+
+## 4.13.2-canary.1
+
+## 4.13.2-canary.0
 
 ## 4.13.1
 

package/README.md

@@ -0,0 +1,15 @@
+# Magento Payment PayPal
+
+Integrates GraphCommerce with the Magento PayPal module.
+
+Note: Not yet working
+
+## Installation
+
+1. Find current version of your `@graphcommerce/magento-cart-payment-method` in
+   your package.json.
+2. `yarn add @graphcommerce/magento-payment-paypal@1.2.3` (replace 1.2.3 with
+   the version of the step above)
+
+This package uses GraphCommerce plugin systems, so there is no code modification
+required.

package/components/PayPalPaymentHandler/PayPalPaymentHandler.tsx

@@ -1,14 +1,10 @@
 import { ApolloErrorSnackbar } from '@graphcommerce/ecommerce-ui'
 import { useMutation } from '@graphcommerce/graphql'
+import { useCurrentCartId } from '@graphcommerce/magento-cart'
 import {
-  useAssignCurrentCartId,
-  useClearCurrentCartId,
-  useCurrentCartId,
-} from '@graphcommerce/magento-cart'
-import { PaymentHandlerProps } from '@graphcommerce/magento-cart-payment-method'
-import { ErrorSnackbar } from '@graphcommerce/next-ui'
-import { Trans } from '@lingui/react'
-import { FormControlLabel } from '@mui/material'
+  PaymentHandlerProps,
+  usePaymentMethodContext,
+} from '@graphcommerce/magento-cart-payment-method'
 import { useRouter } from 'next/router'
 import { useEffect } from 'react'
 import { usePayPalCartLock } from '../../hooks/usePayPalCartLock'
@@ -18,7 +14,7 @@ export const PayPalPaymentHandler = (props: PaymentHandlerProps) => {
   const { code } = props
   const { push } = useRouter()
   const [lockStatus, , unlock] = usePayPalCartLock()
-  const clearCurrentCartId = useClearCurrentCartId()
+  const { onSuccess } = usePaymentMethodContext()
   const { currentCartId: cartId } = useCurrentCartId()
 
   const { token, PayerID, locked, justLocked, method } = lockStatus
@@ -49,27 +45,18 @@ export const PayPalPaymentHandler = (props: PaymentHandlerProps) => {
     const fetchData = async () => {
       const res = await placeOrder()
 
-      if (res.errors) {
+      if (res.errors || !res.data?.placeOrder?.order) {
         await unlock({ token: null, PayerID: null })
         return
       }
 
-      // We're done with the current cart, we clear the current cartId.
-      clearCurrentCartId()
-
       // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      push({
-        pathname: '/checkout/success',
-        query: {
-          cart_id: cartId,
-          order_number: res.data?.placeOrder?.order.order_number,
-        },
-      })
+      onSuccess(res.data?.placeOrder?.order.order_number)
     }
 
     // eslint-disable-next-line @typescript-eslint/no-floating-promises
     fetchData()
-  }, [PayerID, called, cartId, clearCurrentCartId, placeOrder, push, token, unlock])
+  }, [PayerID, called, cartId, onSuccess, placeOrder, push, token, unlock])
 
   if (error) return <ApolloErrorSnackbar error={error} />
   return null

package/index.ts

@@ -3,13 +3,11 @@ import { PayPalExpressActionCard } from './components/PayPalPaymentActionCard/Pa
 import { PayPalPaymentHandler } from './components/PayPalPaymentHandler/PayPalPaymentHandler'
 import { PayPalPaymentOptions } from './components/PayPalPaymentOptionsAndPlaceOrder/PayPalPaymentOptions'
 
-const mspModule: PaymentModule = {
-  PaymentOptions: PayPalPaymentOptions,
-  PaymentActionCard: PayPalExpressActionCard,
-  PaymentHandler: PayPalPaymentHandler,
-  PaymentPlaceOrder: () => null,
-}
-
 export const paypal: Record<string, PaymentModule> = {
-  paypal_express: mspModule,
+  paypal_express: {
+    PaymentOptions: PayPalPaymentOptions,
+    PaymentActionCard: PayPalExpressActionCard,
+    PaymentHandler: PayPalPaymentHandler,
+    PaymentPlaceOrder: () => null,
+  },
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-payment-paypal",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "4.13.3",
+  "version": "4.14.0-canary.10",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -19,13 +19,13 @@
     "type-fest": "^2.12.2"
   },
   "dependencies": {
-    "@graphcommerce/ecommerce-ui": "4.30.2",
-    "@graphcommerce/graphql": "4.30.2",
-    "@graphcommerce/image": "4.30.2",
-    "@graphcommerce/magento-cart": "4.13.3",
-    "@graphcommerce/magento-cart-payment-method": "4.13.3",
-    "@graphcommerce/magento-store": "4.13.3",
-    "@graphcommerce/next-ui": "4.30.2"
+    "@graphcommerce/ecommerce-ui": "4.31.0-canary.6",
+    "@graphcommerce/graphql": "4.31.0-canary.6",
+    "@graphcommerce/image": "4.31.0-canary.6",
+    "@graphcommerce/magento-cart": "4.14.0-canary.10",
+    "@graphcommerce/magento-cart-payment-method": "4.14.0-canary.10",
+    "@graphcommerce/magento-store": "4.14.0-canary.10",
+    "@graphcommerce/next-ui": "4.31.0-canary.6"
   },
   "peerDependencies": {
     "@lingui/react": "^3.13.2",

package/plugins/AddPaypalMethods.tsx

@@ -0,0 +1,22 @@
+import type { PaymentMethodContextProviderProps } from '@graphcommerce/magento-cart-payment-method'
+import type { PluginProps } from '@graphcommerce/next-config'
+import { PayPalExpressActionCard } from '../components/PayPalPaymentActionCard/PayPalPaymentActionCard'
+import { PayPalPaymentHandler } from '../components/PayPalPaymentHandler/PayPalPaymentHandler'
+import { PayPalPaymentOptions } from '../components/PayPalPaymentOptionsAndPlaceOrder/PayPalPaymentOptions'
+
+export const component = 'PaymentMethodContextProvider'
+export const exported = '@graphcommerce/magento-cart-payment-method'
+
+const paypal_express = {
+  PaymentOptions: PayPalPaymentOptions,
+  PaymentActionCard: PayPalExpressActionCard,
+  PaymentHandler: PayPalPaymentHandler,
+  PaymentPlaceOrder: () => null,
+}
+
+function AddPaypalMethods(props: PluginProps<PaymentMethodContextProviderProps>) {
+  const { modules, Prev, ...rest } = props
+  return <Prev {...rest} modules={{ ...modules, paypal_express }} />
+}
+
+export const Plugin = AddPaypalMethods