@unchainedshop/plugins 2.12.2 → 2.13.0
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/payment/stripe/middleware.d.ts.map +1 -1
- package/lib/payment/stripe/middleware.js +0 -3
- package/lib/payment/stripe/middleware.js.map +1 -1
- package/lib/pricing/product-catalog-price.d.ts.map +1 -1
- package/lib/pricing/product-catalog-price.js +5 -5
- package/lib/pricing/product-catalog-price.js.map +1 -1
- package/lib/worker/bulk-import.d.ts.map +1 -1
- package/lib/worker/bulk-import.js +2 -1
- package/lib/worker/bulk-import.js.map +1 -1
- package/lib/worker/update-coinbase-rates.js +4 -7
- package/lib/worker/update-coinbase-rates.js.map +1 -1
- package/package.json +20 -22
- package/src/payment/stripe/middleware.ts +0 -3
- package/src/pricing/product-catalog-price.ts +5 -15
- package/src/worker/bulk-import.ts +6 -1
- package/src/worker/update-coinbase-rates.ts +4 -11
- package/lib/warehousing/google-sheets.d.ts +0 -2
- package/lib/warehousing/google-sheets.d.ts.map +0 -1
- package/lib/warehousing/google-sheets.js +0 -154
- package/lib/warehousing/google-sheets.js.map +0 -1
- package/src/warehousing/google-sheets.ts +0 -167
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/payment/stripe/middleware.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,iBAAiB;;;CAG7B,CAAC;AAEF,eAAO,MAAM,aAAa,
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../src/payment/stripe/middleware.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,iBAAiB;;;CAG7B,CAAC;AAEF,eAAO,MAAM,aAAa,gDAmIzB,CAAC"}
|
|
@@ -62,9 +62,6 @@ export const stripeHandler = async (request, response) => {
|
|
|
62
62
|
throw new Error(`order payment not found with orderPaymentId: ${orderPaymentId}`);
|
|
63
63
|
}
|
|
64
64
|
const order = await modules.orders.checkout(orderPayment.orderId, {
|
|
65
|
-
transactionContext: {
|
|
66
|
-
paymentIntentId: paymentIntent.id,
|
|
67
|
-
},
|
|
68
65
|
paymentContext: {
|
|
69
66
|
paymentIntentId: paymentIntent.id,
|
|
70
67
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/stripe/middleware.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../../src/payment/stripe/middleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-catalog-price.d.ts","sourceRoot":"","sources":["../../src/pricing/product-catalog-price.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;
|
|
1
|
+
{"version":3,"file":"product-catalog-price.d.ts","sourceRoot":"","sources":["../../src/pricing/product-catalog-price.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,0CAA0C,CAAC;AAIlF,eAAO,MAAM,YAAY,EAAE,sBAwC1B,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ProductPricingDirector, ProductPricingAdapter } from '@unchainedshop/core-products';
|
|
2
|
+
import { resolveBestCurrency } from '@unchainedshop/utils';
|
|
2
3
|
export const ProductPrice = {
|
|
3
4
|
...ProductPricingAdapter,
|
|
4
5
|
key: 'shop.unchained.pricing.product-price',
|
|
@@ -13,11 +14,10 @@ export const ProductPrice = {
|
|
|
13
14
|
return {
|
|
14
15
|
...pricingAdapter,
|
|
15
16
|
calculate: async () => {
|
|
16
|
-
const { product, country, currency: forcedCurrency, quantity, modules
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
}, params.context));
|
|
17
|
+
const { product, country, currency: forcedCurrency, quantity, modules } = params.context;
|
|
18
|
+
const countryObject = await modules.countries.findCountry({ isoCode: country });
|
|
19
|
+
const currencies = await modules.currencies.findCurrencies({ includeInactive: false });
|
|
20
|
+
const currency = forcedCurrency || resolveBestCurrency(countryObject.defaultCurrencyCode, currencies);
|
|
21
21
|
const price = await modules.products.prices.price(product, { country, currency, quantity });
|
|
22
22
|
if (price) {
|
|
23
23
|
const itemTotal = price.amount * quantity;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product-catalog-price.js","sourceRoot":"","sources":["../../src/pricing/product-catalog-price.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"product-catalog-price.js","sourceRoot":"","sources":["../../src/pricing/product-catalog-price.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,sBAAsB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAC7F,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE3D,MAAM,CAAC,MAAM,YAAY,GAA2B;IAClD,GAAG,qBAAqB;IAExB,GAAG,EAAE,sCAAsC;IAC3C,OAAO,EAAE,OAAO;IAChB,KAAK,EAAE,4BAA4B;IACnC,UAAU,EAAE,CAAC;IAEb,cAAc,EAAE,GAAG,EAAE;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,MAAM,cAAc,GAAG,qBAAqB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAE7D,OAAO;YACL,GAAG,cAAc;YAEjB,SAAS,EAAE,KAAK,IAAI,EAAE;gBACpB,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC;gBACzF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;gBAChF,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;gBACvF,MAAM,QAAQ,GACZ,cAAc,IAAI,mBAAmB,CAAC,aAAa,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;gBAEvF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;gBAC5F,IAAI,KAAK,EAAE,CAAC;oBACV,MAAM,SAAS,GAAG,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC;oBAC1C,cAAc,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC;wBACnC,MAAM,EAAE,SAAS;wBACjB,SAAS,EAAE,KAAK,CAAC,SAAS;wBAC1B,UAAU,EAAE,KAAK,CAAC,UAAU;wBAC5B,IAAI,EAAE,EAAE,OAAO,EAAE,YAAY,CAAC,GAAG,EAAE;qBACpC,CAAC,CAAC;gBACL,CAAC;gBAED,OAAO,cAAc,CAAC,SAAS,EAAE,CAAC;YACpC,CAAC;SACF,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,sBAAsB,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk-import.d.ts","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAqDhE,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,
|
|
1
|
+
{"version":3,"file":"bulk-import.d.ts","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,gCAAgC,CAAC;AAqDhE,eAAO,MAAM,gBAAgB,EAAE,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA+DzE,CAAC"}
|
|
@@ -39,10 +39,11 @@ export const BulkImportWorker = {
|
|
|
39
39
|
maxParallelAllocations: 1, // Only ever process 1 BULK_IMPORT at a time!
|
|
40
40
|
doWork: async (rawPayload, unchainedAPI) => {
|
|
41
41
|
try {
|
|
42
|
-
const { createShouldUpsertIfIDExists = false, skipCacheInvalidation = false } = rawPayload;
|
|
42
|
+
const { createShouldUpsertIfIDExists = false, skipCacheInvalidation = false, updateShouldUpsertIfIDNotExists = false, } = rawPayload;
|
|
43
43
|
const bulkImporter = unchainedAPI.bulkImporter.createBulkImporter({
|
|
44
44
|
logger,
|
|
45
45
|
createShouldUpsertIfIDExists,
|
|
46
|
+
updateShouldUpsertIfIDNotExists,
|
|
46
47
|
skipCacheInvalidation,
|
|
47
48
|
});
|
|
48
49
|
if (rawPayload.payloadId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bulk-import.js","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAG/C,MAAM,MAAM,GAAG,YAAY,CAAC,gCAAgC,CAAC,CAAC;AAE9D,MAAM,2BAA2B,GAAG,KAAK,EAAE,YAAY,EAAE,SAAS,EAAE,YAA2B,EAAE,EAAE;IACjG,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;IAEjF,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,oBAAoB,CACvE,EAAE,MAAM,EAAE,SAAS,EAAE,EACrB,YAAY,CACb,CAAC;IAEF,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACb,uIAAuI,CACxI,CAAC;IACJ,CAAC;IAED,MAAM,aAAa,GAAG,IAAI,aAAa,CACrC,CAAC,KAAK,EAAE,EAAE;QACR,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,sBAAsB;QACvE,UAAU,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACnC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAEnC,KAAK,CAAC,EAAE,CAAC,WAAW,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;QAChD,KAAK,CAAC,EAAE,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC;QAEhD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC5B,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QAEnC,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9C,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/C,UAAU,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC/C,UAAU,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC,CAAC;IACJ,CAAC,EACD,EAAE,aAAa,EAAE,GAAG,EAAE,YAAY,EAAE,CAAC,EAAE,CACxC,CAAC;IAEF,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC,CAAC,sBAAsB;QAC/D,MAAM,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC;IAClD,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,CAAC;AACnF,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAiD;IAC5E,GAAG,aAAa;IAEhB,GAAG,EAAE,0CAA0C;IAC/C,KAAK,EAAE,aAAa;IACpB,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,aAAa;IACnB,sBAAsB,EAAE,CAAC,EAAE,6CAA6C;IAExE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,EAAE;QACzC,IAAI,CAAC;YACH,MAAM,
|
|
1
|
+
{"version":3,"file":"bulk-import.js","sourceRoot":"","sources":["../../src/worker/bulk-import.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { WorkerAdapter, WorkerDirector } from '@unchainedshop/core-worker';
|
|
2
2
|
import later from '@breejs/later';
|
|
3
|
-
import {
|
|
3
|
+
import { resolveBestCurrency } from '@unchainedshop/utils';
|
|
4
4
|
const getExchangeRates = async (base) => {
|
|
5
5
|
return fetch(`https://api.coinbase.com/v2/exchange-rates?currency=${base}`, {
|
|
6
6
|
method: 'GET',
|
|
@@ -16,12 +16,9 @@ const UpdateCoinbaseRates = {
|
|
|
16
16
|
version: '1.0.0',
|
|
17
17
|
type: 'UPDATE_COINBASE_RATES',
|
|
18
18
|
doWork: async (input, unchainedAPI) => {
|
|
19
|
-
const { modules, services } = unchainedAPI;
|
|
20
19
|
try {
|
|
21
|
-
const
|
|
22
|
-
|
|
23
|
-
}, unchainedAPI);
|
|
24
|
-
const currencies = await modules.currencies.findCurrencies({ includeInactive: true });
|
|
20
|
+
const currencies = await unchainedAPI.modules.currencies.findCurrencies({ includeInactive: true });
|
|
21
|
+
const currencyCode = resolveBestCurrency(null, currencies); // Get fallback currency
|
|
25
22
|
const currencyCodes = currencies.map((currency) => currency.isoCode);
|
|
26
23
|
const { currency: baseCurrency, rates: pairs, } = await getExchangeRates(currencyCode);
|
|
27
24
|
const timestamp = new Date();
|
|
@@ -38,7 +35,7 @@ const UpdateCoinbaseRates = {
|
|
|
38
35
|
};
|
|
39
36
|
})
|
|
40
37
|
.filter((rate) => currencyCodes.includes(rate.quoteCurrency) && rate.quoteCurrency !== rate.baseCurrency);
|
|
41
|
-
const success = await modules.products.prices.rates.updateRates(rates);
|
|
38
|
+
const success = await unchainedAPI.modules.products.prices.rates.updateRates(rates);
|
|
42
39
|
return {
|
|
43
40
|
success,
|
|
44
41
|
result: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-coinbase-rates.js","sourceRoot":"","sources":["../../src/worker/update-coinbase-rates.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,KAAK,MAAM,eAAe,CAAC;AAElC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"update-coinbase-rates.js","sourceRoot":"","sources":["../../src/worker/update-coinbase-rates.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unchainedshop/plugins",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.13.0",
|
|
4
4
|
"main": "lib/plugins-index.js",
|
|
5
5
|
"types": "lib/plugins-index.d.ts",
|
|
6
6
|
"exports": {
|
|
@@ -76,7 +76,6 @@
|
|
|
76
76
|
"bip32": "^4.0.0",
|
|
77
77
|
"ethers": "^6.13.1",
|
|
78
78
|
"express": "^4.x",
|
|
79
|
-
"lru-cache": "^11.0.0",
|
|
80
79
|
"open": "^10.0.0",
|
|
81
80
|
"postfinancecheckout": "^4.1.1",
|
|
82
81
|
"stripe": "^15.12.0",
|
|
@@ -86,37 +85,36 @@
|
|
|
86
85
|
},
|
|
87
86
|
"devDependencies": {
|
|
88
87
|
"@redis/client": "^1.5.17",
|
|
89
|
-
"@types/node": "^20.14.
|
|
90
|
-
"@unchainedshop/api": "^2.
|
|
91
|
-
"@unchainedshop/core-delivery": "^2.
|
|
92
|
-
"@unchainedshop/core-enrollments": "^2.
|
|
93
|
-
"@unchainedshop/core-filters": "^2.
|
|
94
|
-
"@unchainedshop/core-messaging": "^2.
|
|
95
|
-
"@unchainedshop/core-orders": "^2.
|
|
96
|
-
"@unchainedshop/core-payment": "^2.
|
|
97
|
-
"@unchainedshop/core-products": "^2.
|
|
98
|
-
"@unchainedshop/core-quotations": "^2.
|
|
99
|
-
"@unchainedshop/core-warehousing": "^2.
|
|
100
|
-
"@unchainedshop/core-worker": "^2.
|
|
101
|
-
"@unchainedshop/events": "^2.
|
|
102
|
-
"@unchainedshop/file-upload": "^2.
|
|
103
|
-
"@unchainedshop/logger": "^2.
|
|
104
|
-
"@unchainedshop/types": "^2.
|
|
105
|
-
"@unchainedshop/utils": "^2.
|
|
88
|
+
"@types/node": "^20.14.12",
|
|
89
|
+
"@unchainedshop/api": "^2.13.0",
|
|
90
|
+
"@unchainedshop/core-delivery": "^2.13.0",
|
|
91
|
+
"@unchainedshop/core-enrollments": "^2.13.0",
|
|
92
|
+
"@unchainedshop/core-filters": "^2.13.0",
|
|
93
|
+
"@unchainedshop/core-messaging": "^2.13.0",
|
|
94
|
+
"@unchainedshop/core-orders": "^2.13.0",
|
|
95
|
+
"@unchainedshop/core-payment": "^2.13.0",
|
|
96
|
+
"@unchainedshop/core-products": "^2.13.0",
|
|
97
|
+
"@unchainedshop/core-quotations": "^2.13.0",
|
|
98
|
+
"@unchainedshop/core-warehousing": "^2.13.0",
|
|
99
|
+
"@unchainedshop/core-worker": "^2.13.0",
|
|
100
|
+
"@unchainedshop/events": "^2.13.0",
|
|
101
|
+
"@unchainedshop/file-upload": "^2.13.0",
|
|
102
|
+
"@unchainedshop/logger": "^2.13.0",
|
|
103
|
+
"@unchainedshop/types": "^2.13.0",
|
|
104
|
+
"@unchainedshop/utils": "^2.13.0",
|
|
106
105
|
"bluebird": "^3.7.2",
|
|
107
106
|
"event-iterator": "^2.0.0",
|
|
108
107
|
"express": "^4.19.2",
|
|
109
108
|
"jest": "^29.7.0",
|
|
110
109
|
"JSONStream": "^1.3.5",
|
|
111
|
-
"lru-cache": "^11.0.0",
|
|
112
110
|
"minio": "^8.0.1",
|
|
113
111
|
"node-sheets": "^1.2.0",
|
|
114
112
|
"nodemailer": "^6.9.14",
|
|
115
113
|
"open": "^10.1.0",
|
|
116
114
|
"postfinancecheckout": "^4.5.0",
|
|
117
115
|
"request": "^2.88.2",
|
|
118
|
-
"ts-jest": "^29.2.
|
|
119
|
-
"typescript": "^5.5.
|
|
116
|
+
"ts-jest": "^29.2.3",
|
|
117
|
+
"typescript": "^5.5.4",
|
|
120
118
|
"web-push": "^3.6.7",
|
|
121
119
|
"xml-js": "^1.6.11"
|
|
122
120
|
}
|
|
@@ -80,9 +80,6 @@ export const stripeHandler = async (request, response) => {
|
|
|
80
80
|
const order = await modules.orders.checkout(
|
|
81
81
|
orderPayment.orderId,
|
|
82
82
|
{
|
|
83
|
-
transactionContext: {
|
|
84
|
-
paymentIntentId: paymentIntent.id,
|
|
85
|
-
},
|
|
86
83
|
paymentContext: {
|
|
87
84
|
paymentIntentId: paymentIntent.id,
|
|
88
85
|
},
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { IProductPricingAdapter } from '@unchainedshop/types/products.pricing.js';
|
|
2
2
|
import { ProductPricingDirector, ProductPricingAdapter } from '@unchainedshop/core-products';
|
|
3
|
+
import { resolveBestCurrency } from '@unchainedshop/utils';
|
|
3
4
|
|
|
4
5
|
export const ProductPrice: IProductPricingAdapter = {
|
|
5
6
|
...ProductPricingAdapter,
|
|
@@ -20,22 +21,11 @@ export const ProductPrice: IProductPricingAdapter = {
|
|
|
20
21
|
...pricingAdapter,
|
|
21
22
|
|
|
22
23
|
calculate: async () => {
|
|
23
|
-
const {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
currency: forcedCurrency,
|
|
27
|
-
quantity,
|
|
28
|
-
modules,
|
|
29
|
-
services,
|
|
30
|
-
} = params.context;
|
|
24
|
+
const { product, country, currency: forcedCurrency, quantity, modules } = params.context;
|
|
25
|
+
const countryObject = await modules.countries.findCountry({ isoCode: country });
|
|
26
|
+
const currencies = await modules.currencies.findCurrencies({ includeInactive: false });
|
|
31
27
|
const currency =
|
|
32
|
-
forcedCurrency ||
|
|
33
|
-
(await services.countries.resolveDefaultCurrencyCode(
|
|
34
|
-
{
|
|
35
|
-
isoCode: country,
|
|
36
|
-
},
|
|
37
|
-
params.context,
|
|
38
|
-
));
|
|
28
|
+
forcedCurrency || resolveBestCurrency(countryObject.defaultCurrencyCode, currencies);
|
|
39
29
|
|
|
40
30
|
const price = await modules.products.prices.price(product, { country, currency, quantity });
|
|
41
31
|
if (price) {
|
|
@@ -62,11 +62,16 @@ export const BulkImportWorker: IWorkerAdapter<any, Record<string, unknown>> = {
|
|
|
62
62
|
|
|
63
63
|
doWork: async (rawPayload, unchainedAPI) => {
|
|
64
64
|
try {
|
|
65
|
-
const {
|
|
65
|
+
const {
|
|
66
|
+
createShouldUpsertIfIDExists = false,
|
|
67
|
+
skipCacheInvalidation = false,
|
|
68
|
+
updateShouldUpsertIfIDNotExists = false,
|
|
69
|
+
} = rawPayload;
|
|
66
70
|
|
|
67
71
|
const bulkImporter = unchainedAPI.bulkImporter.createBulkImporter({
|
|
68
72
|
logger,
|
|
69
73
|
createShouldUpsertIfIDExists,
|
|
74
|
+
updateShouldUpsertIfIDNotExists,
|
|
70
75
|
skipCacheInvalidation,
|
|
71
76
|
});
|
|
72
77
|
|
|
@@ -3,7 +3,7 @@ import { IWorkerAdapter } from '@unchainedshop/types/worker.js';
|
|
|
3
3
|
import { WorkerAdapter, WorkerDirector } from '@unchainedshop/core-worker';
|
|
4
4
|
import later from '@breejs/later';
|
|
5
5
|
import { ProductPriceRate } from '@unchainedshop/types/products.pricing.js';
|
|
6
|
-
import {
|
|
6
|
+
import { resolveBestCurrency } from '@unchainedshop/utils';
|
|
7
7
|
|
|
8
8
|
const getExchangeRates = async (base) => {
|
|
9
9
|
return fetch(`https://api.coinbase.com/v2/exchange-rates?currency=${base}`, {
|
|
@@ -24,17 +24,10 @@ const UpdateCoinbaseRates: IWorkerAdapter<any, any> = {
|
|
|
24
24
|
type: 'UPDATE_COINBASE_RATES',
|
|
25
25
|
|
|
26
26
|
doWork: async (input, unchainedAPI) => {
|
|
27
|
-
const { modules, services } = unchainedAPI;
|
|
28
|
-
|
|
29
27
|
try {
|
|
30
|
-
const
|
|
31
|
-
|
|
32
|
-
isoCode: systemLocale.country,
|
|
33
|
-
},
|
|
34
|
-
unchainedAPI,
|
|
35
|
-
);
|
|
28
|
+
const currencies = await unchainedAPI.modules.currencies.findCurrencies({ includeInactive: true });
|
|
29
|
+
const currencyCode = resolveBestCurrency(null, currencies); // Get fallback currency
|
|
36
30
|
|
|
37
|
-
const currencies = await modules.currencies.findCurrencies({ includeInactive: true });
|
|
38
31
|
const currencyCodes = currencies.map((currency) => currency.isoCode);
|
|
39
32
|
|
|
40
33
|
const {
|
|
@@ -61,7 +54,7 @@ const UpdateCoinbaseRates: IWorkerAdapter<any, any> = {
|
|
|
61
54
|
currencyCodes.includes(rate.quoteCurrency) && rate.quoteCurrency !== rate.baseCurrency,
|
|
62
55
|
);
|
|
63
56
|
|
|
64
|
-
const success = await modules.products.prices.rates.updateRates(rates);
|
|
57
|
+
const success = await unchainedAPI.modules.products.prices.rates.updateRates(rates);
|
|
65
58
|
return {
|
|
66
59
|
success,
|
|
67
60
|
result: {
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"google-sheets.d.ts","sourceRoot":"","sources":["../../src/warehousing/google-sheets.ts"],"names":[],"mappings":"AAOA,OAAO,8BAA8B,CAAC"}
|
|
@@ -1,154 +0,0 @@
|
|
|
1
|
-
import { WarehousingDirector, WarehousingAdapter, WarehousingProviderType, } from '@unchainedshop/core-warehousing';
|
|
2
|
-
import Sheets from 'node-sheets';
|
|
3
|
-
import { log, LogLevel } from '@unchainedshop/logger';
|
|
4
|
-
import 'abort-controller/polyfill.js';
|
|
5
|
-
import * as lruCache from 'lru-cache';
|
|
6
|
-
const { NODE_ENV, GOOGLE_SHEETS_ID, GOOGLE_SHEETS_PRIVATE_KEY_DATA } = process.env;
|
|
7
|
-
const ttl = NODE_ENV === 'production' ? 1000 * 60 : 0; // 1 minute or 1 second
|
|
8
|
-
const downloadSpreadsheet = async () => {
|
|
9
|
-
if (!GOOGLE_SHEETS_PRIVATE_KEY_DATA || !GOOGLE_SHEETS_ID)
|
|
10
|
-
return null;
|
|
11
|
-
try {
|
|
12
|
-
// https://docs.google.com/spreadsheets/d/GOOGLE_SHEETS_ID/edit?usp=sharing
|
|
13
|
-
const gs = new Sheets(GOOGLE_SHEETS_ID);
|
|
14
|
-
const authData = JSON.parse(GOOGLE_SHEETS_PRIVATE_KEY_DATA);
|
|
15
|
-
await gs.authorizeJWT(authData);
|
|
16
|
-
const delivery = await gs.tables('delivery!A:ZZZ');
|
|
17
|
-
const inventory = await gs.tables('inventory!A:ZZZ');
|
|
18
|
-
log(`GoogleSheet: Updated cache with TTL: ${ttl}`, {
|
|
19
|
-
level: LogLevel.Verbose,
|
|
20
|
-
});
|
|
21
|
-
return {
|
|
22
|
-
delivery,
|
|
23
|
-
inventory,
|
|
24
|
-
};
|
|
25
|
-
}
|
|
26
|
-
catch (err) {
|
|
27
|
-
log(err, { level: LogLevel.Error });
|
|
28
|
-
throw err;
|
|
29
|
-
}
|
|
30
|
-
};
|
|
31
|
-
const updateGoogleCache = async (cache) => {
|
|
32
|
-
try {
|
|
33
|
-
const sheet = await downloadSpreadsheet();
|
|
34
|
-
if (sheet) {
|
|
35
|
-
cache.set('tables', sheet);
|
|
36
|
-
return sheet;
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
catch (e) {
|
|
40
|
-
log(e, { level: LogLevel.Error });
|
|
41
|
-
}
|
|
42
|
-
return null;
|
|
43
|
-
};
|
|
44
|
-
const googleCache = new lruCache.LRUCache({
|
|
45
|
-
max: 500,
|
|
46
|
-
ttl, // 1 second in dev
|
|
47
|
-
allowStale: true,
|
|
48
|
-
dispose: () => {
|
|
49
|
-
updateGoogleCache(googleCache);
|
|
50
|
-
},
|
|
51
|
-
});
|
|
52
|
-
updateGoogleCache(googleCache);
|
|
53
|
-
const getRows = async (name) => {
|
|
54
|
-
const cachedTables = googleCache.get('tables');
|
|
55
|
-
let tables = cachedTables;
|
|
56
|
-
if (!cachedTables) {
|
|
57
|
-
tables = await updateGoogleCache(googleCache);
|
|
58
|
-
}
|
|
59
|
-
if (!tables || !tables[name] || !tables[name].rows)
|
|
60
|
-
return [];
|
|
61
|
-
return tables[name].rows;
|
|
62
|
-
};
|
|
63
|
-
const getRemoteTime = async (sku, quantity, selector) => {
|
|
64
|
-
const rows = await getRows('delivery');
|
|
65
|
-
const resolvedRow = rows.reduce((result, row) => {
|
|
66
|
-
const parsedQuantity = parseInt(row.Quantity.value, 10);
|
|
67
|
-
const parsedSKU = row.SKU.value.toUpperCase();
|
|
68
|
-
if (parsedSKU === sku && parsedQuantity <= quantity) {
|
|
69
|
-
return row;
|
|
70
|
-
}
|
|
71
|
-
return result;
|
|
72
|
-
}, null);
|
|
73
|
-
if (!resolvedRow)
|
|
74
|
-
return null;
|
|
75
|
-
const time = parseInt(resolvedRow[selector].value, 10) || 0;
|
|
76
|
-
log(`GoogleSheet: Resolve Time ${selector} (${quantity}) for ${sku}: ${time}`, {
|
|
77
|
-
level: LogLevel.Verbose,
|
|
78
|
-
});
|
|
79
|
-
return time;
|
|
80
|
-
};
|
|
81
|
-
const getRemoteInventory = async (sku) => {
|
|
82
|
-
const rows = await getRows('inventory');
|
|
83
|
-
const resolvedRow = [].concat(rows).reduce((result, row) => {
|
|
84
|
-
if (result || !row)
|
|
85
|
-
return result;
|
|
86
|
-
const parsedSKU = row.SKU.value.toUpperCase();
|
|
87
|
-
if (parsedSKU === sku) {
|
|
88
|
-
return row;
|
|
89
|
-
}
|
|
90
|
-
return result;
|
|
91
|
-
}, null);
|
|
92
|
-
if (!resolvedRow)
|
|
93
|
-
return null;
|
|
94
|
-
const amount = parseInt(resolvedRow.Stock.value, 10) || 0;
|
|
95
|
-
log(`GoogleSheet: Resolve Inventory for ${sku}: ${amount}`, {
|
|
96
|
-
level: LogLevel.Verbose,
|
|
97
|
-
});
|
|
98
|
-
return amount;
|
|
99
|
-
};
|
|
100
|
-
const GoogleSheets = {
|
|
101
|
-
...WarehousingAdapter,
|
|
102
|
-
key: 'shop.unchained.warehousing.google-sheets',
|
|
103
|
-
label: 'Google Sheets',
|
|
104
|
-
version: '1.0.0',
|
|
105
|
-
orderIndex: 0,
|
|
106
|
-
typeSupported: (type) => {
|
|
107
|
-
return type === WarehousingProviderType.PHYSICAL;
|
|
108
|
-
},
|
|
109
|
-
initialConfiguration: [
|
|
110
|
-
{
|
|
111
|
-
key: 'sheetId',
|
|
112
|
-
value: null,
|
|
113
|
-
},
|
|
114
|
-
],
|
|
115
|
-
actions: (config, context) => {
|
|
116
|
-
return {
|
|
117
|
-
...WarehousingAdapter.actions(config, context),
|
|
118
|
-
isActive: () => {
|
|
119
|
-
return true;
|
|
120
|
-
},
|
|
121
|
-
configurationError: () => {
|
|
122
|
-
return null;
|
|
123
|
-
},
|
|
124
|
-
stock: async () => {
|
|
125
|
-
const { sku } = context.product.warehousing || {};
|
|
126
|
-
return getRemoteInventory(sku);
|
|
127
|
-
},
|
|
128
|
-
productionTime: async (quantity) => {
|
|
129
|
-
const { sku } = context.product.warehousing || {};
|
|
130
|
-
if (!sku)
|
|
131
|
-
return null;
|
|
132
|
-
const selector = 'WAREHOUSE_HOURS';
|
|
133
|
-
const timeInHours = await getRemoteTime(sku.toUpperCase(), quantity, selector);
|
|
134
|
-
if (!timeInHours)
|
|
135
|
-
return null;
|
|
136
|
-
return timeInHours * 60 * 60 * 1000;
|
|
137
|
-
},
|
|
138
|
-
commissioningTime: async (quantity) => {
|
|
139
|
-
const { product, deliveryProvider } = context;
|
|
140
|
-
const { sku } = product.warehousing || {};
|
|
141
|
-
if (!sku)
|
|
142
|
-
return null;
|
|
143
|
-
const { type } = deliveryProvider;
|
|
144
|
-
const selector = `DELIVERY_HOURS:${type}`;
|
|
145
|
-
const timeInHours = await getRemoteTime(sku.toUpperCase(), quantity, selector);
|
|
146
|
-
if (!timeInHours)
|
|
147
|
-
return null;
|
|
148
|
-
return timeInHours * 60 * 60 * 1000;
|
|
149
|
-
},
|
|
150
|
-
};
|
|
151
|
-
},
|
|
152
|
-
};
|
|
153
|
-
WarehousingDirector.registerAdapter(GoogleSheets);
|
|
154
|
-
//# sourceMappingURL=google-sheets.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"google-sheets.js","sourceRoot":"","sources":["../../src/warehousing/google-sheets.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,167 +0,0 @@
|
|
|
1
|
-
import {
|
|
2
|
-
WarehousingDirector,
|
|
3
|
-
WarehousingAdapter,
|
|
4
|
-
WarehousingProviderType,
|
|
5
|
-
} from '@unchainedshop/core-warehousing';
|
|
6
|
-
import Sheets from 'node-sheets';
|
|
7
|
-
import { log, LogLevel } from '@unchainedshop/logger';
|
|
8
|
-
import 'abort-controller/polyfill.js';
|
|
9
|
-
import * as lruCache from 'lru-cache';
|
|
10
|
-
import { IWarehousingAdapter } from '@unchainedshop/types/warehousing.js';
|
|
11
|
-
|
|
12
|
-
const { NODE_ENV, GOOGLE_SHEETS_ID, GOOGLE_SHEETS_PRIVATE_KEY_DATA } = process.env;
|
|
13
|
-
|
|
14
|
-
const ttl = NODE_ENV === 'production' ? 1000 * 60 : 0; // 1 minute or 1 second
|
|
15
|
-
|
|
16
|
-
const downloadSpreadsheet = async () => {
|
|
17
|
-
if (!GOOGLE_SHEETS_PRIVATE_KEY_DATA || !GOOGLE_SHEETS_ID) return null;
|
|
18
|
-
try {
|
|
19
|
-
// https://docs.google.com/spreadsheets/d/GOOGLE_SHEETS_ID/edit?usp=sharing
|
|
20
|
-
const gs = new Sheets(GOOGLE_SHEETS_ID);
|
|
21
|
-
const authData = JSON.parse(GOOGLE_SHEETS_PRIVATE_KEY_DATA);
|
|
22
|
-
await gs.authorizeJWT(authData);
|
|
23
|
-
const delivery = await gs.tables('delivery!A:ZZZ');
|
|
24
|
-
const inventory = await gs.tables('inventory!A:ZZZ');
|
|
25
|
-
log(`GoogleSheet: Updated cache with TTL: ${ttl}`, {
|
|
26
|
-
level: LogLevel.Verbose,
|
|
27
|
-
});
|
|
28
|
-
return {
|
|
29
|
-
delivery,
|
|
30
|
-
inventory,
|
|
31
|
-
};
|
|
32
|
-
} catch (err) {
|
|
33
|
-
log(err, { level: LogLevel.Error });
|
|
34
|
-
throw err;
|
|
35
|
-
}
|
|
36
|
-
};
|
|
37
|
-
|
|
38
|
-
const updateGoogleCache = async (cache) => {
|
|
39
|
-
try {
|
|
40
|
-
const sheet = await downloadSpreadsheet();
|
|
41
|
-
if (sheet) {
|
|
42
|
-
cache.set('tables', sheet);
|
|
43
|
-
return sheet;
|
|
44
|
-
}
|
|
45
|
-
} catch (e) {
|
|
46
|
-
log(e, { level: LogLevel.Error });
|
|
47
|
-
}
|
|
48
|
-
return null;
|
|
49
|
-
};
|
|
50
|
-
|
|
51
|
-
const googleCache = new lruCache.LRUCache({
|
|
52
|
-
max: 500,
|
|
53
|
-
ttl, // 1 second in dev
|
|
54
|
-
allowStale: true,
|
|
55
|
-
dispose: () => {
|
|
56
|
-
updateGoogleCache(googleCache);
|
|
57
|
-
},
|
|
58
|
-
});
|
|
59
|
-
|
|
60
|
-
updateGoogleCache(googleCache);
|
|
61
|
-
|
|
62
|
-
const getRows = async (name: string) => {
|
|
63
|
-
const cachedTables = googleCache.get('tables');
|
|
64
|
-
let tables = cachedTables;
|
|
65
|
-
if (!cachedTables) {
|
|
66
|
-
tables = await updateGoogleCache(googleCache);
|
|
67
|
-
}
|
|
68
|
-
if (!tables || !tables[name] || !tables[name].rows) return [];
|
|
69
|
-
return tables[name].rows;
|
|
70
|
-
};
|
|
71
|
-
|
|
72
|
-
const getRemoteTime = async (sku: string, quantity: number, selector: string) => {
|
|
73
|
-
const rows = await getRows('delivery');
|
|
74
|
-
const resolvedRow = rows.reduce((result, row) => {
|
|
75
|
-
const parsedQuantity = parseInt(row.Quantity.value, 10);
|
|
76
|
-
const parsedSKU = row.SKU.value.toUpperCase();
|
|
77
|
-
if (parsedSKU === sku && parsedQuantity <= quantity) {
|
|
78
|
-
return row;
|
|
79
|
-
}
|
|
80
|
-
return result;
|
|
81
|
-
}, null);
|
|
82
|
-
if (!resolvedRow) return null;
|
|
83
|
-
const time = parseInt(resolvedRow[selector].value, 10) || 0;
|
|
84
|
-
log(`GoogleSheet: Resolve Time ${selector} (${quantity}) for ${sku}: ${time}`, {
|
|
85
|
-
level: LogLevel.Verbose,
|
|
86
|
-
});
|
|
87
|
-
return time;
|
|
88
|
-
};
|
|
89
|
-
|
|
90
|
-
const getRemoteInventory = async (sku: string) => {
|
|
91
|
-
const rows = await getRows('inventory');
|
|
92
|
-
const resolvedRow = [].concat(rows).reduce((result, row) => {
|
|
93
|
-
if (result || !row) return result;
|
|
94
|
-
const parsedSKU = row.SKU.value.toUpperCase();
|
|
95
|
-
if (parsedSKU === sku) {
|
|
96
|
-
return row;
|
|
97
|
-
}
|
|
98
|
-
return result;
|
|
99
|
-
}, null);
|
|
100
|
-
if (!resolvedRow) return null;
|
|
101
|
-
const amount = parseInt(resolvedRow.Stock.value, 10) || 0;
|
|
102
|
-
log(`GoogleSheet: Resolve Inventory for ${sku}: ${amount}`, {
|
|
103
|
-
level: LogLevel.Verbose,
|
|
104
|
-
});
|
|
105
|
-
return amount;
|
|
106
|
-
};
|
|
107
|
-
|
|
108
|
-
const GoogleSheets: IWarehousingAdapter = {
|
|
109
|
-
...WarehousingAdapter,
|
|
110
|
-
|
|
111
|
-
key: 'shop.unchained.warehousing.google-sheets',
|
|
112
|
-
label: 'Google Sheets',
|
|
113
|
-
version: '1.0.0',
|
|
114
|
-
orderIndex: 0,
|
|
115
|
-
|
|
116
|
-
typeSupported: (type) => {
|
|
117
|
-
return type === WarehousingProviderType.PHYSICAL;
|
|
118
|
-
},
|
|
119
|
-
|
|
120
|
-
initialConfiguration: [
|
|
121
|
-
{
|
|
122
|
-
key: 'sheetId',
|
|
123
|
-
value: null,
|
|
124
|
-
},
|
|
125
|
-
],
|
|
126
|
-
|
|
127
|
-
actions: (config, context) => {
|
|
128
|
-
return {
|
|
129
|
-
...WarehousingAdapter.actions(config, context),
|
|
130
|
-
|
|
131
|
-
isActive: () => {
|
|
132
|
-
return true;
|
|
133
|
-
},
|
|
134
|
-
|
|
135
|
-
configurationError: () => {
|
|
136
|
-
return null;
|
|
137
|
-
},
|
|
138
|
-
|
|
139
|
-
stock: async () => {
|
|
140
|
-
const { sku } = context.product.warehousing || {};
|
|
141
|
-
return getRemoteInventory(sku);
|
|
142
|
-
},
|
|
143
|
-
|
|
144
|
-
productionTime: async (quantity: number) => {
|
|
145
|
-
const { sku } = context.product.warehousing || {};
|
|
146
|
-
if (!sku) return null;
|
|
147
|
-
const selector = 'WAREHOUSE_HOURS';
|
|
148
|
-
const timeInHours = await getRemoteTime(sku.toUpperCase(), quantity, selector);
|
|
149
|
-
if (!timeInHours) return null;
|
|
150
|
-
return timeInHours * 60 * 60 * 1000;
|
|
151
|
-
},
|
|
152
|
-
|
|
153
|
-
commissioningTime: async (quantity) => {
|
|
154
|
-
const { product, deliveryProvider } = context;
|
|
155
|
-
const { sku } = product.warehousing || {};
|
|
156
|
-
if (!sku) return null;
|
|
157
|
-
const { type } = deliveryProvider;
|
|
158
|
-
const selector = `DELIVERY_HOURS:${type}`;
|
|
159
|
-
const timeInHours = await getRemoteTime(sku.toUpperCase(), quantity, selector);
|
|
160
|
-
if (!timeInHours) return null;
|
|
161
|
-
return timeInHours * 60 * 60 * 1000;
|
|
162
|
-
},
|
|
163
|
-
};
|
|
164
|
-
},
|
|
165
|
-
};
|
|
166
|
-
|
|
167
|
-
WarehousingDirector.registerAdapter(GoogleSheets);
|