@unchainedshop/core-orders 2.13.1 → 2.13.2
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrderDeliveriesModule.d.ts","sourceRoot":"","sources":["../../src/module/configureOrderDeliveriesModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAA6C,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"configureOrderDeliveriesModule.d.ts","sourceRoot":"","sources":["../../src/module/configureOrderDeliveriesModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAA6C,MAAM,wBAAwB,CAAC;AAC5F,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EACL,qBAAqB,EACrB,aAAa,EAEd,MAAM,2CAA2C,CAAC;AAQnD,eAAO,MAAM,qBAAqB,oBAAqB,MAAM,KAClB,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;AAEzE,eAAO,MAAM,8BAA8B,4CAGxC;IACD,eAAe,EAAE,OAAO,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACnD,iBAAiB,EAAE,YAAY,CAAC,mBAAmB,CAAC,CAAC;CACtD,KAAG,qBAmOH,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { OrderDeliveryStatus, } from '@unchainedshop/types/orders.deliveries.js'
|
|
|
3
3
|
import { emit, registerEvents } from '@unchainedshop/events';
|
|
4
4
|
import { log } from '@unchainedshop/logger';
|
|
5
5
|
import { OrderDeliveriesSchema } from '../db/OrderDeliveriesSchema.js';
|
|
6
|
+
import { DeliveryDirector } from '@unchainedshop/core-delivery';
|
|
6
7
|
const ORDER_DELIVERY_EVENTS = ['ORDER_DELIVER', 'ORDER_UPDATE_DELIVERY'];
|
|
7
8
|
export const buildFindByIdSelector = (orderDeliveryId) => generateDbFilterById(orderDeliveryId);
|
|
8
9
|
export const configureOrderDeliveriesModule = ({ OrderDeliveries, updateCalculation, }) => {
|
|
@@ -60,6 +61,14 @@ export const configureOrderDeliveriesModule = ({ OrderDeliveries, updateCalculat
|
|
|
60
61
|
const isAutoReleaseAllowed = await unchainedAPI.modules.delivery.isAutoReleaseAllowed(provider, unchainedAPI);
|
|
61
62
|
return !isAutoReleaseAllowed;
|
|
62
63
|
},
|
|
64
|
+
activePickUpLocation: async (orderDelivery, unchainedAPI) => {
|
|
65
|
+
const { orderPickUpLocationId } = orderDelivery.context || {};
|
|
66
|
+
const provider = await unchainedAPI.modules.delivery.findProvider({
|
|
67
|
+
deliveryProviderId: orderDelivery.deliveryProviderId,
|
|
68
|
+
});
|
|
69
|
+
const director = await DeliveryDirector.actions(provider, { orderDelivery: orderDelivery }, unchainedAPI);
|
|
70
|
+
return director.pickUpLocationById(orderPickUpLocationId);
|
|
71
|
+
},
|
|
63
72
|
isBlockingOrderFullfillment: (orderDelivery) => {
|
|
64
73
|
if (orderDelivery.status === OrderDeliveryStatus.DELIVERED)
|
|
65
74
|
return false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureOrderDeliveriesModule.js","sourceRoot":"","sources":["../../src/module/configureOrderDeliveriesModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"configureOrderDeliveriesModule.js","sourceRoot":"","sources":["../../src/module/configureOrderDeliveriesModule.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/core-orders",
|
|
3
|
-
"version": "2.13.
|
|
3
|
+
"version": "2.13.2",
|
|
4
4
|
"main": "lib/orders-index.js",
|
|
5
5
|
"exports": {
|
|
6
6
|
".": "./lib/orders-index.js",
|
|
@@ -32,16 +32,16 @@
|
|
|
32
32
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@kontsedal/locco": "0.1.0",
|
|
35
|
-
"@unchainedshop/events": "^2.13.
|
|
36
|
-
"@unchainedshop/logger": "^2.13.
|
|
37
|
-
"@unchainedshop/utils": "^2.13.
|
|
35
|
+
"@unchainedshop/events": "^2.13.2",
|
|
36
|
+
"@unchainedshop/logger": "^2.13.2",
|
|
37
|
+
"@unchainedshop/utils": "^2.13.2",
|
|
38
38
|
"simpl-schema": "^3.4.6"
|
|
39
39
|
},
|
|
40
40
|
"devDependencies": {
|
|
41
|
-
"@types/node": "^20.14.
|
|
42
|
-
"@unchainedshop/types": "^2.13.
|
|
41
|
+
"@types/node": "^20.14.15",
|
|
42
|
+
"@unchainedshop/types": "^2.13.2",
|
|
43
43
|
"jest": "^29.7.0",
|
|
44
|
-
"ts-jest": "^29.2.
|
|
44
|
+
"ts-jest": "^29.2.4",
|
|
45
45
|
"typescript": "^5.5.4"
|
|
46
46
|
}
|
|
47
47
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ModuleMutations } from '@unchainedshop/types/core.js';
|
|
2
2
|
import { mongodb, generateDbFilterById, generateDbMutations } from '@unchainedshop/mongodb';
|
|
3
|
-
|
|
4
3
|
import { OrdersModule } from '@unchainedshop/types/orders.js';
|
|
5
4
|
import {
|
|
6
5
|
OrderDeliveriesModule,
|
|
@@ -10,6 +9,7 @@ import {
|
|
|
10
9
|
import { emit, registerEvents } from '@unchainedshop/events';
|
|
11
10
|
import { log } from '@unchainedshop/logger';
|
|
12
11
|
import { OrderDeliveriesSchema } from '../db/OrderDeliveriesSchema.js';
|
|
12
|
+
import { DeliveryDirector } from '@unchainedshop/core-delivery';
|
|
13
13
|
|
|
14
14
|
const ORDER_DELIVERY_EVENTS: string[] = ['ORDER_DELIVER', 'ORDER_UPDATE_DELIVERY'];
|
|
15
15
|
|
|
@@ -98,6 +98,22 @@ export const configureOrderDeliveriesModule = ({
|
|
|
98
98
|
|
|
99
99
|
return !isAutoReleaseAllowed;
|
|
100
100
|
},
|
|
101
|
+
|
|
102
|
+
activePickUpLocation: async (orderDelivery, unchainedAPI) => {
|
|
103
|
+
const { orderPickUpLocationId } = orderDelivery.context || {};
|
|
104
|
+
|
|
105
|
+
const provider = await unchainedAPI.modules.delivery.findProvider({
|
|
106
|
+
deliveryProviderId: orderDelivery.deliveryProviderId,
|
|
107
|
+
});
|
|
108
|
+
const director = await DeliveryDirector.actions(
|
|
109
|
+
provider,
|
|
110
|
+
{ orderDelivery: orderDelivery },
|
|
111
|
+
unchainedAPI,
|
|
112
|
+
);
|
|
113
|
+
|
|
114
|
+
return director.pickUpLocationById(orderPickUpLocationId);
|
|
115
|
+
},
|
|
116
|
+
|
|
101
117
|
isBlockingOrderFullfillment: (orderDelivery) => {
|
|
102
118
|
if (orderDelivery.status === OrderDeliveryStatus.DELIVERED) return false;
|
|
103
119
|
return true;
|