@unchainedshop/core-orders 4.0.0-rc.9 → 4.0.1

package/lib/module/configureOrderPositionsModule.js

@@ -24,7 +24,7 @@ export const configureOrderPositionsModule = ({ OrderPositions, }) => {
             await emit('ORDER_REMOVE_CART_ITEM', {
                 orderPosition,
             });
-            return { ...orderPosition, calculation: [] };
+            return orderPosition;
         },
         removePositions: async ({ orderId }) => {
             const result = await OrderPositions.deleteMany({ orderId });
@@ -48,6 +48,8 @@ export const configureOrderPositionsModule = ({ OrderPositions, }) => {
             }, modifier, {
                 returnDocument: 'after',
             });
+            if (!updatedOrderPosition)
+                return null;
             await emit('ORDER_UPDATE_CART_ITEM', {
                 orderPosition: updatedOrderPosition,
             });
@@ -105,10 +107,10 @@ export const configureOrderPositionsModule = ({ OrderPositions, }) => {
                 orderId,
                 productId,
                 originalProductId,
-                configuration: configuration || { $in: [null, undefined] },
+                configuration: configuration ?? null,
                 ...scope,
             };
-            await OrderPositions.updateOne(selector, {
+            const upsertedOrderPosition = (await OrderPositions.findOneAndUpdate(selector, {
                 $set: {
                     updated: new Date(),
                 },
@@ -124,8 +126,7 @@ export const configureOrderPositionsModule = ({ OrderPositions, }) => {
                     configuration,
                     ...scope,
                 },
-            }, { upsert: true });
-            const upsertedOrderPosition = await OrderPositions.findOne(selector);
+            }, { upsert: true, returnDocument: 'after' }));
             await emit('ORDER_ADD_PRODUCT', { orderPosition: upsertedOrderPosition });
             return upsertedOrderPosition;
         },
@@ -133,6 +134,25 @@ export const configureOrderPositionsModule = ({ OrderPositions, }) => {
             const { deletedCount } = await OrderPositions.deleteMany({ orderId });
             return deletedCount;
         },
+        aggregatePositions: async ({ match, project, group, addFields, sort, limit, pipeline, }) => {
+            const stages = [];
+            if (pipeline?.length) {
+                return await OrderPositions.aggregate(pipeline).toArray();
+            }
+            if (match)
+                stages.push({ $match: match });
+            if (project)
+                stages.push({ $project: project });
+            if (group)
+                stages.push({ $group: group });
+            if (addFields)
+                stages.push({ $addFields: addFields });
+            if (sort)
+                stages.push({ $sort: sort });
+            if (typeof limit === 'number')
+                stages.push({ $limit: limit });
+            return OrderPositions.aggregate(stages).toArray();
+        },
     };
 };
 //# sourceMappingURL=configureOrderPositionsModule.js.map

package/lib/module/configureOrderPositionsModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureOrderPositionsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderPositionsModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configureOrderPositionsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderPositionsModule.ts"],"names":[],"mappings":"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"}

package/lib/module/configureOrdersModule-mutations.d.ts

@@ -1,8 +1,11 @@
 import { Address, Contact, mongodb } from '@unchainedshop/mongodb';
 import { Order } from '../db/OrdersCollection.js';
 import { OrderPosition } from '../db/OrderPositionsCollection.js';
-export interface OrderMutations {
-    create: (doc: {
+export declare const configureOrderModuleMutations: ({ Orders, OrderPositions, }: {
+    Orders: mongodb.Collection<Order>;
+    OrderPositions: mongodb.Collection<OrderPosition>;
+}) => {
+    create: ({ userId, orderNumber, currencyCode, countryCode, billingAddress, contact, context, }: {
         userId: string;
         billingAddress?: Address;
         contact?: Contact;
@@ -10,23 +13,21 @@ export interface OrderMutations {
         currencyCode: string;
         orderNumber?: string;
         originEnrollmentId?: string;
+        context?: Record<string, any>;
     }) => Promise<Order>;
     delete: (orderId: string) => Promise<number>;
-    setCartOwner: (params: {
+    setCartOwner: ({ orderId, userId }: {
         orderId: string;
         userId: string;
     }) => Promise<void>;
-    moveCartPositions: (params: {
+    moveCartPositions: ({ fromOrderId, toOrderId, }: {
         fromOrderId: string;
         toOrderId: string;
     }) => Promise<void>;
-    updateBillingAddress: (orderId: string, billingAddress: Address) => Promise<Order>;
-    updateContact: (orderId: string, contact: Contact) => Promise<Order>;
-    updateContext: (orderId: string, context: any) => Promise<Order>;
-    updateCalculationSheet: (orderId: string, calculation: any) => Promise<Order>;
-}
-export declare const configureOrderModuleMutations: ({ Orders, OrderPositions, }: {
-    Orders: mongodb.Collection<Order>;
-    OrderPositions: mongodb.Collection<OrderPosition>;
-}) => OrderMutations;
+    updateBillingAddress: (orderId: string, billingAddress: Address) => Promise<mongodb.WithId<Order> | null>;
+    updateContact: (orderId: string, contact: Contact) => Promise<mongodb.WithId<Order> | null>;
+    updateCalculationSheet: (orderId: string, calculation: any) => Promise<mongodb.WithId<Order> | null>;
+    updateContext: (orderId: string, context: any) => Promise<mongodb.WithId<Order> | null>;
+};
+export type OrderMutations = ReturnType<typeof configureOrderModuleMutations>;
 //# sourceMappingURL=configureOrdersModule-mutations.d.ts.map

package/lib/module/configureOrdersModule-mutations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configureOrdersModule-mutations.d.ts","sourceRoot":"","sources":["../../src/module/configureOrdersModule-mutations.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,OAAO,EAGP,OAAO,EACR,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,KAAK,EAAe,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,CAAC,GAAG,EAAE;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;KAC7B,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;IAErB,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAE7C,YAAY,EAAE,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7E,iBAAiB,EAAE,CAAC,MAAM,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAEzF,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;IACnF,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;IACrE,aAAa,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;IACjE,sBAAsB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,KAAA,KAAK,OAAO,CAAC,KAAK,CAAC,CAAC;CAC1E;AAUD,eAAO,MAAM,6BAA6B,GAAI,6BAG3C;IACD,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAClC,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;CACnD,KAAG,cAgIH,CAAC"}
+{"version":3,"file":"configureOrdersModule-mutations.d.ts","sourceRoot":"","sources":["../../src/module/configureOrdersModule-mutations.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EACP,OAAO,EAGP,OAAO,EACR,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,KAAK,EAAe,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAUlE,eAAO,MAAM,6BAA6B,GAAI,6BAG3C;IACD,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAClC,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;CACnD;oGAYM;QACD,MAAM,EAAE,MAAM,CAAC;QACf,cAAc,CAAC,EAAE,OAAO,CAAC;QACzB,OAAO,CAAC,EAAE,OAAO,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,kBAAkB,CAAC,EAAE,MAAM,CAAC;QAC5B,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KAC/B;sBAsBuB,MAAM;wCAOY;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;qDAW1E;QACD,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,MAAM,CAAC;KACnB;oCAWqC,MAAM,kBAAkB,OAAO;6BAiBtC,MAAM,WAAW,OAAO;sCAiBf,MAAM,eAAe,GAAG;6BAiBjC,MAAM,WAAW,GAAG;CAwBtD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,UAAU,CAAC,OAAO,6BAA6B,CAAC,CAAC"}

package/lib/module/configureOrdersModule-mutations.js

@@ -11,7 +11,7 @@ const ORDER_EVENTS = [
 export const configureOrderModuleMutations = ({ Orders, OrderPositions, }) => {
     registerEvents(ORDER_EVENTS);
     return {
-        create: async ({ userId, orderNumber, currencyCode, countryCode, billingAddress, contact }) => {
+        create: async ({ userId, orderNumber, currencyCode, countryCode, billingAddress, contact, context, }) => {
             const { insertedId: orderId } = await Orders.insertOne({
                 _id: generateDbObjectId(),
                 created: new Date(),
@@ -24,13 +24,16 @@ export const configureOrderModuleMutations = ({ Orders, OrderPositions, }) => {
                 calculation: [],
                 log: [],
                 orderNumber,
+                context: context || {},
             });
-            const order = await Orders.findOne(generateDbFilterById(orderId), {});
+            const order = (await Orders.findOne(generateDbFilterById(orderId), {}));
             await emit('ORDER_CREATE', { order });
             return order;
         },
         delete: async (orderId) => {
             const { deletedCount } = await Orders.deleteOne({ _id: orderId });
+            if (!deletedCount)
+                return 0;
             await emit('ORDER_REMOVE', { orderId });
             return deletedCount;
         },
@@ -41,7 +44,7 @@ export const configureOrderModuleMutations = ({ Orders, OrderPositions, }) => {
                 },
             });
         },
-        moveCartPositions: async ({ fromOrderId, toOrderId }) => {
+        moveCartPositions: async ({ fromOrderId, toOrderId, }) => {
             await OrderPositions.updateMany({ orderId: fromOrderId }, {
                 $set: {
                     orderId: toOrderId,
@@ -56,7 +59,9 @@ export const configureOrderModuleMutations = ({ Orders, OrderPositions, }) => {
                     updated: new Date(),
                 },
             }, { returnDocument: 'after' });
-            await emit('ORDER_UPDATE', { order, field: 'billing' });
+            if (!order)
+                return null;
+            await emit('ORDER_UPDATE', { order, field: 'billingAddress' });
             return order;
         },
         updateContact: async (orderId, contact) => {
@@ -67,6 +72,8 @@ export const configureOrderModuleMutations = ({ Orders, OrderPositions, }) => {
                     updated: new Date(),
                 },
             }, { returnDocument: 'after' });
+            if (!order)
+                return null;
             await emit('ORDER_UPDATE', { order, field: 'contact' });
             return order;
         },
@@ -78,6 +85,8 @@ export const configureOrderModuleMutations = ({ Orders, OrderPositions, }) => {
                     updated: new Date(),
                 },
             }, { returnDocument: 'after' });
+            if (!order)
+                return null;
             await emit('ORDER_UPDATE', { order, field: 'calculation' });
             return order;
         },
@@ -87,17 +96,16 @@ export const configureOrderModuleMutations = ({ Orders, OrderPositions, }) => {
             if (!context || Object.keys(context).length === 0)
                 return Orders.findOne(selector, {});
             const contextSetters = Object.fromEntries(Object.entries(context).map(([key, value]) => [`context.${key}`, value]));
-            const result = await Orders.findOneAndUpdate(selector, {
+            const order = await Orders.findOneAndUpdate(selector, {
                 $set: {
                     ...contextSetters,
                     updated: new Date(),
                 },
-            }, { includeResultMetadata: true, returnDocument: 'after' });
-            if (result.ok) {
-                await emit('ORDER_UPDATE', { order: result.value, field: 'context' });
-                return result.value;
-            }
-            return null;
+            }, { returnDocument: 'after' });
+            if (!order)
+                return null;
+            await emit('ORDER_UPDATE', { order, field: 'context' });
+            return order;
         },
     };
 };

package/lib/module/configureOrdersModule-mutations.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureOrdersModule-mutations.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule-mutations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configureOrdersModule-mutations.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule-mutations.ts"],"names":[],"mappings":"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"}

package/lib/module/configureOrdersModule-processing.d.ts

@@ -0,0 +1,14 @@
+import { mongodb } from '@unchainedshop/mongodb';
+import { Order, OrderProcessing } from '@unchainedshop/types/orders.js';
+import type { Locker } from '@kontsedal/locco';
+import { OrderDelivery } from '@unchainedshop/types/orders.deliveries.js';
+import { OrderPayment } from '@unchainedshop/types/orders.payments.js';
+import { OrderPosition } from '@unchainedshop/types/orders.positions.js';
+export declare const configureOrderModuleProcessing: ({ Orders, OrderPositions, OrderDeliveries, OrderPayments, locker, }: {
+    Orders: mongodb.Collection<Order>;
+    OrderPositions: mongodb.Collection<OrderPosition>;
+    OrderDeliveries: mongodb.Collection<OrderDelivery>;
+    OrderPayments: mongodb.Collection<OrderPayment>;
+    locker: Locker;
+}) => OrderProcessing;
+//# sourceMappingURL=configureOrdersModule-processing.d.ts.map

package/lib/module/configureOrdersModule-processing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"configureOrdersModule-processing.d.ts","sourceRoot":"","sources":["../../src/module/configureOrdersModule-processing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAwB,MAAM,wBAAwB,CAAC;AACvE,OAAO,EAAE,KAAK,EAAe,eAAe,EAAgB,MAAM,gCAAgC,CAAC;AACnG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,yCAAyC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAczE,eAAO,MAAM,8BAA8B,wEAMxC;IACD,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAClC,cAAc,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IAClD,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACnD,aAAa,EAAE,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,KAAG,eA6cH,CAAC"}

package/lib/module/configureOrdersModule-processing.js

@@ -0,0 +1,348 @@
+import { generateDbFilterById } from '@unchainedshop/mongodb';
+import { OrderStatus } from '@unchainedshop/types/orders.js';
+import { emit, registerEvents } from '@unchainedshop/events';
+import { log } from '@unchainedshop/logger';
+import { ProductType } from '@unchainedshop/types/products.js';
+import { ordersSettings } from '../orders-settings.js';
+const ORDER_PROCESSING_EVENTS = [
+    'ORDER_CHECKOUT',
+    'ORDER_CONFIRMED',
+    'ORDER_REJECTED',
+    'ORDER_FULLFILLED',
+];
+export const configureOrderModuleProcessing = ({ Orders, OrderPositions, OrderDeliveries, OrderPayments, locker, }) => {
+    registerEvents(ORDER_PROCESSING_EVENTS);
+    const findNewOrderNumber = async (order, index = 0) => {
+        const newHashID = ordersSettings.orderNumberHashFn(order, index);
+        if ((await Orders.countDocuments({ orderNumber: newHashID }, { limit: 1 })) === 0) {
+            return newHashID;
+        }
+        return findNewOrderNumber(order, index + 1);
+    };
+    const updateStatus = async (orderId, { status, info }) => {
+        const selector = generateDbFilterById(orderId);
+        const order = await Orders.findOne(selector, {});
+        if (order.status === status)
+            return order;
+        const date = new Date();
+        const $set = {
+            status,
+            updated: new Date(),
+        };
+        switch (status) {
+            // explicitly use fallthrough here!
+            case OrderStatus.FULLFILLED:
+                $set.fullfilled = order.fullfilled || date;
+            case OrderStatus.REJECTED: // eslint-disable-line no-fallthrough
+            case OrderStatus.CONFIRMED: // eslint-disable-line no-fallthrough
+                if (status === OrderStatus.REJECTED) {
+                    $set.rejected = order.rejected || date;
+                }
+                else {
+                    $set.confirmed = order.confirmed || date;
+                }
+            case OrderStatus.PENDING: // eslint-disable-line no-fallthrough
+                $set.ordered = order.ordered || date;
+                $set.orderNumber = order.orderNumber || (await findNewOrderNumber(order));
+                break;
+            default:
+                break;
+        }
+        const modifier = {
+            $set,
+            $push: {
+                log: {
+                    date,
+                    status,
+                    info,
+                },
+            },
+        };
+        const modificationResult = await Orders.findOneAndUpdate({
+            ...selector,
+            status: { $ne: status }, // Only update if status is different
+        }, modifier, {
+            returnDocument: 'after',
+            includeResultMetadata: true,
+        });
+        if (modificationResult.ok) {
+            log(`New Status: ${status}`, { orderId });
+            if (order.status === null) {
+                // The first time that an order transitions away from cart is a checkout event
+                await emit('ORDER_CHECKOUT', { order: modificationResult.value, oldStatus: order.status });
+            }
+            switch (status) {
+                case OrderStatus.FULLFILLED:
+                    await emit('ORDER_FULLFILLED', { order: modificationResult.value, oldStatus: order.status });
+                    break;
+                case OrderStatus.REJECTED:
+                    await emit('ORDER_REJECTED', { order: modificationResult.value, oldStatus: order.status });
+                    break;
+                case OrderStatus.CONFIRMED:
+                    await emit('ORDER_CONFIRMED', { order: modificationResult.value, oldStatus: order.status });
+                    break;
+                default:
+                    break;
+            }
+        }
+        return modificationResult.value || Orders.findOne(selector, {});
+    };
+    const findOrderPositions = async (order) => OrderPositions.find({
+        orderId: order._id,
+        quantity: { $gt: 0 },
+    }).toArray();
+    const findOrderDelivery = async (order) => OrderDeliveries.findOne(generateDbFilterById(order.deliveryId), {});
+    const findOrderPayment = async (order) => OrderPayments.findOne(generateDbFilterById(order.paymentId), {});
+    const missingInputDataForCheckout = async (order) => {
+        const errors = [];
+        if (!order.contact)
+            errors.push(new Error('Contact data not provided'));
+        if (!order.billingAddress)
+            errors.push(new Error('Billing address not provided'));
+        if (!(await findOrderDelivery(order)))
+            errors.push('No delivery provider selected');
+        if (!(await findOrderPayment(order)))
+            errors.push('No payment provider selected');
+        return errors;
+    };
+    const itemValidationErrors = async (order, unchainedAPI) => {
+        // Check if items are valid
+        const orderPositions = await findOrderPositions(order);
+        if (orderPositions.length === 0) {
+            const NoItemsError = new Error('No items to checkout');
+            NoItemsError.name = 'NoItemsError';
+            return [NoItemsError];
+        }
+        const validationErrors = await Promise.all(orderPositions.map(async (orderPosition) => {
+            const errors = [];
+            log(`OrderPosition ${orderPosition._id} -> Validate ${orderPosition.quantity}`, {
+                orderId: orderPosition.orderId,
+            });
+            const product = await unchainedAPI.modules.products.findProduct({
+                productId: orderPosition.productId,
+            });
+            try {
+                await ordersSettings.validateOrderPosition({
+                    order,
+                    product,
+                    configuration: orderPosition.configuration,
+                    quantityDiff: 0,
+                }, unchainedAPI);
+            }
+            catch (e) {
+                errors.push(e);
+            }
+            const quotation = orderPosition.quotationId &&
+                (await unchainedAPI.modules.quotations.findQuotation({
+                    quotationId: orderPosition.quotationId,
+                }));
+            if (quotation && !unchainedAPI.modules.quotations.isProposalValid(quotation)) {
+                errors.push(new Error('Quotation expired or fullfiled, please request a new offer'));
+            }
+            return errors;
+        }));
+        return validationErrors.flatMap((f) => f);
+    };
+    const isAutoConfirmationEnabled = async (order, unchainedAPI) => {
+        const { modules } = unchainedAPI;
+        if (order.status === OrderStatus.FULLFILLED || order.status === OrderStatus.CONFIRMED) {
+            return false;
+        }
+        const orderPayment = await findOrderPayment(order);
+        let isBlockingOrderConfirmation = orderPayment &&
+            (await modules.orders.payments.isBlockingOrderConfirmation(orderPayment, unchainedAPI));
+        if (isBlockingOrderConfirmation)
+            return false;
+        const orderDelivery = await findOrderDelivery(order);
+        isBlockingOrderConfirmation =
+            orderDelivery &&
+                (await modules.orders.deliveries.isBlockingOrderConfirmation(orderDelivery, unchainedAPI));
+        if (isBlockingOrderConfirmation)
+            return false;
+        return true;
+    };
+    const isAutoFullfillmentEnabled = async (order, unchainedAPI) => {
+        const { modules } = unchainedAPI;
+        const orderPayment = await findOrderPayment(order);
+        let isBlockingOrderFullfillment = orderPayment && modules.orders.payments.isBlockingOrderFullfillment(orderPayment);
+        if (isBlockingOrderFullfillment)
+            return false;
+        const orderDelivery = await findOrderDelivery(order);
+        isBlockingOrderFullfillment =
+            orderDelivery && modules.orders.deliveries.isBlockingOrderFullfillment(orderDelivery);
+        if (isBlockingOrderFullfillment)
+            return false;
+        if (order.status === OrderStatus.FULLFILLED) {
+            return false;
+        }
+        return true;
+    };
+    const findNextStatus = async (status, order, unchainedAPI) => {
+        if (status === null) {
+            return OrderStatus.PENDING;
+        }
+        if (status === OrderStatus.PENDING) {
+            if (await isAutoConfirmationEnabled(order, unchainedAPI)) {
+                return OrderStatus.CONFIRMED;
+            }
+        }
+        if (status === OrderStatus.CONFIRMED) {
+            if (await isAutoFullfillmentEnabled(order, unchainedAPI)) {
+                return OrderStatus.FULLFILLED;
+            }
+        }
+        return status;
+    };
+    return {
+        checkout: async (orderId, transactionContext, unchainedAPI) => {
+            const { modules, services } = unchainedAPI;
+            const order = await Orders.findOne(generateDbFilterById(orderId), {});
+            if (order.status !== null)
+                return order;
+            const errors = [
+                ...(await missingInputDataForCheckout(order)),
+                ...(await itemValidationErrors(order, unchainedAPI)),
+            ].filter(Boolean);
+            if (errors.length > 0) {
+                throw new Error(errors[0]);
+            }
+            const lock = await locker.lock(`order:checkout:${order._id}`, 5000).acquire();
+            try {
+                const processedOrder = await modules.orders.processOrder(order, transactionContext, unchainedAPI);
+                // After checkout, store last checkout information on user
+                await modules.users.updateLastBillingAddress(processedOrder.userId, processedOrder.billingAddress);
+                await modules.users.updateLastContact(processedOrder.userId, processedOrder.contact);
+                // Then eventually build next cart
+                const user = await modules.users.findUserById(processedOrder.userId);
+                const locale = modules.users.userLocale(user);
+                await services.orders.nextUserCart({
+                    user,
+                    countryCode: locale.country,
+                }, unchainedAPI);
+                return processedOrder;
+            }
+            finally {
+                await lock.release();
+            }
+        },
+        confirm: async (order, transactionContext, unchainedAPI) => {
+            const { modules } = unchainedAPI;
+            if (order.status !== OrderStatus.PENDING)
+                return order;
+            const lock = await locker.lock(`order:confirm-reject:${order._id}`, 1500).acquire();
+            try {
+                return await modules.orders.processOrder(order, {
+                    ...transactionContext,
+                    nextStatus: OrderStatus.CONFIRMED,
+                }, unchainedAPI);
+            }
+            finally {
+                await lock.release();
+            }
+        },
+        reject: async (order, transactionContext, unchainedAPI) => {
+            const { modules } = unchainedAPI;
+            if (order.status !== OrderStatus.PENDING)
+                return order;
+            const lock = await locker.lock(`order:confirm-reject:${order._id}`, 1500).acquire();
+            try {
+                return await modules.orders.processOrder(order, {
+                    ...transactionContext,
+                    nextStatus: OrderStatus.REJECTED,
+                }, unchainedAPI);
+            }
+            finally {
+                await lock.release();
+            }
+        },
+        processOrder: async (initialOrder, orderTransactionContext, unchainedAPI) => {
+            const { modules } = unchainedAPI;
+            const { paymentContext, deliveryContext, nextStatus: forceNextStatus, comment, } = orderTransactionContext;
+            const orderId = initialOrder._id;
+            let order = initialOrder;
+            let nextStatus = forceNextStatus || (await findNextStatus(initialOrder.status, order, unchainedAPI));
+            if (nextStatus === OrderStatus.PENDING) {
+                // auto charge during transition to pending
+                const orderPayment = await modules.orders.payments.findOrderPayment({
+                    orderPaymentId: order.paymentId,
+                });
+                await modules.orders.payments.charge(orderPayment, { userId: order.userId, transactionContext: paymentContext }, unchainedAPI);
+                nextStatus = await findNextStatus(nextStatus, order, unchainedAPI);
+            }
+            if (nextStatus === OrderStatus.REJECTED) {
+                // auto cancel during transition to rejected
+                const orderPayment = await modules.orders.payments.findOrderPayment({
+                    orderPaymentId: order.paymentId,
+                });
+                await modules.orders.payments.cancel(orderPayment, { userId: order.userId, transactionContext: paymentContext }, unchainedAPI);
+            }
+            if (nextStatus === OrderStatus.CONFIRMED) {
+                // confirm pre-authorized payments
+                const orderPayment = await modules.orders.payments.findOrderPayment({
+                    orderPaymentId: order.paymentId,
+                });
+                await modules.orders.payments.confirm(orderPayment, { userId: order.userId, transactionContext: paymentContext }, unchainedAPI);
+                if (order.status !== OrderStatus.CONFIRMED) {
+                    // we have to stop here shortly to complete the confirmation
+                    // before auto delivery is started, else we have no chance to create
+                    // numbers that are needed for delivery
+                    order = await updateStatus(orderId, {
+                        status: OrderStatus.CONFIRMED,
+                        info: comment,
+                    });
+                    const orderDelivery = await modules.orders.deliveries.findDelivery({
+                        orderDeliveryId: order.deliveryId,
+                    });
+                    await modules.orders.deliveries.send(orderDelivery, {
+                        order,
+                        deliveryContext,
+                    }, unchainedAPI);
+                    const orderPositions = await findOrderPositions(order);
+                    const mappedProductOrderPositions = await Promise.all(orderPositions.map(async (orderPosition) => {
+                        const product = await modules.products.findProduct({
+                            productId: orderPosition.productId,
+                        });
+                        return {
+                            orderPosition,
+                            product,
+                        };
+                    }));
+                    const tokenizedItems = mappedProductOrderPositions.filter((item) => item.product?.type === ProductType.TokenizedProduct);
+                    if (tokenizedItems.length > 0) {
+                        // Give virtual warehouse a chance to instantiate new virtual objects
+                        await modules.warehousing.tokenizeItems(order, {
+                            items: tokenizedItems,
+                        }, unchainedAPI);
+                    }
+                    // Enrollments: Generate enrollments for plan products
+                    const planItems = mappedProductOrderPositions.filter((item) => item.product?.type === ProductType.PlanProduct && !order.originEnrollmentId);
+                    if (planItems.length > 0) {
+                        await modules.enrollments.createFromCheckout(order, {
+                            items: planItems,
+                            context: {
+                                paymentContext,
+                                deliveryContext,
+                            },
+                        }, unchainedAPI);
+                    }
+                    // Quotations: If we came here, the checkout succeeded, so we can fullfill underlying quotations
+                    const quotationItems = mappedProductOrderPositions.filter((item) => item.orderPosition.quotationId);
+                    await Promise.all(quotationItems.map(async ({ orderPosition }) => {
+                        await modules.quotations.fullfillQuotation(orderPosition.quotationId, {
+                            orderId,
+                            orderPositionId: orderPosition._id,
+                        }, unchainedAPI);
+                    }));
+                    // TODO: we will use this function to keep a "Ordered in Flight" amount, allowing us to
+                    // do live stock stuff
+                    // 2. Reserve quantity at Warehousing Provider until order is CANCELLED/FULLFILLED
+                    // ???
+                }
+                nextStatus = await findNextStatus(nextStatus, order, unchainedAPI);
+            }
+            return updateStatus(order._id, { status: nextStatus, info: comment });
+        },
+        updateStatus,
+    };
+};
+//# sourceMappingURL=configureOrdersModule-processing.js.map