@unchainedshop/core-delivery 3.1.13 → 4.0.0-rc.10
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/db/DeliveryProvidersCollection.d.ts +2 -2
- package/lib/db/DeliveryProvidersCollection.d.ts.map +1 -1
- package/lib/delivery-settings.d.ts +3 -3
- package/lib/delivery-settings.d.ts.map +1 -1
- package/lib/module/configureDeliveryModule.d.ts +2 -1
- package/lib/module/configureDeliveryModule.d.ts.map +1 -1
- package/lib/module/configureDeliveryModule.js +11 -0
- package/lib/module/configureDeliveryModule.js.map +1 -1
- package/package.json +8 -6
- package/src/db/DeliveryProvidersCollection.ts +2 -2
- package/src/delivery-settings.ts +3 -3
- package/src/module/configureDeliveryModule.ts +17 -1
- package/lib/db/DeliveryProvidersSchema.d.ts +0 -3
- package/lib/db/DeliveryProvidersSchema.d.ts.map +0 -1
- package/lib/db/DeliveryProvidersSchema.js +0 -12
- package/lib/db/DeliveryProvidersSchema.js.map +0 -1
- package/lib/director/DeliveryAdapter.d.ts +0 -3
- package/lib/director/DeliveryAdapter.d.ts.map +0 -1
- package/lib/director/DeliveryAdapter.js +0 -44
- package/lib/director/DeliveryAdapter.js.map +0 -1
- package/lib/director/DeliveryDirector.d.ts +0 -3
- package/lib/director/DeliveryDirector.d.ts.map +0 -1
- package/lib/director/DeliveryDirector.js +0 -69
- package/lib/director/DeliveryDirector.js.map +0 -1
- package/lib/director/DeliveryError.d.ts +0 -7
- package/lib/director/DeliveryError.d.ts.map +0 -1
- package/lib/director/DeliveryError.js +0 -8
- package/lib/director/DeliveryError.js.map +0 -1
- package/lib/director/DeliveryPricingAdapter.d.ts +0 -3
- package/lib/director/DeliveryPricingAdapter.d.ts.map +0 -1
- package/lib/director/DeliveryPricingAdapter.js +0 -25
- package/lib/director/DeliveryPricingAdapter.js.map +0 -1
- package/lib/director/DeliveryPricingDirector.d.ts +0 -3
- package/lib/director/DeliveryPricingDirector.d.ts.map +0 -1
- package/lib/director/DeliveryPricingDirector.js +0 -58
- package/lib/director/DeliveryPricingDirector.js.map +0 -1
- package/lib/director/DeliveryPricingSheet.d.ts +0 -4
- package/lib/director/DeliveryPricingSheet.d.ts.map +0 -1
- package/lib/director/DeliveryPricingSheet.js +0 -69
- package/lib/director/DeliveryPricingSheet.js.map +0 -1
- package/lib/director/DeliveryProviderType.d.ts +0 -5
- package/lib/director/DeliveryProviderType.d.ts.map +0 -1
- package/lib/director/DeliveryProviderType.js +0 -6
- package/lib/director/DeliveryProviderType.js.map +0 -1
|
@@ -3,10 +3,10 @@ export declare enum DeliveryProviderType {
|
|
|
3
3
|
SHIPPING = "SHIPPING",
|
|
4
4
|
PICKUP = "PICKUP"
|
|
5
5
|
}
|
|
6
|
-
export type DeliveryConfiguration =
|
|
6
|
+
export type DeliveryConfiguration = {
|
|
7
7
|
key: string;
|
|
8
8
|
value: string;
|
|
9
|
-
}
|
|
9
|
+
}[];
|
|
10
10
|
export type DeliveryProvider = {
|
|
11
11
|
_id?: string;
|
|
12
12
|
type: DeliveryProviderType;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryProvidersCollection.d.ts","sourceRoot":"","sources":["../../src/db/DeliveryProvidersCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAElF,oBAAY,oBAAoB;IAC9B,QAAQ,aAAa;IACrB,MAAM,WAAW;CAClB;AACD,MAAM,MAAM,qBAAqB,GAAG
|
|
1
|
+
{"version":3,"file":"DeliveryProvidersCollection.d.ts","sourceRoot":"","sources":["../../src/db/DeliveryProvidersCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAElF,oBAAY,oBAAoB;IAC9B,QAAQ,aAAa;IACrB,MAAM,WAAW;CAClB;AACD,MAAM,MAAM,qBAAqB,GAAG;IAClC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf,EAAE,CAAC;AAEJ,MAAM,MAAM,gBAAgB,GAAG;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,oBAAoB,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,qBAAqB,CAAC;CACtC,GAAG,eAAe,CAAC;AAEpB,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE;QACP,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,QAAQ,EAAE;QACR,QAAQ,EAAE,MAAM,CAAC;QACjB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH;AACD,eAAO,MAAM,2BAA2B,GAAU,IAAI,OAAO,CAAC,EAAE,kDAc/D,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { DeliveryProvider } from './db/DeliveryProvidersCollection.js';
|
|
2
2
|
export type FilterProviders<Order = unknown, UnchainedAPI = unknown> = (params: {
|
|
3
|
-
providers:
|
|
3
|
+
providers: DeliveryProvider[];
|
|
4
4
|
order: Order;
|
|
5
|
-
}, unchainedAPI: UnchainedAPI) => Promise<
|
|
5
|
+
}, unchainedAPI: UnchainedAPI) => Promise<DeliveryProvider[]>;
|
|
6
6
|
export type DetermineDefaultProvider<Order = unknown, UnchainedAPI = unknown> = (params: {
|
|
7
|
-
providers:
|
|
7
|
+
providers: DeliveryProvider[];
|
|
8
8
|
order: Order;
|
|
9
9
|
}, unchainedAPI: UnchainedAPI) => Promise<DeliveryProvider>;
|
|
10
10
|
export interface DeliverySettingsOptions {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delivery-settings.d.ts","sourceRoot":"","sources":["../src/delivery-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAEvE,MAAM,MAAM,eAAe,CAAC,KAAK,GAAG,OAAO,EAAE,YAAY,GAAG,OAAO,IAAI,CACrE,MAAM,EAAE;IACN,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"delivery-settings.d.ts","sourceRoot":"","sources":["../src/delivery-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AAEvE,MAAM,MAAM,eAAe,CAAC,KAAK,GAAG,OAAO,EAAE,YAAY,GAAG,OAAO,IAAI,CACrE,MAAM,EAAE;IACN,SAAS,EAAE,gBAAgB,EAAE,CAAC;IAC9B,KAAK,EAAE,KAAK,CAAC;CACd,EACD,YAAY,EAAE,YAAY,KACvB,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;AAEjC,MAAM,MAAM,wBAAwB,CAAC,KAAK,GAAG,OAAO,EAAE,YAAY,GAAG,OAAO,IAAI,CAC9E,MAAM,EAAE;IACN,SAAS,EAAE,gBAAgB,EAAE,CAAC;IAC9B,KAAK,EAAE,KAAK,CAAC;CACd,EACD,YAAY,EAAE,YAAY,KACvB,OAAO,CAAC,gBAAgB,CAAC,CAAC;AAC/B,MAAM,WAAW,uBAAuB;IACtC,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,gBAAgB,KAAK,MAAM,CAAC;IACrE,wBAAwB,CAAC,EAAE,eAAe,CAAC;IAC3C,wBAAwB,CAAC,EAAE,wBAAwB,CAAC;CACrD;AAED,MAAM,WAAW,gBAAgB;IAC/B,wBAAwB,EAAE,eAAe,CAAC;IAC1C,wBAAwB,EAAE,wBAAwB,CAAC;IACnD,iBAAiB,EAAE,CAAC,OAAO,CAAC,EAAE,uBAAuB,KAAK,IAAI,CAAC;CAChE;AAcD,eAAO,MAAM,gBAAgB,EAAE,gBAW9B,CAAC"}
|
|
@@ -15,7 +15,8 @@ export declare const configureDeliveryModule: ({ db, options: deliveryOptions, }
|
|
|
15
15
|
findProvider: ({ deliveryProviderId, ...query }: {
|
|
16
16
|
deliveryProviderId: string;
|
|
17
17
|
} & mongodb.Filter<DeliveryProvider>, options?: mongodb.FindOptions<DeliveryProvider>) => Promise<DeliveryProvider>;
|
|
18
|
-
findProviders: (query: mongodb.Filter<DeliveryProvider>, options?: mongodb.FindOptions<DeliveryProvider>) => Promise<
|
|
18
|
+
findProviders: (query: mongodb.Filter<DeliveryProvider>, options?: mongodb.FindOptions<DeliveryProvider>) => Promise<DeliveryProvider[]>;
|
|
19
|
+
allProviders: () => Promise<mongodb.WithId<DeliveryProvider>[]>;
|
|
19
20
|
providerExists: ({ deliveryProviderId }: {
|
|
20
21
|
deliveryProviderId: string;
|
|
21
22
|
}) => Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureDeliveryModule.d.ts","sourceRoot":"","sources":["../../src/module/configureDeliveryModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAA4C,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAA+B,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACrG,OAAO,EAAoB,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"configureDeliveryModule.d.ts","sourceRoot":"","sources":["../../src/module/configureDeliveryModule.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAA4C,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAA+B,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACrG,OAAO,EAAoB,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAUpF,MAAM,WAAW,iBAAiB;IAChC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,iBAAiB,GAAI,WAAU,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAM;;;CAEhF,CAAC;AAIF,eAAO,MAAM,uBAAuB,GAAU,mCAG3C,WAAW,CAAC,uBAAuB,CAAC;mBASd,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,KAAG,OAAO,CAAC,MAAM,CAAC;qDASlE;QACD,kBAAkB,EAAE,MAAM,CAAC;KAC5B,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAC1B,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAC9C,OAAO,CAAC,gBAAgB,CAAC;2BAQnB,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAC9B,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAC7C,OAAO,CAAC,gBAAgB,EAAE,CAAC;;6CAciB;QAAE,kBAAkB,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,OAAO,CAAC;kBAS5E,gBAAgB,KAAG,OAAO,CAAC,gBAAgB,CAAC;kBAY5C,MAAM,OAAO,gBAAgB,KAAG,OAAO,CAAC,gBAAgB,CAAC;kBAgBzD,MAAM,KAAG,OAAO,CAAC,gBAAgB,CAAC;EAezD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,uBAAuB,CAAC,CAAC,CAAC"}
|
|
@@ -2,6 +2,8 @@ import { emit, registerEvents } from '@unchainedshop/events';
|
|
|
2
2
|
import { generateDbFilterById, generateDbObjectId } from '@unchainedshop/mongodb';
|
|
3
3
|
import { DeliveryProvidersCollection } from '../db/DeliveryProvidersCollection.js';
|
|
4
4
|
import { deliverySettings } from '../delivery-settings.js';
|
|
5
|
+
import pMemoize from 'p-memoize';
|
|
6
|
+
import ExpiryMap from 'expiry-map';
|
|
5
7
|
const DELIVERY_PROVIDER_EVENTS = [
|
|
6
8
|
'DELIVERY_PROVIDER_CREATE',
|
|
7
9
|
'DELIVERY_PROVIDER_UPDATE',
|
|
@@ -10,6 +12,7 @@ const DELIVERY_PROVIDER_EVENTS = [
|
|
|
10
12
|
export const buildFindSelector = ({ type } = {}) => {
|
|
11
13
|
return { ...(type ? { type } : {}), deleted: null };
|
|
12
14
|
};
|
|
15
|
+
const allProvidersCache = new ExpiryMap(process.env.NODE_ENV === 'production' ? 60000 : 1);
|
|
13
16
|
export const configureDeliveryModule = async ({ db, options: deliveryOptions = {}, }) => {
|
|
14
17
|
registerEvents(DELIVERY_PROVIDER_EVENTS);
|
|
15
18
|
deliverySettings.configureSettings(deliveryOptions);
|
|
@@ -27,6 +30,11 @@ export const configureDeliveryModule = async ({ db, options: deliveryOptions = {
|
|
|
27
30
|
const providers = DeliveryProviders.find(buildFindSelector(query), options);
|
|
28
31
|
return providers.toArray();
|
|
29
32
|
},
|
|
33
|
+
allProviders: pMemoize(async function () {
|
|
34
|
+
return DeliveryProviders.find({ deleted: null }, { sort: { created: 1 } }).toArray();
|
|
35
|
+
}, {
|
|
36
|
+
cache: allProvidersCache,
|
|
37
|
+
}),
|
|
30
38
|
providerExists: async ({ deliveryProviderId }) => {
|
|
31
39
|
const providerCount = await DeliveryProviders.countDocuments(generateDbFilterById(deliveryProviderId, { deleted: null }), { limit: 1 });
|
|
32
40
|
return !!providerCount;
|
|
@@ -39,6 +47,7 @@ export const configureDeliveryModule = async ({ db, options: deliveryOptions = {
|
|
|
39
47
|
...doc,
|
|
40
48
|
});
|
|
41
49
|
const deliveryProvider = await DeliveryProviders.findOne({ _id: deliveryProviderId }, {});
|
|
50
|
+
allProvidersCache.clear();
|
|
42
51
|
await emit('DELIVERY_PROVIDER_CREATE', { deliveryProvider });
|
|
43
52
|
return deliveryProvider;
|
|
44
53
|
},
|
|
@@ -49,6 +58,7 @@ export const configureDeliveryModule = async ({ db, options: deliveryOptions = {
|
|
|
49
58
|
...doc,
|
|
50
59
|
},
|
|
51
60
|
}, { returnDocument: 'after' });
|
|
61
|
+
allProvidersCache.clear();
|
|
52
62
|
await emit('DELIVERY_PROVIDER_UPDATE', { deliveryProvider });
|
|
53
63
|
return deliveryProvider;
|
|
54
64
|
},
|
|
@@ -58,6 +68,7 @@ export const configureDeliveryModule = async ({ db, options: deliveryOptions = {
|
|
|
58
68
|
deleted: new Date(),
|
|
59
69
|
},
|
|
60
70
|
}, { returnDocument: 'after' });
|
|
71
|
+
allProvidersCache.clear();
|
|
61
72
|
await emit('DELIVERY_PROVIDER_REMOVE', { deliveryProvider });
|
|
62
73
|
return deliveryProvider;
|
|
63
74
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureDeliveryModule.js","sourceRoot":"","sources":["../../src/module/configureDeliveryModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAW,oBAAoB,EAAE,kBAAkB,EAAe,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAAE,2BAA2B,EAAoB,MAAM,sCAAsC,CAAC;AACrG,OAAO,EAAE,gBAAgB,EAA2B,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"configureDeliveryModule.js","sourceRoot":"","sources":["../../src/module/configureDeliveryModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAC7D,OAAO,EAAW,oBAAoB,EAAE,kBAAkB,EAAe,MAAM,wBAAwB,CAAC;AACxG,OAAO,EAAE,2BAA2B,EAAoB,MAAM,sCAAsC,CAAC;AACrG,OAAO,EAAE,gBAAgB,EAA2B,MAAM,yBAAyB,CAAC;AACpF,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,SAAS,MAAM,YAAY,CAAC;AAEnC,MAAM,wBAAwB,GAAa;IACzC,0BAA0B;IAC1B,0BAA0B;IAC1B,0BAA0B;CAC3B,CAAC;AAQF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAE,IAAI,KAAuC,EAAE,EAAE,EAAE;IACnF,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;AACtD,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,IAAI,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAE3F,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAAE,EAC5C,EAAE,EACF,OAAO,EAAE,eAAe,GAAG,EAAE,GACQ,EAAE,EAAE;IACzC,cAAc,CAAC,wBAAwB,CAAC,CAAC;IAEzC,gBAAgB,CAAC,iBAAiB,CAAC,eAAe,CAAC,CAAC;IAEpD,MAAM,iBAAiB,GAAG,MAAM,2BAA2B,CAAC,EAAE,CAAC,CAAC;IAEhE,OAAO;QACL,UAAU;QACV,KAAK,EAAE,KAAK,EAAE,KAAuC,EAAmB,EAAE;YACxE,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;YACvF,OAAO,aAAa,CAAC;QACvB,CAAC;QAED,YAAY,EAAE,KAAK,EACjB,EACE,kBAAkB,EAClB,GAAG,KAAK,EAG0B,EACpC,OAA+C,EACpB,EAAE;YAC7B,OAAO,iBAAiB,CAAC,OAAO,CAC9B,kBAAkB,CAAC,CAAC,CAAC,oBAAoB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,KAAK,EACrE,OAAO,CACR,CAAC;QACJ,CAAC;QAED,aAAa,EAAE,KAAK,EAClB,KAAuC,EACvC,UAAiD,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,EAC5C,EAAE;YAC/B,MAAM,SAAS,GAAG,iBAAiB,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,CAAC;YAC5E,OAAO,SAAS,CAAC,OAAO,EAAE,CAAC;QAC7B,CAAC;QAED,YAAY,EAAE,QAAQ,CACpB,KAAK;YACH,OAAO,iBAAiB,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;QACvF,CAAC,EACD;YACE,KAAK,EAAE,iBAAiB;SACzB,CACF;QAED,cAAc,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAkC,EAAoB,EAAE;YACjG,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAC1D,oBAAoB,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAC3D,EAAE,KAAK,EAAE,CAAC,EAAE,CACb,CAAC;YACF,OAAO,CAAC,CAAC,aAAa,CAAC;QACzB,CAAC;QAED,YAAY;QACZ,MAAM,EAAE,KAAK,EAAE,GAAqB,EAA6B,EAAE;YACjE,MAAM,EAAE,UAAU,EAAE,kBAAkB,EAAE,GAAG,MAAM,iBAAiB,CAAC,SAAS,CAAC;gBAC3E,GAAG,EAAE,kBAAkB,EAAE;gBACzB,OAAO,EAAE,IAAI,IAAI,EAAE;gBACnB,GAAG,GAAG;aACP,CAAC,CAAC;YACH,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAC,CAAC;YAC1F,iBAAiB,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,0BAA0B,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;YAC7D,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,GAAW,EAAE,GAAqB,EAA6B,EAAE;YAC9E,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,gBAAgB,CAC/D,oBAAoB,CAAC,GAAG,CAAC,EACzB;gBACE,IAAI,EAAE;oBACJ,OAAO,EAAE,IAAI,IAAI,EAAE;oBACnB,GAAG,GAAG;iBACP;aACF,EACD,EAAE,cAAc,EAAE,OAAO,EAAE,CAC5B,CAAC;YACF,iBAAiB,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,0BAA0B,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;YAC7D,OAAO,gBAAgB,CAAC;QAC1B,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,GAAW,EAA6B,EAAE;YACvD,MAAM,gBAAgB,GAAG,MAAM,iBAAiB,CAAC,gBAAgB,CAC/D,oBAAoB,CAAC,GAAG,CAAC,EACzB;gBACE,IAAI,EAAE;oBACJ,OAAO,EAAE,IAAI,IAAI,EAAE;iBACpB;aACF,EACD,EAAE,cAAc,EAAE,OAAO,EAAE,CAC5B,CAAC;YACF,iBAAiB,CAAC,KAAK,EAAE,CAAC;YAC1B,MAAM,IAAI,CAAC,0BAA0B,EAAE,EAAE,gBAAgB,EAAE,CAAC,CAAC;YAC7D,OAAO,gBAAgB,CAAC;QAC1B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/core-delivery",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.0-rc.10",
|
|
4
4
|
"main": "lib/delivery-index.js",
|
|
5
5
|
"types": "lib/delivery-index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -31,13 +31,15 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@unchainedshop/events": "^
|
|
35
|
-
"@unchainedshop/logger": "^
|
|
36
|
-
"@unchainedshop/mongodb": "^
|
|
37
|
-
"@unchainedshop/utils": "^
|
|
34
|
+
"@unchainedshop/events": "^4.0.0-rc.4",
|
|
35
|
+
"@unchainedshop/logger": "^4.0.0-rc.4",
|
|
36
|
+
"@unchainedshop/mongodb": "^4.0.0-rc.4",
|
|
37
|
+
"@unchainedshop/utils": "^4.0.0-rc.4",
|
|
38
|
+
"expiry-map": "^2.0.0",
|
|
39
|
+
"p-memoize": "^7.1.1"
|
|
38
40
|
},
|
|
39
41
|
"devDependencies": {
|
|
40
|
-
"@types/node": "^24.0.
|
|
42
|
+
"@types/node": "^24.0.13",
|
|
41
43
|
"tsx": "^4.20.3",
|
|
42
44
|
"typescript": "^5.8.3"
|
|
43
45
|
}
|
|
@@ -4,10 +4,10 @@ export enum DeliveryProviderType {
|
|
|
4
4
|
SHIPPING = 'SHIPPING',
|
|
5
5
|
PICKUP = 'PICKUP',
|
|
6
6
|
}
|
|
7
|
-
export type DeliveryConfiguration =
|
|
7
|
+
export type DeliveryConfiguration = {
|
|
8
8
|
key: string;
|
|
9
9
|
value: string;
|
|
10
|
-
}
|
|
10
|
+
}[];
|
|
11
11
|
|
|
12
12
|
export type DeliveryProvider = {
|
|
13
13
|
_id?: string;
|
package/src/delivery-settings.ts
CHANGED
|
@@ -2,15 +2,15 @@ import { DeliveryProvider } from './db/DeliveryProvidersCollection.js';
|
|
|
2
2
|
|
|
3
3
|
export type FilterProviders<Order = unknown, UnchainedAPI = unknown> = (
|
|
4
4
|
params: {
|
|
5
|
-
providers:
|
|
5
|
+
providers: DeliveryProvider[];
|
|
6
6
|
order: Order;
|
|
7
7
|
},
|
|
8
8
|
unchainedAPI: UnchainedAPI,
|
|
9
|
-
) => Promise<
|
|
9
|
+
) => Promise<DeliveryProvider[]>;
|
|
10
10
|
|
|
11
11
|
export type DetermineDefaultProvider<Order = unknown, UnchainedAPI = unknown> = (
|
|
12
12
|
params: {
|
|
13
|
-
providers:
|
|
13
|
+
providers: DeliveryProvider[];
|
|
14
14
|
order: Order;
|
|
15
15
|
},
|
|
16
16
|
unchainedAPI: UnchainedAPI,
|
|
@@ -2,6 +2,8 @@ import { emit, registerEvents } from '@unchainedshop/events';
|
|
|
2
2
|
import { mongodb, generateDbFilterById, generateDbObjectId, ModuleInput } from '@unchainedshop/mongodb';
|
|
3
3
|
import { DeliveryProvidersCollection, DeliveryProvider } from '../db/DeliveryProvidersCollection.js';
|
|
4
4
|
import { deliverySettings, DeliverySettingsOptions } from '../delivery-settings.js';
|
|
5
|
+
import pMemoize from 'p-memoize';
|
|
6
|
+
import ExpiryMap from 'expiry-map';
|
|
5
7
|
|
|
6
8
|
const DELIVERY_PROVIDER_EVENTS: string[] = [
|
|
7
9
|
'DELIVERY_PROVIDER_CREATE',
|
|
@@ -19,6 +21,8 @@ export const buildFindSelector = ({ type }: mongodb.Filter<DeliveryProvider> = {
|
|
|
19
21
|
return { ...(type ? { type } : {}), deleted: null };
|
|
20
22
|
};
|
|
21
23
|
|
|
24
|
+
const allProvidersCache = new ExpiryMap(process.env.NODE_ENV === 'production' ? 60000 : 1);
|
|
25
|
+
|
|
22
26
|
export const configureDeliveryModule = async ({
|
|
23
27
|
db,
|
|
24
28
|
options: deliveryOptions = {},
|
|
@@ -54,11 +58,20 @@ export const configureDeliveryModule = async ({
|
|
|
54
58
|
findProviders: async (
|
|
55
59
|
query: mongodb.Filter<DeliveryProvider>,
|
|
56
60
|
options: mongodb.FindOptions<DeliveryProvider> = { sort: { created: 1 } },
|
|
57
|
-
): Promise<
|
|
61
|
+
): Promise<DeliveryProvider[]> => {
|
|
58
62
|
const providers = DeliveryProviders.find(buildFindSelector(query), options);
|
|
59
63
|
return providers.toArray();
|
|
60
64
|
},
|
|
61
65
|
|
|
66
|
+
allProviders: pMemoize(
|
|
67
|
+
async function () {
|
|
68
|
+
return DeliveryProviders.find({ deleted: null }, { sort: { created: 1 } }).toArray();
|
|
69
|
+
},
|
|
70
|
+
{
|
|
71
|
+
cache: allProvidersCache,
|
|
72
|
+
},
|
|
73
|
+
),
|
|
74
|
+
|
|
62
75
|
providerExists: async ({ deliveryProviderId }: { deliveryProviderId: string }): Promise<boolean> => {
|
|
63
76
|
const providerCount = await DeliveryProviders.countDocuments(
|
|
64
77
|
generateDbFilterById(deliveryProviderId, { deleted: null }),
|
|
@@ -75,6 +88,7 @@ export const configureDeliveryModule = async ({
|
|
|
75
88
|
...doc,
|
|
76
89
|
});
|
|
77
90
|
const deliveryProvider = await DeliveryProviders.findOne({ _id: deliveryProviderId }, {});
|
|
91
|
+
allProvidersCache.clear();
|
|
78
92
|
await emit('DELIVERY_PROVIDER_CREATE', { deliveryProvider });
|
|
79
93
|
return deliveryProvider;
|
|
80
94
|
},
|
|
@@ -90,6 +104,7 @@ export const configureDeliveryModule = async ({
|
|
|
90
104
|
},
|
|
91
105
|
{ returnDocument: 'after' },
|
|
92
106
|
);
|
|
107
|
+
allProvidersCache.clear();
|
|
93
108
|
await emit('DELIVERY_PROVIDER_UPDATE', { deliveryProvider });
|
|
94
109
|
return deliveryProvider;
|
|
95
110
|
},
|
|
@@ -104,6 +119,7 @@ export const configureDeliveryModule = async ({
|
|
|
104
119
|
},
|
|
105
120
|
{ returnDocument: 'after' },
|
|
106
121
|
);
|
|
122
|
+
allProvidersCache.clear();
|
|
107
123
|
await emit('DELIVERY_PROVIDER_REMOVE', { deliveryProvider });
|
|
108
124
|
return deliveryProvider;
|
|
109
125
|
},
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryProvidersSchema.d.ts","sourceRoot":"","sources":["../../src/db/DeliveryProvidersSchema.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,cAAc,CAAC;AAExC,eAAO,MAAM,uBAAuB,cAWnC,CAAC"}
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
import { Schemas } from '@unchainedshop/utils';
|
|
2
|
-
import SimpleSchema from 'simpl-schema';
|
|
3
|
-
export const DeliveryProvidersSchema = new SimpleSchema({
|
|
4
|
-
type: { type: String, required: true },
|
|
5
|
-
adapterKey: { type: String, required: true },
|
|
6
|
-
configuration: { type: Array },
|
|
7
|
-
'configuration.$': { type: Object },
|
|
8
|
-
'configuration.$.key': { type: String },
|
|
9
|
-
'configuration.$.value': { type: String },
|
|
10
|
-
...Schemas.timestampFields,
|
|
11
|
-
}, { requiredByDefault: false });
|
|
12
|
-
//# sourceMappingURL=DeliveryProvidersSchema.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryProvidersSchema.js","sourceRoot":"","sources":["../../src/db/DeliveryProvidersSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,YAAY,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,uBAAuB,GAAG,IAAI,YAAY,CACrD;IACE,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACtC,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IAC5C,aAAa,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;IAC9B,iBAAiB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACnC,qBAAqB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACvC,uBAAuB,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACzC,GAAG,OAAO,CAAC,eAAe;CAC3B,EACD,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC7B,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryAdapter.d.ts","sourceRoot":"","sources":["../../src/director/DeliveryAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAIpE,eAAO,MAAM,eAAe,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,GAAG,OAAO,GAAG,SAAS,CAmD/E,CAAC"}
|
|
@@ -1,44 +0,0 @@
|
|
|
1
|
-
import { log, LogLevel } from '@unchainedshop/logger';
|
|
2
|
-
import { DeliveryError } from './DeliveryError.js';
|
|
3
|
-
export const DeliveryAdapter = {
|
|
4
|
-
initialConfiguration: [],
|
|
5
|
-
typeSupported: () => {
|
|
6
|
-
return false;
|
|
7
|
-
},
|
|
8
|
-
actions: () => {
|
|
9
|
-
return {
|
|
10
|
-
configurationError: () => {
|
|
11
|
-
return DeliveryError.NOT_IMPLEMENTED;
|
|
12
|
-
},
|
|
13
|
-
estimatedDeliveryThroughput: async () => {
|
|
14
|
-
return 0;
|
|
15
|
-
},
|
|
16
|
-
isActive: () => {
|
|
17
|
-
return false;
|
|
18
|
-
},
|
|
19
|
-
isAutoReleaseAllowed: () => {
|
|
20
|
-
// if you return false here,
|
|
21
|
-
// the order will need manual confirmation before
|
|
22
|
-
// unchained will try to invoke send()
|
|
23
|
-
return true;
|
|
24
|
-
},
|
|
25
|
-
send: async () => {
|
|
26
|
-
// if you return true, the status will be changed to DELIVERED
|
|
27
|
-
// if you return false, the order delivery status stays the
|
|
28
|
-
// same but the order status might change
|
|
29
|
-
// if you throw an error, you cancel the whole checkout process
|
|
30
|
-
return false;
|
|
31
|
-
},
|
|
32
|
-
pickUpLocationById: async () => {
|
|
33
|
-
return null;
|
|
34
|
-
},
|
|
35
|
-
pickUpLocations: async () => {
|
|
36
|
-
return [];
|
|
37
|
-
},
|
|
38
|
-
};
|
|
39
|
-
},
|
|
40
|
-
log: (message, { level = LogLevel.Debug, ...options } = {}) => {
|
|
41
|
-
return log(message, { level, ...options });
|
|
42
|
-
},
|
|
43
|
-
};
|
|
44
|
-
//# sourceMappingURL=DeliveryAdapter.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryAdapter.js","sourceRoot":"","sources":["../../src/director/DeliveryAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,MAAM,eAAe,GAAwD;IAClF,oBAAoB,EAAE,EAAE;IAExB,aAAa,EAAE,GAAG,EAAE;QAClB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,EAAE,GAAG,EAAE;QACZ,OAAO;YACL,kBAAkB,EAAE,GAAG,EAAE;gBACvB,OAAO,aAAa,CAAC,eAAe,CAAC;YACvC,CAAC;YAED,2BAA2B,EAAE,KAAK,IAAI,EAAE;gBACtC,OAAO,CAAC,CAAC;YACX,CAAC;YAED,QAAQ,EAAE,GAAG,EAAE;gBACb,OAAO,KAAK,CAAC;YACf,CAAC;YAED,oBAAoB,EAAE,GAAG,EAAE;gBACzB,4BAA4B;gBAC5B,iDAAiD;gBACjD,sCAAsC;gBACtC,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,8DAA8D;gBAE9D,2DAA2D;gBAC3D,yCAAyC;gBAEzC,+DAA+D;gBAC/D,OAAO,KAAK,CAAC;YACf,CAAC;YAED,kBAAkB,EAAE,KAAK,IAAI,EAAE;gBAC7B,OAAO,IAAI,CAAC;YACd,CAAC;YAED,eAAe,EAAE,KAAK,IAAI,EAAE;gBAC1B,OAAO,EAAE,CAAC;YACZ,CAAC;SACF,CAAC;IACJ,CAAC;IAED,GAAG,EAAE,CAAC,OAAe,EAAE,EAAE,KAAK,GAAG,QAAQ,CAAC,KAAK,EAAE,GAAG,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;QACpE,OAAO,GAAG,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;IAC7C,CAAC;CACF,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryDirector.d.ts","sourceRoot":"","sources":["../../src/director/DeliveryDirector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAOvF,eAAO,MAAM,gBAAgB,EAAE,iBAoE9B,CAAC"}
|
|
@@ -1,69 +0,0 @@
|
|
|
1
|
-
import { log, LogLevel } from '@unchainedshop/logger';
|
|
2
|
-
import { BaseDirector } from '@unchainedshop/utils';
|
|
3
|
-
import { DeliveryError } from './DeliveryError.js';
|
|
4
|
-
const baseDirector = BaseDirector('DeliveryDirector');
|
|
5
|
-
export const DeliveryDirector = {
|
|
6
|
-
...baseDirector,
|
|
7
|
-
actions: async (deliveryProvider, deliveryContext, unchainedAPI) => {
|
|
8
|
-
const Adapter = baseDirector.getAdapter(deliveryProvider.adapterKey);
|
|
9
|
-
const context = { ...deliveryContext, ...unchainedAPI };
|
|
10
|
-
const adapter = Adapter.actions(deliveryProvider.configuration, context);
|
|
11
|
-
return {
|
|
12
|
-
configurationError: () => {
|
|
13
|
-
try {
|
|
14
|
-
return adapter.configurationError();
|
|
15
|
-
}
|
|
16
|
-
catch {
|
|
17
|
-
return DeliveryError.ADAPTER_NOT_FOUND;
|
|
18
|
-
}
|
|
19
|
-
},
|
|
20
|
-
estimatedDeliveryThroughput: async (warehousingThroughputTime) => {
|
|
21
|
-
try {
|
|
22
|
-
const throughput = await adapter.estimatedDeliveryThroughput(warehousingThroughputTime);
|
|
23
|
-
return throughput;
|
|
24
|
-
}
|
|
25
|
-
catch (error) {
|
|
26
|
-
log('Delivery Director -> Error while estimating delivery throughput', {
|
|
27
|
-
level: LogLevel.Warning,
|
|
28
|
-
...error,
|
|
29
|
-
});
|
|
30
|
-
return null;
|
|
31
|
-
}
|
|
32
|
-
},
|
|
33
|
-
isActive: () => {
|
|
34
|
-
try {
|
|
35
|
-
return adapter.isActive();
|
|
36
|
-
}
|
|
37
|
-
catch (error) {
|
|
38
|
-
log('Delivery Director -> Error while checking if is active', {
|
|
39
|
-
level: LogLevel.Warning,
|
|
40
|
-
...error,
|
|
41
|
-
});
|
|
42
|
-
return false;
|
|
43
|
-
}
|
|
44
|
-
},
|
|
45
|
-
isAutoReleaseAllowed: () => {
|
|
46
|
-
try {
|
|
47
|
-
return adapter.isAutoReleaseAllowed();
|
|
48
|
-
}
|
|
49
|
-
catch (error) {
|
|
50
|
-
log('Delivery Director -> Error while checking if auto release is allowed', {
|
|
51
|
-
level: LogLevel.Warning,
|
|
52
|
-
...error,
|
|
53
|
-
});
|
|
54
|
-
return false;
|
|
55
|
-
}
|
|
56
|
-
},
|
|
57
|
-
send: async () => {
|
|
58
|
-
return adapter.send();
|
|
59
|
-
},
|
|
60
|
-
pickUpLocationById: async (locationId) => {
|
|
61
|
-
return adapter.pickUpLocationById(locationId);
|
|
62
|
-
},
|
|
63
|
-
pickUpLocations: async () => {
|
|
64
|
-
return adapter.pickUpLocations();
|
|
65
|
-
},
|
|
66
|
-
};
|
|
67
|
-
},
|
|
68
|
-
};
|
|
69
|
-
//# sourceMappingURL=DeliveryDirector.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryDirector.js","sourceRoot":"","sources":["../../src/director/DeliveryDirector.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,YAAY,GAAG,YAAY,CAAmB,kBAAkB,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,gBAAgB,GAAsB;IACjD,GAAG,YAAY;IAEf,OAAO,EAAE,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAAE,EAAE;QACjE,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAErE,MAAM,OAAO,GAAG,EAAE,GAAG,eAAe,EAAE,GAAG,YAAY,EAAE,CAAC;QACxD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;QAEzE,OAAO;YACL,kBAAkB,EAAE,GAAG,EAAE;gBACvB,IAAI,CAAC;oBACH,OAAO,OAAO,CAAC,kBAAkB,EAAE,CAAC;gBACtC,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,aAAa,CAAC,iBAAiB,CAAC;gBACzC,CAAC;YACH,CAAC;YAED,2BAA2B,EAAE,KAAK,EAAE,yBAAyB,EAAE,EAAE;gBAC/D,IAAI,CAAC;oBACH,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,2BAA2B,CAAC,yBAAyB,CAAC,CAAC;oBACxF,OAAO,UAAU,CAAC;gBACpB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,GAAG,CAAC,iEAAiE,EAAE;wBACrE,KAAK,EAAE,QAAQ,CAAC,OAAO;wBACvB,GAAG,KAAK;qBACT,CAAC,CAAC;oBACH,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,QAAQ,EAAE,GAAG,EAAE;gBACb,IAAI,CAAC;oBACH,OAAO,OAAO,CAAC,QAAQ,EAAE,CAAC;gBAC5B,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,GAAG,CAAC,wDAAwD,EAAE;wBAC5D,KAAK,EAAE,QAAQ,CAAC,OAAO;wBACvB,GAAG,KAAK;qBACT,CAAC,CAAC;oBACH,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YAED,oBAAoB,EAAE,GAAG,EAAE;gBACzB,IAAI,CAAC;oBACH,OAAO,OAAO,CAAC,oBAAoB,EAAE,CAAC;gBACxC,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,GAAG,CAAC,sEAAsE,EAAE;wBAC1E,KAAK,EAAE,QAAQ,CAAC,OAAO;wBACvB,GAAG,KAAK;qBACT,CAAC,CAAC;oBACH,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;YAED,IAAI,EAAE,KAAK,IAAI,EAAE;gBACf,OAAO,OAAO,CAAC,IAAI,EAAE,CAAC;YACxB,CAAC;YAED,kBAAkB,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;gBACvC,OAAO,OAAO,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC;YAChD,CAAC;YAED,eAAe,EAAE,KAAK,IAAI,EAAE;gBAC1B,OAAO,OAAO,CAAC,eAAe,EAAE,CAAC;YACnC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryError.d.ts","sourceRoot":"","sources":["../../src/director/DeliveryError.ts"],"names":[],"mappings":"AAAA,oBAAY,aAAa;IACvB,iBAAiB,sBAAsB;IACvC,eAAe,oBAAoB;IACnC,wBAAwB,6BAA6B;IACrD,iBAAiB,sBAAsB;CACxC"}
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
export var DeliveryError;
|
|
2
|
-
(function (DeliveryError) {
|
|
3
|
-
DeliveryError["ADAPTER_NOT_FOUND"] = "ADAPTER_NOT_FOUND";
|
|
4
|
-
DeliveryError["NOT_IMPLEMENTED"] = "NOT_IMPLEMENTED";
|
|
5
|
-
DeliveryError["INCOMPLETE_CONFIGURATION"] = "INCOMPLETE_CONFIGURATION";
|
|
6
|
-
DeliveryError["WRONG_CREDENTIALS"] = "WRONG_CREDENTIALS";
|
|
7
|
-
})(DeliveryError || (DeliveryError = {}));
|
|
8
|
-
//# sourceMappingURL=DeliveryError.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryError.js","sourceRoot":"","sources":["../../src/director/DeliveryError.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,aAKX;AALD,WAAY,aAAa;IACvB,wDAAuC,CAAA;IACvC,oDAAmC,CAAA;IACnC,sEAAqD,CAAA;IACrD,wDAAuC,CAAA;AACzC,CAAC,EALW,aAAa,KAAb,aAAa,QAKxB"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryPricingAdapter.d.ts","sourceRoot":"","sources":["../../src/director/DeliveryPricingAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,uBAAuB,EACxB,MAAM,0CAA0C,CAAC;AASlD,eAAO,MAAM,sBAAsB,EAAE,uBAyBpC,CAAC"}
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
import { BasePricingAdapter } from '@unchainedshop/utils';
|
|
2
|
-
import { DeliveryPricingSheet } from './DeliveryPricingSheet.js';
|
|
3
|
-
const basePricingAdapter = BasePricingAdapter();
|
|
4
|
-
export const DeliveryPricingAdapter = {
|
|
5
|
-
...basePricingAdapter,
|
|
6
|
-
isActivatedFor: () => {
|
|
7
|
-
return false;
|
|
8
|
-
},
|
|
9
|
-
actions: (params) => {
|
|
10
|
-
const { context } = params;
|
|
11
|
-
const { currency } = context;
|
|
12
|
-
const baseActions = basePricingAdapter.actions(params);
|
|
13
|
-
const resultSheet = DeliveryPricingSheet({ currency });
|
|
14
|
-
return {
|
|
15
|
-
...baseActions,
|
|
16
|
-
calculate: async () => {
|
|
17
|
-
const resultRaw = resultSheet.getRawPricingSheet();
|
|
18
|
-
resultRaw.forEach(({ amount, category }) => basePricingAdapter.log(`Delivery Calculation -> ${category} ${amount}`));
|
|
19
|
-
return resultRaw;
|
|
20
|
-
},
|
|
21
|
-
resultSheet: () => resultSheet,
|
|
22
|
-
};
|
|
23
|
-
},
|
|
24
|
-
};
|
|
25
|
-
//# sourceMappingURL=DeliveryPricingAdapter.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryPricingAdapter.js","sourceRoot":"","sources":["../../src/director/DeliveryPricingAdapter.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,kBAAkB,GAAG,kBAAkB,EAG1C,CAAC;AAEJ,MAAM,CAAC,MAAM,sBAAsB,GAA4B;IAC7D,GAAG,kBAAkB;IAErB,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;QAC3B,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;QAC7B,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACvD,MAAM,WAAW,GAAG,oBAAoB,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QAEvD,OAAO;YACL,GAAG,WAAW;YACd,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,MAAM,SAAS,GAAG,WAAW,CAAC,kBAAkB,EAAE,CAAC;gBACnD,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,CACzC,kBAAkB,CAAC,GAAG,CAAC,2BAA2B,QAAQ,IAAI,MAAM,EAAE,CAAC,CACxE,CAAC;gBACF,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,WAAW,EAAE,GAAG,EAAE,CAAC,WAAW;SAC/B,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryPricingDirector.d.ts","sourceRoot":"","sources":["../../src/director/DeliveryPricingDirector.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,wBAAwB,EACzB,MAAM,0CAA0C,CAAC;AAWlD,eAAO,MAAM,uBAAuB,EAAE,wBA0DrC,CAAC"}
|
|
@@ -1,58 +0,0 @@
|
|
|
1
|
-
import { BasePricingDirector } from '@unchainedshop/utils';
|
|
2
|
-
import { DeliveryPricingSheet } from './DeliveryPricingSheet.js';
|
|
3
|
-
const baseDirector = BasePricingDirector('DeliveryPricingDirector');
|
|
4
|
-
export const DeliveryPricingDirector = {
|
|
5
|
-
...baseDirector,
|
|
6
|
-
async buildPricingContext(context, unchainedAPI) {
|
|
7
|
-
const { modules } = unchainedAPI;
|
|
8
|
-
if ('item' in context) {
|
|
9
|
-
const { item } = context;
|
|
10
|
-
const order = await modules.orders.findOrder({
|
|
11
|
-
orderId: item.orderId,
|
|
12
|
-
});
|
|
13
|
-
const provider = await modules.delivery.findProvider({
|
|
14
|
-
deliveryProviderId: item.deliveryProviderId,
|
|
15
|
-
});
|
|
16
|
-
const user = await modules.users.findUserById(order.userId);
|
|
17
|
-
const discounts = await modules.orders.discounts.findOrderDiscounts({
|
|
18
|
-
orderId: item.orderId,
|
|
19
|
-
});
|
|
20
|
-
return {
|
|
21
|
-
...unchainedAPI,
|
|
22
|
-
country: order.countryCode,
|
|
23
|
-
currency: order.currency,
|
|
24
|
-
order,
|
|
25
|
-
provider,
|
|
26
|
-
user,
|
|
27
|
-
discounts,
|
|
28
|
-
orderDelivery: item,
|
|
29
|
-
providerContext: null,
|
|
30
|
-
};
|
|
31
|
-
}
|
|
32
|
-
return {
|
|
33
|
-
...unchainedAPI,
|
|
34
|
-
country: context.country,
|
|
35
|
-
currency: context.currency,
|
|
36
|
-
order: context.order,
|
|
37
|
-
provider: context.provider,
|
|
38
|
-
user: context.user,
|
|
39
|
-
discounts: [],
|
|
40
|
-
orderDelivery: null,
|
|
41
|
-
providerContext: context.providerContext,
|
|
42
|
-
};
|
|
43
|
-
},
|
|
44
|
-
async actions(pricingContext, unchainedAPI) {
|
|
45
|
-
const actions = await baseDirector.actions(pricingContext, unchainedAPI, this.buildPricingContext);
|
|
46
|
-
return {
|
|
47
|
-
...actions,
|
|
48
|
-
calculationSheet() {
|
|
49
|
-
const context = actions.getContext();
|
|
50
|
-
return DeliveryPricingSheet({
|
|
51
|
-
calculation: actions.getCalculation(),
|
|
52
|
-
currency: context.currency,
|
|
53
|
-
});
|
|
54
|
-
},
|
|
55
|
-
};
|
|
56
|
-
},
|
|
57
|
-
};
|
|
58
|
-
//# sourceMappingURL=DeliveryPricingDirector.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryPricingDirector.js","sourceRoot":"","sources":["../../src/director/DeliveryPricingDirector.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,YAAY,GAAG,mBAAmB,CAKtC,yBAAyB,CAAC,CAAC;AAE7B,MAAM,CAAC,MAAM,uBAAuB,GAA6B;IAC/D,GAAG,YAAY;IAEf,KAAK,CAAC,mBAAmB,CAAC,OAAO,EAAE,YAAY;QAC7C,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QAEjC,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;YACtB,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YACzB,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;gBAC3C,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;gBACnD,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;aAC5C,CAAC,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAC5D,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC;gBAClE,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;YAEH,OAAO;gBACL,GAAG,YAAY;gBACf,OAAO,EAAE,KAAK,CAAC,WAAW;gBAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,KAAK;gBACL,QAAQ;gBACR,IAAI;gBACJ,SAAS;gBACT,aAAa,EAAE,IAAI;gBACnB,eAAe,EAAE,IAAI;aACtB,CAAC;QACJ,CAAC;QAED,OAAO;YACL,GAAG,YAAY;YACf,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,SAAS,EAAE,EAAE;YACb,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,OAAO,CAAC,eAAe;SACzC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY;QACxC,MAAM,OAAO,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,EAAE,IAAI,CAAC,mBAAmB,CAAC,CAAC;QACnG,OAAO;YACL,GAAG,OAAO;YACV,gBAAgB;gBACd,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;gBACrC,OAAO,oBAAoB,CAAC;oBAC1B,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE;oBACrC,QAAQ,EAAE,OAAO,CAAC,QAAQ;iBAC3B,CAAC,CAAC;YACL,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import { DeliveryPricingCalculation, IDeliveryPricingSheet } from '@unchainedshop/types/delivery.pricing.js';
|
|
2
|
-
import { PricingSheetParams } from '@unchainedshop/types/pricing.js';
|
|
3
|
-
export declare const DeliveryPricingSheet: (params: PricingSheetParams<DeliveryPricingCalculation>) => IDeliveryPricingSheet;
|
|
4
|
-
//# sourceMappingURL=DeliveryPricingSheet.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryPricingSheet.d.ts","sourceRoot":"","sources":["../../src/director/DeliveryPricingSheet.ts"],"names":[],"mappings":"AACA,OAAO,EACL,0BAA0B,EAE1B,qBAAqB,EACtB,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAqB,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AAExF,eAAO,MAAM,oBAAoB,WACvB,kBAAkB,CAAC,0BAA0B,CAAC,KACrD,qBAyEF,CAAC"}
|
|
@@ -1,69 +0,0 @@
|
|
|
1
|
-
import { BasePricingSheet } from '@unchainedshop/utils';
|
|
2
|
-
import { DeliveryPricingRowCategory, } from '@unchainedshop/types/delivery.pricing.js';
|
|
3
|
-
export const DeliveryPricingSheet = (params) => {
|
|
4
|
-
const basePricingSheet = BasePricingSheet(params);
|
|
5
|
-
const pricingSheet = {
|
|
6
|
-
...basePricingSheet,
|
|
7
|
-
addDiscount({ amount, isTaxable, isNetPrice, discountId, meta }) {
|
|
8
|
-
basePricingSheet.calculation.push({
|
|
9
|
-
category: DeliveryPricingRowCategory.Discount,
|
|
10
|
-
amount,
|
|
11
|
-
isTaxable,
|
|
12
|
-
isNetPrice,
|
|
13
|
-
discountId,
|
|
14
|
-
meta,
|
|
15
|
-
});
|
|
16
|
-
},
|
|
17
|
-
addFee({ amount, isTaxable, isNetPrice, meta }) {
|
|
18
|
-
basePricingSheet.calculation.push({
|
|
19
|
-
amount,
|
|
20
|
-
category: DeliveryPricingRowCategory.Delivery,
|
|
21
|
-
isNetPrice,
|
|
22
|
-
isTaxable,
|
|
23
|
-
meta,
|
|
24
|
-
});
|
|
25
|
-
},
|
|
26
|
-
addTax({ amount, rate, meta }) {
|
|
27
|
-
basePricingSheet.calculation.push({
|
|
28
|
-
amount,
|
|
29
|
-
category: DeliveryPricingRowCategory.Tax,
|
|
30
|
-
isNetPrice: false,
|
|
31
|
-
isTaxable: false,
|
|
32
|
-
meta,
|
|
33
|
-
rate,
|
|
34
|
-
});
|
|
35
|
-
},
|
|
36
|
-
taxSum(filter) {
|
|
37
|
-
return basePricingSheet.sum({
|
|
38
|
-
category: DeliveryPricingRowCategory.Tax,
|
|
39
|
-
...(filter || {}),
|
|
40
|
-
});
|
|
41
|
-
},
|
|
42
|
-
discountPrices(explicitDiscountId) {
|
|
43
|
-
const discountIds = pricingSheet
|
|
44
|
-
.filterBy({
|
|
45
|
-
category: DeliveryPricingRowCategory.Discount,
|
|
46
|
-
discountId: explicitDiscountId,
|
|
47
|
-
})
|
|
48
|
-
.map(({ discountId }) => discountId);
|
|
49
|
-
return [...new Set(discountIds)]
|
|
50
|
-
.map((discountId) => {
|
|
51
|
-
const { currency, amount } = basePricingSheet.total({
|
|
52
|
-
category: DeliveryPricingRowCategory.Discount,
|
|
53
|
-
discountId,
|
|
54
|
-
});
|
|
55
|
-
if (!amount) {
|
|
56
|
-
return null;
|
|
57
|
-
}
|
|
58
|
-
return {
|
|
59
|
-
discountId,
|
|
60
|
-
amount: Math.round(amount),
|
|
61
|
-
currency,
|
|
62
|
-
};
|
|
63
|
-
})
|
|
64
|
-
.filter(Boolean);
|
|
65
|
-
},
|
|
66
|
-
};
|
|
67
|
-
return pricingSheet;
|
|
68
|
-
};
|
|
69
|
-
//# sourceMappingURL=DeliveryPricingSheet.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryPricingSheet.js","sourceRoot":"","sources":["../../src/director/DeliveryPricingSheet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAEL,0BAA0B,GAE3B,MAAM,0CAA0C,CAAC;AAGlD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,MAAsD,EAC/B,EAAE;IACzB,MAAM,gBAAgB,GAAkD,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAEjG,MAAM,YAAY,GAA0B;QAC1C,GAAG,gBAAgB;QAEnB,WAAW,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE;YAC7D,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;gBAChC,QAAQ,EAAE,0BAA0B,CAAC,QAAQ;gBAC7C,MAAM;gBACN,SAAS;gBACT,UAAU;gBACV,UAAU;gBACV,IAAI;aACL,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE;YAC5C,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;gBAChC,MAAM;gBACN,QAAQ,EAAE,0BAA0B,CAAC,QAAQ;gBAC7C,UAAU;gBACV,SAAS;gBACT,IAAI;aACL,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE;YAC3B,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC;gBAChC,MAAM;gBACN,QAAQ,EAAE,0BAA0B,CAAC,GAAG;gBACxC,UAAU,EAAE,KAAK;gBACjB,SAAS,EAAE,KAAK;gBAChB,IAAI;gBACJ,IAAI;aACL,CAAC,CAAC;QACL,CAAC;QAED,MAAM,CAAC,MAAM;YACX,OAAO,gBAAgB,CAAC,GAAG,CAAC;gBAC1B,QAAQ,EAAE,0BAA0B,CAAC,GAAG;gBACxC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;aAClB,CAAC,CAAC;QACL,CAAC;QAED,cAAc,CAAC,kBAAkB;YAC/B,MAAM,WAAW,GAAG,YAAY;iBAC7B,QAAQ,CAAC;gBACR,QAAQ,EAAE,0BAA0B,CAAC,QAAQ;gBAC7C,UAAU,EAAE,kBAAkB;aAC/B,CAAC;iBACD,GAAG,CAAC,CAAC,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;YAEvC,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;iBAC7B,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;gBAClB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,gBAAgB,CAAC,KAAK,CAAC;oBAClD,QAAQ,EAAE,0BAA0B,CAAC,QAAQ;oBAC7C,UAAU;iBACX,CAAC,CAAC;gBACH,IAAI,CAAC,MAAM,EAAE,CAAC;oBACZ,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO;oBACL,UAAU;oBACV,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;oBAC1B,QAAQ;iBACT,CAAC;YACJ,CAAC,CAAC;iBACD,MAAM,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC;KACF,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryProviderType.d.ts","sourceRoot":"","sources":["../../src/director/DeliveryProviderType.ts"],"names":[],"mappings":"AAAA,oBAAY,oBAAoB;IAC9B,QAAQ,aAAa;IACrB,MAAM,WAAW;CAClB"}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
export var DeliveryProviderType;
|
|
2
|
-
(function (DeliveryProviderType) {
|
|
3
|
-
DeliveryProviderType["SHIPPING"] = "SHIPPING";
|
|
4
|
-
DeliveryProviderType["PICKUP"] = "PICKUP";
|
|
5
|
-
})(DeliveryProviderType || (DeliveryProviderType = {}));
|
|
6
|
-
//# sourceMappingURL=DeliveryProviderType.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"DeliveryProviderType.js","sourceRoot":"","sources":["../../src/director/DeliveryProviderType.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,oBAGX;AAHD,WAAY,oBAAoB;IAC9B,6CAAqB,CAAA;IACrB,yCAAiB,CAAA;AACnB,CAAC,EAHW,oBAAoB,KAApB,oBAAoB,QAG/B"}
|