@graphcommerce/mollie-magento-payment 9.0.4-canary.12 → 9.0.4-canary.14

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 9.0.4-canary.14
+
+### Patch Changes
+
+- [#2495](https://github.com/graphcommerce-org/graphcommerce/pull/2495) [`0fc9805`](https://github.com/graphcommerce-org/graphcommerce/commit/0fc98051b87cd7fc0363609b50211d2d7382a84d) - Remove issuer list from ideal payment method ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+## 9.0.4-canary.13
+
 ## 9.0.4-canary.12
 
 ## 9.0.4-canary.11

package/methods.ts

@@ -1,7 +1,6 @@
 import type { PaymentModule } from '@graphcommerce/magento-cart-payment-method'
 import { PaymentMethodOptionsNoop } from '@graphcommerce/magento-cart-payment-method'
 import { MollieActionCard } from './components/MollieActionCard/MollieActionCard'
-import { MollieIdealOptions } from './components/MollieOptionsIssuer/MollieIdealOptions'
 import { MolliePaymentHandler } from './components/MolliePaymentHandler/MolliePaymentHandler'
 import { MolliePlaceOrder } from './components/MolliePlaceOrder/MolliePlaceOrder'
 
@@ -12,13 +11,6 @@ const mollieModule: PaymentModule = {
   PaymentPlaceOrder: MolliePlaceOrder,
 }
 
-const idealModule: PaymentModule = {
-  PaymentOptions: MollieIdealOptions,
-  PaymentActionCard: MollieActionCard,
-  PaymentHandler: MolliePaymentHandler,
-  PaymentPlaceOrder: MolliePlaceOrder,
-}
-
 /** List is extracted from https://github.com/mollie/magento2/blob/master/etc/payment.xml */
 
 export const molliepayments: Record<string, PaymentModule> = {
@@ -32,7 +24,7 @@ export const molliepayments: Record<string, PaymentModule> = {
   mollie_methods_eps: mollieModule,
   mollie_methods_giftcard: mollieModule,
   mollie_methods_giropay: mollieModule,
-  mollie_methods_ideal: idealModule,
+  mollie_methods_ideal: mollieModule,
   mollie_methods_in3: mollieModule,
   mollie_methods_kbc: mollieModule,
   mollie_methods_klarnapaylater: mollieModule,

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.4-canary.12",
+  "version": "9.0.4-canary.14",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,21 +12,21 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^9.0.4-canary.12",
-    "@graphcommerce/eslint-config-pwa": "^9.0.4-canary.12",
-    "@graphcommerce/graphql": "^9.0.4-canary.12",
-    "@graphcommerce/graphql-mesh": "^9.0.4-canary.12",
-    "@graphcommerce/image": "^9.0.4-canary.12",
-    "@graphcommerce/magento-cart": "^9.0.4-canary.12",
-    "@graphcommerce/magento-cart-payment-method": "^9.0.4-canary.12",
-    "@graphcommerce/magento-cart-shipping-address": "^9.0.4-canary.12",
-    "@graphcommerce/magento-product": "^9.0.4-canary.12",
-    "@graphcommerce/magento-product-configurable": "^9.0.4-canary.12",
-    "@graphcommerce/magento-store": "^9.0.4-canary.12",
-    "@graphcommerce/next-ui": "^9.0.4-canary.12",
-    "@graphcommerce/prettier-config-pwa": "^9.0.4-canary.12",
-    "@graphcommerce/react-hook-form": "^9.0.4-canary.12",
-    "@graphcommerce/typescript-config-pwa": "^9.0.4-canary.12",
+    "@graphcommerce/ecommerce-ui": "^9.0.4-canary.14",
+    "@graphcommerce/eslint-config-pwa": "^9.0.4-canary.14",
+    "@graphcommerce/graphql": "^9.0.4-canary.14",
+    "@graphcommerce/graphql-mesh": "^9.0.4-canary.14",
+    "@graphcommerce/image": "^9.0.4-canary.14",
+    "@graphcommerce/magento-cart": "^9.0.4-canary.14",
+    "@graphcommerce/magento-cart-payment-method": "^9.0.4-canary.14",
+    "@graphcommerce/magento-cart-shipping-address": "^9.0.4-canary.14",
+    "@graphcommerce/magento-product": "^9.0.4-canary.14",
+    "@graphcommerce/magento-product-configurable": "^9.0.4-canary.14",
+    "@graphcommerce/magento-store": "^9.0.4-canary.14",
+    "@graphcommerce/next-ui": "^9.0.4-canary.14",
+    "@graphcommerce/prettier-config-pwa": "^9.0.4-canary.14",
+    "@graphcommerce/react-hook-form": "^9.0.4-canary.14",
+    "@graphcommerce/typescript-config-pwa": "^9.0.4-canary.14",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",

package/components/MollieOptionsIssuer/MollieIdealOptions.tsx

@@ -1,26 +0,0 @@
-import type { PaymentOptionsProps } from '@graphcommerce/magento-cart-payment-method'
-import { i18n } from '@lingui/core'
-import { Trans } from '@lingui/react'
-import { Box } from '@mui/material'
-import { MollieIssuerOptions } from './MollieIssuerOptions'
-
-export function MollieIdealOptions(props: PaymentOptionsProps) {
-  return (
-    <MollieIssuerOptions label={i18n._(/* i18n */ 'Choose your bank')} {...props}>
-      <Box
-        component='ul'
-        sx={(theme) => ({ typography: 'body2', paddingLeft: theme.spacings.xs, margin: 0 })}
-      >
-        <li>
-          <Trans id='Choose your bank, and place your order.' />
-        </li>
-        <li>
-          <Trans id='Complete the payment on your bank’s website.' />
-        </li>
-        <li>
-          <Trans id='As soon as the payment is completed, you will automatically return to the webshop.' />
-        </li>
-      </Box>
-    </MollieIssuerOptions>
-  )
-}

package/components/MollieOptionsIssuer/MollieIssuerOptions.tsx

@@ -1,58 +0,0 @@
-import { SelectElement } from '@graphcommerce/ecommerce-ui'
-import { useFormGqlMutationCart } from '@graphcommerce/magento-cart'
-import type { PaymentOptionsProps } from '@graphcommerce/magento-cart-payment-method'
-import { filterNonNullableKeys, FormRow } from '@graphcommerce/next-ui'
-import { FormPersist, useFormCompose } from '@graphcommerce/react-hook-form'
-import { SetMolliePaymentMethodIssuerOnCartDocument } from './SetMolliePaymentMethodIssuerOnCart.gql'
-
-export type MollieIssuerOptionsProps = PaymentOptionsProps & {
-  label: string
-  children?: React.ReactNode
-}
-
-export function MollieIssuerOptions(props: MollieIssuerOptionsProps) {
-  const { mollie_available_issuers = [], children } = props
-  const { code, step, label } = props
-
-  const form = useFormGqlMutationCart(SetMolliePaymentMethodIssuerOnCartDocument, {
-    defaultValues: { code },
-  })
-
-  const { handleSubmit, formState, required, control } = form
-  const submit = handleSubmit(() => {})
-
-  useFormCompose({ form, step, submit, key: `PaymentMethodOptions_${code}` })
-
-  return (
-    <>
-      <form onSubmit={submit} noValidate>
-        <FormRow>
-          <SelectElement
-            control={control}
-            name='issuer'
-            SelectProps={{ native: true, displayEmpty: true }}
-            variant='outlined'
-            helperText={formState.isSubmitted && formState.errors.issuer?.message}
-            label={label}
-            required={required.issuer}
-            showValid
-            options={filterNonNullableKeys(mollie_available_issuers, ['code', 'name']).map(
-              (option) => ({
-                id: option.code,
-                label: option.name,
-              }),
-            )}
-          />
-        </FormRow>
-      </form>
-      {children}
-      <FormPersist
-        // Since the issuer isn't retrievable from Magento we persist this value.
-        form={form}
-        name={`PaymentMethodOptions_${code}`}
-        persist={['issuer']}
-        storage='localStorage'
-      />
-    </>
-  )
-}

package/components/MollieOptionsIssuer/SetMolliePaymentMethodIssuerOnCart.graphql

@@ -1,9 +0,0 @@
-mutation SetMolliePaymentMethodIssuerOnCart($cartId: String!, $code: String!, $issuer: String!) {
-  setPaymentMethodOnCart(
-    input: { cart_id: $cartId, payment_method: { code: $code, mollie_selected_issuer: $issuer } }
-  ) {
-    cart {
-      ...PaymentMethodUpdated
-    }
-  }
-}