@unchainedshop/core-delivery 2.2.3 → 2.3.1

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.
Files changed (8) hide show
  1. package/lib/director/DeliveryError.js +1 -1
  2. package/lib/director/DeliveryError.js.map +1 -1
  3. package/lib/director/DeliveryPricingDirector.js +30 -22
  4. package/lib/director/DeliveryPricingDirector.js.map +1 -1
  5. package/lib/director/DeliveryProviderType.js +1 -1
  6. package/lib/director/DeliveryProviderType.js.map +1 -1
  7. package/package.json +9 -9
  8. package/src/director/DeliveryPricingDirector.ts +31 -23
package/lib/director/DeliveryError.js CHANGED
@@ -4,5 +4,5 @@ export var DeliveryError;
4
4
  DeliveryError["NOT_IMPLEMENTED"] = "NOT_IMPLEMENTED";
5
5
  DeliveryError["INCOMPLETE_CONFIGURATION"] = "INCOMPLETE_CONFIGURATION";
6
6
  DeliveryError["WRONG_CREDENTIALS"] = "WRONG_CREDENTIALS";
7
- })(DeliveryError = DeliveryError || (DeliveryError = {}));
7
+ })(DeliveryError || (DeliveryError = {}));
8
8
  //# sourceMappingURL=DeliveryError.js.map
package/lib/director/DeliveryError.js.map CHANGED
@@ -1 +1 @@
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,GAAb,aAAa,KAAb,aAAa,QAKxB"}
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"}
package/lib/director/DeliveryPricingDirector.js CHANGED
@@ -3,34 +3,42 @@ import { DeliveryPricingSheet } from './DeliveryPricingSheet.js';
3
3
  const baseDirector = BasePricingDirector('DeliveryPricingDirector');
4
4
  export const DeliveryPricingDirector = {
5
5
  ...baseDirector,
6
- async buildPricingContext({ item, ...context }, unchainedAPI) {
6
+ async buildPricingContext(context, unchainedAPI) {
7
7
  const { modules } = unchainedAPI;
8
- if (!item)
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
+ });
9
20
  return {
10
- discounts: [],
11
- ...context,
12
21
  ...unchainedAPI,
22
+ country: order.countryCode,
23
+ currency: order.currency,
24
+ order,
25
+ provider,
26
+ user,
27
+ discounts,
28
+ orderDelivery: item,
29
+ providerContext: null,
13
30
  };
14
- const order = await modules.orders.findOrder({
15
- orderId: item.orderId,
16
- });
17
- const provider = await modules.delivery.findProvider({
18
- deliveryProviderId: item.deliveryProviderId,
19
- });
20
- const user = await modules.users.findUserById(order.userId);
21
- const discounts = await modules.orders.discounts.findOrderDiscounts({
22
- orderId: item.orderId,
23
- });
31
+ }
24
32
  return {
25
- country: order.countryCode,
26
- currency: order.currency,
27
- ...context,
28
33
  ...unchainedAPI,
29
- order,
30
- orderDelivery: item,
31
- provider,
32
- user,
33
- discounts,
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,
34
42
  };
35
43
  },
36
44
  async actions(pricingContext, unchainedAPI) {
package/lib/director/DeliveryPricingDirector.js.map CHANGED
@@ -1 +1 @@
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,EAAE,IAAI,EAAE,GAAG,OAAO,EAAE,EAAE,YAAY;QAC1D,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QAEjC,IAAI,CAAC,IAAI;YACP,OAAO;gBACL,SAAS,EAAE,EAAE;gBACb,GAAG,OAAO;gBACV,GAAG,YAAY;aAChB,CAAC;QAEJ,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC;YAC3C,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;YACnD,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;SAC5C,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC5D,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC;YAClE,OAAO,EAAE,IAAI,CAAC,OAAO;SACtB,CAAC,CAAC;QAEH,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,WAAW;YAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,GAAG,OAAO;YACV,GAAG,YAAY;YACf,KAAK;YACL,aAAa,EAAE,IAAI;YACnB,QAAQ;YACR,IAAI;YACJ,SAAS;SACV,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
+ {"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;YACrB,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;SACH;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"}
package/lib/director/DeliveryProviderType.js CHANGED
@@ -2,5 +2,5 @@ export var DeliveryProviderType;
2
2
  (function (DeliveryProviderType) {
3
3
  DeliveryProviderType["SHIPPING"] = "SHIPPING";
4
4
  DeliveryProviderType["PICKUP"] = "PICKUP";
5
- })(DeliveryProviderType = DeliveryProviderType || (DeliveryProviderType = {}));
5
+ })(DeliveryProviderType || (DeliveryProviderType = {}));
6
6
  //# sourceMappingURL=DeliveryProviderType.js.map
package/lib/director/DeliveryProviderType.js.map CHANGED
@@ -1 +1 @@
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,GAApB,oBAAoB,KAApB,oBAAoB,QAG/B"}
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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/core-delivery",
3
- "version": "2.2.3",
3
+ "version": "2.3.1",
4
4
  "main": "lib/delivery-index.js",
5
5
  "exports": {
6
6
  ".": "./lib/delivery-index.js",
@@ -31,16 +31,16 @@
31
31
  },
32
32
  "homepage": "https://github.com/unchainedshop/unchained#readme",
33
33
  "dependencies": {
34
- "@unchainedshop/events": "^2.2.3",
35
- "@unchainedshop/logger": "^2.2.3",
36
- "@unchainedshop/utils": "^2.2.3",
34
+ "@unchainedshop/events": "^2.3.1",
35
+ "@unchainedshop/logger": "^2.3.1",
36
+ "@unchainedshop/utils": "^2.3.1",
37
37
  "simpl-schema": "=3.2.0"
38
38
  },
39
39
  "devDependencies": {
40
- "@types/node": "^18.16.16",
41
- "@unchainedshop/types": "^2.2.3",
42
- "jest": "^29.5.0",
43
- "ts-jest": "^29.1.0",
44
- "typescript": "^4.9.5"
40
+ "@types/node": "^18.16.19",
41
+ "@unchainedshop/types": "^2.3.1",
42
+ "jest": "^29.6.1",
43
+ "ts-jest": "^29.1.1",
44
+ "typescript": "^5.1.6"
45
45
  }
46
46
  }
package/src/director/DeliveryPricingDirector.ts CHANGED
@@ -18,37 +18,45 @@ const baseDirector = BasePricingDirector<
18
18
  export const DeliveryPricingDirector: IDeliveryPricingDirector = {
19
19
  ...baseDirector,
20
20
 
21
- async buildPricingContext({ item, ...context }, unchainedAPI) {
21
+ async buildPricingContext(context, unchainedAPI) {
22
22
  const { modules } = unchainedAPI;
23
23
 
24
- if (!item)
24
+ if ('item' in context) {
25
+ const { item } = context;
26
+ const order = await modules.orders.findOrder({
27
+ orderId: item.orderId,
28
+ });
29
+ const provider = await modules.delivery.findProvider({
30
+ deliveryProviderId: item.deliveryProviderId,
31
+ });
32
+ const user = await modules.users.findUserById(order.userId);
33
+ const discounts = await modules.orders.discounts.findOrderDiscounts({
34
+ orderId: item.orderId,
35
+ });
36
+
25
37
  return {
26
- discounts: [],
27
- ...context,
28
38
  ...unchainedAPI,
39
+ country: order.countryCode,
40
+ currency: order.currency,
41
+ order,
42
+ provider,
43
+ user,
44
+ discounts,
45
+ orderDelivery: item,
46
+ providerContext: null,
29
47
  };
30
-
31
- const order = await modules.orders.findOrder({
32
- orderId: item.orderId,
33
- });
34
- const provider = await modules.delivery.findProvider({
35
- deliveryProviderId: item.deliveryProviderId,
36
- });
37
- const user = await modules.users.findUserById(order.userId);
38
- const discounts = await modules.orders.discounts.findOrderDiscounts({
39
- orderId: item.orderId,
40
- });
48
+ }
41
49
 
42
50
  return {
43
- country: order.countryCode,
44
- currency: order.currency,
45
- ...context,
46
51
  ...unchainedAPI,
47
- order,
48
- orderDelivery: item,
49
- provider,
50
- user,
51
- discounts,
52
+ country: context.country,
53
+ currency: context.currency,
54
+ order: context.order,
55
+ provider: context.provider,
56
+ user: context.user,
57
+ discounts: [],
58
+ orderDelivery: null,
59
+ providerContext: context.providerContext,
52
60
  };
53
61
  },
54
62