@unchainedshop/api 2.12.1 → 2.13.0

package/lib/express/createBulkImportMiddleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createBulkImportMiddleware.d.ts","sourceRoot":"","sources":["../../src/express/createBulkImportMiddleware.ts"],"names":[],"mappings":"AAmBA,wBAA8B,oBAAoB,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA,iBA6C1D"}
+{"version":3,"file":"createBulkImportMiddleware.d.ts","sourceRoot":"","sources":["../../src/express/createBulkImportMiddleware.ts"],"names":[],"mappings":"AAmBA,wBAA8B,oBAAoB,CAAC,GAAG,KAAA,EAAE,GAAG,KAAA,iBA8C1D"}

package/lib/express/createBulkImportMiddleware.js

@@ -24,6 +24,7 @@ export default async function bulkImportMiddleware(req, res) {
         await checkAction(context, actions.bulkImport);
         const input = {
             createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
+            updateShouldUpsertIfIDNotExists: !!req.query?.updateShouldUpsertIfIDNotExists,
             skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
             remoteAddress: context.remoteAddress,
         };

package/lib/express/createBulkImportMiddleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"createBulkImportMiddleware.js","sourceRoot":"","sources":["../../src/express/createBulkImportMiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,MAAM,MAAM,GAAG,YAAY,CAAC,uBAAuB,CAAC,CAAC;AAErD,MAAM,YAAY,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;IAClC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACxB,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACnB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;AAC9E,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,EAAE;IACvC,MAAM,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACjD,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACnB,GAAG,CAAC,GAAG,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,oBAAoB,CAAC,GAAG,EAAE,GAAG;IACzD,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC1B,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,MAAM,eAAe,GAAG,yBAAyB,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,MAAM,eAAe,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;QACpD,MAAM,WAAW,CAAC,OAAO,EAAG,OAAe,CAAC,UAAU,CAAC,CAAC;QAExD,MAAM,KAAK,GAAQ;YACjB,4BAA4B,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,4BAA4B;YACvE,qBAAqB,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,qBAAqB;YACzD,aAAa,EAAE,OAAO,CAAC,aAAa;SACrC,CAAC;QAEF,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;QAEtC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,oBAAoB,CAC5D;YACE,aAAa,EAAE,qBAAqB;YACpC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,OAAO,EAAE,gBAAgB,EAAE,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC;YACnF,IAAI,EAAE,EAAE;SACT,EACD,OAAO,CACR,CAAC;QAEF,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG,CAAC;QAC3B,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC;QAE9B,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAEpG,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC;YAChD,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,WAAW;YAClB,OAAO,EAAE,CAAC;YACV,QAAQ,EAAE,EAAE;SACb,CAAC,CAAC;QAEH,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACnB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IAChC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;AACH,CAAC"}
+{"version":3,"file":"createBulkImportMiddleware.js","sourceRoot":"","sources":["../../src/express/createBulkImportMiddleware.ts"],"names":[],"mappings":"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"}

package/lib/locale-context.d.ts

@@ -2,5 +2,6 @@ import { IncomingMessage, OutgoingMessage } from 'http';
 import { UnchainedLocaleContext } from '@unchainedshop/types/api.js';
 import 'abort-controller/polyfill.js';
 import { UnchainedCore } from '@unchainedshop/types/core.js';
+export declare const resolveDefaultContext: any;
 export declare const getLocaleContext: (req: IncomingMessage, res: OutgoingMessage, unchainedAPI: UnchainedCore) => Promise<UnchainedLocaleContext>;
 //# sourceMappingURL=locale-context.d.ts.map

package/lib/locale-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"locale-context.d.ts","sourceRoot":"","sources":["../src/locale-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,8BAA8B,CAAC;AAQtC,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAc7D,eAAO,MAAM,gBAAgB,QACtB,eAAe,OACf,eAAe,gBACN,aAAa,KAC1B,OAAO,CAAC,sBAAsB,CAgDhC,CAAC"}
+{"version":3,"file":"locale-context.d.ts","sourceRoot":"","sources":["../src/locale-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErE,OAAO,8BAA8B,CAAC;AAStC,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAO7D,eAAO,MAAM,qBAAqB,KAgDjC,CAAC;AAEF,eAAO,MAAM,gBAAgB,QACtB,eAAe,OACf,eAAe,gBACN,aAAa,KAC1B,OAAO,CAAC,sBAAsB,CAQhC,CAAC"}

package/lib/locale-context.js

@@ -1,27 +1,14 @@
 import localePkg from 'locale';
 import 'abort-controller/polyfill.js';
 import { log, LogLevel } from '@unchainedshop/logger';
-import { resolveBestCountry, resolveBestSupported, resolveUserRemoteAddress, systemLocale, } from '@unchainedshop/utils';
-import * as lruCache from 'lru-cache';
+import { resolveBestCountry, resolveBestSupported, resolveBestCurrency, resolveUserRemoteAddress, systemLocale, } from '@unchainedshop/utils';
+import memoizee from 'memoizee';
 const { Locales } = localePkg;
 const { NODE_ENV } = process.env;
-const ttl = NODE_ENV === 'production' ? 1000 * 60 : 0; // minute or second
-const localeContextCache = new lruCache.LRUCache({
-    max: 500,
-    ttl,
-});
-export const getLocaleContext = async (req, res, unchainedAPI) => {
-    const cacheKey = `${req.headers['accept-language']}:${req.headers['x-shop-country']}`;
-    const cachedContext = localeContextCache.get(cacheKey);
-    const userAgent = req.headers['user-agent'];
-    const { remoteAddress, remotePort } = resolveUserRemoteAddress(req);
-    if (cachedContext)
-        return { remoteAddress, remotePort, userAgent, ...cachedContext };
-    // return the parsed locale by bcp47 and
-    // return the best resolved normalized locale by locale according to system-wide configuration
-    // else fallback to base language & base country
+export const resolveDefaultContext = memoizee(async ({ acceptLang, acceptCountry }, unchainedAPI) => {
     const languages = await unchainedAPI.modules.languages.findLanguages({ includeInactive: false }, { projection: { isoCode: 1, isActive: 1 } });
     const countries = await unchainedAPI.modules.countries.findCountries({ includeInactive: false }, { projection: { isoCode: 1, isActive: 1 } });
+    const currencies = await unchainedAPI.modules.currencies.findCurrencies({ includeInactive: false });
     const supportedLocaleStrings = languages.reduce((accumulator, language) => {
         const added = countries.map((country) => {
             return `${language.isoCode}-${country.isoCode}`;
@@ -29,16 +16,30 @@ export const getLocaleContext = async (req, res, unchainedAPI) => {
         return accumulator.concat(added);
     }, []);
     const supportedLocales = new Locales(supportedLocaleStrings, systemLocale.code);
-    const localeContext = resolveBestSupported(req.headers['accept-language'], supportedLocales);
-    const countryContext = resolveBestCountry(localeContext.country, req.headers['x-shop-country'], countries);
-    log(`Locale Context: Resolved ${localeContext.normalized} ${countryContext}`, {
+    const localeContext = resolveBestSupported(acceptLang, supportedLocales);
+    const countryContext = resolveBestCountry(localeContext.country, acceptCountry, countries);
+    const countryObject = countries.find((country) => country.isoCode === countryContext);
+    const currencyContext = resolveBestCurrency(countryObject.defaultCurrencyCode, currencies);
+    log(`Locale Context: Resolved ${localeContext.normalized} ${countryContext} ${currencyContext}`, {
         level: LogLevel.Debug,
     });
     const newContext = {
         localeContext,
         countryContext,
+        currencyContext,
     };
-    localeContextCache.set(cacheKey, newContext);
-    return { remoteAddress, remotePort, userAgent, ...newContext };
+    return newContext;
+}, {
+    maxAge: NODE_ENV === 'production' ? 1000 * 60 : 100, // minute or 100ms
+    promise: true,
+    normalizer(args) {
+        return `${args[0].acceptLang}-${args[0].acceptCountry}`;
+    },
+});
+export const getLocaleContext = async (req, res, unchainedAPI) => {
+    const userAgent = req.headers['user-agent'];
+    const { remoteAddress, remotePort } = resolveUserRemoteAddress(req);
+    const context = await resolveDefaultContext({ acceptLang: req.headers['accept-language'], acceptCountry: req.headers['x-shop-country'] }, unchainedAPI);
+    return { remoteAddress, remotePort, userAgent, ...context };
 };
 //# sourceMappingURL=locale-context.js.map

package/lib/locale-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"locale-context.js","sourceRoot":"","sources":["../src/locale-context.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,QAAQ,CAAC;AAC/B,OAAO,8BAA8B,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,wBAAwB,EACxB,YAAY,GACb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,QAAQ,MAAM,WAAW,CAAC;AAEtC,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;AAE9B,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjC,MAAM,GAAG,GAAG,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,mBAAmB;AAE1E,MAAM,kBAAkB,GAAG,IAAI,QAAQ,CAAC,QAAQ,CAAC;IAC/C,GAAG,EAAE,GAAG;IACR,GAAG;CACJ,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,GAAoB,EACpB,GAAoB,EACpB,YAA2B,EACM,EAAE;IACnC,MAAM,QAAQ,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC;IACtF,MAAM,aAAa,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAA2B,CAAC;IAEjF,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;IAEpE,IAAI,aAAa;QAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,aAAa,EAAE,CAAC;IAErF,wCAAwC;IACxC,8FAA8F;IAC9F,gDAAgD;IAEhD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAClE,EAAE,eAAe,EAAE,KAAK,EAAE,EAC1B,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAC5C,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAClE,EAAE,eAAe,EAAE,KAAK,EAAE,EAC1B,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAC5C,CAAC;IAEF,MAAM,sBAAsB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE;QACxE,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACtC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,OAAO,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,gBAAgB,GAAG,IAAI,OAAO,CAAC,sBAAsB,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAEhF,MAAM,aAAa,GAAG,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAC7F,MAAM,cAAc,GAAG,kBAAkB,CACvC,aAAa,CAAC,OAAO,EACrB,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAC7B,SAAS,CACV,CAAC;IACF,GAAG,CAAC,4BAA4B,aAAa,CAAC,UAAU,IAAI,cAAc,EAAE,EAAE;QAC5E,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAC,CAAC;IACH,MAAM,UAAU,GAA2B;QACzC,aAAa;QACb,cAAc;KACf,CAAC;IACF,kBAAkB,CAAC,GAAG,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAE7C,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE,CAAC;AACjE,CAAC,CAAC"}
+{"version":3,"file":"locale-context.js","sourceRoot":"","sources":["../src/locale-context.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,QAAQ,CAAC;AAC/B,OAAO,8BAA8B,CAAC;AACtC,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,mBAAmB,EACnB,wBAAwB,EACxB,YAAY,GACb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAEhC,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;AAE9B,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAEjC,MAAM,CAAC,MAAM,qBAAqB,GAAG,QAAQ,CAC3C,KAAK,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,YAAY,EAAE,EAAE;IACpD,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAClE,EAAE,eAAe,EAAE,KAAK,EAAE,EAC1B,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAC5C,CAAC;IAEF,MAAM,SAAS,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,aAAa,CAClE,EAAE,eAAe,EAAE,KAAK,EAAE,EAC1B,EAAE,UAAU,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,CAC5C,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAC;IAEpG,MAAM,sBAAsB,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,QAAQ,EAAE,EAAE;QACxE,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE;YACtC,OAAO,GAAG,QAAQ,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAClD,CAAC,CAAC,CAAC;QACH,OAAO,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,gBAAgB,GAAG,IAAI,OAAO,CAAC,sBAAsB,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAEhF,MAAM,aAAa,GAAG,oBAAoB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IACzE,MAAM,cAAc,GAAG,kBAAkB,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,EAAE,SAAS,CAAC,CAAC;IAE3F,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,cAAc,CAAC,CAAC;IACtF,MAAM,eAAe,GAAG,mBAAmB,CAAC,aAAa,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAE3F,GAAG,CAAC,4BAA4B,aAAa,CAAC,UAAU,IAAI,cAAc,IAAI,eAAe,EAAE,EAAE;QAC/F,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAC,CAAC;IAEH,MAAM,UAAU,GAA2B;QACzC,aAAa;QACb,cAAc;QACd,eAAe;KAChB,CAAC;IAEF,OAAO,UAAU,CAAC;AACpB,CAAC,EACD;IACE,MAAM,EAAE,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,kBAAkB;IACvE,OAAO,EAAE,IAAI;IACb,UAAU,CAAC,IAAI;QACb,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IAC1D,CAAC;CACF,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EACnC,GAAoB,EACpB,GAAoB,EACpB,YAA2B,EACM,EAAE;IACnC,MAAM,SAAS,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5C,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC;IACpE,MAAM,OAAO,GAAG,MAAM,qBAAqB,CACzC,EAAE,UAAU,EAAE,GAAG,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,aAAa,EAAE,GAAG,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,EAC5F,YAAY,CACb,CAAC;IACF,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,OAAO,EAAE,CAAC;AAC9D,CAAC,CAAC"}

package/lib/resolvers/mutations/countries/updateCountry.d.ts

@@ -1,7 +1,9 @@
 import { Country } from '@unchainedshop/types/countries.js';
 import { Context, Root } from '@unchainedshop/types/api.js';
 export default function updateCountry(root: Root, { country, countryId }: {
-    country: Country;
+    country: Country & {
+        defaultCurrencyId: string;
+    };
     countryId: string;
 }, { userId, modules }: Context): Promise<Country>;
 //# sourceMappingURL=updateCountry.d.ts.map

package/lib/resolvers/mutations/countries/updateCountry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"updateCountry.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/countries/updateCountry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAA8B,aAAa,CACzC,IAAI,EAAE,IAAI,EACV,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC/D,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,oBAY7B"}
+{"version":3,"file":"updateCountry.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/countries/updateCountry.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAG5D,wBAA8B,aAAa,CACzC,IAAI,EAAE,IAAI,EACV,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE;IAAE,OAAO,EAAE,OAAO,GAAG;QAAE,iBAAiB,EAAE,MAAM,CAAA;KAAE,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,EAC/F,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,oBAiB7B"}

package/lib/resolvers/mutations/countries/updateCountry.js

@@ -6,7 +6,11 @@ export default async function updateCountry(root, { country, countryId }, { user
         throw new InvalidIdError({ countryId });
     if (!(await modules.countries.countryExists({ countryId })))
         throw new CountryNotFoundError({ countryId });
-    await modules.countries.update(countryId, country);
+    const currencyObject = await modules.currencies.findCurrency({
+        currencyId: country.defaultCurrencyId,
+    });
+    const defaultCurrencyCode = country?.defaultCurrencyCode || currencyObject?.isoCode;
+    await modules.countries.update(countryId, { ...country, defaultCurrencyCode });
     return modules.countries.findCountry({ countryId });
 }
 //# sourceMappingURL=updateCountry.js.map

package/lib/resolvers/mutations/countries/updateCountry.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateCountry.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/countries/updateCountry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,IAAU,EACV,EAAE,OAAO,EAAE,SAAS,EAA2C,EAC/D,EAAE,MAAM,EAAE,OAAO,EAAW;IAE5B,GAAG,CAAC,0BAA0B,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExD,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAEhD,MAAM,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAEnD,OAAO,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;AACtD,CAAC"}
+{"version":3,"file":"updateCountry.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/countries/updateCountry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAG5C,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAE1E,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,aAAa,CACzC,IAAU,EACV,EAAE,OAAO,EAAE,SAAS,EAA2E,EAC/F,EAAE,MAAM,EAAE,OAAO,EAAW;IAE5B,GAAG,CAAC,0BAA0B,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvD,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExD,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,SAAS,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;QACzD,MAAM,IAAI,oBAAoB,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAEhD,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC;QAC3D,UAAU,EAAE,OAAO,CAAC,iBAAiB;KACtC,CAAC,CAAC;IACH,MAAM,mBAAmB,GAAG,OAAO,EAAE,mBAAmB,IAAI,cAAc,EAAE,OAAO,CAAC;IAEpF,MAAM,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,GAAG,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;IAE/E,OAAO,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;AACtD,CAAC"}

package/lib/resolvers/mutations/enrollments/createEnrollment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createEnrollment.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/enrollments/createEnrollment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAS5D,wBAA8B,gBAAgB,CAC5C,IAAI,EAAE,IAAI,EACV,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;;;;;;;CAAA,EAC1D,OAAO,EAAE,OAAO,qEAsCjB"}
+{"version":3,"file":"createEnrollment.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/enrollments/createEnrollment.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAS5D,wBAA8B,gBAAgB,CAC5C,IAAI,EAAE,IAAI,EACV,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE;;;;;;;CAAA,EAC1D,OAAO,EAAE,OAAO,qEAuCjB"}

package/lib/resolvers/mutations/enrollments/createEnrollment.js

@@ -2,7 +2,7 @@ import { log } from '@unchainedshop/logger';
 import { ProductStatus, ProductTypes } from '@unchainedshop/core-products';
 import { ProductNotFoundError, ProductWrongStatusError, InvalidIdError, ProductWrongTypeError, } from '../../../errors.js';
 export default async function createEnrollment(root, { contact, plan, billingAddress, payment, delivery, meta }, context) {
-    const { countryContext, modules, userId } = context;
+    const { countryContext, currencyContext, modules, userId } = context;
     log('mutation createEnrollment', { userId });
     const { configuration, quantity, productId } = plan;
     if (!productId)
@@ -23,6 +23,7 @@ export default async function createEnrollment(root, { contact, plan, billingAdd
         configuration,
         contact,
         countryCode: countryContext,
+        currencyCode: currencyContext,
         delivery,
         meta,
         payment,

package/lib/resolvers/mutations/enrollments/createEnrollment.js.map

@@ -1 +1 @@
-{"version":3,"file":"createEnrollment.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/enrollments/createEnrollment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,cAAc,EACd,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,gBAAgB,CAC5C,IAAU,EACV,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAC1D,OAAgB;IAEhB,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEpD,GAAG,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE7C,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAEpD,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,oBAAoB,CAAC;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,EAAE,CAAC;QAC5C,MAAM,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC,WAAW;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAEvG,OAAO,OAAO,CAAC,WAAW,CAAC,MAAM,CAC/B;QACE,cAAc;QACd,aAAa;QACb,OAAO;QACP,WAAW,EAAE,cAAc;QAC3B,QAAQ;QACR,IAAI;QACJ,OAAO;QACP,SAAS;QACT,QAAQ;QACR,MAAM;KACP,EACD,OAAO,CACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"createEnrollment.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/enrollments/createEnrollment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC3E,OAAO,EACL,oBAAoB,EACpB,uBAAuB,EACvB,cAAc,EACd,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,gBAAgB,CAC5C,IAAU,EACV,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,EAC1D,OAAgB;IAEhB,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAErE,GAAG,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE7C,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;IAEpD,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,oBAAoB,CAAC;YAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,CAAC,MAAM,EAAE,CAAC;QAC5C,MAAM,IAAI,uBAAuB,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,CAAC,WAAW;QAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAEvG,OAAO,OAAO,CAAC,WAAW,CAAC,MAAM,CAC/B;QACE,cAAc;QACd,aAAa;QACb,OAAO;QACP,WAAW,EAAE,cAAc;QAC3B,YAAY,EAAE,eAAe;QAC7B,QAAQ;QACR,IAAI;QACJ,OAAO;QACP,SAAS;QACT,QAAQ;QACR,MAAM;KACP,EACD,OAAO,CACR,CAAC;AACJ,CAAC"}

package/lib/resolvers/mutations/orders/confirmOrder.d.ts

@@ -3,5 +3,6 @@ export default function confirmOrder(root: Root, params: {
     orderId: string;
     paymentContext?: any;
     deliveryContext?: any;
+    comment?: string;
 }, context: Context): Promise<import("@unchainedshop/types/orders.js").Order>;
 //# sourceMappingURL=confirmOrder.d.ts.map

package/lib/resolvers/mutations/orders/confirmOrder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"confirmOrder.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/confirmOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAK5D,wBAA8B,YAAY,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;CACvB,EACD,OAAO,EAAE,OAAO,2DAiBjB"}
+{"version":3,"file":"confirmOrder.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/confirmOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAK5D,wBAA8B,YAAY,CACxC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,EACD,OAAO,EAAE,OAAO,2DAiBjB"}

package/lib/resolvers/mutations/orders/confirmOrder.js.map

@@ -1 +1 @@
-{"version":3,"file":"confirmOrder.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/confirmOrder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE/F,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,IAAU,EACV,MAIC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAElD,GAAG,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEtD,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;AACpE,CAAC"}
+{"version":3,"file":"confirmOrder.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/confirmOrder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE/F,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,YAAY,CACxC,IAAU,EACV,MAKC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAElD,GAAG,CAAC,uBAAuB,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAElD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEtD,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;AACpE,CAAC"}

package/lib/resolvers/mutations/orders/rejectOrder.d.ts

@@ -3,5 +3,6 @@ export default function rejectOrder(root: Root, params: {
     orderId: string;
     paymentContext?: any;
     deliveryContext?: any;
+    comment?: string;
 }, context: Context): Promise<import("@unchainedshop/types/orders.js").Order>;
 //# sourceMappingURL=rejectOrder.d.ts.map

package/lib/resolvers/mutations/orders/rejectOrder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rejectOrder.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/rejectOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAK5D,wBAA8B,WAAW,CACvC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;CACvB,EACD,OAAO,EAAE,OAAO,2DAejB"}
+{"version":3,"file":"rejectOrder.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/rejectOrder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAK5D,wBAA8B,WAAW,CACvC,IAAI,EAAE,IAAI,EACV,MAAM,EAAE;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,eAAe,CAAC,EAAE,GAAG,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,EACD,OAAO,EAAE,OAAO,2DAgBjB"}

package/lib/resolvers/mutations/orders/rejectOrder.js.map

@@ -1 +1 @@
-{"version":3,"file":"rejectOrder.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/rejectOrder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE/F,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACvC,IAAU,EACV,MAIC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAElD,GAAG,CAAC,sBAAsB,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IACjD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEtD,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC"}
+{"version":3,"file":"rejectOrder.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/orders/rejectOrder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE/F,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,WAAW,CACvC,IAAU,EACV,MAKC,EACD,OAAgB;IAEhB,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACpC,MAAM,EAAE,OAAO,EAAE,GAAG,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAElD,GAAG,CAAC,sBAAsB,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAEjD,IAAI,CAAC,OAAO;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEpD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK;QAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAEtD,IAAI,KAAK,CAAC,MAAM,KAAK,WAAW,CAAC,OAAO,EAAE,CAAC;QACzC,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,OAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,kBAAkB,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC"}

package/lib/resolvers/type/country-types.js

@@ -1,8 +1,8 @@
 export const Country = {
     defaultCurrency: async (country, _, { modules }) => {
-        if (country.defaultCurrencyId) {
+        if (country.defaultCurrencyCode) {
             return modules.currencies.findCurrency({
-                currencyId: country.defaultCurrencyId,
+                isoCode: country.defaultCurrencyCode,
             });
         }
         return null;

package/lib/resolvers/type/country-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"country-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/country-types.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,MAAM,OAAO,GAAuB;IACzC,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACjD,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC9B,OAAO,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC;gBACrC,UAAU,EAAE,OAAO,CAAC,iBAAiB;aACtC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,OAAO,EAAW,EAAE,EAAE;QAC9C,OAAO,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,OAAO,EAAW,EAAE,EAAE;QAC3C,OAAO,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,EAAE;QAC7D,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChF,CAAC;CACF,CAAC"}
+{"version":3,"file":"country-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/country-types.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,MAAM,OAAO,GAAuB;IACzC,eAAe,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACjD,IAAI,OAAO,CAAC,mBAAmB,EAAE,CAAC;YAChC,OAAO,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC;gBACrC,OAAO,EAAE,OAAO,CAAC,mBAAmB;aACrC,CAAC,CAAC;QACL,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,SAAS,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,OAAO,EAAW,EAAE,EAAE;QAC9C,OAAO,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IACD,MAAM,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,EAAE,OAAO,EAAW,EAAE,EAAE;QAC3C,OAAO,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,aAAa,EAAE,OAAO,EAAE,EAAE,EAAE;QAC7D,OAAO,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAC;IAChF,CAAC;CACF,CAAC"}

package/lib/resolvers/type/delivery-provider-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"delivery-provider-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/delivery-provider-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EACL,aAAa,EACb,gBAAgB,IAAI,oBAAoB,EACzC,MAAM,kCAAkC,CAAC;AAG1C,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAElG,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,UAAU,CACnB,KAAK,EACL;QACE,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CACF,CAAC;IACF,QAAQ,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,kBAAkB,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;IAC9D,cAAc,EAAE,UAAU,CACxB;QACE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;KACd,EACD,OAAO,CAAC;QACN,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC,CACH,CAAC;CACH;AAED,eAAO,MAAM,gBAAgB,EAAE,2BAoE9B,CAAC"}
+{"version":3,"file":"delivery-provider-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/delivery-provider-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EACL,aAAa,EACb,gBAAgB,IAAI,oBAAoB,EACzC,MAAM,kCAAkC,CAAC;AAG1C,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,oBAAoB,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,KAAK,CAAC,CAAC;AAElG,MAAM,WAAW,2BAA2B;IAC1C,SAAS,EAAE,UAAU,CACnB,KAAK,EACL;QACE,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CACF,CAAC;IACF,QAAQ,EAAE,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7C,kBAAkB,EAAE,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC;IAC9D,cAAc,EAAE,UAAU,CACxB;QACE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;KACd,EACD,OAAO,CAAC;QACN,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC,CACH,CAAC;CACH;AAED,eAAO,MAAM,gBAAgB,EAAE,2BA4D9B,CAAC"}

package/lib/resolvers/type/delivery-provider-types.js

@@ -16,12 +16,9 @@ export const DeliveryProvider = {
         return modules.delivery.configurationError(deliveryProvider, requestContext);
     },
     async simulatedPrice(deliveryProvider, { currency: currencyCode, orderId, useNetPrice, context: providerContext }, requestContext) {
-        const { modules, services, countryContext: country, user } = requestContext;
+        const { modules, countryContext: country, user } = requestContext;
         const order = await modules.orders.findOrder({ orderId });
-        const currency = currencyCode ||
-            (await services.countries.resolveDefaultCurrencyCode({
-                isoCode: country,
-            }, requestContext));
+        const currency = currencyCode || requestContext.currencyContext;
         const pricingDirector = await DeliveryPricingDirector.actions({
             country,
             currency,

package/lib/resolvers/type/delivery-provider-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"delivery-provider-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/delivery-provider-types.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAM5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAiCvE,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QAC3B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,EAAE,cAAc;QAChD,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnC,OAAO,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,CAAC,EAAE,cAAc;QAC1D,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnC,OAAO,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,gBAAgB,EAChB,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,EAC1E,cAAc;QAEd,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC;QAC5E,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAE1D,MAAM,QAAQ,GACZ,YAAY;YACZ,CAAC,MAAM,QAAQ,CAAC,SAAS,CAAC,0BAA0B,CAClD;gBACE,OAAO,EAAE,OAAO;aACjB,EACD,cAAc,CACf,CAAC,CAAC;QAEL,MAAM,eAAe,GAAG,MAAM,uBAAuB,CAAC,OAAO,CAC3D;YACE,OAAO;YACP,QAAQ;YACR,QAAQ,EAAE,gBAAgB;YAC1B,KAAK;YACL,eAAe;YACf,IAAI;SACL,EACD,cAAc,CACf,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC;QACrD,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEnD,MAAM,OAAO,GAAG,eAAe,CAAC,gBAAgB,EAAE,CAAC;QAEnD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,CAG/C,CAAC;QAEF,OAAO;YACL,GAAG,EAAE,MAAM;iBACR,UAAU,CAAC,QAAQ,CAAC;iBACpB,MAAM,CAAC,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACrF,MAAM,CAAC,KAAK,CAAC;YAChB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,YAAY,EAAE,UAAU,CAAC,QAAQ;YACjC,WAAW,EAAE,OAAO;YACpB,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;YAC/B,UAAU,EAAE,WAAW;SACxB,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"delivery-provider-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/delivery-provider-types.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAM5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAC;AAiCvE,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QAC3B,MAAM,SAAS,GAAG,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACtD,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,gBAAgB,EAAE,CAAC,EAAE,cAAc;QAChD,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnC,OAAO,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,CAAC,EAAE,cAAc;QAC1D,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnC,OAAO,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;IAC/E,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,gBAAgB,EAChB,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,EAC1E,cAAc;QAEd,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC;QAClE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,YAAY,IAAI,cAAc,CAAC,eAAe,CAAC;QAEhE,MAAM,eAAe,GAAG,MAAM,uBAAuB,CAAC,OAAO,CAC3D;YACE,OAAO;YACP,QAAQ;YACR,QAAQ,EAAE,gBAAgB;YAC1B,KAAK;YACL,eAAe;YACf,IAAI;SACL,EACD,cAAc,CACf,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC;QACrD,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEnD,MAAM,OAAO,GAAG,eAAe,CAAC,gBAAgB,EAAE,CAAC;QAEnD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,CAG/C,CAAC;QAEF,OAAO;YACL,GAAG,EAAE,MAAM;iBACR,UAAU,CAAC,QAAQ,CAAC;iBACpB,MAAM,CAAC,CAAC,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACrF,MAAM,CAAC,KAAK,CAAC;YAChB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,YAAY,EAAE,UAAU,CAAC,QAAQ;YACjC,WAAW,EAAE,OAAO;YACpB,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;YAC/B,UAAU,EAAE,WAAW;SACxB,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/index.ts"],"names":[],"mappings":"AAwEA,QAAA,MAAM,KAAK;;;;;;;;;;;;uBA5DP,CAAC;;;;;;;gBAKW,CAAC;;;uBAKG,CAAC;iBAAqB,CAAC;kBAC1B,CAAC;gBAAoB,CAAC;;;uBAKE,CAAC;;;wBAGZ,CAAC;;;;;;;uBAc1B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBA3B6B,CAAC;;;;;;;;;;oBAiBoC,CAAC;;oBAClB,CAAC;;;;;;uBAxBpD,CAAC;;;;;;;gBAKW,CAAC;;;uBAKG,CAAC;iBAAqB,CAAC;kBAC1B,CAAC;gBAAoB,CAAC;;;uBAKE,CAAC;;;wBAGZ,CAAC;;;;;;;uBAc1B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAvCc,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAKV,CAAC;gBAAyB,CAAC;iBACtB,CAAC;;mBACV,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBATiD,CAAC;oBAAkB,CAAC;;;oBAW3B,CAAC;oBAC7C,CAAC;uBAAsB,CAAA;;;oBASuB,CAAC;;;;;;;;;;;uBAbhD,CAAC;;;;;;;gBAKW,CAAC;;;uBAKG,CAAC;iBAAqB,CAAC;kBAC1B,CAAC;gBAAoB,CAAC;;;uBAKE,CAAC;;;wBAGZ,CAAC;;;;;;;uBAc1B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAjCF,CAAC;;;;;;;gBAKW,CAAC;;;uBAKG,CAAC;iBAAqB,CAAC;kBAC1B,CAAC;gBAAoB,CAAC;;;uBAKE,CAAC;;;wBAGZ,CAAC;;;;;;;uBAc1B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAnCyB,CAAC;+BACD,CAAC;oBACX,CAAC;4BAA8B,CAAC;;;;;;;4BAuB5B,CAAC;+BAA6C,CAAC;oBACrC,CAAC;;;;;;;;;;;;oBAhCoB,CAAC;oBAAkB,CAAC;;;oBAW3B,CAAC;oBAC7C,CAAC;uBAAsB,CAAA;;;oBASuB,CAAC;;;;;;;;;;;uBAbhD,CAAC;;;;;;;gBAKW,CAAC;;;uBAKG,CAAC;iBAAqB,CAAC;kBAC1B,CAAC;gBAAoB,CAAC;;;uBAKE,CAAC;;;wBAGZ,CAAC;;;;;;;uBAc1B,CAAC;;;;;;;;;;;4BA1BC,CAAA;+BAA6C,CAAC;oBAClC,CAAC;;;;oBAhBoC,CAAC;oBAAkB,CAAC;;;oBAW3B,CAAC;oBAC7C,CAAC;uBAAsB,CAAA;;;oBASuB,CAAC;;;;;;;;;;;uBAbhD,CAAC;;;;;;;gBAKW,CAAC;;;uBAKG,CAAC;iBAAqB,CAAC;kBAC1B,CAAC;gBAAoB,CAAC;;;uBAKE,CAAC;;;wBAGZ,CAAC;;;;;;;uBAc1B,CAAC;;;;;;;;;;;;;;;;;;;;kBAxCmE,CAAC;;;;;;;;;;;;;;;;;;;;;;;CA2IzE,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/index.ts"],"names":[],"mappings":"AAwEA,QAAA,MAAM,KAAK;;;;;;;;;;;;uBA5DP,CAAC;;;;;;;gBAKW,CAAC;;;uBAKG,CAAC;iBAAqB,CAAC;kBAC1B,CAAC;gBAAoB,CAAC;;;uBAKE,CAAC;;;wBAGZ,CAAC;;;;;;;uBAc1B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBA3B6B,CAAC;;;;;;;;;;oBAegC,CAAC;;oBACtB,CAAC;;;;;;uBAtB5C,CAAC;;;;;;;gBAKW,CAAC;;;uBAKG,CAAC;iBAAqB,CAAC;kBAC1B,CAAC;gBAAoB,CAAC;;;uBAKE,CAAC;;;wBAGZ,CAAC;;;;;;;uBAc1B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAvCc,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAKV,CAAC;gBAAyB,CAAC;iBACtB,CAAC;;mBACV,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBATiD,CAAC;oBAAkB,CAAC;;;oBAQnB,CAAC;oBAC/C,CAAC;uBAAqB,CAAC;;;oBAQzB,CAAC;;;;;;;;;;;uBATN,CAAC;;;;;;;gBAKW,CAAC;;;uBAKG,CAAC;iBAAqB,CAAC;kBAC1B,CAAC;gBAAoB,CAAC;;;uBAKE,CAAC;;;wBAGZ,CAAC;;;;;;;uBAc1B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uBAjCF,CAAC;;;;;;;gBAKW,CAAC;;;uBAKG,CAAC;iBAAqB,CAAC;kBAC1B,CAAC;gBAAoB,CAAC;;;uBAKE,CAAC;;;wBAGZ,CAAC;;;;;;;uBAc1B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4BAnCyB,CAAC;+BACD,CAAC;oBACX,CAAC;4BAA8B,CAAC;;;;;;;4BAuB5B,CAAC;+BAA6C,CAAC;oBACrC,CAAC;;;;;;;;;;;;oBAhCoB,CAAC;oBAAkB,CAAC;;;oBAQnB,CAAC;oBAC/C,CAAC;uBAAqB,CAAC;;;oBAQzB,CAAC;;;;;;;;;;;uBATN,CAAC;;;;;;;gBAKW,CAAC;;;uBAKG,CAAC;iBAAqB,CAAC;kBAC1B,CAAC;gBAAoB,CAAC;;;uBAKE,CAAC;;;wBAGZ,CAAC;;;;;;;uBAc1B,CAAC;;;;;;;;;;;4BA1BC,CAAA;+BAA6C,CAAC;oBAClC,CAAC;;;;oBAhBoC,CAAC;oBAAkB,CAAC;;;oBAQnB,CAAC;oBAC/C,CAAC;uBAAqB,CAAC;;;oBAQzB,CAAC;;;;;;;;;;;uBATN,CAAC;;;;;;;gBAKW,CAAC;;;uBAKG,CAAC;iBAAqB,CAAC;kBAC1B,CAAC;gBAAoB,CAAC;;;uBAKE,CAAC;;;wBAGZ,CAAC;;;;;;;uBAc1B,CAAC;;;;;;;;;;;;;;;;;;;;kBAxCmE,CAAC;;;;;;;;;;;;;;;;;;;;;;;CA2IzE,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/lib/resolvers/type/payment/payment-provider-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"payment-provider-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-provider-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAGxG,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,CACT,QAAQ,EAAE,mBAAmB,EAC7B,CAAC,EAAE,KAAK,EACR,OAAO,EAAE,OAAO,KACb;QACH,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,QAAQ,EAAE,CAAC,QAAQ,EAAE,mBAAmB,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1F,kBAAkB,EAAE,CAClB,QAAQ,EAAE,mBAAmB,EAC7B,CAAC,EAAE,KAAK,EACR,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3B,cAAc,EAAE,CACd,QAAQ,EAAE,mBAAmB,EAC7B,MAAM,EAAE;QACN,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;KACd,EACD,OAAO,EAAE,OAAO,KACb,OAAO,CAAC;QACX,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC,CAAC;CACJ;AACD,eAAO,MAAM,eAAe,EAAE,0BAoE7B,CAAC"}
+{"version":3,"file":"payment-provider-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-provider-types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,eAAe,IAAI,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAGxG,MAAM,WAAW,0BAA0B;IACzC,SAAS,EAAE,CACT,QAAQ,EAAE,mBAAmB,EAC7B,CAAC,EAAE,KAAK,EACR,OAAO,EAAE,OAAO,KACb;QACH,GAAG,EAAE,MAAM,CAAC;QACZ,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,QAAQ,EAAE,CAAC,QAAQ,EAAE,mBAAmB,EAAE,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1F,kBAAkB,EAAE,CAClB,QAAQ,EAAE,mBAAmB,EAC7B,CAAC,EAAE,KAAK,EACR,OAAO,EAAE,OAAO,KACb,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3B,cAAc,EAAE,CACd,QAAQ,EAAE,mBAAmB,EAC7B,MAAM,EAAE;QACN,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,MAAM,CAAC;QAChB,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,OAAO,EAAE,GAAG,CAAC;KACd,EACD,OAAO,EAAE,OAAO,KACb,OAAO,CAAC;QACX,GAAG,EAAE,MAAM,CAAC;QACZ,MAAM,EAAE,MAAM,CAAC;QACf,YAAY,EAAE,MAAM,CAAC;QACrB,WAAW,EAAE,MAAM,CAAC;QACpB,SAAS,EAAE,OAAO,CAAC;QACnB,UAAU,EAAE,OAAO,CAAC;KACrB,CAAC,CAAC;CACJ;AACD,eAAO,MAAM,eAAe,EAAE,0BA6D7B,CAAC"}

package/lib/resolvers/type/payment/payment-provider-types.js

@@ -16,12 +16,9 @@ export const PaymentProvider = {
         return modules.payment.paymentProviders.isActive(obj, requestContext);
     },
     async simulatedPrice(paymentProvider, { currency: currencyCode, orderId, useNetPrice, context: providerContext }, requestContext) {
-        const { modules, services, countryContext: country, user } = requestContext;
+        const { modules, countryContext: country, user } = requestContext;
         const order = await modules.orders.findOrder({ orderId });
-        const currency = currencyCode ||
-            (await services.countries.resolveDefaultCurrencyCode({
-                isoCode: country,
-            }, requestContext));
+        const currency = currencyCode || requestContext.currencyContext;
         const pricingDirector = await PaymentPricingDirector.actions({
             country,
             currency,

package/lib/resolvers/type/payment/payment-provider-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"payment-provider-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-provider-types.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAoCrE,MAAM,CAAC,MAAM,eAAe,GAA+B;IACzD,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QAC3B,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACtE,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE,cAAc;QACvC,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAClF,CAAC;IAED,QAAQ,CAAC,GAAG,EAAE,CAAC,EAAE,cAAc;QAC7B,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,eAAe,EACf,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,EAC1E,cAAc;QAEd,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC;QAC5E,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAE1D,MAAM,QAAQ,GACZ,YAAY;YACZ,CAAC,MAAM,QAAQ,CAAC,SAAS,CAAC,0BAA0B,CAClD;gBACE,OAAO,EAAE,OAAO;aACjB,EACD,cAAc,CACf,CAAC,CAAC;QAEL,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAC1D;YACE,OAAO;YACP,QAAQ;YACR,QAAQ,EAAE,eAAe;YACzB,KAAK;YACL,eAAe;YACf,IAAI;SACL,EACD,cAAc,CACf,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC;QACrD,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEnD,MAAM,OAAO,GAAG,eAAe,CAAC,gBAAgB,EAAE,CAAC;QAEnD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,CAG/C,CAAC;QAEF,OAAO;YACL,GAAG,EAAE,MAAM;iBACR,UAAU,CAAC,QAAQ,CAAC;iBACpB,MAAM,CAAC,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACpF,MAAM,CAAC,KAAK,CAAC;YAChB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,YAAY,EAAE,UAAU,CAAC,QAAQ;YACjC,WAAW,EAAE,OAAO;YACpB,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;YAC/B,UAAU,EAAE,WAAW;SACxB,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"payment-provider-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/payment/payment-provider-types.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAoCrE,MAAM,CAAC,MAAM,eAAe,GAA+B;IACzD,SAAS,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE;QAC3B,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACtE,IAAI,CAAC,SAAS;YAAE,OAAO,IAAI,CAAC;QAC5B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,kBAAkB,CAAC,GAAG,EAAE,CAAC,EAAE,cAAc;QACvC,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IAClF,CAAC;IAED,QAAQ,CAAC,GAAG,EAAE,CAAC,EAAE,cAAc;QAC7B,MAAM,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnC,OAAO,OAAO,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,eAAe,EACf,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,eAAe,EAAE,EAC1E,cAAc;QAEd,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,cAAc,CAAC;QAClE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAE1D,MAAM,QAAQ,GAAG,YAAY,IAAI,cAAc,CAAC,eAAe,CAAC;QAEhE,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,OAAO,CAC1D;YACE,OAAO;YACP,QAAQ;YACR,QAAQ,EAAE,eAAe;YACzB,KAAK;YACL,eAAe;YACf,IAAI;SACL,EACD,cAAc,CACf,CAAC;QAEF,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,SAAS,EAAE,CAAC;QACrD,IAAI,CAAC,UAAU,IAAI,CAAC,UAAU,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEnD,MAAM,OAAO,GAAG,eAAe,CAAC,gBAAgB,EAAE,CAAC;QAEnD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,EAAE,WAAW,EAAE,CAG/C,CAAC;QAEF,OAAO;YACL,GAAG,EAAE,MAAM;iBACR,UAAU,CAAC,QAAQ,CAAC;iBACpB,MAAM,CAAC,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;iBACpF,MAAM,CAAC,KAAK,CAAC;YAChB,MAAM,EAAE,UAAU,CAAC,MAAM;YACzB,YAAY,EAAE,UAAU,CAAC,QAAQ;YACjC,WAAW,EAAE,OAAO;YACpB,SAAS,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;YAC/B,UAAU,EAAE,WAAW;SACxB,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/product/product-configurable-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"product-configurable-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-configurable-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAG/E,eAAO,MAAM,mBAAmB;yBAInB,WAAW,UACZ;QACN,eAAe,EAAE,OAAO,CAAC;KAC1B,eACY,OAAO,GACnB,OAAO,CACR,KAAK,CAAC;QACJ,UAAU,EAAE,iBAAiB,CAAC;QAC9B,OAAO,EAAE,OAAO,OAAO,CAAC;KACzB,CAAC,CACH;sBAKU,WAAW,iCAIjB;QACD,OAAO,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACrC,eAAe,EAAE,OAAO,CAAC;KAC1B,eACY,OAAO,GACnB,OAAO,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,CAAC;+BAOtB,WAAW,yEAMjB;QACD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,OAAO,CAAC;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;KACtC,kBACe,OAAO,GACtB,OAAO,CAAC,iBAAiB,CAAC;wBAoBlB,WAAW,sBAIjB;QACD,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,eACY,OAAO,GACnB,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;iCASxB,WAAW,sFAOjB;QACD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,OAAO,CAAC;QACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACrC,WAAW,EAAE,OAAO,CAAC;KACtB,kBACe,OAAO,GACtB,OAAO,CAAC,iBAAiB,CAAC;;;mBA7EzB,CAAJ;;;;;;;YAcI,CAAL;;;mBAYS,CAAC;aACJ,CAAC;cACF,CAAH;YAAoB,CAAC;;;mBAatB,CAAD;;;oBAaW,CAAC;;;;;;;mBAsCuB,CAAC;;CASpC,CAAC"}
+{"version":3,"file":"product-configurable-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-configurable-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,IAAI,WAAW,EACtB,iBAAiB,EACjB,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6CAA6C,CAAC;AAG/E,eAAO,MAAM,mBAAmB;yBAInB,WAAW,UACZ;QACN,eAAe,EAAE,OAAO,CAAC;KAC1B,eACY,OAAO,GACnB,OAAO,CACR,KAAK,CAAC;QACJ,UAAU,EAAE,iBAAiB,CAAC;QAC9B,OAAO,EAAE,OAAO,OAAO,CAAC;KACzB,CAAC,CACH;sBAKU,WAAW,iCAIjB;QACD,OAAO,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACrC,eAAe,EAAE,OAAO,CAAC;KAC1B,eACY,OAAO,GACnB,OAAO,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,CAAC;+BAOtB,WAAW,yEAMjB;QACD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,OAAO,CAAC;QACzB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;KACtC,kBACe,OAAO,GACtB,OAAO,CAAC,iBAAiB,CAAC;wBAalB,WAAW,sBAIjB;QACD,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;KAChB,eACY,OAAO,GACnB,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;iCASxB,WAAW,sFAOjB;QACD,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,OAAO,CAAC;QACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,OAAO,EAAE,KAAK,CAAC,oBAAoB,CAAC,CAAC;QACrC,WAAW,EAAE,OAAO,CAAC;KACtB,kBACe,OAAO,GACtB,OAAO,CAAC,iBAAiB,CAAC;;;mBAtEzB,CAAJ;;;;;;;YAcI,CAAL;;;mBAYS,CAAC;aAAqB,CAAC;cAAsB,CAAC;YAAoB,CAAC;;;mBAiB9D,CAAC;;;oBAWC,CAAC;;;;;;;mBAmCkH,CAAC;;CADpI,CAAC"}

package/lib/resolvers/type/product/product-configurable-types.js

@@ -11,10 +11,7 @@ export const ConfigurableProduct = {
     },
     async catalogPriceRange(product, { quantity, vectors, currency: forcedCurrencyCode, includeInactive, }, requestContext) {
         const { countryContext, modules } = requestContext;
-        const currencyCode = forcedCurrencyCode ||
-            (await requestContext.services.countries.resolveDefaultCurrencyCode({
-                isoCode: countryContext,
-            }, requestContext));
+        const currencyCode = forcedCurrencyCode || requestContext.currencyContext;
         return modules.products.prices.catalogPriceRange(product, {
             quantity,
             vectors,
@@ -32,10 +29,7 @@ export const ConfigurableProduct = {
     },
     async simulatedPriceRange(product, { currency: forcedCurrencyCode, quantity, useNetPrice, vectors, includeInactive, }, requestContext) {
         const { countryContext, modules } = requestContext;
-        const currency = forcedCurrencyCode ||
-            (await requestContext.services.countries.resolveDefaultCurrencyCode({
-                isoCode: countryContext,
-            }, requestContext));
+        const currency = forcedCurrencyCode || requestContext.currencyContext;
         return modules.products.prices.simulatedPriceRange(product, {
             quantity,
             currency,

package/lib/resolvers/type/product/product-configurable-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-configurable-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-configurable-types.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,GAAG,OAAO;IAEV,KAAK,CAAC,WAAW,CACf,OAAoB,EACpB,MAEC,EACD,EAAE,OAAO,EAAW;QAOpB,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,OAAoB,EACpB,EACE,OAAO,EACP,eAAe,GAIhB,EACD,EAAE,OAAO,EAAW;QAEpB,OAAO,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE;YACtD,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,OAAoB,EACpB,EACE,QAAQ,EACR,OAAO,EACP,QAAQ,EAAE,kBAAkB,EAC5B,eAAe,GAMhB,EACD,cAAuB;QAEvB,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnD,MAAM,YAAY,GAChB,kBAAkB;YAClB,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,0BAA0B,CACjE;gBACE,OAAO,EAAE,cAAc;aACxB,EACD,cAAc,CACf,CAAC,CAAC;QACL,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE;YACxD,QAAQ;YACR,OAAO;YACP,eAAe;YACf,OAAO,EAAE,cAAc;YACvB,QAAQ,EAAE,YAAY;SACvB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CACd,OAAoB,EACpB,EACE,KAAK,GAAG,EAAE,EACV,MAAM,GAAG,CAAC,GAIX,EACD,EAAE,OAAO,EAAW;QAEpB,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACvD,SAAS,EAAE,OAAO,CAAC,GAAG;YACtB,KAAK;YACL,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,OAAoB,EACpB,EACE,QAAQ,EAAE,kBAAkB,EAC5B,QAAQ,EACR,WAAW,EACX,OAAO,EACP,eAAe,GAOhB,EACD,cAAuB;QAEvB,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnD,MAAM,QAAQ,GACZ,kBAAkB;YAClB,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,0BAA0B,CACjE;gBACE,OAAO,EAAE,cAAc;aACxB,EACD,cAAc,CACf,CAAC,CAAC;QACL,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAChD,OAAO,EACP;YACE,QAAQ;YACR,QAAQ;YACR,MAAM,EAAE,cAAc,CAAC,MAAM;YAC7B,OAAO,EAAE,cAAc;YACvB,WAAW;YACX,OAAO;YACP,eAAe;SAChB,EACD,cAAc,CACf,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"product-configurable-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-configurable-types.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,CAAC,MAAM,mBAAmB,GAAG;IACjC,GAAG,OAAO;IAEV,KAAK,CAAC,WAAW,CACf,OAAoB,EACpB,MAEC,EACD,EAAE,OAAO,EAAW;QAOpB,OAAO,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,QAAQ,CACZ,OAAoB,EACpB,EACE,OAAO,EACP,eAAe,GAIhB,EACD,EAAE,OAAO,EAAW;QAEpB,OAAO,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,EAAE;YACtD,eAAe;SAChB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,OAAoB,EACpB,EACE,QAAQ,EACR,OAAO,EACP,QAAQ,EAAE,kBAAkB,EAC5B,eAAe,GAMhB,EACD,cAAuB;QAEvB,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnD,MAAM,YAAY,GAAG,kBAAkB,IAAI,cAAc,CAAC,eAAe,CAAC;QAC1E,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,iBAAiB,CAAC,OAAO,EAAE;YACxD,QAAQ;YACR,OAAO;YACP,eAAe;YACf,OAAO,EAAE,cAAc;YACvB,QAAQ,EAAE,YAAY;SACvB,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,UAAU,CACd,OAAoB,EACpB,EACE,KAAK,GAAG,EAAE,EACV,MAAM,GAAG,CAAC,GAIX,EACD,EAAE,OAAO,EAAW;QAEpB,OAAO,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,qBAAqB,CAAC;YACvD,SAAS,EAAE,OAAO,CAAC,GAAG;YACtB,KAAK;YACL,MAAM;SACP,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,OAAoB,EACpB,EACE,QAAQ,EAAE,kBAAkB,EAC5B,QAAQ,EACR,WAAW,EACX,OAAO,EACP,eAAe,GAOhB,EACD,cAAuB;QAEvB,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnD,MAAM,QAAQ,GAAG,kBAAkB,IAAI,cAAc,CAAC,eAAe,CAAC;QAEtE,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAChD,OAAO,EACP;YACE,QAAQ;YACR,QAAQ;YACR,MAAM,EAAE,cAAc,CAAC,MAAM;YAC7B,OAAO,EAAE,cAAc;YACvB,WAAW;YACX,OAAO;YACP,eAAe;SAChB,EACD,cAAc,CACf,CAAC;IACJ,CAAC;CACF,CAAC"}

package/lib/resolvers/type/product/product-plan-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"product-plan-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-plan-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACxF,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,eAAO,MAAM,WAAW;0BAIX,WAAW,8CACwB;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,kBACpE,OAAO,GACtB,OAAO,CAAC,YAAY,CAAC;wBAkBjB,WAAW,4DAKb;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,kBAClD,OAAO,GACtB,OAAO,CAAC,YAAY,CAAC;8BAkBjB,WAAW,oCACkB;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,kBACvC,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,EAAE,YAAY,CAAC;KACrB,CAAC,CACH;4BAauB,WAAW,GAAG,MAAM;uCAGT,WAAW,GAAG,MAAM;uCAGpB,WAAW,GAAG,MAAM;;;mBA5DpC,CAAC;;;;;;;YAcK,CAAA;;;mBAYb,CAAC;aAAqB,CAAC;cAAsB,CAAC;YAAoB,CAAC;;;mBAgBpE,CAAC;;;oBAON,CAAC;;;;;;;mBAemf,CAAC;;CAD5f,CAAC"}
+{"version":3,"file":"product-plan-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-plan-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACxF,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AAGtD,eAAO,MAAM,WAAW;0BAIX,WAAW,8CACwB;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,kBACpE,OAAO,GACtB,OAAO,CAAC,YAAY,CAAC;wBAWjB,WAAW,4DAKb;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,kBAClD,OAAO,GACtB,OAAO,CAAC,YAAY,CAAC;8BAYjB,WAAW,oCACkB;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,kBACvC,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,WAAW,EAAE,MAAM,CAAC;QACpB,WAAW,EAAE,MAAM,CAAC;QACpB,KAAK,EAAE,YAAY,CAAC;KACrB,CAAC,CACH;4BAMuB,WAAW,GAAG,MAAM;uCAGT,WAAW,GAAG,MAAM;uCAGpB,WAAW,GAAG,MAAM;;;mBArCnD,CAAN;;;;;;;YAQsB,CAAC;;;mBAahB,CAAC;aACF,CAAH;cAAsB,CAAC;YACP,CAAC;;;mBASC,CAAC;;;oBAQtB,CAAA;;;;;;;mBAC86B,CAAC;;CAD96B,CAAC"}

package/lib/resolvers/type/product/product-plan-types.js

@@ -3,30 +3,21 @@ export const PlanProduct = {
     ...Product,
     async catalogPrice(product, { quantity, currency: forcedCurrencyCode }, requestContext) {
         const { modules, countryContext } = requestContext;
-        const currencyCode = forcedCurrencyCode ||
-            (await requestContext.services.countries.resolveDefaultCurrencyCode({
-                isoCode: countryContext,
-            }, requestContext));
+        const currency = forcedCurrencyCode || requestContext.currencyContext;
         return modules.products.prices.price(product, {
             country: countryContext,
-            currency: currencyCode,
+            currency,
             quantity,
         });
     },
     async simulatedPrice(obj, { currency: forcedCurrencyCode, quantity, useNetPrice, }, requestContext) {
         const { countryContext, modules } = requestContext;
-        const currency = forcedCurrencyCode ||
-            (await requestContext.services.countries.resolveDefaultCurrencyCode({
-                isoCode: countryContext,
-            }, requestContext));
+        const currency = forcedCurrencyCode || requestContext.currencyContext;
         return modules.products.prices.userPrice(obj, { quantity, userId: requestContext.userId, currency, country: countryContext, useNetPrice }, requestContext);
     },
     async leveledCatalogPrices(obj, { currency: forcedCurrencyCode }, requestContext) {
         const { countryContext, modules } = requestContext;
-        const currency = forcedCurrencyCode ||
-            (await requestContext.services.countries.resolveDefaultCurrencyCode({
-                isoCode: countryContext,
-            }, requestContext));
+        const currency = forcedCurrencyCode || requestContext.currencyContext;
         return modules.products.prices.catalogPricesLeveled(obj, { currency, country: countryContext });
     },
     salesUnit({ commerce }) {

package/lib/resolvers/type/product/product-plan-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-plan-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-plan-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,OAAO;IAEV,KAAK,CAAC,YAAY,CAChB,OAAoB,EACpB,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAA4C,EACpF,cAAuB;QAEvB,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;QACnD,MAAM,YAAY,GAChB,kBAAkB;YAClB,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,0BAA0B,CACjE;gBACE,OAAO,EAAE,cAAc;aACxB,EACD,cAAc,CACf,CAAC,CAAC;QACL,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;YAC5C,OAAO,EAAE,cAAc;YACvB,QAAQ,EAAE,YAAY;YACtB,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,GAAgB,EAChB,EACE,QAAQ,EAAE,kBAAkB,EAC5B,QAAQ,EACR,WAAW,GACqD,EAClE,cAAuB;QAEvB,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnD,MAAM,QAAQ,GACZ,kBAAkB;YAClB,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,0BAA0B,CACjE;gBACE,OAAO,EAAE,cAAc;aACxB,EACD,cAAc,CACf,CAAC,CAAC;QACL,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CACtC,GAAG,EACH,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,EAC3F,cAAc,CACf,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,GAAgB,EAChB,EAAE,QAAQ,EAAE,kBAAkB,EAAyB,EACvD,cAAuB;QAQvB,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnD,MAAM,QAAQ,GACZ,kBAAkB;YAClB,CAAC,MAAM,cAAc,CAAC,QAAQ,CAAC,SAAS,CAAC,0BAA0B,CACjE;gBACE,OAAO,EAAE,cAAc;aACxB,EACD,cAAc,CACf,CAAC,CAAC;QACL,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;IAClG,CAAC;IAED,SAAS,CAAC,EAAE,QAAQ,EAAe;QACjC,OAAO,QAAQ,EAAE,SAAS,CAAC;IAC7B,CAAC;IACD,oBAAoB,CAAC,EAAE,QAAQ,EAAe;QAC5C,OAAO,QAAQ,EAAE,oBAAoB,CAAC;IACxC,CAAC;IACD,oBAAoB,CAAC,EAAE,QAAQ,EAAe;QAC5C,OAAO,QAAQ,EAAE,oBAAoB,CAAC;IACxC,CAAC;CACF,CAAC"}
+{"version":3,"file":"product-plan-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-plan-types.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,GAAG,OAAO;IAEV,KAAK,CAAC,YAAY,CAChB,OAAoB,EACpB,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAA4C,EACpF,cAAuB;QAEvB,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,cAAc,CAAC;QACnD,MAAM,QAAQ,GAAG,kBAAkB,IAAI,cAAc,CAAC,eAAe,CAAC;QACtE,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE;YAC5C,OAAO,EAAE,cAAc;YACvB,QAAQ;YACR,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,cAAc,CAClB,GAAgB,EAChB,EACE,QAAQ,EAAE,kBAAkB,EAC5B,QAAQ,EACR,WAAW,GACqD,EAClE,cAAuB;QAEvB,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnD,MAAM,QAAQ,GAAG,kBAAkB,IAAI,cAAc,CAAC,eAAe,CAAC;QAEtE,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CACtC,GAAG,EACH,EAAE,QAAQ,EAAE,MAAM,EAAE,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,EAC3F,cAAc,CACf,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,GAAgB,EAChB,EAAE,QAAQ,EAAE,kBAAkB,EAAyB,EACvD,cAAuB;QAQvB,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC;QACnD,MAAM,QAAQ,GAAG,kBAAkB,IAAI,cAAc,CAAC,eAAe,CAAC;QACtE,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,oBAAoB,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;IAClG,CAAC;IAED,SAAS,CAAC,EAAE,QAAQ,EAAe;QACjC,OAAO,QAAQ,EAAE,SAAS,CAAC;IAC7B,CAAC;IACD,oBAAoB,CAAC,EAAE,QAAQ,EAAe;QAC5C,OAAO,QAAQ,EAAE,oBAAoB,CAAC;IACxC,CAAC;IACD,oBAAoB,CAAC,EAAE,QAAQ,EAAe;QAC5C,OAAO,QAAQ,EAAE,oBAAoB,CAAC;IACxC,CAAC;CACF,CAAC"}

package/lib/resolvers/type/product/product-simple-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"product-simple-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-simple-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAsB,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC9F,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,eAAO,MAAM,aAAa;6BAIjB,OAAO,UACJ;QAAE,aAAa,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,oBAAoB,CAAA;KAAE,kBAC7E,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,GAAG,EAAE,MAAM,CAAC;QACZ,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,QAAQ,CAAC,EAAE,IAAI,CAAC;QAChB,gBAAgB,CAAC,EAAE,IAAI,CAAC;KACzB,CAAC,CACH;yBA+CM,OAAO,UACJ;QACN,aAAa,EAAE,IAAI,CAAC;QACpB,oBAAoB,EAAE,oBAAoB,CAAC;KAC5C,kBACe,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,GAAG,EAAE,MAAM,CAAC;QACZ,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC,CACH;;;QA6C0B,MAAM;;;QAIX,MAAM;;;QAIJ,aAAa;;gBAnIQ,CAAC;gBAAkB,CAAC;;;gBAsBrC,CAAA;gBAAkB,CAAC;mBAC3C,CAAJ;;;gBAqBQ,CAAP;;;;;;;;;;;mBA9B2C,CAAC;;;;;;;YAYpB,CAAC;;;mBAYhB,CAAC;aAAqB,CAAC;cAAsB,CAAC;YAC9C,CAAC;;;mBAUa,CAAC;;;oBAYvB,CAAC;;;;;;;mBAoCqD,CAAC;;CA4C1D,CAAC"}
+{"version":3,"file":"product-simple-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-simple-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAsB,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC9F,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAGpE,eAAO,MAAM,aAAa;6BAIjB,OAAO,UACJ;QAAE,aAAa,EAAE,IAAI,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,oBAAoB,EAAE,oBAAoB,CAAA;KAAE,kBAC7E,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,GAAG,EAAE,MAAM,CAAC;QACZ,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,QAAQ,CAAC,EAAE,IAAI,CAAC;QAChB,gBAAgB,CAAC,EAAE,IAAI,CAAC;KACzB,CAAC,CACH;yBA+CM,OAAO,UACJ;QACN,aAAa,EAAE,IAAI,CAAC;QACpB,oBAAoB,EAAE,oBAAoB,CAAC;KAC5C,kBACe,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,GAAG,EAAE,MAAM,CAAC;QACZ,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC,CACH;;;QA6C0B,MAAM;;;QAIX,MAAM;;;QAIJ,aAAa;;gBAnIQ,CAAC;gBAAkB,CAAC;;;gBAgBxC,CAAC;gBAGxB,CAAD;mBAAqB,CAAC;;;gBAgBlB,CAAC;;;;;;;;;;;mBArBsC,CAAC;;;;;;;YAYpB,CAAC;;;mBAYhB,CAAC;aAAqB,CAAC;cAAsB,CAAC;YAC9C,CAAC;;;mBAUa,CAAC;;;oBAYvB,CAAC;;;;;;;mBAoCqD,CAAC;;CA4C1D,CAAC"}

package/lib/resolvers/type/product/product-tokenized-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"product-tokenized-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-tokenized-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,4BAA4B,EAC5B,uBAAuB,EACxB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAsB,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC9F,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAKpE,eAAO,MAAM,gBAAgB;sCAGO,OAAO,GAAG,MAAM;4CAIV,OAAO,GAAG,4BAA4B;uCAS3C,OAAO,GAAG,uBAAuB;yBAK7D,OAAO,UACJ;QACN,aAAa,EAAE,IAAI,CAAC;KACrB,kBACe,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,GAAG,EAAE,MAAM,CAAC;QACZ,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC,CACH;oBA2CqB,OAAO,UAAU,KAAK,kBAAkB,OAAO;;gBAhFvE,CAAC;gBAAkB,CAAC;;;gBAoBmC,CAAC;gBACpD,CAAF;mBAAqB,CAAC;;;gBAyBoB,CAAC;;;;;;;;;;;mBAjCrC,CAAC;;;;;;;YAaL,CAAH;;;mBAeY,CAAC;aAAsB,CAAA;cAAsB,CAAC;YAErD,CAAC;;;mBAW6B,CAAC;;;oBAM3B,CAAV;;;;;;;mBAiC6F,CAAC;;CAL7F,CAAC"}
+{"version":3,"file":"product-tokenized-types.d.ts","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-tokenized-types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,4BAA4B,EAC5B,uBAAuB,EACxB,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAsB,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC9F,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAKpE,eAAO,MAAM,gBAAgB;sCAGO,OAAO,GAAG,MAAM;4CAIV,OAAO,GAAG,4BAA4B;uCAS3C,OAAO,GAAG,uBAAuB;yBAK7D,OAAO,UACJ;QACN,aAAa,EAAE,IAAI,CAAC;KACrB,kBACe,OAAO,GACtB,OAAO,CACR,KAAK,CAAC;QACJ,GAAG,EAAE,MAAM,CAAC;QACZ,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;QACpC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;QAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;KACnB,CAAC,CACH;oBA2CqB,OAAO,UAAU,KAAK,kBAAkB,OAAO;;gBAhFvE,CAAC;gBAAkB,CAAC;;;gBAeP,CAAC;gBAAkB,CAAC;mBAChB,CAAC;;;gBAsBD,CAAC;;;;;;;;;;;mBAzBV,CAAC;;;;;;;YAaL,CAAH;;;mBAeY,CAAC;aAAsB,CAAA;cAAsB,CAAC;YAErD,CAAC;;;mBAW6B,CAAC;;;oBAM3B,CAAV;;;;;;;mBAiC6F,CAAC;;CAL7F,CAAC"}

package/lib/schema/inputTypes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"inputTypes.d.ts","sourceRoot":"","sources":["../../src/schema/inputTypes.ts"],"names":[],"mappings":";AAAA,wBAuRE"}
+{"version":3,"file":"inputTypes.d.ts","sourceRoot":"","sources":["../../src/schema/inputTypes.ts"],"names":[],"mappings":";AAAA,wBAwRE"}

package/lib/schema/inputTypes.js

@@ -44,7 +44,8 @@ export default [
     input UpdateCountryInput {
       isoCode: String!
       isActive: Boolean
-      defaultCurrencyId: String
+      defaultCurrencyCode: String
+      defaultCurrencyId: String @deprecated(reason: "Use defaultCurrencyCode instead")
     }
 
     input CreateCurrencyInput {

package/lib/schema/inputTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"inputTypes.js","sourceRoot":"","sources":["../../src/schema/inputTypes.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqRb;CACF,CAAC"}
+{"version":3,"file":"inputTypes.js","sourceRoot":"","sources":["../../src/schema/inputTypes.ts"],"names":[],"mappings":"AAAA,eAAe;IACb,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsRb;CACF,CAAC"}

package/lib/schema/mutation.js

@@ -304,12 +304,12 @@ export default [
       """
       Manually confirm an order which is in progress
       """
-      confirmOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
+      confirmOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON, comment: String): Order!
 
       """
       Manually reject an order which is in progress
       """
-      rejectOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
+      rejectOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON, comment: String): Order!
 
       """
       Manually mark an unpaid/partially paid order as fully paid

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.12.1",
+  "version": "2.13.0",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -40,35 +40,35 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "peerDependencies": {
-    "@apollo/server": "^4.10.4",
+    "@apollo/server": "^4.10.5",
     "cookie": "~0.6"
   },
   "optionalDependencies": {
     "express": "~4"
   },
   "dependencies": {
-    "@metamask/eth-sig-util": "^7.0.2",
-    "@unchainedshop/core": "^2.12.1",
-    "@unchainedshop/events": "^2.12.1",
-    "@unchainedshop/logger": "^2.12.1",
-    "@unchainedshop/roles": "^2.12.1",
-    "@unchainedshop/utils": "^2.12.1",
+    "@metamask/eth-sig-util": "^7.0.3",
+    "@unchainedshop/core": "^2.13.0",
+    "@unchainedshop/events": "^2.13.0",
+    "@unchainedshop/logger": "^2.13.0",
+    "@unchainedshop/roles": "^2.13.0",
+    "@unchainedshop/utils": "^2.13.0",
     "accounting": "0.4.1",
     "dataloader": "^2.2.2",
     "graphql-scalars": "^1.23.0",
     "graphql-upload": "^16.0.2",
     "locale": "0.1.0",
     "lodash.isnumber": "3.0.3",
-    "lru-cache": "^10.4.0"
+    "memoizee": "^0.4.17"
   },
   "devDependencies": {
     "@types/graphql-upload": "^16.0.7",
     "@types/locale": "^0.1.4",
-    "@types/node": "^20.14.10",
-    "@unchainedshop/types": "^2.12.1",
+    "@types/node": "^20.14.12",
+    "@unchainedshop/types": "^2.13.0",
     "express": "^4.19.2",
     "jest": "^29.7.0",
-    "ts-jest": "^29.1.5",
-    "typescript": "^5.5.3"
+    "ts-jest": "^29.2.3",
+    "typescript": "^5.5.4"
   }
 }

package/src/express/createBulkImportMiddleware.ts

@@ -30,6 +30,7 @@ export default async function bulkImportMiddleware(req, res) {
 
     const input: any = {
       createShouldUpsertIfIDExists: !!req.query?.createShouldUpsertIfIDExists,
+      updateShouldUpsertIfIDNotExists: !!req.query?.updateShouldUpsertIfIDNotExists,
       skipCacheInvalidation: !!req.query?.skipCacheInvalidation,
       remoteAddress: context.remoteAddress,
     };

package/src/locale-context.ts

@@ -6,73 +6,77 @@ import { log, LogLevel } from '@unchainedshop/logger';
 import {
   resolveBestCountry,
   resolveBestSupported,
+  resolveBestCurrency,
   resolveUserRemoteAddress,
   systemLocale,
 } from '@unchainedshop/utils';
 import { UnchainedCore } from '@unchainedshop/types/core.js';
-import * as lruCache from 'lru-cache';
+import memoizee from 'memoizee';
 
 const { Locales } = localePkg;
 
 const { NODE_ENV } = process.env;
 
-const ttl = NODE_ENV === 'production' ? 1000 * 60 : 0; // minute or second
+export const resolveDefaultContext = memoizee(
+  async ({ acceptLang, acceptCountry }, unchainedAPI) => {
+    const languages = await unchainedAPI.modules.languages.findLanguages(
+      { includeInactive: false },
+      { projection: { isoCode: 1, isActive: 1 } },
+    );
 
-const localeContextCache = new lruCache.LRUCache({
-  max: 500,
-  ttl,
-});
+    const countries = await unchainedAPI.modules.countries.findCountries(
+      { includeInactive: false },
+      { projection: { isoCode: 1, isActive: 1 } },
+    );
 
-export const getLocaleContext = async (
-  req: IncomingMessage,
-  res: OutgoingMessage,
-  unchainedAPI: UnchainedCore,
-): Promise<UnchainedLocaleContext> => {
-  const cacheKey = `${req.headers['accept-language']}:${req.headers['x-shop-country']}`;
-  const cachedContext = localeContextCache.get(cacheKey) as UnchainedLocaleContext;
+    const currencies = await unchainedAPI.modules.currencies.findCurrencies({ includeInactive: false });
 
-  const userAgent = req.headers['user-agent'];
-  const { remoteAddress, remotePort } = resolveUserRemoteAddress(req);
+    const supportedLocaleStrings = languages.reduce((accumulator, language) => {
+      const added = countries.map((country) => {
+        return `${language.isoCode}-${country.isoCode}`;
+      });
+      return accumulator.concat(added);
+    }, []);
 
-  if (cachedContext) return { remoteAddress, remotePort, userAgent, ...cachedContext };
+    const supportedLocales = new Locales(supportedLocaleStrings, systemLocale.code);
 
-  // return the parsed locale by bcp47 and
-  // return the best resolved normalized locale by locale according to system-wide configuration
-  // else fallback to base language & base country
+    const localeContext = resolveBestSupported(acceptLang, supportedLocales);
+    const countryContext = resolveBestCountry(localeContext.country, acceptCountry, countries);
 
-  const languages = await unchainedAPI.modules.languages.findLanguages(
-    { includeInactive: false },
-    { projection: { isoCode: 1, isActive: 1 } },
-  );
-
-  const countries = await unchainedAPI.modules.countries.findCountries(
-    { includeInactive: false },
-    { projection: { isoCode: 1, isActive: 1 } },
-  );
+    const countryObject = countries.find((country) => country.isoCode === countryContext);
+    const currencyContext = resolveBestCurrency(countryObject.defaultCurrencyCode, currencies);
 
-  const supportedLocaleStrings = languages.reduce((accumulator, language) => {
-    const added = countries.map((country) => {
-      return `${language.isoCode}-${country.isoCode}`;
+    log(`Locale Context: Resolved ${localeContext.normalized} ${countryContext} ${currencyContext}`, {
+      level: LogLevel.Debug,
     });
-    return accumulator.concat(added);
-  }, []);
 
-  const supportedLocales = new Locales(supportedLocaleStrings, systemLocale.code);
+    const newContext: UnchainedLocaleContext = {
+      localeContext,
+      countryContext,
+      currencyContext,
+    };
 
-  const localeContext = resolveBestSupported(req.headers['accept-language'], supportedLocales);
-  const countryContext = resolveBestCountry(
-    localeContext.country,
-    req.headers['x-shop-country'],
-    countries,
-  );
-  log(`Locale Context: Resolved ${localeContext.normalized} ${countryContext}`, {
-    level: LogLevel.Debug,
-  });
-  const newContext: UnchainedLocaleContext = {
-    localeContext,
-    countryContext,
-  };
-  localeContextCache.set(cacheKey, newContext);
+    return newContext;
+  },
+  {
+    maxAge: NODE_ENV === 'production' ? 1000 * 60 : 100, // minute or 100ms
+    promise: true,
+    normalizer(args) {
+      return `${args[0].acceptLang}-${args[0].acceptCountry}`;
+    },
+  },
+);
 
-  return { remoteAddress, remotePort, userAgent, ...newContext };
+export const getLocaleContext = async (
+  req: IncomingMessage,
+  res: OutgoingMessage,
+  unchainedAPI: UnchainedCore,
+): Promise<UnchainedLocaleContext> => {
+  const userAgent = req.headers['user-agent'];
+  const { remoteAddress, remotePort } = resolveUserRemoteAddress(req);
+  const context = await resolveDefaultContext(
+    { acceptLang: req.headers['accept-language'], acceptCountry: req.headers['x-shop-country'] },
+    unchainedAPI,
+  );
+  return { remoteAddress, remotePort, userAgent, ...context };
 };

package/src/resolvers/mutations/countries/updateCountry.ts

@@ -5,7 +5,7 @@ import { CountryNotFoundError, InvalidIdError } from '../../../errors.js';
 
 export default async function updateCountry(
   root: Root,
-  { country, countryId }: { country: Country; countryId: string },
+  { country, countryId }: { country: Country & { defaultCurrencyId: string }; countryId: string },
   { userId, modules }: Context,
 ) {
   log(`mutation updateCountry ${countryId}`, { userId });
@@ -15,7 +15,12 @@ export default async function updateCountry(
   if (!(await modules.countries.countryExists({ countryId })))
     throw new CountryNotFoundError({ countryId });
 
-  await modules.countries.update(countryId, country);
+  const currencyObject = await modules.currencies.findCurrency({
+    currencyId: country.defaultCurrencyId,
+  });
+  const defaultCurrencyCode = country?.defaultCurrencyCode || currencyObject?.isoCode;
+
+  await modules.countries.update(countryId, { ...country, defaultCurrencyCode });
 
   return modules.countries.findCountry({ countryId });
 }

package/src/resolvers/mutations/enrollments/createEnrollment.ts

@@ -13,7 +13,7 @@ export default async function createEnrollment(
   { contact, plan, billingAddress, payment, delivery, meta },
   context: Context,
 ) {
-  const { countryContext, modules, userId } = context;
+  const { countryContext, currencyContext, modules, userId } = context;
 
   log('mutation createEnrollment', { userId });
 
@@ -40,6 +40,7 @@ export default async function createEnrollment(
       configuration,
       contact,
       countryCode: countryContext,
+      currencyCode: currencyContext,
       delivery,
       meta,
       payment,

package/src/resolvers/mutations/orders/confirmOrder.ts

@@ -9,6 +9,7 @@ export default async function confirmOrder(
     orderId: string;
     paymentContext?: any;
     deliveryContext?: any;
+    comment?: string;
   },
   context: Context,
 ) {

package/src/resolvers/mutations/orders/rejectOrder.ts

@@ -9,6 +9,7 @@ export default async function rejectOrder(
     orderId: string;
     paymentContext?: any;
     deliveryContext?: any;
+    comment?: string;
   },
   context: Context,
 ) {
@@ -16,6 +17,7 @@ export default async function rejectOrder(
   const { orderId, ...transactionContext } = params;
 
   log('mutation rejectOrder', { orderId, userId });
+
   if (!orderId) throw new InvalidIdError({ orderId });
 
   const order = await modules.orders.findOrder({ orderId });

package/src/resolvers/type/country-types.ts

@@ -13,9 +13,9 @@ export interface CountryHelperTypes {
 
 export const Country: CountryHelperTypes = {
   defaultCurrency: async (country, _, { modules }) => {
-    if (country.defaultCurrencyId) {
+    if (country.defaultCurrencyCode) {
       return modules.currencies.findCurrency({
-        currencyId: country.defaultCurrencyId,
+        isoCode: country.defaultCurrencyCode,
       });
     }
     return null;

package/src/resolvers/type/delivery-provider-types.ts

@@ -59,17 +59,9 @@ export const DeliveryProvider: DeliveryProviderHelperTypes = {
     { currency: currencyCode, orderId, useNetPrice, context: providerContext },
     requestContext,
   ) {
-    const { modules, services, countryContext: country, user } = requestContext;
+    const { modules, countryContext: country, user } = requestContext;
     const order = await modules.orders.findOrder({ orderId });
-
-    const currency =
-      currencyCode ||
-      (await services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: country,
-        },
-        requestContext,
-      ));
+    const currency = currencyCode || requestContext.currencyContext;
 
     const pricingDirector = await DeliveryPricingDirector.actions(
       {

package/src/resolvers/type/payment/payment-provider-types.ts

@@ -59,17 +59,10 @@ export const PaymentProvider: PaymentProviderHelperTypes = {
     { currency: currencyCode, orderId, useNetPrice, context: providerContext },
     requestContext,
   ) {
-    const { modules, services, countryContext: country, user } = requestContext;
+    const { modules, countryContext: country, user } = requestContext;
     const order = await modules.orders.findOrder({ orderId });
 
-    const currency =
-      currencyCode ||
-      (await services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: country,
-        },
-        requestContext,
-      ));
+    const currency = currencyCode || requestContext.currencyContext;
 
     const pricingDirector = await PaymentPricingDirector.actions(
       {

package/src/resolvers/type/product/product-configurable-types.ts

@@ -58,14 +58,7 @@ export const ConfigurableProduct = {
     requestContext: Context,
   ): Promise<ProductPriceRange> {
     const { countryContext, modules } = requestContext;
-    const currencyCode =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currencyCode = forcedCurrencyCode || requestContext.currencyContext;
     return modules.products.prices.catalogPriceRange(product, {
       quantity,
       vectors,
@@ -111,14 +104,8 @@ export const ConfigurableProduct = {
     requestContext: Context,
   ): Promise<ProductPriceRange> {
     const { countryContext, modules } = requestContext;
-    const currency =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currency = forcedCurrencyCode || requestContext.currencyContext;
+
     return modules.products.prices.simulatedPriceRange(
       product,
       {

package/src/resolvers/type/product/product-plan-types.ts

@@ -11,17 +11,10 @@ export const PlanProduct = {
     requestContext: Context,
   ): Promise<ProductPrice> {
     const { modules, countryContext } = requestContext;
-    const currencyCode =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currency = forcedCurrencyCode || requestContext.currencyContext;
     return modules.products.prices.price(product, {
       country: countryContext,
-      currency: currencyCode,
+      currency,
       quantity,
     });
   },
@@ -36,14 +29,8 @@ export const PlanProduct = {
     requestContext: Context,
   ): Promise<ProductPrice> {
     const { countryContext, modules } = requestContext;
-    const currency =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currency = forcedCurrencyCode || requestContext.currencyContext;
+
     return modules.products.prices.userPrice(
       obj,
       { quantity, userId: requestContext.userId, currency, country: countryContext, useNetPrice },
@@ -63,14 +50,7 @@ export const PlanProduct = {
     }>
   > {
     const { countryContext, modules } = requestContext;
-    const currency =
-      forcedCurrencyCode ||
-      (await requestContext.services.countries.resolveDefaultCurrencyCode(
-        {
-          isoCode: countryContext,
-        },
-        requestContext,
-      ));
+    const currency = forcedCurrencyCode || requestContext.currencyContext;
     return modules.products.prices.catalogPricesLeveled(obj, { currency, country: countryContext });
   },
 

package/src/schema/inputTypes.ts

@@ -44,7 +44,8 @@ export default [
     input UpdateCountryInput {
       isoCode: String!
       isActive: Boolean
-      defaultCurrencyId: String
+      defaultCurrencyCode: String
+      defaultCurrencyId: String @deprecated(reason: "Use defaultCurrencyCode instead")
     }
 
     input CreateCurrencyInput {

package/src/schema/mutation.ts

@@ -304,12 +304,12 @@ export default [
       """
       Manually confirm an order which is in progress
       """
-      confirmOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
+      confirmOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON, comment: String): Order!
 
       """
       Manually reject an order which is in progress
       """
-      rejectOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
+      rejectOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON, comment: String): Order!
 
       """
       Manually mark an unpaid/partially paid order as fully paid