@unchainedshop/core-delivery 2.7.0 → 2.7.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.
Files changed (4) hide show
  1. package/lib/director/DeliveryPricingSheet.js +8 -16
  2. package/lib/director/DeliveryPricingSheet.js.map +1 -1
  3. package/package.json +5 -5
  4. package/src/director/DeliveryPricingSheet.ts +8 -18
package/lib/director/DeliveryPricingSheet.js CHANGED
@@ -33,24 +33,22 @@ export const DeliveryPricingSheet = (params) => {
33
33
  rate,
34
34
  });
35
35
  },
36
- taxSum() {
36
+ taxSum(filter) {
37
37
  return basePricingSheet.sum({
38
38
  category: DeliveryPricingRowCategory.Tax,
39
- });
40
- },
41
- discountSum(discountId) {
42
- return basePricingSheet.sum({
43
- category: DeliveryPricingRowCategory.Discount,
44
- discountId,
39
+ ...(filter || {}),
45
40
  });
46
41
  },
47
42
  discountPrices(explicitDiscountId) {
48
43
  const discountIds = pricingSheet
49
- .getDiscountRows(explicitDiscountId)
44
+ .filterBy({
45
+ category: DeliveryPricingRowCategory.Discount,
46
+ discountId: explicitDiscountId,
47
+ })
50
48
  .map(({ discountId }) => discountId);
51
49
  return [...new Set(discountIds)]
52
50
  .map((discountId) => {
53
- const amount = basePricingSheet.sum({
51
+ const { currency, amount } = basePricingSheet.total({
54
52
  category: DeliveryPricingRowCategory.Discount,
55
53
  discountId,
56
54
  });
@@ -60,17 +58,11 @@ export const DeliveryPricingSheet = (params) => {
60
58
  return {
61
59
  discountId,
62
60
  amount: Math.round(amount),
63
- currency: basePricingSheet.currency,
61
+ currency,
64
62
  };
65
63
  })
66
64
  .filter(Boolean);
67
65
  },
68
- getDiscountRows(discountId) {
69
- return basePricingSheet.filterBy({
70
- category: DeliveryPricingRowCategory.Discount,
71
- discountId,
72
- });
73
- },
74
66
  };
75
67
  return pricingSheet;
76
68
  };
package/lib/director/DeliveryPricingSheet.js.map CHANGED
@@ -1 +1 @@
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;YACJ,OAAO,gBAAgB,CAAC,GAAG,CAAC;gBAC1B,QAAQ,EAAE,0BAA0B,CAAC,GAAG;aACzC,CAAC,CAAC;QACL,CAAC;QAED,WAAW,CAAC,UAAU;YACpB,OAAO,gBAAgB,CAAC,GAAG,CAAC;gBAC1B,QAAQ,EAAE,0BAA0B,CAAC,QAAQ;gBAC7C,UAAU;aACX,CAAC,CAAC;QACL,CAAC;QAED,cAAc,CAAC,kBAAkB;YAC/B,MAAM,WAAW,GAAG,YAAY;iBAC7B,eAAe,CAAC,kBAAkB,CAAC;iBACnC,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,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC;oBAClC,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,EAAE,gBAAgB,CAAC,QAAQ;iBACpC,CAAC;YACJ,CAAC,CAAC;iBACD,MAAM,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC;QAED,eAAe,CAAC,UAAU;YACxB,OAAO,gBAAgB,CAAC,QAAQ,CAAC;gBAC/B,QAAQ,EAAE,0BAA0B,CAAC,QAAQ;gBAC7C,UAAU;aACX,CAAC,CAAC;QACL,CAAC;KACF,CAAC;IAEF,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC"}
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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@unchainedshop/core-delivery",
3
- "version": "2.7.0",
3
+ "version": "2.7.2",
4
4
  "main": "lib/delivery-index.js",
5
5
  "exports": {
6
6
  ".": "./lib/delivery-index.js",
@@ -31,14 +31,14 @@
31
31
  },
32
32
  "homepage": "https://github.com/unchainedshop/unchained#readme",
33
33
  "dependencies": {
34
- "@unchainedshop/events": "^2.7.0",
35
- "@unchainedshop/logger": "^2.7.0",
36
- "@unchainedshop/utils": "^2.7.0",
34
+ "@unchainedshop/events": "^2.7.2",
35
+ "@unchainedshop/logger": "^2.7.2",
36
+ "@unchainedshop/utils": "^2.7.2",
37
37
  "simpl-schema": "=3.2.0"
38
38
  },
39
39
  "devDependencies": {
40
40
  "@types/node": "^20.11.17",
41
- "@unchainedshop/types": "^2.7.0",
41
+ "@unchainedshop/types": "^2.7.2",
42
42
  "jest": "^29.7.0",
43
43
  "ts-jest": "^29.1.2",
44
44
  "typescript": "^5.3.3"
package/src/director/DeliveryPricingSheet.ts CHANGED
@@ -46,27 +46,24 @@ export const DeliveryPricingSheet = (
46
46
  });
47
47
  },
48
48
 
49
- taxSum() {
49
+ taxSum(filter) {
50
50
  return basePricingSheet.sum({
51
51
  category: DeliveryPricingRowCategory.Tax,
52
- });
53
- },
54
-
55
- discountSum(discountId) {
56
- return basePricingSheet.sum({
57
- category: DeliveryPricingRowCategory.Discount,
58
- discountId,
52
+ ...(filter || {}),
59
53
  });
60
54
  },
61
55
 
62
56
  discountPrices(explicitDiscountId) {
63
57
  const discountIds = pricingSheet
64
- .getDiscountRows(explicitDiscountId)
58
+ .filterBy({
59
+ category: DeliveryPricingRowCategory.Discount,
60
+ discountId: explicitDiscountId,
61
+ })
65
62
  .map(({ discountId }) => discountId);
66
63
 
67
64
  return [...new Set(discountIds)]
68
65
  .map((discountId) => {
69
- const amount = basePricingSheet.sum({
66
+ const { currency, amount } = basePricingSheet.total({
70
67
  category: DeliveryPricingRowCategory.Discount,
71
68
  discountId,
72
69
  });
@@ -76,18 +73,11 @@ export const DeliveryPricingSheet = (
76
73
  return {
77
74
  discountId,
78
75
  amount: Math.round(amount),
79
- currency: basePricingSheet.currency,
76
+ currency,
80
77
  };
81
78
  })
82
79
  .filter(Boolean);
83
80
  },
84
-
85
- getDiscountRows(discountId) {
86
- return basePricingSheet.filterBy({
87
- category: DeliveryPricingRowCategory.Discount,
88
- discountId,
89
- });
90
- },
91
81
  };
92
82
 
93
83
  return pricingSheet;