Merge pull request #282 from Pinelab-studio/fix/picqer-fulfilment

Fix/picqer fulfilment

packages/util/src/order-state-util.ts

@@ -84,7 +84,7 @@ export async function transitionToDelivered(
 }
 
 /**
- * Throw an error if the transition failed
+ * Throws the error result if the transition failed
  */
 export function throwIfTransitionFailed(
   result:
@@ -93,17 +93,15 @@ export function throwIfTransitionFailed(
     | AddFulfillmentToOrderResult
 ): void {
   const stateError = result as FulfillmentStateTransitionError;
-  if (stateError.transitionError) {
-    if (stateError.fromState === stateError.toState) {
-      return; // If already 'Shipped', don't count this as an error
-    }
-    throw Error(
-      `${stateError.message} - from ${stateError.fromState} to ${stateError.toState} - ${stateError.transitionError}`
-    );
+  if (
+    stateError.transitionError &&
+    stateError.fromState === stateError.toState
+  ) {
+    return; // If already 'Shipped', don't count this as an error
   }
   // It's not a stateTransition error
   const error = result as ErrorResult;
   if (error.errorCode) {
-    throw Error(`${error.errorCode}: ${error.message}`);
+    throw error;
   }
 }

packages/vendure-plugin-picqer/CHANGELOG.md

@@ -1,4 +1,8 @@
-# 2.0.0
+# 2.0.2
+
+- Try to fulfill again on order status changed webhooks, to support fulfilling of back orders.
+
+# 2.0.1
 
 - Push to Picqer even when fulfilling failed. Log order codes and manual steps needed when fulfillment fails.
 

packages/vendure-plugin-picqer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-picqer",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "Vendure plugin syncing to orders and stock with Picqer",
   "author": "Martijn van de Brug <[email protected]>",
   "homepage": "https://pinelab-plugins.com/",

packages/vendure-plugin-picqer/src/api/picqer.service.ts

@@ -407,8 +407,9 @@ export class PicqerService implements OnApplicationBootstrap {
     if (data.status === 'completed' && order.state !== 'Delivered') {
       // Order should be transitioned to Shipped, then to Delivered
       if (order.state !== 'Shipped') {
+        // Try to fulfill order first. This should have been done already, except for back orders
+        await this.safeFulfill(ctx, order, 'order.status_changed webhook');
         // If order isn't Shipped yet, mark all it's fulfillments as Shipped
-        // The order should already have been fulfilled when pushing to Picqer
         for (const fulfillment of order.fulfillments) {
           const result = await this.orderService.transitionFulfillmentToState(
             ctx,
@@ -728,22 +729,7 @@ export class PicqerService implements OnApplicationBootstrap {
       return;
     }
     // Fulfill order first
-    try {
-      const fulfillment = await fulfillAll(ctx, this.orderService, order, {
-        code: picqerHandler.code,
-        arguments: [],
-      });
-      Logger.info(
-        `Created fulfillment (${fulfillment.id}) for order ${order.code}`,
-        loggerCtx
-      );
-    } catch (e: any) {
-      Logger.error(
-        `Failed to fulfill order ${order.code}: ${e?.message}. Transition this order manually to 'Delivered' if it has been sent to Picqer, to prevent future errors related to status changes for this order.`,
-        loggerCtx,
-        util.inspect(e)
-      );
-    }
+    await this.safeFulfill(ctx, order, 'order placement');
     // Push the order to Picqer
     await this.pushOrderToPicqer(ctx, order, client);
   }
@@ -1177,6 +1163,32 @@ export class PicqerService implements OnApplicationBootstrap {
     };
   }
 
+  /**
+   * Fulfill without throwing errors. Logs an error if fulfilment fails
+   */
+  private async safeFulfill(
+    ctx: RequestContext,
+    order: Order,
+    logAction: string
+  ): Promise<void> {
+    try {
+      const fulfillment = await fulfillAll(ctx, this.orderService, order, {
+        code: picqerHandler.code,
+        arguments: [],
+      });
+      Logger.info(
+        `Created fulfillment (${fulfillment.id}) for order ${order.code} on '${logAction}'`,
+        loggerCtx
+      );
+    } catch (e: any) {
+      Logger.error(
+        `Failed to fulfill order ${order.code} on '${logAction}': ${e?.message}. Transition this order manually to 'Delivered' after checking that it exists in Picqer.`,
+        loggerCtx,
+        util.inspect(e)
+      );
+    }
+  }
+
   /**
    * Combine street and housenumber to get a full readable address.
    * Returns undefined if address undefined