@graphcommerce/mollie-magento-payment 3.5.17 → 3.5.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/components/MollieActionCard/MollieIdealActionCard.tsx +6 -1
  3. package/components/MolliePaymentHandler/MolliePaymentHandler.tsx +3 -2
  4. package/components/MolliePlaceOrder/MolliePlaceOrder.tsx +9 -9
  5. package/icons/paypal.jpg +0 -0
  6. package/icons/paypal.svg +55 -0
  7. package/methods/mollie_methods_creditcard.tsx +2 -0
  8. package/methods/mollie_methods_klarnapaylater.tsx +2 -0
  9. package/methods/mollie_methods_paypal.tsx +5 -0
  10. package/package.json +8 -8
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # Change Log
2
2
 
3
+ ## 3.5.18
4
+
5
+ ### Patch Changes
6
+
7
+ - [#1688](https://github.com/graphcommerce-org/graphcommerce/pull/1688) [`8393cb266`](https://github.com/graphcommerce-org/graphcommerce/commit/8393cb2662860be0c2aa5df432447bb73c427d8e) Thanks [@paales](https://github.com/paales)! - Add missing icons for payment methods
8
+
9
+ - [#1688](https://github.com/graphcommerce-org/graphcommerce/pull/1688) [`f544401c7`](https://github.com/graphcommerce-org/graphcommerce/commit/f544401c7b653fda39c7c260ad0dcfb3bf543b65) Thanks [@paales](https://github.com/paales)! - Return the promise when changing the URL
10
+
11
+ - [#1688](https://github.com/graphcommerce-org/graphcommerce/pull/1688) [`ea6f120eb`](https://github.com/graphcommerce-org/graphcommerce/commit/ea6f120eb46d18c8be48fd7ecfa9b5b838875c6c) Thanks [@paales](https://github.com/paales)! - Correctly show the error message returned when payment hasn’t succeeded
12
+
13
+ - Updated dependencies [[`8393cb266`](https://github.com/graphcommerce-org/graphcommerce/commit/8393cb2662860be0c2aa5df432447bb73c427d8e), [`f544401c7`](https://github.com/graphcommerce-org/graphcommerce/commit/f544401c7b653fda39c7c260ad0dcfb3bf543b65), [`f105d4223`](https://github.com/graphcommerce-org/graphcommerce/commit/f105d4223aa68df30970149e51ae72897e489bf9)]:
14
+ - @graphcommerce/next-ui@4.29.3
15
+ - @graphcommerce/magento-cart-payment-method@3.6.8
16
+ - @graphcommerce/magento-cart@4.9.4
17
+ - @graphcommerce/magento-store@4.3.6
18
+
3
19
  ## 3.5.17
4
20
 
5
21
  ### Patch Changes
package/components/MollieActionCard/MollieIdealActionCard.tsx CHANGED
@@ -13,7 +13,12 @@ export function MollieActionCard(props: MollieActionCardProps) {
13
13
  {...props}
14
14
  image={
15
15
  mollie_meta?.image && (
16
- <Image layout='fixed' sx={{ width: iconSize, height: iconSize }} unoptimized src={icon} />
16
+ <Image
17
+ layout='fixed'
18
+ sx={{ width: iconSize, height: iconSize, objectFit: 'contain' }}
19
+ unoptimized
20
+ src={icon}
21
+ />
17
22
  )
18
23
  }
19
24
  />
package/components/MolliePaymentHandler/MolliePaymentHandler.tsx CHANGED
@@ -65,12 +65,13 @@ export function MolliePaymentHandler({ code }: PaymentHandlerProps) {
65
65
  }, [called, clear, error, handle, isActive, lockState, recoverCart, router])
66
66
 
67
67
  const paymentStatus = data?.mollieProcessTransaction?.paymentStatus
68
- if (paymentStatus)
68
+ if (paymentStatus) {
69
69
  return (
70
70
  <ErrorSnackbar open>
71
- <Trans id='Payment failed with status: {paymentStatus}' />
71
+ <Trans id='Payment failed with status: {paymentStatus}' values={{ paymentStatus }} />
72
72
  </ErrorSnackbar>
73
73
  )
74
+ }
74
75
 
75
76
  if (!error || recoverResult.loading) return null
76
77
 
package/components/MolliePlaceOrder/MolliePlaceOrder.tsx CHANGED
@@ -38,16 +38,16 @@ export function MolliePlaceOrder(props: PaymentPlaceOrderProps) {
38
38
  const redirectUrl = data?.placeOrder?.order.mollie_redirect_url
39
39
  const mollie_payment_token = data?.placeOrder?.order.mollie_payment_token
40
40
 
41
- // When redirecting to the payment gateway
42
- if (redirectUrl && mollie_payment_token) {
43
- lock({
44
- mollie_payment_token,
45
- method: selectedMethod?.code ?? null,
46
- })
47
-
48
- // eslint-disable-next-line @typescript-eslint/no-floating-promises
49
- push(redirectUrl)
41
+ async function redirect() {
42
+ // When redirecting to the payment gateway
43
+ if (redirectUrl && mollie_payment_token) {
44
+ await lock({ mollie_payment_token, method: selectedMethod?.code ?? null })
45
+ await push(redirectUrl)
46
+ }
50
47
  }
48
+
49
+ // eslint-disable-next-line @typescript-eslint/no-floating-promises
50
+ redirect()
51
51
  }, [currentCartId, data?.placeOrder?.order, error, lock, push, selectedMethod?.code])
52
52
 
53
53
  useFormCompose({ form, step, submit, key: `PaymentMethodPlaceOrder_${code}` })
package/icons/paypal.jpg ADDED
Binary file
package/icons/paypal.svg ADDED
@@ -0,0 +1,55 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
3
+ <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
4
+ <svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
5
+ width="124px" height="33px" viewBox="0 0 124 33" enable-background="new 0 0 124 33" xml:space="preserve">
6
+ <path fill="#253B80" d="M46.211,6.749h-6.839c-0.468,0-0.866,0.34-0.939,0.802l-2.766,17.537c-0.055,0.346,0.213,0.658,0.564,0.658
7
+ h3.265c0.468,0,0.866-0.34,0.939-0.803l0.746-4.73c0.072-0.463,0.471-0.803,0.938-0.803h2.165c4.505,0,7.105-2.18,7.784-6.5
8
+ c0.306-1.89,0.013-3.375-0.872-4.415C50.224,7.353,48.5,6.749,46.211,6.749z M47,13.154c-0.374,2.454-2.249,2.454-4.062,2.454
9
+ h-1.032l0.724-4.583c0.043-0.277,0.283-0.481,0.563-0.481h0.473c1.235,0,2.4,0,3.002,0.704C47.027,11.668,47.137,12.292,47,13.154z"
10
+ />
11
+ <path fill="#253B80" d="M66.654,13.075h-3.275c-0.279,0-0.52,0.204-0.563,0.481l-0.145,0.916l-0.229-0.332
12
+ c-0.709-1.029-2.29-1.373-3.868-1.373c-3.619,0-6.71,2.741-7.312,6.586c-0.313,1.918,0.132,3.752,1.22,5.031
13
+ c0.998,1.176,2.426,1.666,4.125,1.666c2.916,0,4.533-1.875,4.533-1.875l-0.146,0.91c-0.055,0.348,0.213,0.66,0.562,0.66h2.95
14
+ c0.469,0,0.865-0.34,0.939-0.803l1.77-11.209C67.271,13.388,67.004,13.075,66.654,13.075z M62.089,19.449
15
+ c-0.316,1.871-1.801,3.127-3.695,3.127c-0.951,0-1.711-0.305-2.199-0.883c-0.484-0.574-0.668-1.391-0.514-2.301
16
+ c0.295-1.855,1.805-3.152,3.67-3.152c0.93,0,1.686,0.309,2.184,0.892C62.034,17.721,62.232,18.543,62.089,19.449z"/>
17
+ <path fill="#253B80" d="M84.096,13.075h-3.291c-0.314,0-0.609,0.156-0.787,0.417l-4.539,6.686l-1.924-6.425
18
+ c-0.121-0.402-0.492-0.678-0.912-0.678h-3.234c-0.393,0-0.666,0.384-0.541,0.754l3.625,10.638l-3.408,4.811
19
+ c-0.268,0.379,0.002,0.9,0.465,0.9h3.287c0.312,0,0.604-0.152,0.781-0.408L84.564,13.97C84.826,13.592,84.557,13.075,84.096,13.075z
20
+ "/>
21
+ <path fill="#179BD7" d="M94.992,6.749h-6.84c-0.467,0-0.865,0.34-0.938,0.802l-2.766,17.537c-0.055,0.346,0.213,0.658,0.562,0.658
22
+ h3.51c0.326,0,0.605-0.238,0.656-0.562l0.785-4.971c0.072-0.463,0.471-0.803,0.938-0.803h2.164c4.506,0,7.105-2.18,7.785-6.5
23
+ c0.307-1.89,0.012-3.375-0.873-4.415C99.004,7.353,97.281,6.749,94.992,6.749z M95.781,13.154c-0.373,2.454-2.248,2.454-4.062,2.454
24
+ h-1.031l0.725-4.583c0.043-0.277,0.281-0.481,0.562-0.481h0.473c1.234,0,2.4,0,3.002,0.704
25
+ C95.809,11.668,95.918,12.292,95.781,13.154z"/>
26
+ <path fill="#179BD7" d="M115.434,13.075h-3.273c-0.281,0-0.52,0.204-0.562,0.481l-0.145,0.916l-0.23-0.332
27
+ c-0.709-1.029-2.289-1.373-3.867-1.373c-3.619,0-6.709,2.741-7.311,6.586c-0.312,1.918,0.131,3.752,1.219,5.031
28
+ c1,1.176,2.426,1.666,4.125,1.666c2.916,0,4.533-1.875,4.533-1.875l-0.146,0.91c-0.055,0.348,0.213,0.66,0.564,0.66h2.949
29
+ c0.467,0,0.865-0.34,0.938-0.803l1.771-11.209C116.053,13.388,115.785,13.075,115.434,13.075z M110.869,19.449
30
+ c-0.314,1.871-1.801,3.127-3.695,3.127c-0.949,0-1.711-0.305-2.199-0.883c-0.484-0.574-0.666-1.391-0.514-2.301
31
+ c0.297-1.855,1.805-3.152,3.67-3.152c0.93,0,1.686,0.309,2.184,0.892C110.816,17.721,111.014,18.543,110.869,19.449z"/>
32
+ <path fill="#179BD7" d="M119.295,7.23l-2.807,17.858c-0.055,0.346,0.213,0.658,0.562,0.658h2.822c0.469,0,0.867-0.34,0.939-0.803
33
+ l2.768-17.536c0.055-0.346-0.213-0.659-0.562-0.659h-3.16C119.578,6.749,119.338,6.953,119.295,7.23z"/>
34
+ <path fill="#253B80" d="M7.266,29.154l0.523-3.322l-1.165-0.027H1.061L4.927,1.292C4.939,1.218,4.978,1.149,5.035,1.1
35
+ c0.057-0.049,0.13-0.076,0.206-0.076h9.38c3.114,0,5.263,0.648,6.385,1.927c0.526,0.6,0.861,1.227,1.023,1.917
36
+ c0.17,0.724,0.173,1.589,0.007,2.644l-0.012,0.077v0.676l0.526,0.298c0.443,0.235,0.795,0.504,1.065,0.812
37
+ c0.45,0.513,0.741,1.165,0.864,1.938c0.127,0.795,0.085,1.741-0.123,2.812c-0.24,1.232-0.628,2.305-1.152,3.183
38
+ c-0.482,0.809-1.096,1.48-1.825,2c-0.696,0.494-1.523,0.869-2.458,1.109c-0.906,0.236-1.939,0.355-3.072,0.355h-0.73
39
+ c-0.522,0-1.029,0.188-1.427,0.525c-0.399,0.344-0.663,0.814-0.744,1.328l-0.055,0.299l-0.924,5.855l-0.042,0.215
40
+ c-0.011,0.068-0.03,0.102-0.058,0.125c-0.025,0.021-0.061,0.035-0.096,0.035H7.266z"/>
41
+ <path fill="#179BD7" d="M23.048,7.667L23.048,7.667L23.048,7.667c-0.028,0.179-0.06,0.362-0.096,0.55
42
+ c-1.237,6.351-5.469,8.545-10.874,8.545H9.326c-0.661,0-1.218,0.48-1.321,1.132l0,0l0,0L6.596,26.83l-0.399,2.533
43
+ c-0.067,0.428,0.263,0.814,0.695,0.814h4.881c0.578,0,1.069-0.42,1.16-0.99l0.048-0.248l0.919-5.832l0.059-0.32
44
+ c0.09-0.572,0.582-0.992,1.16-0.992h0.73c4.729,0,8.431-1.92,9.513-7.476c0.452-2.321,0.218-4.259-0.978-5.622
45
+ C24.022,8.286,23.573,7.945,23.048,7.667z"/>
46
+ <path fill="#222D65" d="M21.754,7.151c-0.189-0.055-0.384-0.105-0.584-0.15c-0.201-0.044-0.407-0.083-0.619-0.117
47
+ c-0.742-0.12-1.555-0.177-2.426-0.177h-7.352c-0.181,0-0.353,0.041-0.507,0.115C9.927,6.985,9.675,7.306,9.614,7.699L8.05,17.605
48
+ l-0.045,0.289c0.103-0.652,0.66-1.132,1.321-1.132h2.752c5.405,0,9.637-2.195,10.874-8.545c0.037-0.188,0.068-0.371,0.096-0.55
49
+ c-0.313-0.166-0.652-0.308-1.017-0.429C21.941,7.208,21.848,7.179,21.754,7.151z"/>
50
+ <path fill="#253B80" d="M9.614,7.699c0.061-0.393,0.313-0.714,0.652-0.876c0.155-0.074,0.326-0.115,0.507-0.115h7.352
51
+ c0.871,0,1.684,0.057,2.426,0.177c0.212,0.034,0.418,0.073,0.619,0.117c0.2,0.045,0.395,0.095,0.584,0.15
52
+ c0.094,0.028,0.187,0.057,0.278,0.086c0.365,0.121,0.704,0.264,1.017,0.429c0.368-2.347-0.003-3.945-1.272-5.392
53
+ C20.378,0.682,17.853,0,14.622,0h-9.38c-0.66,0-1.223,0.48-1.325,1.133L0.01,25.898c-0.077,0.49,0.301,0.932,0.795,0.932h5.791
54
+ l1.454-9.225L9.614,7.699z"/>
55
+ </svg>
package/methods/mollie_methods_creditcard.tsx CHANGED
@@ -1,4 +1,5 @@
1
1
  import { PaymentMethodOptionsNoop, PaymentModule } from '@graphcommerce/magento-cart-payment-method'
2
+ import { ActionCard, iconCreditCard, IconSvg } from '@graphcommerce/next-ui'
2
3
  import { MolliePaymentHandler } from '../components/MolliePaymentHandler/MolliePaymentHandler'
3
4
  import { MolliePlaceOrder } from '../components/MolliePlaceOrder/MolliePlaceOrder'
4
5
 
@@ -6,4 +7,5 @@ export const mollie_methods_creditcard: PaymentModule = {
6
7
  PaymentOptions: PaymentMethodOptionsNoop,
7
8
  PaymentPlaceOrder: MolliePlaceOrder,
8
9
  PaymentHandler: MolliePaymentHandler,
10
+ PaymentActionCard: (props) => <ActionCard {...props} image={<IconSvg src={iconCreditCard} />} />,
9
11
  }
package/methods/mollie_methods_klarnapaylater.tsx CHANGED
@@ -1,7 +1,9 @@
1
1
  import { PaymentMethodOptionsNoop, PaymentModule } from '@graphcommerce/magento-cart-payment-method'
2
+ import { MolliePaymentHandler } from '../components/MolliePaymentHandler/MolliePaymentHandler'
2
3
  import { MolliePlaceOrder } from '../components/MolliePlaceOrder/MolliePlaceOrder'
3
4
 
4
5
  export const mollie_methods_klarnapaylater: PaymentModule = {
5
6
  PaymentOptions: PaymentMethodOptionsNoop,
6
7
  PaymentPlaceOrder: MolliePlaceOrder,
8
+ PaymentHandler: MolliePaymentHandler,
7
9
  }
package/methods/mollie_methods_paypal.tsx CHANGED
@@ -1,7 +1,12 @@
1
1
  import { PaymentMethodOptionsNoop, PaymentModule } from '@graphcommerce/magento-cart-payment-method'
2
+ import { MollieActionCard } from '../components/MollieActionCard/MollieIdealActionCard'
3
+ import { MolliePaymentHandler } from '../components/MolliePaymentHandler/MolliePaymentHandler'
2
4
  import { MolliePlaceOrder } from '../components/MolliePlaceOrder/MolliePlaceOrder'
5
+ import paypalIcon from '../icons/paypal.jpg'
3
6
 
4
7
  export const mollie_methods_paypal: PaymentModule = {
5
8
  PaymentOptions: PaymentMethodOptionsNoop,
6
9
  PaymentPlaceOrder: MolliePlaceOrder,
10
+ PaymentHandler: MolliePaymentHandler,
11
+ PaymentActionCard: (props) => <MollieActionCard {...props} icon={paypalIcon} />,
7
12
  }
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@graphcommerce/mollie-magento-payment",
3
3
  "homepage": "https://www.graphcommerce.org/",
4
4
  "repository": "github:graphcommerce-org/graphcommerce",
5
- "version": "3.5.17",
5
+ "version": "3.5.18",
6
6
  "sideEffects": false,
7
7
  "prettier": "@graphcommerce/prettier-config-pwa",
8
8
  "eslintConfig": {
@@ -13,9 +13,9 @@
13
13
  },
14
14
  "devDependencies": {
15
15
  "@graphcommerce/eslint-config-pwa": "^4.1.10",
16
- "@graphcommerce/magento-cart-shipping-address": "3.5.7",
17
- "@graphcommerce/magento-product": "4.8.2",
18
- "@graphcommerce/magento-product-configurable": "4.3.8",
16
+ "@graphcommerce/magento-cart-shipping-address": "3.5.8",
17
+ "@graphcommerce/magento-product": "4.8.3",
18
+ "@graphcommerce/magento-product-configurable": "4.3.9",
19
19
  "@graphcommerce/prettier-config-pwa": "^4.0.6",
20
20
  "@graphcommerce/typescript-config-pwa": "^4.0.4",
21
21
  "@playwright/test": "^1.21.1",
@@ -25,10 +25,10 @@
25
25
  "@graphcommerce/graphql": "3.5.0",
26
26
  "@graphcommerce/graphql-mesh": "4.2.0",
27
27
  "@graphcommerce/image": "3.1.10",
28
- "@graphcommerce/magento-cart": "4.9.3",
29
- "@graphcommerce/magento-cart-payment-method": "3.6.7",
30
- "@graphcommerce/magento-store": "4.3.5",
31
- "@graphcommerce/next-ui": "4.29.2",
28
+ "@graphcommerce/magento-cart": "4.9.4",
29
+ "@graphcommerce/magento-cart-payment-method": "3.6.8",
30
+ "@graphcommerce/magento-store": "4.3.6",
31
+ "@graphcommerce/next-ui": "4.29.3",
32
32
  "@graphcommerce/react-hook-form": "3.3.5"
33
33
  },
34
34
  "peerDependencies": {