@unchainedshop/core-orders 1.2.2 → 1.2.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/module/configureOrderDeliveriesModule.js +2 -0
- package/lib/module/configureOrderDeliveriesModule.js.map +1 -1
- package/lib/module/configureOrderDiscountsModule.js.map +1 -1
- package/lib/module/configureOrderPaymentsModule.js +4 -0
- package/lib/module/configureOrderPaymentsModule.js.map +1 -1
- package/lib/module/configureOrderPositionsModule.js +1 -1
- package/lib/module/configureOrderPositionsModule.js.map +1 -1
- package/lib/module/configureOrdersModule-mutations.js +1 -1
- package/lib/module/configureOrdersModule-mutations.js.map +1 -1
- package/lib/module/configureOrdersModule-processing.d.ts +1 -2
- package/lib/module/configureOrdersModule-processing.js +11 -18
- package/lib/module/configureOrdersModule-processing.js.map +1 -1
- package/lib/module/configureOrdersModule-queries.js +5 -5
- package/lib/module/configureOrdersModule-queries.js.map +1 -1
- package/lib/module/configureOrdersModule.d.ts +1 -1
- package/lib/module/configureOrdersModule.js +0 -1
- package/lib/module/configureOrdersModule.js.map +1 -1
- package/lib/orders-settings.d.ts +3 -10
- package/lib/orders-settings.js +1 -1
- package/lib/orders-settings.js.map +1 -1
- package/lib/service/migrateOrderCartService.js +18 -4
- package/lib/service/migrateOrderCartService.js.map +1 -1
- package/package.json +6 -6
- package/src/module/configureOrderDeliveriesModule.ts +5 -1
- package/src/module/configureOrderDiscountsModule.ts +2 -1
- package/src/module/configureOrderPaymentsModule.ts +7 -1
- package/src/module/configureOrderPositionsModule.ts +3 -2
- package/src/module/configureOrdersModule-mutations.ts +5 -3
- package/src/module/configureOrdersModule-processing.ts +11 -22
- package/src/module/configureOrdersModule-queries.ts +5 -5
- package/src/module/configureOrdersModule.ts +2 -2
- package/src/orders-settings.ts +3 -2
- package/src/service/migrateOrderCartService.ts +23 -11
|
@@ -30,6 +30,8 @@ export const configureOrderDeliveriesModule = ({ OrderDeliveries, updateCalculat
|
|
|
30
30
|
},
|
|
31
31
|
};
|
|
32
32
|
if (status === OrderDeliveryStatus.DELIVERED) {
|
|
33
|
+
// eslint-disable-next-line
|
|
34
|
+
// @ts-ignore
|
|
33
35
|
modifier.$set.delivered = date;
|
|
34
36
|
}
|
|
35
37
|
const selector = buildFindByIdSelector(orderDeliveryId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrderDeliveriesModule.js","sourceRoot":"","sources":["../../src/module/configureOrderDeliveriesModule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configureOrderDeliveriesModule.js","sourceRoot":"","sources":["../../src/module/configureOrderDeliveriesModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrderDiscountsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderDiscountsModule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configureOrderDiscountsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderDiscountsModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,9 +52,13 @@ export const configureOrderPaymentsModule = ({ OrderPayments, updateCalculation,
|
|
|
52
52
|
},
|
|
53
53
|
};
|
|
54
54
|
if (transactionId) {
|
|
55
|
+
// eslint-disable-next-line
|
|
56
|
+
// @ts-ignore
|
|
55
57
|
modifier.$set.transactionId = transactionId;
|
|
56
58
|
}
|
|
57
59
|
if (status === OrderPaymentStatus.PAID) {
|
|
60
|
+
// eslint-disable-next-line
|
|
61
|
+
// @ts-ignore
|
|
58
62
|
modifier.$set.paid = date;
|
|
59
63
|
}
|
|
60
64
|
const selector = buildFindByIdSelector(orderPaymentId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrderPaymentsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderPaymentsModule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configureOrderPaymentsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderPaymentsModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -152,7 +152,7 @@ export const configureOrderPositionsModule = ({ OrderPositions, updateCalculatio
|
|
|
152
152
|
log(`OrderPosition ${orderPosition._id} -> Update Calculation`, {
|
|
153
153
|
orderId: orderPosition.orderId,
|
|
154
154
|
});
|
|
155
|
-
const calculation = await requestContext.modules.products.calculate({ item: orderPosition }, requestContext);
|
|
155
|
+
const calculation = await requestContext.modules.products.calculate({ item: orderPosition, configuration: orderPosition.configuration }, requestContext);
|
|
156
156
|
const selector = buildFindByIdSelector(orderPosition._id);
|
|
157
157
|
await OrderPositions.updateOne(selector, {
|
|
158
158
|
$set: { calculation },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrderPositionsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderPositionsModule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configureOrderPositionsModule.js","sourceRoot":"","sources":["../../src/module/configureOrderPositionsModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ export const configureOrderModuleMutations = ({ Orders, OrderDeliveries, OrderPa
|
|
|
51
51
|
status: { $eq: null },
|
|
52
52
|
updated: { $gte: minValidDate },
|
|
53
53
|
}).toArray();
|
|
54
|
-
await Promise.all(orders.map((order) => initProviders(order, requestContext)));
|
|
54
|
+
await Promise.all(orders.map((order) => initProviders(order, requestContext))); // TODO: Refactor Types
|
|
55
55
|
},
|
|
56
56
|
setDeliveryProvider: async (orderId, deliveryProviderId, requestContext) => {
|
|
57
57
|
const { modules } = requestContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrdersModule-mutations.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule-mutations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configureOrdersModule-mutations.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule-mutations.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,10 @@ import { Order, OrderProcessing, OrdersModule } from '@unchainedshop/types/order
|
|
|
3
3
|
import { OrderDelivery } from '@unchainedshop/types/orders.deliveries';
|
|
4
4
|
import { OrderPayment } from '@unchainedshop/types/orders.payments';
|
|
5
5
|
import { OrderPosition } from '@unchainedshop/types/orders.positions';
|
|
6
|
-
export declare const configureOrderModuleProcessing: ({ Orders, OrderPositions, OrderDeliveries, OrderPayments,
|
|
6
|
+
export declare const configureOrderModuleProcessing: ({ Orders, OrderPositions, OrderDeliveries, OrderPayments, updateStatus, }: {
|
|
7
7
|
Orders: Collection<Order>;
|
|
8
8
|
OrderPositions: Collection<OrderPosition>;
|
|
9
9
|
OrderDeliveries: Collection<OrderDelivery>;
|
|
10
10
|
OrderPayments: Collection<OrderPayment>;
|
|
11
|
-
updateCalculation: OrdersModule['updateCalculation'];
|
|
12
11
|
updateStatus: OrdersModule['updateStatus'];
|
|
13
12
|
}) => OrderProcessing;
|
|
@@ -4,7 +4,7 @@ import { log } from '@unchainedshop/logger';
|
|
|
4
4
|
import { generateDbFilterById } from '@unchainedshop/utils';
|
|
5
5
|
import { ordersSettings } from '../orders-settings';
|
|
6
6
|
const ORDER_PROCESSING_EVENTS = ['ORDER_CHECKOUT', 'ORDER_CONFIRMED', 'ORDER_FULLFILLED'];
|
|
7
|
-
export const configureOrderModuleProcessing = ({ Orders, OrderPositions, OrderDeliveries, OrderPayments,
|
|
7
|
+
export const configureOrderModuleProcessing = ({ Orders, OrderPositions, OrderDeliveries, OrderPayments, updateStatus, }) => {
|
|
8
8
|
registerEvents(ORDER_PROCESSING_EVENTS);
|
|
9
9
|
const findOrderPositions = async (order) => OrderPositions.find({
|
|
10
10
|
orderId: order._id,
|
|
@@ -179,26 +179,19 @@ export const configureOrderModuleProcessing = ({ Orders, OrderPositions, OrderDe
|
|
|
179
179
|
countryCode,
|
|
180
180
|
}, requestContext);
|
|
181
181
|
},
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
return updateCalculation(fromCartId, requestContext);
|
|
192
|
-
}
|
|
193
|
-
// Move positions
|
|
194
|
-
const toCartId = toCart._id;
|
|
195
|
-
await OrderPositions.updateMany({ orderId: fromCartId }, {
|
|
182
|
+
setCartOwner: async ({ orderId, userId }) => {
|
|
183
|
+
await Orders.updateOne(generateDbFilterById(orderId), {
|
|
184
|
+
$set: {
|
|
185
|
+
userId,
|
|
186
|
+
},
|
|
187
|
+
});
|
|
188
|
+
},
|
|
189
|
+
moveCartPositions: async ({ fromOrderId, toOrderId }) => {
|
|
190
|
+
await OrderPositions.updateMany({ orderId: fromOrderId }, {
|
|
196
191
|
$set: {
|
|
197
|
-
orderId:
|
|
192
|
+
orderId: toOrderId,
|
|
198
193
|
},
|
|
199
194
|
});
|
|
200
|
-
await updateCalculation(fromCartId, requestContext);
|
|
201
|
-
return updateCalculation(toCartId, requestContext);
|
|
202
195
|
},
|
|
203
196
|
processOrder: async (initialOrder, params, requestContext) => {
|
|
204
197
|
const { modules } = requestContext;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrdersModule-processing.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule-processing.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"configureOrdersModule-processing.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule-processing.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,WAAW,EAAiC,MAAM,6BAA6B,CAAC;AAIhG,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEpD,MAAM,uBAAuB,GAAa,CAAC,gBAAgB,EAAE,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;AAEpG,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,EAC7C,MAAM,EACN,cAAc,EACd,eAAe,EACf,aAAa,EACb,YAAY,GAOb,EAAmB,EAAE;IACpB,cAAc,CAAC,uBAAuB,CAAC,CAAC;IAExC,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAAY,EAAE,EAAE,CAChD,cAAc,CAAC,IAAI,CAAC;QAClB,OAAO,EAAE,KAAK,CAAC,GAAG;QAClB,QAAQ,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE;KACrB,CAAC,CAAC,OAAO,EAAE,CAAC;IAEf,MAAM,iBAAiB,GAAG,KAAK,EAAE,KAAY,EAAE,EAAE,CAC/C,eAAe,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,EAAE,CAAC,CAAC;IAEtE,MAAM,gBAAgB,GAAG,KAAK,EAAE,KAAY,EAAE,EAAE,CAC9C,aAAa,CAAC,OAAO,CAAC,oBAAoB,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IAEnE,MAAM,2BAA2B,GAAG,KAAK,EAAE,KAAY,EAAE,EAAE;QACzD,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,KAAK,CAAC,OAAO;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC,CAAC;QACxE,IAAI,CAAC,KAAK,CAAC,cAAc;YAAE,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC,CAAC;QAClF,IAAI,CAAC,CAAC,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QACpF,IAAI,CAAC,CAAC,MAAM,gBAAgB,CAAC,KAAK,CAAC,CAAC;YAAE,MAAM,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAClF,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,MAAM,oBAAoB,GAAG,KAAK,EAAE,KAAY,EAAE,EAAE,OAAO,EAAW,EAAE,EAAE;QACxE,2BAA2B;QAC3B,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,MAAM,YAAY,GAAG,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;YACvD,YAAY,CAAC,IAAI,GAAG,cAAc,CAAC;YACnC,OAAO,CAAC,YAAY,CAAC,CAAC;SACvB;QACD,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;YACzC,MAAM,MAAM,GAAG,EAAE,CAAC;YAElB,GAAG,CAAC,iBAAiB,aAAa,CAAC,GAAG,gBAAgB,aAAa,CAAC,QAAQ,EAAE,EAAE;gBAC9E,OAAO,EAAE,aAAa,CAAC,OAAO;aAC/B,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;gBACjD,SAAS,EAAE,aAAa,CAAC,SAAS;aACnC,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBACvC,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC,CAAC;aACjE;YAED,MAAM,SAAS,GACb,aAAa,CAAC,WAAW;gBACzB,CAAC,MAAM,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC;oBACtC,WAAW,EAAE,aAAa,CAAC,WAAW;iBACvC,CAAC,CAAC,CAAC;YACN,IAAI,SAAS,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,SAAS,CAAC,EAAE;gBAC/D,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC,CAAC;aACtF;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CACH,CAAC;QAEF,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC;IAEF,MAAM,yBAAyB,GAAG,KAAK,EAAE,KAAY,EAAE,cAAuB,EAAE,EAAE;QAChF,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QAEnC,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,2BAA2B,GAC7B,YAAY;YACZ,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC;QAE5F,IAAI,2BAA2B;YAAE,OAAO,KAAK,CAAC;QAE9C,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACrD,2BAA2B;YACzB,aAAa;gBACb,CAAC,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,2BAA2B,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;QAE/F,IAAI,2BAA2B;YAAE,OAAO,KAAK,CAAC;QAE9C,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,UAAU,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,SAAS,EAAE;YACrF,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,yBAAyB,GAAG,KAAK,EAAE,KAAY,EAAE,cAAuB,EAAE,EAAE;QAChF,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QAEnC,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,2BAA2B,GAC7B,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,YAAY,CAAC,CAAC;QAEpF,IAAI,2BAA2B;YAAE,OAAO,KAAK,CAAC;QAE9C,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,KAAK,CAAC,CAAC;QACrD,2BAA2B;YACzB,aAAa,IAAI,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,2BAA2B,CAAC,aAAa,CAAC,CAAC;QAExF,IAAI,2BAA2B;YAAE,OAAO,KAAK,CAAC;QAE9C,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,UAAU,EAAE;YAC3C,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,cAAc,GAAG,KAAK,EAC1B,MAA0B,EAC1B,KAAY,EACZ,cAAuB,EACD,EAAE;QACxB,IAAI,MAAM,KAAK,IAAI,EAAE;YACnB,IAAI,CAAC,MAAM,2BAA2B,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC3D,IAAI,CAAC,gBAAgB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAClC,OAAO,WAAW,CAAC,OAAO,CAAC;aAC5B;SACF;QAED,IAAI,MAAM,KAAK,WAAW,CAAC,OAAO,EAAE;YAClC,IAAI,MAAM,yBAAyB,CAAC,KAAK,EAAE,cAAc,CAAC,EAAE;gBAC1D,IAAI,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBACnC,OAAO,WAAW,CAAC,SAAS,CAAC;aAC9B;SACF;QAED,IAAI,MAAM,KAAK,WAAW,CAAC,SAAS,EAAE;YACpC,MAAM,YAAY,GAAG,MAAM,yBAAyB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;YAC5E,IAAI,YAAY,EAAE;gBAChB,IAAI,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBACpC,OAAO,WAAW,CAAC,UAAU,CAAC;aAC/B;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,OAAO;QACL,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE,cAAc,EAAE,EAAE;YAC7F,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,cAAc,CAAC;YAE1D,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;YAC1E,IAAI,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YAExD,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI;gBAAE,OAAO,KAAK,CAAC;YAExC,MAAM,MAAM,GAAG;gBACb,GAAG,CAAC,MAAM,2BAA2B,CAAC,KAAK,CAAC,CAAC;gBAC7C,GAAG,CAAC,MAAM,oBAAoB,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;aACvD,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YAElB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;aAC5B;YAED,gBAAgB;YAChB,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,CACvC,KAAK,EACL;gBACE,cAAc;gBACd,eAAe;aAChB,EACD,cAAc,CACf,CAAC;YAEF,0DAA0D;YAC1D,MAAM,OAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;YACzF,MAAM,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAE3E,iEAAiE;YACjE,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;gBAC5C,aAAa;aACd,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,MAAM,CAAC,iBAAiB,CACpC;gBACE,IAAI;gBACJ,WAAW,EAAE,MAAM,CAAC,OAAO;aAC5B,EACD,cAAc,CACf,CAAC;YAEF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE,cAAc,EAAE,EAAE;YAC5F,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;YAEnC,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;YAC1E,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YAE1D,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,OAAO;gBAAE,OAAO,KAAK,CAAC;YAEvD,OAAO,OAAO,CAAC,MAAM,CAAC,YAAY,CAChC,KAAK,EACL;gBACE,cAAc;gBACd,eAAe;gBACf,UAAU,EAAE,WAAW,CAAC,SAAS;aAClC,EACD,cAAc,CACf,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,YAAY,EAAE,cAAc,EAAE,eAAe,EAAE,EAAE,cAAc,EAAE,EAAE;YAC3F,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;YAEnC,MAAM,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;YAC1E,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;YAE1D,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,OAAO;gBAAE,OAAO,KAAK,CAAC;YAEvD,OAAO,OAAO,CAAC,MAAM,CAAC,YAAY,CAChC,KAAK,EACL;gBACE,cAAc;gBACd,eAAe;gBACf,UAAU,EAAE,WAAW,CAAC,QAAQ;aACjC,EACD,cAAc,CACf,CAAC;QACJ,CAAC;QAED,iBAAiB,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,cAAc,EAAE,EAAE;YACjE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,cAAc,CAAC;YAE7C,IAAI,CAAC,cAAc,CAAC,iBAAiB;gBAAE,OAAO,IAAI,CAAC;YAEnD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,EAAE,IAAI,CAAC,CAAC;YAC9E,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAC;YAEtB,OAAO,QAAQ,CAAC,MAAM,CAAC,cAAc,CACnC;gBACE,IAAI;gBACJ,WAAW;aACZ,EACD,cAAyB,CAC1B,CAAC;QACJ,CAAC;QAED,YAAY,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;YAC1C,MAAM,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE;gBACpD,IAAI,EAAE;oBACJ,MAAM;iBACP;aACF,CAAC,CAAC;QACL,CAAC;QAED,iBAAiB,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,EAAE,EAAE;YACtD,MAAM,cAAc,CAAC,UAAU,CAC7B,EAAE,OAAO,EAAE,WAAW,EAAE,EACxB;gBACE,IAAI,EAAE;oBACJ,OAAO,EAAE,SAAS;iBACnB;aACF,CACF,CAAC;QACJ,CAAC;QAED,YAAY,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,EAAE;YAC3D,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;YACnC,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,UAAU,EAAE,eAAe,EAAE,GAAG,MAAM,CAAC;YAEhF,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC;YACjC,IAAI,KAAK,GAAG,YAAY,CAAC;YACzB,IAAI,UAAU,GACZ,eAAe,IAAI,CAAC,MAAM,cAAc,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC,CAAC;YAExF,IAAI,UAAU,KAAK,WAAW,CAAC,OAAO,EAAE;gBACtC,2CAA2C;gBAC3C,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;oBAClE,cAAc,EAAE,KAAK,CAAC,SAAS;iBAChC,CAAC,CAAC;gBAEH,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAClC,YAAY,EACZ,EAAE,kBAAkB,EAAE,cAAc,EAAE,EACtC,cAAc,CACf,CAAC;gBACF,UAAU,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;aACtE;YAED,IAAI,UAAU,KAAK,WAAW,CAAC,QAAQ,EAAE;gBACvC,4CAA4C;gBAC5C,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;oBAClE,cAAc,EAAE,KAAK,CAAC,SAAS;iBAChC,CAAC,CAAC;gBACH,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAClC,YAAY,EACZ,EAAE,kBAAkB,EAAE,cAAc,EAAE,EACtC,cAAc,CACf,CAAC;gBACF,UAAU,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;aACtE;YAED,IAAI,UAAU,KAAK,WAAW,CAAC,SAAS,EAAE;gBACxC,kCAAkC;gBAClC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC;oBAClE,cAAc,EAAE,KAAK,CAAC,SAAS;iBAChC,CAAC,CAAC;gBACH,MAAM,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CACnC,YAAY,EACZ,EAAE,kBAAkB,EAAE,cAAc,EAAE,EACtC,cAAc,CACf,CAAC;gBAEF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC;oBACjE,eAAe,EAAE,KAAK,CAAC,UAAU;iBAClC,CAAC,CAAC;gBACH,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,SAAS,EAAE;oBAC1C,4DAA4D;oBAC5D,oEAAoE;oBACpE,qDAAqD;oBACrD,KAAK,GAAG,MAAM,YAAY,CACxB,OAAO,EACP;wBACE,MAAM,EAAE,WAAW,CAAC,SAAS;wBAC7B,IAAI,EAAE,iBAAiB;qBACxB,EACD,cAAc,CACf,CAAC;oBAEF,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAClC,aAAa,EACb;wBACE,KAAK;wBACL,eAAe;qBAChB,EACD,cAAc,CACf,CAAC;oBAEF,uBAAuB;oBACvB,IAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE;wBAC7B,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;wBAEtF,MAAM,2BAA2B,GAAG,MAAM,OAAO,CAAC,GAAG,CACnD,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;4BACzC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;gCACjD,SAAS,EAAE,aAAa,CAAC,SAAS;6BACnC,CAAC,CAAC;4BACH,OAAO;gCACL,aAAa;gCACb,OAAO;6BACR,CAAC;wBACJ,CAAC,CAAC,CACH,CAAC;wBAEF,MAAM,6BAA6B,GAAG,2BAA2B,CAAC,MAAM,CACtE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAC7B,CAAC;wBAEF,IAAI,6BAA6B,CAAC,MAAM,GAAG,CAAC,EAAE;4BAC5C,MAAM,OAAO,CAAC,WAAW,CAAC,kBAAkB,CAC1C,KAAK,EACL;gCACE,KAAK,EAAE,6BAA6B;gCACpC,OAAO,EAAE;oCACP,cAAc;oCACd,eAAe;iCAChB;6BACF,EACD,cAAc,CACf,CAAC;yBACH;qBACF;iBACF;qBAAM;oBACL,MAAM,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAClC,aAAa,EACb;wBACE,KAAK;wBACL,eAAe;qBAChB,EACD,cAAc,CACf,CAAC;iBACH;gBAED,gBAAgB;gBAChB,uEAAuE;gBACvE,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAAC,KAAK,CAAC,CAAC;gBACvD,MAAM,OAAO,CAAC,GAAG,CACf,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,EAAE;oBACzC,IAAI,aAAa,CAAC,WAAW,EAAE;wBAC7B,MAAM,OAAO,CAAC,UAAU,CAAC,iBAAiB,CACxC,aAAa,CAAC,WAAW,EACzB;4BACE,OAAO;4BACP,eAAe,EAAE,aAAa,CAAC,GAAG;yBACnC,EACD,cAAc,CACf,CAAC;qBACH;oBAED,GAAG,CAAC,iBAAiB,aAAa,CAAC,GAAG,eAAe,aAAa,CAAC,QAAQ,EAAE,EAAE;wBAC7E,OAAO;qBACR,CAAC,CAAC;gBACL,CAAC,CAAC,CACH,CAAC;gBAEF,UAAU,GAAG,MAAM,cAAc,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;gBAErE,uFAAuF;gBACvF,sBAAsB;gBACtB,kFAAkF;gBAClF,MAAM;aACP;YAED,KAAK,GAAG,MAAM,YAAY,CACxB,KAAK,CAAC,GAAG,EACT,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,iBAAiB,EAAE,EAC/C,cAAc,CACf,CAAC;YAEF,IAAI,YAAY,CAAC,MAAM,KAAK,KAAK,CAAC,MAAM,EAAE;gBACxC,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,QAAQ,EAAE;oBACzC,MAAM,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;iBAClF;qBAAM;oBACL,MAAM,OAAO,CAAC,MAAM,CAAC,+BAA+B,CAAC,KAAK,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;iBACrF;aACF;YAED,OAAO,KAAK,CAAC;QACf,CAAC;QAED,+BAA+B,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,EAAE;YAC3F,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;gBAC5C,aAAa;aACd,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAC1B;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE;oBACL,GAAG,MAAM;oBACT,MAAM;oBACN,QAAQ,EAAE,oBAAoB;oBAC9B,OAAO,EAAE,KAAK,CAAC,GAAG;iBACnB;aACF,EACD,MAAM,CACP,CAAC;YAEF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,4BAA4B,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,EAAE;YACxF,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE;gBAC5C,aAAa;aACd,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,MAAM,CAAC,OAAO,CAC1B;gBACE,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE;oBACL,GAAG,MAAM;oBACT,MAAM;oBACN,QAAQ,EAAE,iBAAiB;oBAC3B,OAAO,EAAE,KAAK,CAAC,GAAG;iBACnB;aACF,EACD,MAAM,CACP,CAAC;YAEF,OAAO,KAAK,CAAC;QACf,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { SortDirection } from '@unchainedshop/types/api';
|
|
2
|
+
import { generateDbFilterById, buildSortOptions } from '@unchainedshop/utils';
|
|
2
3
|
const buildFindSelector = ({ includeCarts, status, userId, queryString }) => {
|
|
3
4
|
const selector = {};
|
|
4
5
|
if (userId) {
|
|
@@ -26,13 +27,12 @@ export const configureOrdersModuleQueries = ({ Orders, }) => {
|
|
|
26
27
|
const selector = orderId ? generateDbFilterById(orderId) : { orderNumber };
|
|
27
28
|
return Orders.findOne(selector, options);
|
|
28
29
|
},
|
|
29
|
-
findOrders: async ({ limit, offset, queryString, ...query }, options) => {
|
|
30
|
+
findOrders: async ({ limit, offset, queryString, sort, ...query }, options) => {
|
|
31
|
+
const defaultSortOption = [{ key: 'created', value: SortDirection.DESC }];
|
|
30
32
|
const findOptions = {
|
|
31
33
|
skip: offset,
|
|
32
34
|
limit,
|
|
33
|
-
sort:
|
|
34
|
-
created: -1,
|
|
35
|
-
},
|
|
35
|
+
sort: buildSortOptions(sort || defaultSortOption),
|
|
36
36
|
};
|
|
37
37
|
const selector = buildFindSelector({ queryString, ...query });
|
|
38
38
|
if (queryString) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrdersModule-queries.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule-queries.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configureOrdersModule-queries.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule-queries.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAc,MAAM,0BAA0B,CAAC;AAGrE,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE9E,MAAM,iBAAiB,GAAG,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAc,EAAE,EAAE;IACtF,MAAM,QAAQ,GAAU,EAAE,CAAC;IAE3B,IAAI,MAAM,EAAE;QACV,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;KAC1B;IAED,IAAI,MAAM,EAAE;QACV,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC;KAC1B;SAAM,IAAI,CAAC,YAAY,EAAE;QACxB,QAAQ,CAAC,MAAM,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC;KACjC;IAED,IAAI,WAAW,EAAE;QACf,QAAQ,CAAC,KAAK,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;KAC3C;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,EAC3C,MAAM,GAGP,EAAgB,EAAE;IACjB,OAAO;QACL,UAAU;QACV,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;YACrB,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;YACzE,OAAO,UAAU,CAAC;QACpB,CAAC;QAED,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,EAAE;YACrD,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC;YAE3E,OAAO,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC3C,CAAC;QAED,UAAU,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE;YAC5E,MAAM,iBAAiB,GAAsB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;YAC7F,MAAM,WAAW,GAAgB;gBAC/B,IAAI,EAAE,MAAM;gBACZ,KAAK;gBACL,IAAI,EAAE,gBAAgB,CAAC,IAAI,IAAI,iBAAiB,CAAC;aAClD,CAAC;YACF,MAAM,QAAQ,GAAG,iBAAiB,CAAC,EAAE,WAAW,EAAE,GAAG,KAAK,EAAE,CAAC,CAAC;YAE9D,IAAI,WAAW,EAAE;gBACf,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE;oBAC3B,GAAG,OAAO;oBACV,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;oBAC7C,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE;iBACxC,CAAC,CAAC,OAAO,EAAE,CAAC;aACd;YAED,OAAO,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,OAAO,EAAE,CAAC;QACtD,CAAC;QAED,WAAW,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;YACjC,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAAE;gBAC5E,KAAK,EAAE,CAAC;aACT,CAAC,CAAC;YACH,OAAO,CAAC,CAAC,UAAU,CAAC;QACtB,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { ModuleInput } from '@unchainedshop/types/
|
|
1
|
+
import { ModuleInput } from '@unchainedshop/types/core';
|
|
2
2
|
import { OrdersModule, OrdersSettingsOptions } from '@unchainedshop/types/orders';
|
|
3
3
|
export declare const configureOrdersModule: ({ db, options: orderOptions, }: ModuleInput<OrdersSettingsOptions>) => Promise<OrdersModule>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrdersModule.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configureOrdersModule.js","sourceRoot":"","sources":["../../src/module/configureOrdersModule.ts"],"names":[],"mappings":"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"}
|
package/lib/orders-settings.d.ts
CHANGED
|
@@ -1,19 +1,12 @@
|
|
|
1
|
+
import { OrdersSettingsOptions } from '@unchainedshop/types/orders';
|
|
1
2
|
export declare const defaultValidateOrderPosition: ({ product }: {
|
|
2
3
|
product: any;
|
|
3
4
|
}, { modules }: {
|
|
4
5
|
modules: any;
|
|
5
|
-
}) => void
|
|
6
|
+
}) => Promise<void>;
|
|
6
7
|
export declare const ordersSettings: {
|
|
7
8
|
ensureUserHasCart: any;
|
|
8
9
|
orderNumberHashFn: any;
|
|
9
10
|
validateOrderPosition: any;
|
|
10
|
-
configureSettings({ ensureUserHasCart, orderNumberHashFn, validateOrderPosition, }?:
|
|
11
|
-
ensureUserHasCart?: boolean;
|
|
12
|
-
orderNumberHashFn?: () => string;
|
|
13
|
-
validateOrderPosition?: ({ product }: {
|
|
14
|
-
product: any;
|
|
15
|
-
}, { modules }: {
|
|
16
|
-
modules: any;
|
|
17
|
-
}) => void;
|
|
18
|
-
}): void;
|
|
11
|
+
configureSettings({ ensureUserHasCart, orderNumberHashFn, validateOrderPosition, }?: OrdersSettingsOptions): void;
|
|
19
12
|
};
|
package/lib/orders-settings.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { generateRandomHash } from '@unchainedshop/utils';
|
|
2
|
-
export const defaultValidateOrderPosition = ({ product }, { modules }) => {
|
|
2
|
+
export const defaultValidateOrderPosition = async ({ product }, { modules }) => {
|
|
3
3
|
if (!modules.products.isActive(product)) {
|
|
4
4
|
throw new Error('This product is inactive');
|
|
5
5
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orders-settings.js","sourceRoot":"","sources":["../src/orders-settings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"orders-settings.js","sourceRoot":"","sources":["../src/orders-settings.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;IAC7E,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QACvC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;KAC7C;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,iBAAiB,EAAE,IAAI;IACvB,iBAAiB,EAAE,IAAI;IACvB,qBAAqB,EAAE,IAAI;IAE3B,iBAAiB,CAAC,EAChB,iBAAiB,GAAG,KAAK,EACzB,iBAAiB,GAAG,kBAAkB,EACtC,qBAAqB,GAAG,4BAA4B,MAC3B,EAAE;QAC3B,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,qBAAqB,GAAG,qBAAqB,CAAC;IACrD,CAAC;CACF,CAAC"}
|
|
@@ -1,10 +1,24 @@
|
|
|
1
|
-
export const migrateOrderCartsService = async ({ fromUser, toUser, shouldMerge },
|
|
2
|
-
const fromCart = await
|
|
3
|
-
const toCart = await
|
|
1
|
+
export const migrateOrderCartsService = async ({ fromUser, toUser, shouldMerge, countryContext }, unchainedAPI) => {
|
|
2
|
+
const fromCart = await unchainedAPI.modules.orders.cart({ countryContext }, fromUser);
|
|
3
|
+
const toCart = await unchainedAPI.modules.orders.cart({ countryContext }, toUser);
|
|
4
4
|
if (!fromCart) {
|
|
5
5
|
// No cart, don't copy
|
|
6
6
|
return toCart;
|
|
7
7
|
}
|
|
8
|
-
|
|
8
|
+
const artificialContext = {
|
|
9
|
+
countryContext,
|
|
10
|
+
user: toUser,
|
|
11
|
+
userId: toUser._id,
|
|
12
|
+
...unchainedAPI,
|
|
13
|
+
};
|
|
14
|
+
if (!toCart || !shouldMerge) {
|
|
15
|
+
// No destination cart, move whole cart
|
|
16
|
+
unchainedAPI.modules.orders.setCartOwner({ orderId: fromCart._id, userId: toUser._id });
|
|
17
|
+
return unchainedAPI.modules.orders.updateCalculation(fromCart._id, artificialContext);
|
|
18
|
+
}
|
|
19
|
+
// Move positions
|
|
20
|
+
unchainedAPI.modules.orders.moveCartPositions({ fromOrderId: fromCart._id, toOrderId: toCart._id });
|
|
21
|
+
await unchainedAPI.modules.orders.updateCalculation(fromCart._id, artificialContext);
|
|
22
|
+
return unchainedAPI.modules.orders.updateCalculation(toCart._id, artificialContext);
|
|
9
23
|
};
|
|
10
24
|
//# sourceMappingURL=migrateOrderCartService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrateOrderCartService.js","sourceRoot":"","sources":["../../src/service/migrateOrderCartService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"migrateOrderCartService.js","sourceRoot":"","sources":["../../src/service/migrateOrderCartService.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,wBAAwB,GAA6B,KAAK,EACrE,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,cAAc,EAAE,EACjD,YAAY,EACZ,EAAE;IACF,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,QAAQ,CAAC,CAAC;IACtF,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,MAAM,CAAC,CAAC;IAElF,IAAI,CAAC,QAAQ,EAAE;QACb,sBAAsB;QACtB,OAAO,MAAM,CAAC;KACf;IAED,MAAM,iBAAiB,GAAY;QACjC,cAAc;QACd,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,MAAM,CAAC,GAAG;QAClB,GAAG,YAAY;KACL,CAAC;IAEb,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE;QAC3B,uCAAuC;QACvC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;QACxF,OAAO,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;KACvF;IAED,iBAAiB;IACjB,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC;IAEpG,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;IACrF,OAAO,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;AACtF,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/core-orders",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.12",
|
|
4
4
|
"main": "lib/orders-index.js",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./lib/orders-index.js",
|
|
@@ -30,14 +30,14 @@
|
|
|
30
30
|
},
|
|
31
31
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@unchainedshop/events": "
|
|
34
|
-
"@unchainedshop/logger": "
|
|
35
|
-
"@unchainedshop/utils": "
|
|
33
|
+
"@unchainedshop/events": "1.x",
|
|
34
|
+
"@unchainedshop/logger": "1.x",
|
|
35
|
+
"@unchainedshop/utils": "1.x",
|
|
36
36
|
"simpl-schema": "^1.12.2"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
|
-
"@types/node": "^16.11.
|
|
40
|
-
"@unchainedshop/types": "
|
|
39
|
+
"@types/node": "^16.11.48",
|
|
40
|
+
"@unchainedshop/types": "1.x",
|
|
41
41
|
"jest": "^28.1.2",
|
|
42
42
|
"ts-jest": "^28.0.5",
|
|
43
43
|
"typescript": "^4.7.4"
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import { Collection, Filter,
|
|
1
|
+
import { Collection, Filter, Update } from '@unchainedshop/types/common';
|
|
2
|
+
import { ModuleMutations } from '@unchainedshop/types/core';
|
|
3
|
+
|
|
2
4
|
import { OrdersModule } from '@unchainedshop/types/orders';
|
|
3
5
|
import {
|
|
4
6
|
OrderDeliveriesModule,
|
|
@@ -54,6 +56,8 @@ export const configureOrderDeliveriesModule = ({
|
|
|
54
56
|
},
|
|
55
57
|
};
|
|
56
58
|
if (status === OrderDeliveryStatus.DELIVERED) {
|
|
59
|
+
// eslint-disable-next-line
|
|
60
|
+
// @ts-ignore
|
|
57
61
|
modifier.$set.delivered = date;
|
|
58
62
|
}
|
|
59
63
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Context } from '@unchainedshop/types/api';
|
|
2
|
-
import { Collection, Filter
|
|
2
|
+
import { Collection, Filter } from '@unchainedshop/types/common';
|
|
3
|
+
import { ModuleMutations } from '@unchainedshop/types/core';
|
|
3
4
|
import { OrdersModule } from '@unchainedshop/types/orders';
|
|
4
5
|
import { OrderDiscount, OrderDiscountsModule } from '@unchainedshop/types/orders.discounts';
|
|
5
6
|
import { emit, registerEvents } from '@unchainedshop/events';
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
import { Collection, Filter,
|
|
1
|
+
import { Collection, Filter, Query, Update } from '@unchainedshop/types/common';
|
|
2
|
+
import { ModuleMutations } from '@unchainedshop/types/core';
|
|
3
|
+
|
|
2
4
|
import { OrdersModule } from '@unchainedshop/types/orders';
|
|
3
5
|
import {
|
|
4
6
|
OrderPayment,
|
|
@@ -83,9 +85,13 @@ export const configureOrderPaymentsModule = ({
|
|
|
83
85
|
},
|
|
84
86
|
};
|
|
85
87
|
if (transactionId) {
|
|
88
|
+
// eslint-disable-next-line
|
|
89
|
+
// @ts-ignore
|
|
86
90
|
modifier.$set.transactionId = transactionId;
|
|
87
91
|
}
|
|
88
92
|
if (status === OrderPaymentStatus.PAID) {
|
|
93
|
+
// eslint-disable-next-line
|
|
94
|
+
// @ts-ignore
|
|
89
95
|
modifier.$set.paid = date;
|
|
90
96
|
}
|
|
91
97
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { Collection, Filter,
|
|
1
|
+
import { Collection, Filter, Query } from '@unchainedshop/types/common';
|
|
2
|
+
import { ModuleMutations } from '@unchainedshop/types/core';
|
|
2
3
|
import { OrdersModule } from '@unchainedshop/types/orders';
|
|
3
4
|
import { OrderPosition, OrderPositionsModule } from '@unchainedshop/types/orders.positions';
|
|
4
5
|
import { emit, registerEvents } from '@unchainedshop/events';
|
|
@@ -244,7 +245,7 @@ export const configureOrderPositionsModule = ({
|
|
|
244
245
|
});
|
|
245
246
|
|
|
246
247
|
const calculation = await requestContext.modules.products.calculate(
|
|
247
|
-
{ item: orderPosition },
|
|
248
|
+
{ item: orderPosition, configuration: orderPosition.configuration },
|
|
248
249
|
requestContext,
|
|
249
250
|
);
|
|
250
251
|
const selector = buildFindByIdSelector(orderPosition._id);
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import { Collection
|
|
1
|
+
import { Collection } from '@unchainedshop/types/common';
|
|
2
|
+
import { ModuleMutations } from '@unchainedshop/types/core';
|
|
2
3
|
import { Order, OrderStatus, OrderMutations, OrdersModule } from '@unchainedshop/types/orders';
|
|
3
4
|
import { OrderDelivery } from '@unchainedshop/types/orders.deliveries';
|
|
4
5
|
import { OrderPayment } from '@unchainedshop/types/orders.payments';
|
|
5
6
|
import { emit, registerEvents } from '@unchainedshop/events';
|
|
6
7
|
import { log, LogLevel } from '@unchainedshop/logger';
|
|
7
8
|
import { generateDbFilterById, generateDbMutations } from '@unchainedshop/utils';
|
|
9
|
+
import { Context } from '@unchainedshop/types/api';
|
|
8
10
|
import { OrdersSchema } from '../db/OrdersSchema';
|
|
9
11
|
|
|
10
12
|
const ORDER_EVENTS: string[] = [
|
|
@@ -84,7 +86,7 @@ export const configureOrderModuleMutations = ({
|
|
|
84
86
|
updated: { $gte: minValidDate },
|
|
85
87
|
}).toArray();
|
|
86
88
|
|
|
87
|
-
await Promise.all(orders.map((order) => initProviders(order, requestContext)));
|
|
89
|
+
await Promise.all(orders.map((order) => initProviders(order, requestContext as Context))); // TODO: Refactor Types
|
|
88
90
|
},
|
|
89
91
|
|
|
90
92
|
setDeliveryProvider: async (orderId, deliveryProviderId, requestContext) => {
|
|
@@ -204,7 +206,7 @@ export const configureOrderModuleMutations = ({
|
|
|
204
206
|
updateContext: async (orderId, context, requestContext) => {
|
|
205
207
|
log('Update Arbitrary Context', { orderId, context });
|
|
206
208
|
|
|
207
|
-
const selector = generateDbFilterById(orderId);
|
|
209
|
+
const selector = generateDbFilterById<Order>(orderId);
|
|
208
210
|
|
|
209
211
|
selector.status = { $in: [null, OrderStatus.PENDING] };
|
|
210
212
|
|
|
@@ -16,14 +16,12 @@ export const configureOrderModuleProcessing = ({
|
|
|
16
16
|
OrderPositions,
|
|
17
17
|
OrderDeliveries,
|
|
18
18
|
OrderPayments,
|
|
19
|
-
updateCalculation,
|
|
20
19
|
updateStatus,
|
|
21
20
|
}: {
|
|
22
21
|
Orders: Collection<Order>;
|
|
23
22
|
OrderPositions: Collection<OrderPosition>;
|
|
24
23
|
OrderDeliveries: Collection<OrderDelivery>;
|
|
25
24
|
OrderPayments: Collection<OrderPayment>;
|
|
26
|
-
updateCalculation: OrdersModule['updateCalculation'];
|
|
27
25
|
updateStatus: OrdersModule['updateStatus'];
|
|
28
26
|
}): OrderProcessing => {
|
|
29
27
|
registerEvents(ORDER_PROCESSING_EVENTS);
|
|
@@ -263,36 +261,27 @@ export const configureOrderModuleProcessing = ({
|
|
|
263
261
|
user,
|
|
264
262
|
countryCode,
|
|
265
263
|
},
|
|
266
|
-
requestContext,
|
|
264
|
+
requestContext as Context,
|
|
267
265
|
);
|
|
268
266
|
},
|
|
269
267
|
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
userId: requestContext.userId,
|
|
278
|
-
},
|
|
279
|
-
});
|
|
280
|
-
return updateCalculation(fromCartId, requestContext);
|
|
281
|
-
}
|
|
268
|
+
setCartOwner: async ({ orderId, userId }) => {
|
|
269
|
+
await Orders.updateOne(generateDbFilterById(orderId), {
|
|
270
|
+
$set: {
|
|
271
|
+
userId,
|
|
272
|
+
},
|
|
273
|
+
});
|
|
274
|
+
},
|
|
282
275
|
|
|
283
|
-
|
|
284
|
-
const toCartId = toCart._id;
|
|
276
|
+
moveCartPositions: async ({ fromOrderId, toOrderId }) => {
|
|
285
277
|
await OrderPositions.updateMany(
|
|
286
|
-
{ orderId:
|
|
278
|
+
{ orderId: fromOrderId },
|
|
287
279
|
{
|
|
288
280
|
$set: {
|
|
289
|
-
orderId:
|
|
281
|
+
orderId: toOrderId,
|
|
290
282
|
},
|
|
291
283
|
},
|
|
292
284
|
);
|
|
293
|
-
|
|
294
|
-
await updateCalculation(fromCartId, requestContext);
|
|
295
|
-
return updateCalculation(toCartId, requestContext);
|
|
296
285
|
},
|
|
297
286
|
|
|
298
287
|
processOrder: async (initialOrder, params, requestContext) => {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { SortDirection, SortOption } from '@unchainedshop/types/api';
|
|
1
2
|
import { Collection, FindOptions, Query } from '@unchainedshop/types/common';
|
|
2
3
|
import { Order, OrderQueries, OrderQuery } from '@unchainedshop/types/orders';
|
|
3
|
-
import { generateDbFilterById } from '@unchainedshop/utils';
|
|
4
|
+
import { generateDbFilterById, buildSortOptions } from '@unchainedshop/utils';
|
|
4
5
|
|
|
5
6
|
const buildFindSelector = ({ includeCarts, status, userId, queryString }: OrderQuery) => {
|
|
6
7
|
const selector: Query = {};
|
|
@@ -40,13 +41,12 @@ export const configureOrdersModuleQueries = ({
|
|
|
40
41
|
return Orders.findOne(selector, options);
|
|
41
42
|
},
|
|
42
43
|
|
|
43
|
-
findOrders: async ({ limit, offset, queryString, ...query }, options) => {
|
|
44
|
+
findOrders: async ({ limit, offset, queryString, sort, ...query }, options) => {
|
|
45
|
+
const defaultSortOption: Array<SortOption> = [{ key: 'created', value: SortDirection.DESC }];
|
|
44
46
|
const findOptions: FindOptions = {
|
|
45
47
|
skip: offset,
|
|
46
48
|
limit,
|
|
47
|
-
sort:
|
|
48
|
-
created: -1,
|
|
49
|
-
},
|
|
49
|
+
sort: buildSortOptions(sort || defaultSortOption),
|
|
50
50
|
};
|
|
51
51
|
const selector = buildFindSelector({ queryString, ...query });
|
|
52
52
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Context } from '@unchainedshop/types/api';
|
|
2
|
-
import {
|
|
2
|
+
import { Update } from '@unchainedshop/types/common';
|
|
3
|
+
import { ModuleInput } from '@unchainedshop/types/core';
|
|
3
4
|
import { Order, OrderStatus, OrdersModule, OrdersSettingsOptions } from '@unchainedshop/types/orders';
|
|
4
5
|
import { OrderDelivery } from '@unchainedshop/types/orders.deliveries';
|
|
5
6
|
import { OrderPayment } from '@unchainedshop/types/orders.payments';
|
|
@@ -312,7 +313,6 @@ export const configureOrdersModule = async ({
|
|
|
312
313
|
OrderDeliveries,
|
|
313
314
|
OrderPayments,
|
|
314
315
|
OrderPositions,
|
|
315
|
-
updateCalculation,
|
|
316
316
|
updateStatus,
|
|
317
317
|
});
|
|
318
318
|
const orderMutations = configureOrderModuleMutations({
|
package/src/orders-settings.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { OrdersSettingsOptions } from '@unchainedshop/types/orders';
|
|
1
2
|
import { generateRandomHash } from '@unchainedshop/utils';
|
|
2
3
|
|
|
3
|
-
export const defaultValidateOrderPosition = ({ product }, { modules }) => {
|
|
4
|
+
export const defaultValidateOrderPosition = async ({ product }, { modules }) => {
|
|
4
5
|
if (!modules.products.isActive(product)) {
|
|
5
6
|
throw new Error('This product is inactive');
|
|
6
7
|
}
|
|
@@ -15,7 +16,7 @@ export const ordersSettings = {
|
|
|
15
16
|
ensureUserHasCart = false,
|
|
16
17
|
orderNumberHashFn = generateRandomHash,
|
|
17
18
|
validateOrderPosition = defaultValidateOrderPosition,
|
|
18
|
-
} = {}) {
|
|
19
|
+
}: OrdersSettingsOptions = {}) {
|
|
19
20
|
this.ensureUserHasCart = ensureUserHasCart;
|
|
20
21
|
this.orderNumberHashFn = orderNumberHashFn;
|
|
21
22
|
this.validateOrderPosition = validateOrderPosition;
|
|
@@ -1,22 +1,34 @@
|
|
|
1
|
+
import { Context } from '@unchainedshop/types/api';
|
|
1
2
|
import { MigrateOrderCartsService } from '@unchainedshop/types/orders';
|
|
2
3
|
|
|
3
4
|
export const migrateOrderCartsService: MigrateOrderCartsService = async (
|
|
4
|
-
{ fromUser, toUser, shouldMerge },
|
|
5
|
-
|
|
5
|
+
{ fromUser, toUser, shouldMerge, countryContext },
|
|
6
|
+
unchainedAPI,
|
|
6
7
|
) => {
|
|
7
|
-
const fromCart = await
|
|
8
|
-
|
|
9
|
-
fromUser,
|
|
10
|
-
);
|
|
11
|
-
const toCart = await requestContext.modules.orders.cart(
|
|
12
|
-
{ countryContext: requestContext.countryContext },
|
|
13
|
-
toUser,
|
|
14
|
-
);
|
|
8
|
+
const fromCart = await unchainedAPI.modules.orders.cart({ countryContext }, fromUser);
|
|
9
|
+
const toCart = await unchainedAPI.modules.orders.cart({ countryContext }, toUser);
|
|
15
10
|
|
|
16
11
|
if (!fromCart) {
|
|
17
12
|
// No cart, don't copy
|
|
18
13
|
return toCart;
|
|
19
14
|
}
|
|
20
15
|
|
|
21
|
-
|
|
16
|
+
const artificialContext: Context = {
|
|
17
|
+
countryContext,
|
|
18
|
+
user: toUser,
|
|
19
|
+
userId: toUser._id,
|
|
20
|
+
...unchainedAPI,
|
|
21
|
+
} as Context;
|
|
22
|
+
|
|
23
|
+
if (!toCart || !shouldMerge) {
|
|
24
|
+
// No destination cart, move whole cart
|
|
25
|
+
unchainedAPI.modules.orders.setCartOwner({ orderId: fromCart._id, userId: toUser._id });
|
|
26
|
+
return unchainedAPI.modules.orders.updateCalculation(fromCart._id, artificialContext);
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
// Move positions
|
|
30
|
+
unchainedAPI.modules.orders.moveCartPositions({ fromOrderId: fromCart._id, toOrderId: toCart._id });
|
|
31
|
+
|
|
32
|
+
await unchainedAPI.modules.orders.updateCalculation(fromCart._id, artificialContext);
|
|
33
|
+
return unchainedAPI.modules.orders.updateCalculation(toCart._id, artificialContext);
|
|
22
34
|
};
|