@unchainedshop/core-orders 5.0.0-alpha.10 → 5.0.0-alpha.11

package/lib/db/OrderDeliveriesCollection.d.ts

@@ -19,5 +19,7 @@ export type OrderDeliveryDiscount = Omit<Price, '_id'> & {
     _id: string;
     discountId: string;
     item: OrderDelivery;
+    isTaxable?: boolean;
+    isNetPrice?: boolean;
 };
 export declare const OrderDeliveriesCollection: (db: mongodb.Db) => Promise<mongodb.Collection<OrderDelivery>>;

package/lib/db/OrderPositionsCollection.d.ts

@@ -18,5 +18,7 @@ export type OrderPosition = {
 export type OrderPositionDiscount = Omit<Price, '_id'> & {
     discountId: string;
     item: OrderPosition;
+    isTaxable?: boolean;
+    isNetPrice?: boolean;
 };
 export declare const OrderPositionsCollection: (db: mongodb.Db) => Promise<mongodb.Collection<OrderPosition>>;

package/lib/db/OrderPositionsCollection.js

@@ -4,6 +4,7 @@ export const OrderPositionsCollection = async (db) => {
     await buildDbIndexes(OrderPositions, [
         { index: { orderId: 1, created: 1 } },
         { index: { productId: 1 } },
+        { index: { quotationId: 1 } },
     ]);
     return OrderPositions;
 };

package/lib/module/configureOrderPositionsModule.d.ts

@@ -27,6 +27,8 @@ export declare const configureOrderPositionsModule: ({ OrderPositions, }: {
         orderId: string;
     } | {
         orderIds: string[];
+    } | {
+        quotationId: string;
     }) => Promise<OrderPosition[]>;
     delete: (orderPositionId: string) => Promise<mongodb.WithId<OrderPosition> | null>;
     removePositions: ({ orderId }: {

package/lib/module/configureOrderPositionsModule.js

@@ -16,8 +16,10 @@ export const configureOrderPositionsModule = ({ OrderPositions, }) => {
         findOrderPositions: async (query) => {
             if ('orderIds' in query && !query.orderIds.length)
                 return [];
-            const orderId = 'orderIds' in query ? { $in: query.orderIds } : query.orderId;
-            const positions = OrderPositions.find({ orderId, quantity: { $gt: 0 } }, { sort: { created: 1, _id: 1 } });
+            const selector = 'quotationId' in query
+                ? { quotationId: query.quotationId }
+                : { orderId: 'orderIds' in query ? { $in: query.orderIds } : query.orderId };
+            const positions = OrderPositions.find({ ...selector, quantity: { $gt: 0 } }, { sort: { created: 1, _id: 1 } });
             return positions.toArray();
         },
         delete: async (orderPositionId) => {
@@ -110,6 +112,7 @@ export const configureOrderPositionsModule = ({ OrderPositions, }) => {
                 originalProductId,
                 configuration: configuration ?? null,
                 ...scope,
+                quotationId: scope.quotationId ?? { $not: { $type: 'string' } },
             };
             const upsertedOrderPosition = (await OrderPositions.findOneAndUpdate(selector, {
                 $set: {

package/lib/module/configureOrdersModule.d.ts

@@ -53,6 +53,8 @@ export declare const configureOrdersModule: ({ db, migrationRepository, options:
             orderId: string;
         } | {
             orderIds: string[];
+        } | {
+            quotationId: string;
         }) => Promise<import("../db/OrderPositionsCollection.ts").OrderPosition[]>;
         delete: (orderPositionId: string) => Promise<mongodb.WithId<import("../db/OrderPositionsCollection.ts").OrderPosition> | null>;
         removePositions: ({ orderId }: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core-orders",
   "description": "Order management module for the Unchained Engine",
-  "version": "5.0.0-alpha.10",
+  "version": "5.0.0-alpha.11",
   "files": [
     "lib"
   ],
@@ -38,9 +38,9 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^5.0.0-alpha.10",
-    "@unchainedshop/mongodb": "^5.0.0-alpha.10",
-    "@unchainedshop/utils": "^5.0.0-alpha.10"
+    "@unchainedshop/events": "^5.0.0-alpha.11",
+    "@unchainedshop/mongodb": "^5.0.0-alpha.11",
+    "@unchainedshop/utils": "^5.0.0-alpha.11"
   },
   "devDependencies": {
     "@types/node": "^26.2.0",