fix(core): Correct cancellation logic with custom Order process

Fixes #1104
vendure-ecommerce · Oct 5, 2021 · b8448c1 · b8448c1
1 parent 861ef29
commit b8448c1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/core/src/service/services/order.service.ts b/packages/core/src/service/services/order.service.ts
@@ -1024,7 +1024,7 @@ export class OrderService {
 
     private async cancelOrderById(ctx: RequestContext, input: CancelOrderInput) {
         const order = await this.getOrderOrThrow(ctx, input.orderId);
-        if (order.state === 'AddingItems' || order.state === 'ArrangingPayment') {
+        if (order.active) {
             return true;
         } else {
             const lines: OrderLineInput[] = order.lines.map(l => ({
@@ -1055,7 +1055,7 @@ export class OrderService {
         if (!idsAreEqual(order.id, input.orderId)) {
             return new MultipleOrderError();
         }
-        if (order.state === 'AddingItems' || order.state === 'ArrangingPayment') {
+        if (order.active) {
             return new CancelActiveOrderError(order.state);
         }
         const fullOrder = await this.findOne(ctx, order.id);