@pinelab/vendure-plugin-sendcloud 1.2.0 → 1.2.2

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.2.2 (2024-06-13)
+
+- Added better logging for failing incoming webhooks
+
+# 1.2.1 (2023-01-16)
+
+- Correctly transition order to Delivered after it has been Shipped
+
 # 1.2.0 (2023-11-16)
 
 - Fulfill on order placement, to prevent stock levels going out of sync

package/README.md

@@ -1,8 +1,6 @@
 # Vendure SendCloud plugin
 
-![Vendure version](https://img.shields.io/badge/dynamic/json.svg?url=https%3A%2F%2Fraw.githubusercontent.com%2FPinelab-studio%2Fpinelab-vendure-plugins%2Fmain%2Fpackage.json&query=$.devDependencies[%27@vendure/core%27]&colorB=blue&label=Built%20on%20Vendure)
-
-### Visit [pinelab-plugins.com](https://pinelab-plugins.com/plugin/vendure-plugin-sendcloud) for more documentation and examples.
+### [Official documentation here](https://pinelab-plugins.com/plugin/vendure-plugin-sendcloud)
 
 This plugin syncs orders to the SendCloud fulfillment platform.
 

package/dist/util/src/order-state-util.d.ts

@@ -8,12 +8,14 @@ export declare function fulfillAll(ctx: RequestContext, orderService: OrderServi
 /**
  * Fulfills all items to shipped using transitionFulfillmentToState
  */
-export declare function transitionToShipped(orderService: OrderService, ctx: RequestContext, order: Order, handler: ConfigurableOperationInput): Promise<Fulfillment>;
+export declare function transitionToShipped(orderService: OrderService, ctx: RequestContext, order: Order, handler: ConfigurableOperationInput): Promise<Fulfillment | FulfillmentStateTransitionError>;
 /**
  * Fulfills all items to shipped, then to delivered using transitionFulfillmentToState
  */
-export declare function transitionToDelivered(orderService: OrderService, ctx: RequestContext, order: Order, handler: ConfigurableOperationInput): Promise<Fulfillment>;
+export declare function transitionToDelivered(orderService: OrderService, ctx: RequestContext, order: Order, handler: ConfigurableOperationInput): Promise<(Fulfillment | FulfillmentStateTransitionError)[]>;
 /**
  * Throws the error result if the transition failed
+ * Ignores transition errors where from and to state are the same,
+ * because that still results in the situation we want
  */
 export declare function throwIfTransitionFailed(result: FulfillmentStateTransitionError | Fulfillment | AddFulfillmentToOrderResult): void;

package/dist/util/src/order-state-util.js

@@ -36,14 +36,28 @@ exports.transitionToShipped = transitionToShipped;
  * Fulfills all items to shipped, then to delivered using transitionFulfillmentToState
  */
 async function transitionToDelivered(orderService, ctx, order, handler) {
-    const fulfillment = await transitionToShipped(orderService, ctx, order, handler);
-    const result = await orderService.transitionFulfillmentToState(ctx, fulfillment.id, 'Delivered');
-    throwIfTransitionFailed(result);
-    return result;
+    const shippedResult = await transitionToShipped(orderService, ctx, order, handler);
+    let fulfillments = [];
+    if (shippedResult.errorCode) {
+        fulfillments = await orderService.getOrderFulfillments(ctx, order);
+    }
+    else {
+        // if not an error, shippedResult is the only fulfillment
+        fulfillments.push(shippedResult);
+    }
+    const results = [];
+    for (const fulfillment of fulfillments) {
+        const result = await orderService.transitionFulfillmentToState(ctx, fulfillment.id, 'Delivered');
+        throwIfTransitionFailed(result);
+        results.push(result);
+    }
+    return results;
 }
 exports.transitionToDelivered = transitionToDelivered;
 /**
  * Throws the error result if the transition failed
+ * Ignores transition errors where from and to state are the same,
+ * because that still results in the situation we want
  */
 function throwIfTransitionFailed(result) {
     const stateError = result;

package/dist/vendure-plugin-sendcloud/src/api/sendcloud.controller.js

@@ -19,12 +19,20 @@ const sendcloud_client_1 = require("./sendcloud.client");
 const core_1 = require("@vendure/core");
 const constants_1 = require("./constants");
 const sendcloud_types_1 = require("./types/sendcloud.types");
+const util_1 = require("util");
 let SendcloudController = class SendcloudController {
     constructor(sendcloudService) {
         this.sendcloudService = sendcloudService;
     }
     async webhook(req, signature, channelToken) {
-        const body = JSON.parse(req.body.toString());
+        let body;
+        try {
+            body = JSON.parse(req.body.toString());
+        }
+        catch (e) {
+            core_1.Logger.error(`Error parsing incoming webhook body: ${e?.message ?? e}`, constants_1.loggerCtx, (0, util_1.inspect)(req.body));
+            return;
+        }
         const rawBody = req.rawBody;
         const ctx = await this.sendcloudService.createContext(channelToken);
         const { client } = await this.sendcloudService.getClient(ctx);

package/dist/vendure-plugin-sendcloud/src/api/sendcloud.service.js

@@ -110,7 +110,7 @@ let SendcloudService = class SendcloudService {
         }
         if (sendcloudStatus.orderState === 'Shipped') {
             await this.shipAll(ctx, order);
-            return core_2.Logger.info(`Successfully update order ${orderCode} to ${sendcloudStatus.orderState}`, constants_1.loggerCtx);
+            return core_2.Logger.info(`Successfully updated order ${orderCode} to Shipped`, constants_1.loggerCtx);
         }
         order = await this.connection
             .getRepository(ctx, core_2.Order)
@@ -120,7 +120,7 @@ let SendcloudService = class SendcloudService {
                 code: sendcloud_handler_1.sendcloudHandler.code,
                 arguments: [],
             });
-            return core_2.Logger.info(`Successfully update order ${orderCode} to ${sendcloudStatus.orderState}`, constants_1.loggerCtx);
+            return core_2.Logger.info(`Successfully updated order ${orderCode} to Delivered`, constants_1.loggerCtx);
         }
         // Fall through, means unhandled state
         core_2.Logger.info(`Not handling state ${sendcloudStatus.orderState}`, constants_1.loggerCtx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pinelab/vendure-plugin-sendcloud",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Vendure plugin for syncing orders with SendCloud",
   "author": "Martijn van de Brug <martijn@pinelab.studio>",
   "homepage": "https://pinelab-plugins.com/",
@@ -20,7 +20,8 @@
   "scripts": {
     "build": "rimraf dist && tsc && copyfiles -u 1 'src/ui/**/*' dist/vendure-plugin-sendcloud/src/",
     "test": "vitest run",
-    "start": "yarn ts-node test/dev-server.ts"
+    "start": "yarn ts-node test/dev-server.ts",
+    "lint": "echo 'No linting configured'"
   },
-  "gitHead": "51491de3e0babe4f579d880f935501c2b4d6f7a1"
+  "gitHead": "7531c167693e3a991ef910c6d398658547d313bb"
 }