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

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @graphcommerce/magento-payment-multisafepay
 
+## 9.0.4-canary.14
+
+### Patch Changes
+
+- [#2495](https://github.com/graphcommerce-org/graphcommerce/pull/2495) [`cd386e3`](https://github.com/graphcommerce-org/graphcommerce/commit/cd386e3bce61256bab46cca88aacc7c4aa4ac415) - Remove issuers field from MultiSafePay in preparation for iDeal 2. Please not that this change requires an upgrade to the Magento module as well. ([@Giovanni-Schroevers](https://github.com/Giovanni-Schroevers))
+
+- [#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/components/MSPPaymentPlaceOrder/MSPPaymentPlaceOrder.tsx

@@ -35,6 +35,7 @@ export function MSPPaymentPlaceOrder(props: PaymentPlaceOrderProps) {
 
       if (!selectedMethod?.code) {
         throwGenericPlaceOrderError()
+        return
       }
 
       if (url?.error || !url?.payment_url) {
@@ -46,7 +47,7 @@ export function MSPPaymentPlaceOrder(props: PaymentPlaceOrderProps) {
       }
 
       await lock({
-        method: selectedMethod.code,
+        method: selectedMethod?.code ?? '',
         order_number: result.data.placeOrder.order.order_number,
       })
 
@@ -64,9 +65,9 @@ export function MSPPaymentPlaceOrder(props: PaymentPlaceOrderProps) {
 
   return (
     <form onSubmit={submit}>
-      {form.data?.placeOrder?.order.multisafepay_payment_url.error && (
+      {form.data?.placeOrder?.order?.multisafepay_payment_url.error && (
         <ErrorSnackbar open>
-          <>{form.data?.placeOrder?.order.multisafepay_payment_url.error}</>
+          <>{form.data?.placeOrder?.order?.multisafepay_payment_url?.error}</>
         </ErrorSnackbar>
       )}
       <ApolloErrorSnackbar error={restoreResult.error} />

package/graphql/MSPAvailablePaymentMethod.graphql

@@ -4,8 +4,4 @@ fragment MSPAvailablePaymentMethod on AvailablePaymentMethod
     image
     is_preselected
   }
-  multisafepay_available_issuers {
-    code
-    description
-  }
 }

package/graphql/MSPCart.graphql

@@ -0,0 +1,5 @@
+query MSPCart($cartId: String!) {
+  multisafepayCart(cart_id: $cartId) {
+    ...CartTotals
+  }
+}

package/graphql/MSPPaymentRequestData.graphql

@@ -0,0 +1,58 @@
+query MSPPaymentRequestData($cartId: String!) {
+  multisafepayPaymentRequestData(cart_id: $cartId) {
+    apiToken
+    payment_component_template_id
+    storeId
+    apiTokenLifeTime
+    applePayButton {
+      additionalTotalItems {
+        amount
+        label
+      }
+      applePayButtonId
+      cartItems {
+        label
+        price
+      }
+      getMerchantSessionUrl
+      getMerchantSessionUrl
+      isActive
+    }
+    cartTotal
+    currency
+    environment
+    googlePayButton {
+      accountId
+      googlePayButtonId
+      isActive
+      merchantInfo {
+        merchantId
+        merchantName
+      }
+      mode
+    }
+    locale
+    paymentComponentConfig {
+      additionalInfo {
+        image
+        is_preselected
+        vaultCode
+      }
+      gatewayCode
+      paymentMethod
+      paymentType
+      tokens {
+        bin
+        code
+        display
+        expired
+        expiry_date
+        last4
+        model
+        name_holder
+        token
+      }
+    }
+    paymentComponentContainerId
+  }
+}

package/methods.ts

@@ -1,11 +1,11 @@
-import type { PaymentModule } from '@graphcommerce/magento-cart-payment-method'
+import { type PaymentModule } from '@graphcommerce/magento-cart-payment-method'
+import { PaymentMethodOptionsNoop } from '@graphcommerce/magento-cart-payment-method/PaymentMethodOptionsNoop/PaymentMethodOptionsNoop'
 import { MSPPaymentActionCard } from './components/MSPPaymentActionCard/MSPPaymentActionCard'
 import { MSPPaymentHandler } from './components/MSPPaymentHandler/MSPPaymentHandler'
-import { MSPPaymentOptions } from './components/MSPPaymentOptions/MSPPaymentOptions'
 import { MSPPaymentPlaceOrder } from './components/MSPPaymentPlaceOrder/MSPPaymentPlaceOrder'
 
 const mspModule: PaymentModule = {
-  PaymentOptions: MSPPaymentOptions,
+  PaymentOptions: PaymentMethodOptionsNoop,
   PaymentActionCard: MSPPaymentActionCard,
   PaymentHandler: MSPPaymentHandler,
   PaymentPlaceOrder: MSPPaymentPlaceOrder,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-payment-multisafepay",
   "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,22 +12,22 @@
     }
   },
   "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-checkout": "^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-checkout": "^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/MSPPaymentOptions/MSPPaymentOptions.graphql

@@ -1,7 +0,0 @@
-mutation MSPPaymentOptions($cartId: String!, $paymentMethod: PaymentMethodInput!) {
-  setPaymentMethodOnCart(input: { cart_id: $cartId, payment_method: $paymentMethod }) {
-    cart {
-      ...PaymentMethodUpdated
-    }
-  }
-}

package/components/MSPPaymentOptions/MSPPaymentOptions.tsx

@@ -1,56 +0,0 @@
-import {
-  FormPersist,
-  SelectElement,
-  useFormAutoSubmit,
-  useFormCompose,
-} 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 { i18n } from '@lingui/core'
-import { MSPPaymentOptionsDocument } from './MSPPaymentOptions.gql'
-
-/** It sets the selected payment method on the cart. */
-export function MSPPaymentOptions(props: PaymentOptionsProps) {
-  const { code, step, multisafepay_available_issuers } = props
-
-  const form = useFormGqlMutationCart(MSPPaymentOptionsDocument, { mode: 'onChange' })
-
-  const { handleSubmit, register, control } = form
-
-  const submit = handleSubmit(() => {})
-  useFormAutoSubmit({ form, submit, forceInitialSubmit: true })
-
-  const key = `PaymentMethodOptions_${code}`
-  useFormCompose({ form, step, submit, key })
-
-  const issuers = filterNonNullableKeys(multisafepay_available_issuers, ['code', 'description'])
-
-  return (
-    <form onSubmit={submit} noValidate>
-      <input type='hidden' value={code} {...register('paymentMethod.code')} />
-
-      {code === 'multisafepay_ideal' && issuers.length && (
-        <FormRow>
-          <SelectElement
-            control={control}
-            name='paymentMethod.multisafepay_ideal.issuer_id'
-            required
-            rules={{ required: { message: 'Please provide an issuer', value: true } }}
-            variant='outlined'
-            color='secondary'
-            select
-            label={i18n._(/* i18n */ 'Select your bank')}
-            options={issuers.map(({ code: id, description: label }) => ({ id, label }))}
-          />
-        </FormRow>
-      )}
-      <FormPersist
-        form={form}
-        name={key}
-        persist={['paymentMethod.multisafepay_ideal.issuer_id']}
-        storage='localStorage'
-      />
-    </form>
-  )
-}