@vendure/core 1.4.7 → 2.0.0-next.0

package/dist/service/services/order.service.js

@@ -34,9 +34,11 @@ const refund_entity_1 = require("../../entity/refund/refund.entity");
 const shipping_line_entity_1 = require("../../entity/shipping-line/shipping-line.entity");
 const surcharge_entity_1 = require("../../entity/surcharge/surcharge.entity");
 const event_bus_1 = require("../../event-bus/event-bus");
-const coupon_code_event_1 = require("../../event-bus/events/coupon-code-event");
-const order_state_transition_event_1 = require("../../event-bus/events/order-state-transition-event");
-const refund_state_transition_event_1 = require("../../event-bus/events/refund-state-transition-event");
+const index_1 = require("../../event-bus/index");
+const index_2 = require("../../event-bus/index");
+const index_3 = require("../../event-bus/index");
+const index_4 = require("../../event-bus/index");
+const index_5 = require("../../event-bus/index");
 const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
 const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
 const order_calculator_1 = require("../helpers/order-calculator/order-calculator");
@@ -155,7 +157,7 @@ let OrderService = class OrderService {
         const order = await qb.getOne();
         if (order) {
             for (const line of order.lines) {
-                line.productVariant = translate_entity_1.translateDeep(await this.productVariantService.applyChannelPriceAndTax(line.productVariant, ctx, order), ctx.languageCode);
+                line.productVariant = (0, translate_entity_1.translateDeep)(await this.productVariantService.applyChannelPriceAndTax(line.productVariant, ctx, order), ctx.languageCode);
             }
             return order;
         }
@@ -189,7 +191,7 @@ let OrderService = class OrderService {
             .then(([items, totalItems]) => {
             items.forEach(item => {
                 item.lines.forEach(line => {
-                    line.productVariant = translate_entity_1.translateDeep(line.productVariant, ctx.languageCode, [
+                    line.productVariant = (0, translate_entity_1.translateDeep)(line.productVariant, ctx.languageCode, [
                         'options',
                     ]);
                 });
@@ -297,8 +299,9 @@ let OrderService = class OrderService {
         }
         await this.channelService.assignToCurrentChannel(newOrder, ctx);
         const order = await this.connection.getRepository(ctx, order_entity_1.Order).save(newOrder);
+        this.eventBus.publish(new index_2.OrderEvent(ctx, order, 'created'));
         const transitionResult = await this.transitionToState(ctx, order.id, 'AddingItems');
-        if (error_result_1.isGraphQlErrorResult(transitionResult)) {
+        if ((0, error_result_1.isGraphQlErrorResult)(transitionResult)) {
             // this should never occur, so we will throw rather than return
             throw transitionResult;
         }
@@ -310,9 +313,11 @@ let OrderService = class OrderService {
      */
     async updateCustomFields(ctx, orderId, customFields) {
         let order = await this.getOrderOrThrow(ctx, orderId);
-        order = patch_entity_1.patchEntity(order, { customFields });
+        order = (0, patch_entity_1.patchEntity)(order, { customFields });
         await this.customFieldRelationService.updateRelations(ctx, order_entity_1.Order, { customFields }, order);
-        return this.connection.getRepository(ctx, order_entity_1.Order).save(order);
+        const updatedOrder = await this.connection.getRepository(ctx, order_entity_1.Order).save(order);
+        this.eventBus.publish(new index_2.OrderEvent(ctx, updatedOrder, 'updated'));
+        return updatedOrder;
     }
     /**
      * @description
@@ -341,7 +346,7 @@ let OrderService = class OrderService {
         }
         const correctedQuantity = await this.orderModifier.constrainQuantityToSaleable(ctx, variant, quantity, existingOrderLine === null || existingOrderLine === void 0 ? void 0 : existingOrderLine.quantity);
         if (correctedQuantity === 0) {
-            return new generated_graphql_shop_errors_1.InsufficientStockError(correctedQuantity, order);
+            return new generated_graphql_shop_errors_1.InsufficientStockError({ order, quantityAvailable: correctedQuantity });
         }
         const orderLine = await this.orderModifier.getOrCreateOrderLine(ctx, order, productVariantId, customFields);
         if (correctedQuantity < quantity) {
@@ -354,7 +359,7 @@ let OrderService = class OrderService {
         const quantityWasAdjustedDown = correctedQuantity < quantity;
         const updatedOrder = await this.applyPriceAdjustments(ctx, order, [orderLine]);
         if (quantityWasAdjustedDown) {
-            return new generated_graphql_shop_errors_1.InsufficientStockError(correctedQuantity, updatedOrder);
+            return new generated_graphql_shop_errors_1.InsufficientStockError({ quantityAvailable: correctedQuantity, order: updatedOrder });
         }
         else {
             return updatedOrder;
@@ -381,8 +386,9 @@ let OrderService = class OrderService {
         const correctedQuantity = await this.orderModifier.constrainQuantityToSaleable(ctx, orderLine.productVariant, quantity);
         let updatedOrderLines = [orderLine];
         if (correctedQuantity === 0) {
-            order.lines = order.lines.filter(l => !utils_1.idsAreEqual(l.id, orderLine.id));
+            order.lines = order.lines.filter(l => !(0, utils_1.idsAreEqual)(l.id, orderLine.id));
             await this.connection.getRepository(ctx, order_line_entity_1.OrderLine).remove(orderLine);
+            this.eventBus.publish(new index_5.OrderLineEvent(ctx, order, orderLine, 'deleted'));
             updatedOrderLines = [];
         }
         else {
@@ -391,7 +397,7 @@ let OrderService = class OrderService {
         const quantityWasAdjustedDown = correctedQuantity < quantity;
         const updatedOrder = await this.applyPriceAdjustments(ctx, order, updatedOrderLines);
         if (quantityWasAdjustedDown) {
-            return new generated_graphql_shop_errors_1.InsufficientStockError(correctedQuantity, updatedOrder);
+            return new generated_graphql_shop_errors_1.InsufficientStockError({ quantityAvailable: correctedQuantity, order: updatedOrder });
         }
         else {
             return updatedOrder;
@@ -408,9 +414,10 @@ let OrderService = class OrderService {
             return validationError;
         }
         const orderLine = this.getOrderLineOrThrow(order, orderLineId);
-        order.lines = order.lines.filter(line => !utils_1.idsAreEqual(line.id, orderLineId));
+        order.lines = order.lines.filter(line => !(0, utils_1.idsAreEqual)(line.id, orderLineId));
         const updatedOrder = await this.applyPriceAdjustments(ctx, order);
         await this.connection.getRepository(ctx, order_line_entity_1.OrderLine).remove(orderLine);
+        this.eventBus.publish(new index_5.OrderLineEvent(ctx, order, orderLine, 'deleted'));
         return updatedOrder;
     }
     /**
@@ -446,8 +453,8 @@ let OrderService = class OrderService {
     async removeSurchargeFromOrder(ctx, orderId, surchargeId) {
         const order = await this.getOrderOrThrow(ctx, orderId);
         const surcharge = await this.connection.getEntityOrThrow(ctx, surcharge_entity_1.Surcharge, surchargeId);
-        if (order.surcharges.find(s => utils_1.idsAreEqual(s.id, surcharge.id))) {
-            order.surcharges = order.surcharges.filter(s => !utils_1.idsAreEqual(s.id, surchargeId));
+        if (order.surcharges.find(s => (0, utils_1.idsAreEqual)(s.id, surcharge.id))) {
+            order.surcharges = order.surcharges.filter(s => !(0, utils_1.idsAreEqual)(s.id, surchargeId));
             const updatedOrder = await this.applyPriceAdjustments(ctx, order);
             await this.connection.getRepository(ctx, surcharge_entity_1.Surcharge).remove(surcharge);
             return updatedOrder;
@@ -467,7 +474,7 @@ let OrderService = class OrderService {
             return order;
         }
         const validationResult = await this.promotionService.validateCouponCode(ctx, couponCode, order.customer && order.customer.id);
-        if (error_result_1.isGraphQlErrorResult(validationResult)) {
+        if ((0, error_result_1.isGraphQlErrorResult)(validationResult)) {
             return validationResult;
         }
         order.couponCodes.push(couponCode);
@@ -477,7 +484,7 @@ let OrderService = class OrderService {
             type: generated_types_1.HistoryEntryType.ORDER_COUPON_APPLIED,
             data: { couponCode, promotionId: validationResult.id },
         });
-        this.eventBus.publish(new coupon_code_event_1.CouponCodeEvent(ctx, couponCode, orderId, 'assigned'));
+        this.eventBus.publish(new index_1.CouponCodeEvent(ctx, couponCode, orderId, 'assigned'));
         return this.applyPriceAdjustments(ctx, order);
     }
     /**
@@ -501,7 +508,7 @@ let OrderService = class OrderService {
                 type: generated_types_1.HistoryEntryType.ORDER_COUPON_REMOVED,
                 data: { couponCode },
             });
-            this.eventBus.publish(new coupon_code_event_1.CouponCodeEvent(ctx, couponCode, orderId, 'removed'));
+            this.eventBus.publish(new index_1.CouponCodeEvent(ctx, couponCode, orderId, 'removed'));
             const result = await this.applyPriceAdjustments(ctx, order);
             await this.connection.getRepository(ctx, order_item_entity_1.OrderItem).save(affectedOrderItems);
             return result;
@@ -574,8 +581,8 @@ let OrderService = class OrderService {
             const { price, taxRate, priceIncludesTax, metadata } = eligible.result;
             return {
                 id: eligible.method.id,
-                price: priceIncludesTax ? tax_utils_1.netPriceOf(price, taxRate) : price,
-                priceWithTax: priceIncludesTax ? price : tax_utils_1.grossPriceOf(price, taxRate),
+                price: priceIncludesTax ? (0, tax_utils_1.netPriceOf)(price, taxRate) : price,
+                priceWithTax: priceIncludesTax ? price : (0, tax_utils_1.grossPriceOf)(price, taxRate),
                 description: eligible.method.description,
                 name: eligible.method.name,
                 code: eligible.method.code,
@@ -639,10 +646,10 @@ let OrderService = class OrderService {
         }
         catch (e) {
             const transitionError = ctx.translate(e.message, { fromState, toState: state });
-            return new generated_graphql_shop_errors_1.OrderStateTransitionError(transitionError, fromState, state);
+            return new generated_graphql_shop_errors_1.OrderStateTransitionError({ transitionError, fromState, toState: state });
         }
         await this.connection.getRepository(ctx, order_entity_1.Order).save(order, { reload: false });
-        this.eventBus.publish(new order_state_transition_event_1.OrderStateTransitionEvent(fromState, state, ctx, order));
+        this.eventBus.publish(new index_3.OrderStateTransitionEvent(fromState, state, ctx, order));
         return order;
     }
     /**
@@ -652,7 +659,7 @@ let OrderService = class OrderService {
      */
     async transitionFulfillmentToState(ctx, fulfillmentId, state) {
         const result = await this.fulfillmentService.transitionToState(ctx, fulfillmentId, state);
-        if (error_result_1.isGraphQlErrorResult(result)) {
+        if ((0, error_result_1.isGraphQlErrorResult)(result)) {
             return result;
         }
         const { fulfillment, fromState, toState, orders } = result;
@@ -682,9 +689,9 @@ let OrderService = class OrderService {
         const result = await this.orderModifier.modifyOrder(ctx, input, order);
         if (input.dryRun) {
             await this.connection.rollBackTransaction(ctx);
-            return error_result_1.isGraphQlErrorResult(result) ? result : result.order;
+            return (0, error_result_1.isGraphQlErrorResult)(result) ? result : result.order;
         }
-        if (error_result_1.isGraphQlErrorResult(result)) {
+        if ((0, error_result_1.isGraphQlErrorResult)(result)) {
             await this.connection.rollBackTransaction(ctx);
             return result;
         }
@@ -704,7 +711,7 @@ let OrderService = class OrderService {
         const transitionOrderIfStateAvailable = (state) => nextOrderStates.includes(state) && this.transitionToState(ctx, order.id, state);
         if (toState === 'Shipped') {
             const orderWithFulfillment = await this.getOrderWithFulfillments(ctx, order.id);
-            if (order_utils_1.orderItemsAreShipped(orderWithFulfillment)) {
+            if ((0, order_utils_1.orderItemsAreShipped)(orderWithFulfillment)) {
                 await transitionOrderIfStateAvailable('Shipped');
             }
             else {
@@ -713,7 +720,7 @@ let OrderService = class OrderService {
         }
         if (toState === 'Delivered') {
             const orderWithFulfillment = await this.getOrderWithFulfillments(ctx, order.id);
-            if (order_utils_1.orderItemsAreDelivered(orderWithFulfillment)) {
+            if ((0, order_utils_1.orderItemsAreDelivered)(orderWithFulfillment)) {
                 await transitionOrderIfStateAvailable('Delivered');
             }
             else {
@@ -729,7 +736,7 @@ let OrderService = class OrderService {
      */
     async transitionPaymentToState(ctx, paymentId, state) {
         const result = await this.paymentService.transitionToState(ctx, paymentId, state);
-        if (error_result_1.isGraphQlErrorResult(result)) {
+        if ((0, error_result_1.isGraphQlErrorResult)(result)) {
             return result;
         }
         const order = await this.findOne(ctx, result.order.id);
@@ -750,28 +757,28 @@ let OrderService = class OrderService {
             return new generated_graphql_shop_errors_1.OrderPaymentStateError();
         }
         order.payments = await this.getOrderPayments(ctx, order.id);
-        const amountToPay = order.totalWithTax - order_utils_1.totalCoveredByPayments(order);
+        const amountToPay = order.totalWithTax - (0, order_utils_1.totalCoveredByPayments)(order);
         const payment = await this.paymentService.createPayment(ctx, order, amountToPay, input.method, input.metadata);
-        if (error_result_1.isGraphQlErrorResult(payment)) {
+        if ((0, error_result_1.isGraphQlErrorResult)(payment)) {
             return payment;
         }
         const existingPayments = await this.getOrderPayments(ctx, orderId);
         order.payments = [...existingPayments, payment];
         await this.connection.getRepository(ctx, order_entity_1.Order).save(order, { reload: false });
         if (payment.state === 'Error') {
-            return new generated_graphql_shop_errors_1.PaymentFailedError(payment.errorMessage || '');
+            return new generated_graphql_shop_errors_1.PaymentFailedError({ paymentErrorMessage: payment.errorMessage || '' });
         }
         if (payment.state === 'Declined') {
-            return new generated_graphql_shop_errors_1.PaymentDeclinedError(payment.errorMessage || '');
+            return new generated_graphql_shop_errors_1.PaymentDeclinedError({ paymentErrorMessage: payment.errorMessage || '' });
         }
         return this.transitionOrderIfTotalIsCovered(ctx, order);
     }
     async transitionOrderIfTotalIsCovered(ctx, order) {
         const orderId = order.id;
-        if (order_utils_1.orderTotalIsCovered(order, 'Settled') && order.state !== 'PaymentSettled') {
+        if ((0, order_utils_1.orderTotalIsCovered)(order, 'Settled') && order.state !== 'PaymentSettled') {
             return this.transitionToState(ctx, orderId, 'PaymentSettled');
         }
-        if (order_utils_1.orderTotalIsCovered(order, ['Authorized', 'Settled']) && order.state !== 'PaymentAuthorized') {
+        if ((0, order_utils_1.orderTotalIsCovered)(order, ['Authorized', 'Settled']) && order.state !== 'PaymentAuthorized') {
             return this.transitionToState(ctx, orderId, 'PaymentAuthorized');
         }
         return order;
@@ -792,11 +799,11 @@ let OrderService = class OrderService {
         }
         const existingPayments = await this.getOrderPayments(ctx, order.id);
         order.payments = existingPayments;
-        const amount = order.totalWithTax - order_utils_1.totalCoveredByPayments(order);
+        const amount = order.totalWithTax - (0, order_utils_1.totalCoveredByPayments)(order);
         const modifications = await this.getOrderModifications(ctx, order.id);
         const unsettledModifications = modifications.filter(m => !m.isSettled);
         if (0 < unsettledModifications.length) {
-            const outstandingModificationsTotal = shared_utils_1.summate(unsettledModifications, 'priceChange');
+            const outstandingModificationsTotal = (0, shared_utils_1.summate)(unsettledModifications, 'priceChange');
             if (outstandingModificationsTotal !== amount) {
                 throw new errors_1.InternalServerError(`The outstanding order amount (${amount}) should equal the unsettled OrderModifications total (${outstandingModificationsTotal})`);
             }
@@ -817,15 +824,15 @@ let OrderService = class OrderService {
      */
     async settlePayment(ctx, paymentId) {
         const payment = await this.paymentService.settlePayment(ctx, paymentId);
-        if (!error_result_1.isGraphQlErrorResult(payment)) {
+        if (!(0, error_result_1.isGraphQlErrorResult)(payment)) {
             if (payment.state !== 'Settled') {
-                return new generated_graphql_admin_errors_1.SettlePaymentError(payment.errorMessage || '');
+                return new generated_graphql_admin_errors_1.SettlePaymentError({ paymentErrorMessage: payment.errorMessage || '' });
             }
             const order = await this.findOne(ctx, payment.order.id);
             if (order) {
                 order.payments = await this.getOrderPayments(ctx, order.id);
                 const orderTransitionResult = await this.transitionOrderIfTotalIsCovered(ctx, order);
-                if (error_result_1.isGraphQlErrorResult(orderTransitionResult)) {
+                if ((0, error_result_1.isGraphQlErrorResult)(orderTransitionResult)) {
                     return orderTransitionResult;
                 }
             }
@@ -837,7 +844,7 @@ let OrderService = class OrderService {
      * Creates a new Fulfillment associated with the given Order and OrderItems.
      */
     async createFulfillment(ctx, input) {
-        if (!input.lines || input.lines.length === 0 || shared_utils_1.summate(input.lines, 'quantity') === 0) {
+        if (!input.lines || input.lines.length === 0 || (0, shared_utils_1.summate)(input.lines, 'quantity') === 0) {
             return new generated_graphql_admin_errors_1.EmptyOrderLineSelectionError();
         }
         const ordersAndItems = await this.getOrdersAndItemsFromLines(ctx, input.lines, i => !i.fulfillment && !i.cancelled);
@@ -845,11 +852,11 @@ let OrderService = class OrderService {
             return new generated_graphql_admin_errors_1.ItemsAlreadyFulfilledError();
         }
         const stockCheckResult = await this.ensureSufficientStockForFulfillment(ctx, input);
-        if (error_result_1.isGraphQlErrorResult(stockCheckResult)) {
+        if ((0, error_result_1.isGraphQlErrorResult)(stockCheckResult)) {
             return stockCheckResult;
         }
         const fulfillment = await this.fulfillmentService.create(ctx, ordersAndItems.orders, ordersAndItems.items, input.handler);
-        if (error_result_1.isGraphQlErrorResult(fulfillment)) {
+        if ((0, error_result_1.isGraphQlErrorResult)(fulfillment)) {
             return fulfillment;
         }
         await this.stockMovementService.createSalesForOrder(ctx, ordersAndItems.items);
@@ -864,7 +871,7 @@ let OrderService = class OrderService {
             });
         }
         const result = await this.fulfillmentService.transitionToState(ctx, fulfillment.id, 'Pending');
-        if (error_result_1.isGraphQlErrorResult(result)) {
+        if ((0, error_result_1.isGraphQlErrorResult)(result)) {
             return result;
         }
         return result.fulfillment;
@@ -873,11 +880,15 @@ let OrderService = class OrderService {
         const lines = await this.connection.getRepository(ctx, order_line_entity_1.OrderLine).findByIds(input.lines.map(l => l.orderLineId), { relations: ['productVariant'] });
         for (const line of lines) {
             // tslint:disable-next-line:no-non-null-assertion
-            const lineInput = input.lines.find(l => utils_1.idsAreEqual(l.orderLineId, line.id));
+            const lineInput = input.lines.find(l => (0, utils_1.idsAreEqual)(l.orderLineId, line.id));
             const fulfillableStockLevel = await this.productVariantService.getFulfillableStockLevel(ctx, line.productVariant);
             if (fulfillableStockLevel < lineInput.quantity) {
-                const productVariant = translate_entity_1.translateDeep(line.productVariant, ctx.languageCode);
-                return new generated_graphql_admin_errors_1.InsufficientStockOnHandError(productVariant.id, productVariant.name, productVariant.stockOnHand);
+                const productVariant = (0, translate_entity_1.translateDeep)(line.productVariant, ctx.languageCode);
+                return new generated_graphql_admin_errors_1.InsufficientStockOnHandError({
+                    productVariantId: productVariant.id,
+                    productVariantName: productVariant.name,
+                    stockOnHand: productVariant.stockOnHand,
+                });
             }
         }
     }
@@ -901,7 +912,7 @@ let OrderService = class OrderService {
         }
         const items = lines.reduce((acc, l) => [...acc, ...l.items], []);
         const fulfillments = items.reduce((acc, i) => [...acc, ...(i.fulfillments || [])], []);
-        return unique_1.unique(fulfillments, 'id');
+        return (0, unique_1.unique)(fulfillments, 'id');
     }
     /**
      * @description
@@ -924,7 +935,7 @@ let OrderService = class OrderService {
         const cancelResult = input.lines != null
             ? await this.cancelOrderByOrderLines(ctx, input, input.lines)
             : await this.cancelOrderById(ctx, input);
-        if (error_result_1.isGraphQlErrorResult(cancelResult)) {
+        if ((0, error_result_1.isGraphQlErrorResult)(cancelResult)) {
             return cancelResult;
         }
         else {
@@ -932,11 +943,11 @@ let OrderService = class OrderService {
         }
         if (allOrderItemsCancelled) {
             const transitionResult = await this.transitionToState(ctx, input.orderId, 'Cancelled');
-            if (error_result_1.isGraphQlErrorResult(transitionResult)) {
+            if ((0, error_result_1.isGraphQlErrorResult)(transitionResult)) {
                 return transitionResult;
             }
         }
-        return utils_1.assertFound(this.findOne(ctx, input.orderId));
+        return (0, utils_1.assertFound)(this.findOne(ctx, input.orderId));
     }
     async cancelOrderById(ctx, input) {
         const order = await this.getOrderOrThrow(ctx, input.orderId);
@@ -952,7 +963,7 @@ let OrderService = class OrderService {
         }
     }
     async cancelOrderByOrderLines(ctx, input, lines) {
-        if (lines.length === 0 || shared_utils_1.summate(lines, 'quantity') === 0) {
+        if (lines.length === 0 || (0, shared_utils_1.summate)(lines, 'quantity') === 0) {
             return new generated_graphql_admin_errors_1.EmptyOrderLineSelectionError();
         }
         const ordersAndItems = await this.getOrdersAndItemsFromLines(ctx, lines, i => !i.cancelled);
@@ -964,11 +975,11 @@ let OrderService = class OrderService {
         }
         const { orders, items } = ordersAndItems;
         const order = orders[0];
-        if (!utils_1.idsAreEqual(order.id, input.orderId)) {
+        if (!(0, utils_1.idsAreEqual)(order.id, input.orderId)) {
             return new generated_graphql_admin_errors_1.MultipleOrderError();
         }
         if (order.active) {
-            return new generated_graphql_admin_errors_1.CancelActiveOrderError(order.state);
+            return new generated_graphql_admin_errors_1.CancelActiveOrderError({ orderState: order.state });
         }
         const fullOrder = await this.findOne(ctx, order.id);
         const soldItems = items.filter(i => !!i.fulfillment);
@@ -978,8 +989,22 @@ let OrderService = class OrderService {
         items.forEach(i => (i.cancelled = true));
         await this.connection.getRepository(ctx, order_item_entity_1.OrderItem).save(items, { reload: false });
         const orderWithItems = await this.connection.getEntityOrThrow(ctx, order_entity_1.Order, order.id, {
-            relations: ['lines', 'lines.items'],
+            relations: ['lines', 'lines.items', 'surcharges', 'shippingLines'],
         });
+        if (input.cancelShipping === true) {
+            for (const shippingLine of orderWithItems.shippingLines) {
+                shippingLine.adjustments.push({
+                    adjustmentSource: 'CANCEL_ORDER',
+                    type: generated_types_1.AdjustmentType.OTHER,
+                    description: 'shipping cancellation',
+                    amount: -shippingLine.discountedPriceWithTax,
+                });
+                this.connection.getRepository(ctx, shipping_line_entity_1.ShippingLine).save(shippingLine, { reload: false });
+            }
+        }
+        // Update totals after cancellation
+        this.orderCalculator.calculateOrderTotals(orderWithItems);
+        await this.connection.getRepository(ctx, order_entity_1.Order).save(orderWithItems, { reload: false });
         await this.historyService.createHistoryEntryForOrder({
             ctx,
             orderId: order.id,
@@ -987,9 +1012,10 @@ let OrderService = class OrderService {
             data: {
                 orderItemIds: items.map(i => i.id),
                 reason: input.reason || undefined,
+                shippingCancelled: !!input.cancelShipping,
             },
         });
-        return order_utils_1.orderItemsAreAllCancelled(orderWithItems);
+        return (0, order_utils_1.orderItemsAreAllCancelled)(orderWithItems);
     }
     /**
      * @description
@@ -997,7 +1023,7 @@ let OrderService = class OrderService {
      * {@link PaymentMethodHandler}.
      */
     async refundOrder(ctx, input) {
-        if ((!input.lines || input.lines.length === 0 || shared_utils_1.summate(input.lines, 'quantity') === 0) &&
+        if ((!input.lines || input.lines.length === 0 || (0, shared_utils_1.summate)(input.lines, 'quantity') === 0) &&
             input.shipping === 0) {
             return new generated_graphql_admin_errors_1.NothingToRefundError();
         }
@@ -1012,18 +1038,18 @@ let OrderService = class OrderService {
         const payment = await this.connection.getEntityOrThrow(ctx, payment_entity_1.Payment, input.paymentId, {
             relations: ['order'],
         });
-        if (orders && orders.length && !utils_1.idsAreEqual(payment.order.id, orders[0].id)) {
+        if (orders && orders.length && !(0, utils_1.idsAreEqual)(payment.order.id, orders[0].id)) {
             return new generated_graphql_admin_errors_1.PaymentOrderMismatchError();
         }
         const order = payment.order;
         if (order.state === 'AddingItems' ||
             order.state === 'ArrangingPayment' ||
             order.state === 'PaymentAuthorized') {
-            return new generated_graphql_admin_errors_1.RefundOrderStateError(order.state);
+            return new generated_graphql_admin_errors_1.RefundOrderStateError({ orderState: order.state });
         }
         const alreadyRefunded = items.find(i => { var _a, _b; return ((_a = i.refund) === null || _a === void 0 ? void 0 : _a.state) === 'Pending' || ((_b = i.refund) === null || _b === void 0 ? void 0 : _b.state) === 'Settled'; });
         if (alreadyRefunded) {
-            return new generated_graphql_admin_errors_1.AlreadyRefundedError(alreadyRefunded.refundId);
+            return new generated_graphql_admin_errors_1.AlreadyRefundedError({ refundId: alreadyRefunded.refundId });
         }
         return await this.paymentService.createRefund(ctx, input, order, items, payment);
     }
@@ -1040,7 +1066,7 @@ let OrderService = class OrderService {
         const toState = 'Settled';
         await this.refundStateMachine.transition(ctx, refund.payment.order, refund, toState);
         await this.connection.getRepository(ctx, refund_entity_1.Refund).save(refund);
-        this.eventBus.publish(new refund_state_transition_event_1.RefundStateTransitionEvent(fromState, toState, ctx, refund, refund.payment.order));
+        this.eventBus.publish(new index_4.RefundStateTransitionEvent(fromState, toState, ctx, refund, refund.payment.order));
         return refund;
     }
     /**
@@ -1057,7 +1083,7 @@ let OrderService = class OrderService {
             let codesRemoved = false;
             for (const couponCode of order.couponCodes.slice()) {
                 const validationResult = await this.promotionService.validateCouponCode(ctx, couponCode, customer.id);
-                if (error_result_1.isGraphQlErrorResult(validationResult)) {
+                if ((0, error_result_1.isGraphQlErrorResult)(validationResult)) {
                     order.couponCodes = order.couponCodes.filter(c => c !== couponCode);
                     codesRemoved = true;
                 }
@@ -1135,7 +1161,7 @@ let OrderService = class OrderService {
             const orderId = order.id;
             for (const line of linesToInsert) {
                 const result = await this.addItemToOrder(ctx, orderId, line.productVariantId, line.quantity, line.customFields);
-                if (!error_result_1.isGraphQlErrorResult(result)) {
+                if (!(0, error_result_1.isGraphQlErrorResult)(result)) {
                     order = result;
                 }
             }
@@ -1144,7 +1170,7 @@ let OrderService = class OrderService {
             const orderId = order.id;
             for (const line of linesToModify) {
                 const result = await this.adjustOrderLine(ctx, orderId, line.orderLineId, line.quantity, line.customFields);
-                if (!error_result_1.isGraphQlErrorResult(result)) {
+                if (!(0, error_result_1.isGraphQlErrorResult)(result)) {
                     order = result;
                 }
             }
@@ -1153,7 +1179,7 @@ let OrderService = class OrderService {
             const orderId = order.id;
             for (const line of linesToDelete) {
                 const result = await this.removeItemFromOrder(ctx, orderId, line.orderLineId);
-                if (!error_result_1.isGraphQlErrorResult(result)) {
+                if (!(0, error_result_1.isGraphQlErrorResult)(result)) {
                     order = result;
                 }
             }
@@ -1173,7 +1199,7 @@ let OrderService = class OrderService {
         return order;
     }
     getOrderLineOrThrow(order, orderLineId) {
-        const orderLine = order.lines.find(line => utils_1.idsAreEqual(line.id, orderLineId));
+        const orderLine = order.lines.find(line => (0, utils_1.idsAreEqual)(line.id, orderLineId));
         if (!orderLine) {
             throw new errors_1.UserInputError(`error.order-does-not-contain-line-with-id`, { id: orderLineId });
         }
@@ -1200,10 +1226,10 @@ let OrderService = class OrderService {
      * maximum limit specified in the config.
      */
     assertNotOverOrderItemsLimit(order, quantityToAdd) {
-        const currentItemsCount = shared_utils_1.summate(order.lines, 'quantity');
+        const currentItemsCount = (0, shared_utils_1.summate)(order.lines, 'quantity');
         const { orderItemsLimit } = this.configService.orderOptions;
         if (orderItemsLimit < currentItemsCount + quantityToAdd) {
-            return new generated_graphql_shop_errors_1.OrderLimitError(orderItemsLimit);
+            return new generated_graphql_shop_errors_1.OrderLimitError({ maxItems: orderItemsLimit });
         }
     }
     /**
@@ -1214,7 +1240,7 @@ let OrderService = class OrderService {
         const currentQuantity = (orderLine === null || orderLine === void 0 ? void 0 : orderLine.quantity) || 0;
         const { orderLineItemsLimit } = this.configService.orderOptions;
         if (orderLineItemsLimit < currentQuantity + quantityToAdd) {
-            return new generated_graphql_shop_errors_1.OrderLimitError(orderLineItemsLimit);
+            return new generated_graphql_shop_errors_1.OrderLimitError({ maxItems: orderLineItemsLimit });
         }
     }
     /**
@@ -1281,7 +1307,7 @@ let OrderService = class OrderService {
             order: { id: 'ASC' },
         });
         for (const line of lines) {
-            const inputLine = orderLinesInput.find(l => utils_1.idsAreEqual(l.orderLineId, line.id));
+            const inputLine = orderLinesInput.find(l => (0, utils_1.idsAreEqual)(l.orderLineId, line.id));
             if (!inputLine) {
                 continue;
             }
@@ -1339,7 +1365,7 @@ let OrderService = class OrderService {
     }
 };
 OrderService = __decorate([
-    common_1.Injectable(),
+    (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
         config_service_1.ConfigService,
         product_variant_service_1.ProductVariantService,