@unchainedshop/core-products 3.0.0-rc7 → 3.0.0-rc8
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/ProductsCollection.d.ts +0 -2
- package/lib/db/ProductsCollection.d.ts.map +1 -1
- package/lib/db/ProductsCollection.js.map +1 -1
- package/lib/module/configureProductPrices.d.ts.map +1 -1
- package/lib/module/configureProductPrices.js +4 -39
- package/lib/module/configureProductPrices.js.map +1 -1
- package/package.json +4 -4
- package/src/db/ProductsCollection.ts +0 -2
- package/src/module/configureProductPrices.ts +4 -53
|
@@ -43,7 +43,6 @@ export interface ProductBundleItem {
|
|
|
43
43
|
configuration: Array<ProductConfiguration>;
|
|
44
44
|
}
|
|
45
45
|
export interface ProductPrice {
|
|
46
|
-
_id?: string;
|
|
47
46
|
isTaxable?: boolean;
|
|
48
47
|
isNetPrice?: boolean;
|
|
49
48
|
countryCode?: string;
|
|
@@ -52,7 +51,6 @@ export interface ProductPrice {
|
|
|
52
51
|
maxQuantity?: number;
|
|
53
52
|
}
|
|
54
53
|
export interface ProductPriceRange {
|
|
55
|
-
_id: string;
|
|
56
54
|
minPrice: ProductPrice;
|
|
57
55
|
maxPrice: ProductPrice;
|
|
58
56
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProductsCollection.d.ts","sourceRoot":"","sources":["../../src/db/ProductsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAElF,oBAAY,aAAa;IACvB,KAAK,UAAU;IACf,MAAM,WAAW;IACjB,OAAO,YAAY;CACpB;AAED,oBAAY,YAAY;IACtB,aAAa,mBAAmB;IAChC,mBAAmB,yBAAyB;IAC5C,aAAa,mBAAmB;IAChC,WAAW,iBAAiB;IAC5B,gBAAgB,sBAAsB;CACvC;AACD,MAAM,WAAW,4BAA4B;IAC3C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qBAAqB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAC7C;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,GAAG,CAAC;IACZ,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,WAAW,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,aAAa;IAC5B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,oBAAY,uBAAuB;IACjC,MAAM,WAAW;IACjB,OAAO,YAAY;CACpB;AAED,MAAM,WAAW,oBAAoB;IACnC,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,YAAY;IAE3B,
|
|
1
|
+
{"version":3,"file":"ProductsCollection.d.ts","sourceRoot":"","sources":["../../src/db/ProductsCollection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProductsCollection.js","sourceRoot":"","sources":["../../src/db/ProductsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,cAAc,EAAmB,MAAM,wBAAwB,CAAC;AAElF,MAAM,CAAN,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,kCAAiB,CAAA;IACjB,oCAAmB,CAAA;AACrB,CAAC,EAJW,aAAa,KAAb,aAAa,QAIxB;AAED,MAAM,CAAN,IAAY,YAMX;AAND,WAAY,YAAY;IACtB,gDAAgC,CAAA;IAChC,4DAA4C,CAAA;IAC5C,gDAAgC,CAAA;IAChC,4CAA4B,CAAA;IAC5B,sDAAsC,CAAA;AACxC,CAAC,EANW,YAAY,KAAZ,YAAY,QAMvB;AAuBD,MAAM,CAAN,IAAY,uBAGX;AAHD,WAAY,uBAAuB;IACjC,4CAAiB,CAAA;IACjB,8CAAmB,CAAA;AACrB,CAAC,EAHW,uBAAuB,KAAvB,uBAAuB,QAGlC;
|
|
1
|
+
{"version":3,"file":"ProductsCollection.js","sourceRoot":"","sources":["../../src/db/ProductsCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,cAAc,EAAmB,MAAM,wBAAwB,CAAC;AAElF,MAAM,CAAN,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,gCAAe,CAAA;IACf,kCAAiB,CAAA;IACjB,oCAAmB,CAAA;AACrB,CAAC,EAJW,aAAa,KAAb,aAAa,QAIxB;AAED,MAAM,CAAN,IAAY,YAMX;AAND,WAAY,YAAY;IACtB,gDAAgC,CAAA;IAChC,4DAA4C,CAAA;IAC5C,gDAAgC,CAAA;IAChC,4CAA4B,CAAA;IAC5B,sDAAsC,CAAA;AACxC,CAAC,EANW,YAAY,KAAZ,YAAY,QAMvB;AAuBD,MAAM,CAAN,IAAY,uBAGX;AAHD,WAAY,uBAAuB;IACjC,4CAAiB,CAAA;IACjB,8CAAmB,CAAA;AACrB,CAAC,EAHW,uBAAuB,KAAvB,uBAAuB,QAGlC;AAuFD,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,EAAc,EAAE,EAAE;IACzD,MAAM,QAAQ,GAAG,EAAE,CAAC,UAAU,CAAU,UAAU,CAAC,CAAC;IACpD,MAAM,YAAY,GAAG,EAAE,CAAC,UAAU,CAAc,eAAe,CAAC,CAAC;IAEjE,kBAAkB;IAClB,MAAM,cAAc,CAAC,QAAQ,EAAE;QAC7B,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE;QAC1B,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACvB,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE;QACxB,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE;QACtB,EAAE,KAAK,EAAE,EAAE,iBAAiB,EAAE,CAAC,EAAE,EAAE;QACnC;YACE,KAAK,EAAE,EAAE,iBAAiB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;YACnD,OAAO,EAAE;gBACP,IAAI,EAAE,0BAA0B;aACjC;SACK;KACT,CAAC,CAAC;IAEH,uBAAuB;IACvB,MAAM,cAAc,CAAC,YAAY,EAAE;QACjC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE;QAC3B,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE;QACxB,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE;QACtB,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,EAAE;QACtC;YACE,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;YACzE,OAAO,EAAE;gBACP,OAAO,EAAE;oBACP,KAAK,EAAE,CAAC;oBACR,QAAQ,EAAE,CAAC;oBACX,MAAM,EAAE,CAAC;oBACT,KAAK,EAAE,CAAC;iBACT;gBACD,IAAI,EAAE,+BAA+B;aACtC;SACF;KACF,CAAC,CAAC;IAEH,OAAO;QACL,QAAQ;QACR,YAAY;KACb,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureProductPrices.d.ts","sourceRoot":"","sources":["../../src/module/configureProductPrices.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"configureProductPrices.d.ts","sourceRoot":"","sources":["../../src/module/configureProductPrices.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAqB,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAE5E,eAAO,MAAM,WAAW,8BAUvB,CAAC;AAEF,eAAO,MAAM,aAAa,iBACV;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,iBACc;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,cACW,gBAAgB,QAY7B,CAAC;AAEF,eAAO,MAAM,4BAA4B,2BAGtC;IACD,aAAa,EAAE,CACb,OAAO,EAAE,OAAO,EAChB,OAAO,EAAE,KAAK,CAAC,oBAAoB,CAAC,EACpC,OAAO,EAAE;QAAE,eAAe,CAAC,EAAE,OAAO,CAAA;KAAE,KACnC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7B,EAAE,EAAE,GAAG,CAAC;CACT,KAAG,cAAc,CAAC,QAAQ,CAyM1B,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { getPriceLevels } from './utils/getPriceLevels.js';
|
|
2
2
|
import { getPriceRange } from './utils/getPriceRange.js';
|
|
3
3
|
import { ProductPriceRates } from '../db/ProductPriceRates.js';
|
|
4
|
-
import { sha256 } from '@unchainedshop/utils';
|
|
5
4
|
export const getDecimals = (originDecimals) => {
|
|
6
5
|
if (originDecimals === null || originDecimals === undefined) {
|
|
7
6
|
return 2;
|
|
@@ -43,10 +42,7 @@ export const configureProductPricesModule = ({ proxyProducts, db, }) => {
|
|
|
43
42
|
...foundPrice,
|
|
44
43
|
};
|
|
45
44
|
if (normalizedPrice.amount !== undefined && normalizedPrice.amount !== null) {
|
|
46
|
-
return
|
|
47
|
-
_id: await sha256([product._id, normalizedPrice.countryCode, normalizedPrice.currencyCode].join('')),
|
|
48
|
-
...normalizedPrice,
|
|
49
|
-
};
|
|
45
|
+
return normalizedPrice;
|
|
50
46
|
}
|
|
51
47
|
return null;
|
|
52
48
|
};
|
|
@@ -54,11 +50,7 @@ export const configureProductPricesModule = ({ proxyProducts, db, }) => {
|
|
|
54
50
|
price: catalogPrice,
|
|
55
51
|
priceRange: getPriceRange,
|
|
56
52
|
async catalogPrices(product) {
|
|
57
|
-
|
|
58
|
-
return await Promise.all(prices.map(async (price) => ({
|
|
59
|
-
_id: await sha256([product._id, price.countryCode, price.currencyCode, price.maxQuantity, price.amount].join('')),
|
|
60
|
-
...price,
|
|
61
|
-
})));
|
|
53
|
+
return (product.commerce && product.commerce.pricing) || [];
|
|
62
54
|
},
|
|
63
55
|
catalogPriceRange: async (product, { quantity = 0, vectors = [], includeInactive = false, country, currency }) => {
|
|
64
56
|
const products = await proxyProducts(product, vectors, {
|
|
@@ -76,34 +68,8 @@ export const configureProductPricesModule = ({ proxyProducts, db, }) => {
|
|
|
76
68
|
prices: filteredPrices,
|
|
77
69
|
});
|
|
78
70
|
return {
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
Math.random(),
|
|
82
|
-
minPrice.amount,
|
|
83
|
-
minPrice.currencyCode,
|
|
84
|
-
maxPrice.amount,
|
|
85
|
-
maxPrice.currencyCode,
|
|
86
|
-
].join('')),
|
|
87
|
-
minPrice: {
|
|
88
|
-
_id: await sha256([
|
|
89
|
-
product._id,
|
|
90
|
-
minPrice?.isTaxable,
|
|
91
|
-
minPrice?.isNetPrice,
|
|
92
|
-
minPrice?.amount,
|
|
93
|
-
minPrice?.currencyCode,
|
|
94
|
-
].join('')),
|
|
95
|
-
...minPrice,
|
|
96
|
-
},
|
|
97
|
-
maxPrice: {
|
|
98
|
-
_id: await sha256([
|
|
99
|
-
product._id,
|
|
100
|
-
maxPrice?.isTaxable,
|
|
101
|
-
maxPrice?.isNetPrice,
|
|
102
|
-
maxPrice?.amount,
|
|
103
|
-
maxPrice?.currencyCode,
|
|
104
|
-
].join('')),
|
|
105
|
-
...maxPrice,
|
|
106
|
-
},
|
|
71
|
+
minPrice,
|
|
72
|
+
maxPrice,
|
|
107
73
|
};
|
|
108
74
|
},
|
|
109
75
|
catalogPricesLeveled: async (product, { currency: currencyCode, country: countryCode }) => {
|
|
@@ -121,7 +87,6 @@ export const configureProductPricesModule = ({ proxyProducts, db, }) => {
|
|
|
121
87
|
minQuantity: min,
|
|
122
88
|
maxQuantity: i === 0 && priceLevel.maxQuantity > 0 ? priceLevel.maxQuantity : max,
|
|
123
89
|
price: {
|
|
124
|
-
_id: await sha256([product._id, priceLevel.amount, currencyCode].join('')),
|
|
125
90
|
isTaxable: !!priceLevel.isTaxable,
|
|
126
91
|
isNetPrice: !!priceLevel.isNetPrice,
|
|
127
92
|
amount: priceLevel.amount,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configureProductPrices.js","sourceRoot":"","sources":["../../src/module/configureProductPrices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAoB,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"configureProductPrices.js","sourceRoot":"","sources":["../../src/module/configureProductPrices.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/core-products",
|
|
3
|
-
"version": "3.0.0-
|
|
3
|
+
"version": "3.0.0-rc8",
|
|
4
4
|
"main": "lib/products-index.js",
|
|
5
5
|
"types": "lib/products-index.d.ts",
|
|
6
6
|
"type": "module",
|
|
@@ -31,9 +31,9 @@
|
|
|
31
31
|
},
|
|
32
32
|
"homepage": "https://github.com/unchainedshop/unchained#readme",
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@unchainedshop/events": "^3.0.0-
|
|
35
|
-
"@unchainedshop/file-upload": "^3.0.0-
|
|
36
|
-
"@unchainedshop/utils": "^3.0.0-
|
|
34
|
+
"@unchainedshop/events": "^3.0.0-rc8",
|
|
35
|
+
"@unchainedshop/file-upload": "^3.0.0-rc8",
|
|
36
|
+
"@unchainedshop/utils": "^3.0.0-rc8"
|
|
37
37
|
},
|
|
38
38
|
"devDependencies": {
|
|
39
39
|
"@types/node": "^22.10.2",
|
|
@@ -53,7 +53,6 @@ export interface ProductBundleItem {
|
|
|
53
53
|
|
|
54
54
|
export interface ProductPrice {
|
|
55
55
|
// TODO: Extends Price!
|
|
56
|
-
_id?: string;
|
|
57
56
|
isTaxable?: boolean;
|
|
58
57
|
isNetPrice?: boolean;
|
|
59
58
|
countryCode?: string;
|
|
@@ -63,7 +62,6 @@ export interface ProductPrice {
|
|
|
63
62
|
}
|
|
64
63
|
|
|
65
64
|
export interface ProductPriceRange {
|
|
66
|
-
_id: string;
|
|
67
65
|
minPrice: ProductPrice;
|
|
68
66
|
maxPrice: ProductPrice;
|
|
69
67
|
}
|
|
@@ -3,7 +3,6 @@ import { getPriceRange } from './utils/getPriceRange.js';
|
|
|
3
3
|
import { ProductPriceRate, ProductPriceRates } from '../db/ProductPriceRates.js';
|
|
4
4
|
import { ProductsModule } from '../products-index.js';
|
|
5
5
|
import { Product, ProductConfiguration } from '../db/ProductsCollection.js';
|
|
6
|
-
import { sha256 } from '@unchainedshop/utils';
|
|
7
6
|
|
|
8
7
|
export const getDecimals = (originDecimals) => {
|
|
9
8
|
if (originDecimals === null || originDecimals === undefined) {
|
|
@@ -73,12 +72,7 @@ export const configureProductPricesModule = ({
|
|
|
73
72
|
};
|
|
74
73
|
|
|
75
74
|
if (normalizedPrice.amount !== undefined && normalizedPrice.amount !== null) {
|
|
76
|
-
return
|
|
77
|
-
_id: await sha256(
|
|
78
|
-
[product._id, normalizedPrice.countryCode, normalizedPrice.currencyCode].join(''),
|
|
79
|
-
),
|
|
80
|
-
...normalizedPrice,
|
|
81
|
-
};
|
|
75
|
+
return normalizedPrice;
|
|
82
76
|
}
|
|
83
77
|
return null;
|
|
84
78
|
};
|
|
@@ -89,17 +83,7 @@ export const configureProductPricesModule = ({
|
|
|
89
83
|
priceRange: getPriceRange,
|
|
90
84
|
|
|
91
85
|
async catalogPrices(product) {
|
|
92
|
-
|
|
93
|
-
return await Promise.all(
|
|
94
|
-
prices.map(async (price) => ({
|
|
95
|
-
_id: await sha256(
|
|
96
|
-
[product._id, price.countryCode, price.currencyCode, price.maxQuantity, price.amount].join(
|
|
97
|
-
'',
|
|
98
|
-
),
|
|
99
|
-
),
|
|
100
|
-
...price,
|
|
101
|
-
})),
|
|
102
|
-
);
|
|
86
|
+
return (product.commerce && product.commerce.pricing) || [];
|
|
103
87
|
},
|
|
104
88
|
|
|
105
89
|
catalogPriceRange: async (
|
|
@@ -130,40 +114,8 @@ export const configureProductPricesModule = ({
|
|
|
130
114
|
});
|
|
131
115
|
|
|
132
116
|
return {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
product._id,
|
|
136
|
-
Math.random(),
|
|
137
|
-
minPrice.amount,
|
|
138
|
-
minPrice.currencyCode,
|
|
139
|
-
maxPrice.amount,
|
|
140
|
-
maxPrice.currencyCode,
|
|
141
|
-
].join(''),
|
|
142
|
-
),
|
|
143
|
-
minPrice: {
|
|
144
|
-
_id: await sha256(
|
|
145
|
-
[
|
|
146
|
-
product._id,
|
|
147
|
-
minPrice?.isTaxable,
|
|
148
|
-
minPrice?.isNetPrice,
|
|
149
|
-
minPrice?.amount,
|
|
150
|
-
minPrice?.currencyCode,
|
|
151
|
-
].join(''),
|
|
152
|
-
),
|
|
153
|
-
...minPrice,
|
|
154
|
-
},
|
|
155
|
-
maxPrice: {
|
|
156
|
-
_id: await sha256(
|
|
157
|
-
[
|
|
158
|
-
product._id,
|
|
159
|
-
maxPrice?.isTaxable,
|
|
160
|
-
maxPrice?.isNetPrice,
|
|
161
|
-
maxPrice?.amount,
|
|
162
|
-
maxPrice?.currencyCode,
|
|
163
|
-
].join(''),
|
|
164
|
-
),
|
|
165
|
-
...maxPrice,
|
|
166
|
-
},
|
|
117
|
+
minPrice,
|
|
118
|
+
maxPrice,
|
|
167
119
|
};
|
|
168
120
|
},
|
|
169
121
|
|
|
@@ -186,7 +138,6 @@ export const configureProductPricesModule = ({
|
|
|
186
138
|
minQuantity: min,
|
|
187
139
|
maxQuantity: i === 0 && priceLevel.maxQuantity > 0 ? priceLevel.maxQuantity : max,
|
|
188
140
|
price: {
|
|
189
|
-
_id: await sha256([product._id, priceLevel.amount, currencyCode].join('')),
|
|
190
141
|
isTaxable: !!priceLevel.isTaxable,
|
|
191
142
|
isNetPrice: !!priceLevel.isNetPrice,
|
|
192
143
|
amount: priceLevel.amount,
|