@wearejh/m2-pwa-adyen 0.26.0 → 0.28.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.28.0](https://github.com/WeareJH/mage-mono/compare/v0.25.0...v0.28.0) (2024-07-30)
+
+
+### Bug Fixes
+
+* WOOD-2009 cancelled adyen orders ([#92](https://github.com/WeareJH/mage-mono/issues/92)) ([38c017e](https://github.com/WeareJH/mage-mono/commit/38c017e70c26adbb63616727d15594b5bf77e510))
+
+
+
+
+
+# [0.27.0](https://github.com/WeareJH/mage-mono/compare/v0.25.0...v0.27.0) (2024-07-30)
+
+
+### Bug Fixes
+
+* WOOD-2009 cancelled adyen orders ([#92](https://github.com/WeareJH/mage-mono/issues/92)) ([38c017e](https://github.com/WeareJH/mage-mono/commit/38c017e70c26adbb63616727d15594b5bf77e510))
+
+
+
+
+
 # [0.26.0](https://github.com/WeareJH/mage-mono/compare/v0.25.0...v0.26.0) (2024-07-15)
 
 **Note:** Version bump only for package @wearejh/m2-pwa-adyen

package/lib/epics/onCancel.epic.ts

@@ -2,14 +2,12 @@ import { CheckoutMsg } from '@wearejh/m2-pwa-checkout';
 import { State as CheckoutState } from '@wearejh/m2-pwa-checkout/lib/checkout.reducer';
 import { scrollTop } from '@wearejh/m2-pwa-engine/lib/runtime/utils/scrollTop';
 import { EpicDeps } from '@wearejh/m2-pwa-engine/lib/types';
-import { extractErrorAndCode } from '@wearejh/swagger-rxjs/utils/ajax-helpers';
 import { ofType } from 'redux-observable';
 import { EMPTY, Observable, of } from 'rxjs';
-import { catchError, mergeMap, pluck, switchMap, withLatestFrom } from 'rxjs/operators';
+import { pluck, switchMap, withLatestFrom } from 'rxjs/operators';
 
-import { Actions, AdyenMessage, ActionTypes, TypeMap } from '../adyen.actions';
+import { Actions, ActionTypes, TypeMap } from '../adyen.actions';
 import { AppendState as AdyenStore } from '../adyen.types';
-import { execute as cancelQuery } from '../rest/JhAdyenPaymentAdyenThreeDSAbortV1AbortPost';
 
 /**
  * This epic handles Adyen cancel events and communicates
@@ -18,7 +16,7 @@ import { execute as cancelQuery } from '../rest/JhAdyenPaymentAdyenThreeDSAbortV
  * Within the Adyen module, you only need to dispatch
  * the cancel action. This epic will handle the rest.
  */
-export function onCancel(action$: Observable<any>, state$: Observable<any>, deps: EpicDeps) {
+export function onCancel(action$: Observable<any>, state$: Observable<any>, _deps: EpicDeps) {
     /**
      * Get the checkout order id from the store.
      */
@@ -43,27 +41,7 @@ export function onCancel(action$: Observable<any>, state$: Observable<any>, deps
                 return EMPTY;
             }
 
-            const ajax$ = cancelQuery(
-                {
-                    orderId: Number(orderId),
-                },
-                deps,
-            );
-
-            return ajax$.pipe(
-                mergeMap(() => of(CheckoutMsg('Checkout.SetState', CheckoutState.Ready), scrollTop())),
-
-                catchError((errorResponse) => {
-                    const { error } = extractErrorAndCode(errorResponse);
-
-                    return of(
-                        AdyenMessage(ActionTypes.Error, {
-                            cancelPayment: false,
-                            message: error,
-                        }),
-                    );
-                }),
-            );
+            return of(CheckoutMsg('Checkout.SetState', CheckoutState.Ready), scrollTop());
         }),
     );
 }

package/lib/epics/onError.epic.ts

@@ -1,15 +1,12 @@
 import { CheckoutMsg } from '@wearejh/m2-pwa-checkout';
 import { scrollTop } from '@wearejh/m2-pwa-engine/lib/runtime/utils/scrollTop';
 import { EpicDeps } from '@wearejh/m2-pwa-engine/lib/types';
-import { extractErrorAndCode } from '@wearejh/swagger-rxjs/utils/ajax-helpers';
 import { ofType } from 'redux-observable';
-import { EMPTY, concat, Observable, of } from 'rxjs';
-import { catchError, mergeMap, pluck, switchMap, withLatestFrom } from 'rxjs/operators';
-import { CartMsg } from '@wearejh/m2-pwa-cart-gql';
+import { EMPTY, Observable, of } from 'rxjs';
+import { pluck, switchMap, withLatestFrom } from 'rxjs/operators';
 
 import { Actions, ActionTypes, TypeMap } from '../adyen.actions';
 import { AppendState as AdyenStore } from '../adyen.types';
-import { execute as cancelQuery } from '../rest/JhAdyenPaymentAdyenThreeDSAbortV1AbortPost';
 
 /**
  * This epic handles Adyen error events, cancels the order,
@@ -18,7 +15,7 @@ import { execute as cancelQuery } from '../rest/JhAdyenPaymentAdyenThreeDSAbortV
  * Within the Adyen module, you only need to dispatch
  * the error action. This epic will handle the rest.
  */
-export function onError(action$: Observable<any>, state$: Observable<any>, deps: EpicDeps) {
+export function onError(action$: Observable<any>, state$: Observable<any>, _deps: EpicDeps) {
     /**
      * Get the checkout order id from the store.
      */
@@ -40,9 +37,9 @@ export function onError(action$: Observable<any>, state$: Observable<any>, deps:
         switchMap(
             ([
                 {
-                    payload: { cancelPayment, message },
+                    payload: { message },
                 },
-                orderId,
+                _orderId,
             ]) => {
                 let errorMessage = message;
 
@@ -54,35 +51,7 @@ export function onError(action$: Observable<any>, state$: Observable<any>, deps:
                     errorMessage = 'Can not set name for cross-domain window.';
                 }
 
-                if (cancelPayment) {
-                    if (!orderId) {
-                        return of(CheckoutMsg('Checkout.PaymentSubmitError', 'Cannot find the order ID.'), scrollTop());
-                    }
-
-                    const ajax$ = cancelQuery(
-                        {
-                            orderId: Number(orderId),
-                        },
-                        deps,
-                    );
-
-                    return ajax$.pipe(
-                        mergeMap(() => {
-                            return concat(
-                                of(CheckoutMsg('Checkout.PaymentSubmitError', message)),
-                                of(CartMsg('Cart.Refresh', { force: true }), scrollTop()),
-                            );
-                        }),
-
-                        catchError((errorResponse) => {
-                            const { error } = extractErrorAndCode(errorResponse);
-
-                            return of(CheckoutMsg('Checkout.PaymentSubmitError', error), scrollTop());
-                        }),
-                    );
-                }
-
-                return of(CheckoutMsg('Checkout.PaymentSubmitError', message), scrollTop());
+                return of(CheckoutMsg('Checkout.PaymentSubmitError', errorMessage), scrollTop());
             },
         ),
     );

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wearejh/m2-pwa-adyen",
-    "version": "0.26.0",
+    "version": "0.28.0",
     "description": "> TODO: description",
     "author": "Shane Osbourne <shane.osbourne8@gmail.com>",
     "homepage": "",
@@ -22,13 +22,13 @@
     },
     "dependencies": {
         "@adyen/adyen-web": "5.59.0",
-        "@wearejh/m2-pwa-cart": "^0.26.0",
-        "@wearejh/m2-pwa-checkout": "^0.26.0",
-        "@wearejh/m2-pwa-engine": "^0.26.0",
-        "@wearejh/react-hooks": "^0.26.0",
-        "@wearejh/rx-form": "^0.26.0",
-        "@wearejh/swagger-rxjs": "^0.26.0",
+        "@wearejh/m2-pwa-cart": "^0.28.0",
+        "@wearejh/m2-pwa-checkout": "^0.28.0",
+        "@wearejh/m2-pwa-engine": "^0.28.0",
+        "@wearejh/react-hooks": "^0.28.0",
+        "@wearejh/rx-form": "^0.28.0",
+        "@wearejh/swagger-rxjs": "^0.28.0",
         "load-js": "^3.0.3"
     },
-    "gitHead": "d626f346da72a5ee0fe293d4f57f70e12c4cccf5"
+    "gitHead": "7fafabd9c93a5f95b4b4794bc650da1bb599b480"
 }