Przeglądaj źródła

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

Fixes #1104
Michael Bromley 4 lat temu
rodzic
commit
b8448c1731

+ 2 - 2
packages/core/src/service/services/order.service.ts

@@ -1024,7 +1024,7 @@ export class OrderService {
 
 
     private async cancelOrderById(ctx: RequestContext, input: CancelOrderInput) {
     private async cancelOrderById(ctx: RequestContext, input: CancelOrderInput) {
         const order = await this.getOrderOrThrow(ctx, input.orderId);
         const order = await this.getOrderOrThrow(ctx, input.orderId);
-        if (order.state === 'AddingItems' || order.state === 'ArrangingPayment') {
+        if (order.active) {
             return true;
             return true;
         } else {
         } else {
             const lines: OrderLineInput[] = order.lines.map(l => ({
             const lines: OrderLineInput[] = order.lines.map(l => ({
@@ -1055,7 +1055,7 @@ export class OrderService {
         if (!idsAreEqual(order.id, input.orderId)) {
         if (!idsAreEqual(order.id, input.orderId)) {
             return new MultipleOrderError();
             return new MultipleOrderError();
         }
         }
-        if (order.state === 'AddingItems' || order.state === 'ArrangingPayment') {
+        if (order.active) {
             return new CancelActiveOrderError(order.state);
             return new CancelActiveOrderError(order.state);
         }
         }
         const fullOrder = await this.findOne(ctx, order.id);
         const fullOrder = await this.findOne(ctx, order.id);