@wearejh/m2-pwa-checkout 0.18.0 → 0.20.0

package/CHANGELOG.md

@@ -3,6 +3,22 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.20.0](https://github.com/WeareJH/mage-mono/compare/v0.19.0...v0.20.0) (2023-03-27)
+
+**Note:** Version bump only for package @wearejh/m2-pwa-checkout
+
+
+
+
+
+# [0.19.0](https://github.com/WeareJH/mage-mono/compare/v0.18.0...v0.19.0) (2023-03-24)
+
+**Note:** Version bump only for package @wearejh/m2-pwa-checkout
+
+
+
+
+
 # [0.18.0](https://github.com/WeareJH/mage-mono/compare/v0.17.0...v0.18.0) (2023-03-14)
 
 **Note:** Version bump only for package @wearejh/m2-pwa-checkout

package/lib/epics/getOrderIncrementId.epic.ts

@@ -7,6 +7,7 @@ import { catchError, mergeMap, withLatestFrom } from 'rxjs/operators';
 
 import { CheckoutActions, CheckoutMsg, TypeMap } from '../checkout.actions';
 import { execute as getJHOrderIDQuery } from '../rest/JhOrderApiOrderListServiceV1GetOrderGet';
+import { execute as getGuestJHOrderIDQuery } from '../rest/WoodiesSalesOrderIdMapperServiceV1GetIncrementIdByEntityIdGet';
 import { signedIn } from '../utils/stateObservables';
 
 /**
@@ -41,7 +42,7 @@ export function getOrderIncrementId(action$: Observable<any>, state$: any, deps:
             const orderId = parseInt(payload.orderId);
 
             /**
-             * The Order increment ID can only be retrived by
+             * The Order increment ID for
              * signed in users.
              */
             if (isSignedInUser) {
@@ -81,16 +82,36 @@ export function getOrderIncrementId(action$: Observable<any>, state$: any, deps:
             }
 
             /**
-             * If the user is a guest, the order increment
-             * ID cannot be retrived.
-             *
-             * The temporary solution is to continue with
-             * the original order id (which doesn't match
-             * the order id in the confirmation email).
+             * The Order increment ID for
+             * Guest users.
              */
-            return of(
-                CheckoutMsg('Checkout.Complete', {
-                    orderId: payload.orderId,
+            return getGuestJHOrderIDQuery({ entityId: orderId }, deps).pipe(
+                /**
+                 * Handle the success response from the
+                 * API query.
+                 */
+                mergeMap((response: any) => {
+                    const orderId = response ?? null;
+
+                    /**
+                     * Return the increment id
+                     * but if failed then it returns the entity id
+                     */
+                    return of(
+                        CheckoutMsg('Checkout.Complete', {
+                            orderId: orderId ?? payload.orderId,
+                        }),
+                    );
+                }),
+
+                /**
+                 * Handle the error response from the
+                 * API query.
+                 */
+                catchError((errorResponse) => {
+                    const { error } = extractErrorAndCode(errorResponse);
+
+                    return of(CheckoutMsg('Checkout.PaymentSubmitError', error), scrollTop());
                 }),
             );
         }),

package/lib/rest/WoodiesSalesOrderIdMapperServiceV1GetIncrementIdByEntityIdGet.ts

@@ -0,0 +1,18 @@
+import { Effects } from '@wearejh/swagger-rxjs';
+import * as Definitions from '@wearejh/swagger-rxjs/lib/Definitions';
+import { Observable } from 'rxjs';
+
+export const description = '';
+export const method = 'GET';
+export const operationId = 'woodiesSalesOrderIdMapperServiceV1GetIncrementIdByEntityIdGet';
+export const path = '/V1/get-increment-id/{entityId}';
+export interface PathParams {
+    entityId: number;
+}
+export type Response = Response200 | ResponseDefault;
+export type Response200 = string;
+export type ResponseDefault = Definitions.ErrorResponse;
+type MinimalEffects = Pick<Effects, 'apiUrl' | 'restHeaders' | 'getJSON'>;
+export function execute(pathParams: PathParams, effects: MinimalEffects): Observable<Response200> {
+    return effects.getJSON(effects.apiUrl(operationId)(path, pathParams), effects.restHeaders({})) as any;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wearejh/m2-pwa-checkout",
-    "version": "0.18.0",
+    "version": "0.20.0",
     "description": "> TODO: description",
     "author": "Shane Osbourne <shane.osbourne8@gmail.com>",
     "homepage": "",
@@ -18,15 +18,15 @@
     ],
     "scripts": {},
     "dependencies": {
-        "@wearejh/m2-pwa-addresses": "^0.18.0",
-        "@wearejh/m2-pwa-cart": "^0.18.0",
-        "@wearejh/m2-pwa-engine": "^0.18.0",
-        "@wearejh/m2-pwa-user": "^0.18.0",
-        "@wearejh/rx-form": "^0.18.0",
-        "@wearejh/swagger-rxjs": "^0.18.0"
+        "@wearejh/m2-pwa-addresses": "^0.20.0",
+        "@wearejh/m2-pwa-cart": "^0.20.0",
+        "@wearejh/m2-pwa-engine": "^0.20.0",
+        "@wearejh/m2-pwa-user": "^0.20.0",
+        "@wearejh/rx-form": "^0.20.0",
+        "@wearejh/swagger-rxjs": "^0.20.0"
     },
     "devDependencies": {
         "@reach/dialog": "0.8.2"
     },
-    "gitHead": "b8ae72d72b9b73e1cfc1e42347bd012de3f2095c"
+    "gitHead": "187f06965f8f6c3f9e6d5393c6526f3c76144b0a"
 }