@vendure/core 2.1.2 → 2.1.4
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/dist/bootstrap.js +4 -1
- package/dist/bootstrap.js.map +1 -1
- package/dist/common/finite-state-machine/validate-transition-definition.js +25 -12
- package/dist/common/finite-state-machine/validate-transition-definition.js.map +1 -1
- package/dist/common/utils.d.ts +8 -0
- package/dist/common/utils.js +13 -2
- package/dist/common/utils.js.map +1 -1
- package/dist/config/catalog/default-product-variant-price-selection-strategy.d.ts +1 -1
- package/dist/config/catalog/default-product-variant-price-selection-strategy.js +1 -1
- package/dist/config/catalog/default-product-variant-price-selection-strategy.js.map +1 -1
- package/dist/entity/register-custom-entity-fields.js +29 -0
- package/dist/entity/register-custom-entity-fields.js.map +1 -1
- package/dist/event-bus/vendure-entity-event.d.ts +0 -1
- package/dist/event-bus/vendure-entity-event.js +0 -1
- package/dist/event-bus/vendure-entity-event.js.map +1 -1
- package/dist/i18n/messages/en.json +1 -0
- package/dist/plugin/default-search-plugin/index.d.ts +1 -0
- package/dist/plugin/default-search-plugin/index.js +1 -0
- package/dist/plugin/default-search-plugin/index.js.map +1 -1
- package/dist/plugin/default-search-plugin/indexer/mutable-request-context.d.ts +2 -0
- package/dist/plugin/default-search-plugin/indexer/mutable-request-context.js +4 -0
- package/dist/plugin/default-search-plugin/indexer/mutable-request-context.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-common.d.ts +0 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-common.js +1 -8
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-common.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-utils.js +12 -11
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-utils.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js +3 -2
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js.map +1 -1
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js +27 -6
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js.map +1 -1
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state-machine.d.ts +1 -3
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state-machine.js +11 -5
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state-machine.js.map +1 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.d.ts +1 -3
- package/dist/service/helpers/order-state-machine/order-state-machine.js +11 -6
- package/dist/service/helpers/order-state-machine/order-state-machine.js.map +1 -1
- package/dist/service/helpers/payment-state-machine/payment-state-machine.js +9 -1
- package/dist/service/helpers/payment-state-machine/payment-state-machine.js.map +1 -1
- package/dist/service/helpers/request-context/request-context.service.js +8 -2
- package/dist/service/helpers/request-context/request-context.service.js.map +1 -1
- package/dist/service/services/channel.service.js +37 -5
- package/dist/service/services/channel.service.js.map +1 -1
- package/dist/service/services/order.service.js +10 -2
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/product-variant.service.js +3 -3
- package/dist/service/services/product-variant.service.js.map +1 -1
- package/dist/service/services/user.service.js +13 -7
- package/dist/service/services/user.service.js.map +1 -1
- package/package.json +4 -4
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.applyLanguageConstraints = exports.createPlaceholderFromId = exports.createCollectionIdCountMap = exports.createFacetIdCountMap = exports.mapToSearchResult = void 0;
|
|
4
4
|
const unique_1 = require("@vendure/common/lib/unique");
|
|
5
|
+
const typeorm_1 = require("typeorm");
|
|
5
6
|
const search_index_item_entity_1 = require("../entities/search-index-item.entity");
|
|
6
|
-
const search_strategy_common_1 = require("./search-strategy-common");
|
|
7
7
|
/**
|
|
8
8
|
* Maps a raw database result to a SearchResult.
|
|
9
9
|
*/
|
|
@@ -112,24 +112,25 @@ exports.createPlaceholderFromId = createPlaceholderFromId;
|
|
|
112
112
|
*/
|
|
113
113
|
function applyLanguageConstraints(qb, languageCode, defaultLanguageCode) {
|
|
114
114
|
const lcEscaped = qb.escape('languageCode');
|
|
115
|
+
const ciEscaped = qb.escape('channelId');
|
|
116
|
+
const pviEscaped = qb.escape('productVariantId');
|
|
115
117
|
if (languageCode === defaultLanguageCode) {
|
|
116
|
-
qb.andWhere(`si.${lcEscaped} = :languageCode`, {
|
|
118
|
+
qb.andWhere(`si.${lcEscaped} = :languageCode`, {
|
|
119
|
+
languageCode,
|
|
120
|
+
});
|
|
117
121
|
}
|
|
118
122
|
else {
|
|
119
123
|
qb.andWhere(`si.${lcEscaped} IN (:...languageCodes)`, {
|
|
120
124
|
languageCodes: [languageCode, defaultLanguageCode],
|
|
121
125
|
});
|
|
122
|
-
|
|
123
|
-
.map(field => `si.${qb.escape(field)} = sil.${qb.escape(field)}`)
|
|
124
|
-
.join(' AND ');
|
|
125
|
-
qb.leftJoin(search_index_item_entity_1.SearchIndexItem, 'sil', `
|
|
126
|
-
${joinFieldConditions}
|
|
127
|
-
AND si.${lcEscaped} != sil.${lcEscaped}
|
|
128
|
-
AND sil.${lcEscaped} = :languageCode
|
|
129
|
-
`, {
|
|
126
|
+
qb.leftJoin(search_index_item_entity_1.SearchIndexItem, 'sil', `sil.${lcEscaped} = :languageCode AND sil.${ciEscaped} = si.${ciEscaped} AND sil.${pviEscaped} = si.${pviEscaped}`, {
|
|
130
127
|
languageCode,
|
|
131
128
|
});
|
|
132
|
-
qb.andWhere(
|
|
129
|
+
qb.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
130
|
+
qb1.where(`si.${lcEscaped} = :languageCode1`, {
|
|
131
|
+
languageCode1: languageCode,
|
|
132
|
+
}).orWhere(`sil.${lcEscaped} IS NULL`);
|
|
133
|
+
}));
|
|
133
134
|
}
|
|
134
135
|
return qb;
|
|
135
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-strategy-utils.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/search-strategy-utils.ts"],"names":[],"mappings":";;;AAUA,uDAAoD;
|
|
1
|
+
{"version":3,"file":"search-strategy-utils.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/search-strategy-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -67,7 +67,8 @@ class SqliteSearchStrategy {
|
|
|
67
67
|
}
|
|
68
68
|
if (sort) {
|
|
69
69
|
if (sort.name) {
|
|
70
|
-
|
|
70
|
+
// TODO: v3 - set the collation on the SearchIndexItem entity
|
|
71
|
+
qb.addOrderBy('si.productName COLLATE NOCASE', sort.name);
|
|
71
72
|
}
|
|
72
73
|
if (sort.price) {
|
|
73
74
|
qb.addOrderBy('si.price', sort.price);
|
|
@@ -175,8 +176,8 @@ class SqliteSearchStrategy {
|
|
|
175
176
|
collectionSlug: `%,${collectionSlug},%`,
|
|
176
177
|
});
|
|
177
178
|
}
|
|
178
|
-
(0, search_strategy_utils_1.applyLanguageConstraints)(qb, ctx.languageCode, ctx.channel.defaultLanguageCode);
|
|
179
179
|
qb.andWhere('si.channelId = :channelId', { channelId: ctx.channelId });
|
|
180
|
+
(0, search_strategy_utils_1.applyLanguageConstraints)(qb, ctx.languageCode, ctx.channel.defaultLanguageCode);
|
|
180
181
|
if (input.groupByProduct === true) {
|
|
181
182
|
qb.groupBy('si.productId');
|
|
182
183
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sqlite-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.ts"],"names":[],"mappings":";;;AAAA,yEAAoF;AAEpF,qCAAuD;AAIvD,yDAA8D;AAC9D,2FAAuF;AACvF,4CAAmD;AACnD,mFAAuE;AAIvE,mEAMiC;AAEjC;;;GAGG;AACH,MAAa,oBAAoB;IAAjC;QACqB,kBAAa,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"sqlite-search-strategy.js","sourceRoot":"","sources":["../../../../src/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.ts"],"names":[],"mappings":"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"}
|
|
@@ -257,10 +257,10 @@ let EntityHydrator = class EntityHydrator {
|
|
|
257
257
|
return currentMetadata.target;
|
|
258
258
|
}
|
|
259
259
|
isTranslatable(input) {
|
|
260
|
-
var
|
|
260
|
+
var _c, _d, _e;
|
|
261
261
|
return Array.isArray(input)
|
|
262
|
-
? (
|
|
263
|
-
: (
|
|
262
|
+
? (_d = (_c = input[0]) === null || _c === void 0 ? void 0 : _c.hasOwnProperty('translations')) !== null && _d !== void 0 ? _d : false
|
|
263
|
+
: (_e = input === null || input === void 0 ? void 0 : input.hasOwnProperty('translations')) !== null && _e !== void 0 ? _e : false;
|
|
264
264
|
}
|
|
265
265
|
/**
|
|
266
266
|
* Merges properties into a target entity. This is needed for the cases in which a
|
|
@@ -269,14 +269,35 @@ let EntityHydrator = class EntityHydrator {
|
|
|
269
269
|
* entity from having data overwritten.
|
|
270
270
|
*/
|
|
271
271
|
mergeDeep(a, b) {
|
|
272
|
-
var
|
|
272
|
+
var _c;
|
|
273
273
|
if (!a) {
|
|
274
274
|
return b;
|
|
275
275
|
}
|
|
276
|
+
if (Array.isArray(a) && Array.isArray(b) && a.length === b.length && a.length > 1) {
|
|
277
|
+
if (a[0].hasOwnProperty('id')) {
|
|
278
|
+
// If the array contains entities, we can use the id to match them up
|
|
279
|
+
// so that we ensure that we don't merge properties from different entities
|
|
280
|
+
// with the same index.
|
|
281
|
+
const aIds = a.map(e => e.id);
|
|
282
|
+
const bIds = b.map(e => e.id);
|
|
283
|
+
if (JSON.stringify(aIds) !== JSON.stringify(bIds)) {
|
|
284
|
+
// The entities in the arrays are not in the same order, so we can't
|
|
285
|
+
// safely merge them. We need to sort the `b` array so that the entities
|
|
286
|
+
// are in the same order as the `a` array.
|
|
287
|
+
const idToIndexMap = new Map();
|
|
288
|
+
a.forEach((item, index) => {
|
|
289
|
+
idToIndexMap.set(item.id, index);
|
|
290
|
+
});
|
|
291
|
+
b.sort((_a, _b) => {
|
|
292
|
+
return idToIndexMap.get(_a.id) - idToIndexMap.get(_b.id);
|
|
293
|
+
});
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
}
|
|
276
297
|
for (const [key, value] of Object.entries(b)) {
|
|
277
|
-
if ((
|
|
298
|
+
if ((_c = Object.getOwnPropertyDescriptor(b, key)) === null || _c === void 0 ? void 0 : _c.writable) {
|
|
278
299
|
if (Array.isArray(value)) {
|
|
279
|
-
a[key] = value.map((v, index) => { var
|
|
300
|
+
a[key] = value.map((v, index) => { var _c; return this.mergeDeep((_c = a === null || a === void 0 ? void 0 : a[key]) === null || _c === void 0 ? void 0 : _c[index], b[key][index]); });
|
|
280
301
|
}
|
|
281
302
|
else if ((0, shared_utils_1.isObject)(value)) {
|
|
282
303
|
a[key] = this.mergeDeep(a === null || a === void 0 ? void 0 : a[key], b[key]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-hydrator.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/entity-hydrator/entity-hydrator.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"entity-hydrator.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/entity-hydrator/entity-hydrator.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,mEAA4D;AAC5D,uDAAoD;AAGpD,yDAAmE;AACnE,2FAAuF;AAEvF,mGAAwF;AACxF,mGAA8F;AAC9F,yEAAqE;AAIrE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AAEI,IAAM,cAAc,GAApB,MAAM,cAAc;IACvB,YACY,UAAmC,EACnC,sBAA8C,EAC9C,UAA6B;QAF7B,eAAU,GAAV,UAAU,CAAyB;QACnC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,eAAU,GAAV,UAAU,CAAmB;IACtC,CAAC;IAEJ;;;;;;;;;;;;;;;;;;OAkBG;IACH,KAAK,CAAC,OAAO,CACT,GAAmB,EACnB,MAAc,EACd,OAA+B;QAE/B,IAAI,OAAO,CAAC,SAAS,EAAE;YACnB,IAAI,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAEjE,IAAI,OAAO,CAAC,yBAAyB,KAAK,IAAI,EAAE;gBAC5C,MAAM,4BAA4B,GAAG,IAAI,CAAC,kCAAkC,CACxE,MAAM,EACN,gBAAgB,CACnB,CAAC;gBACF,gBAAgB,GAAG,IAAA,eAAM,EAAC,CAAC,GAAG,gBAAgB,EAAE,GAAG,4BAA4B,CAAC,CAAC,CAAC;aACrF;YAED,IAAI,gBAAgB,CAAC,MAAM,EAAE;gBACzB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAC;oBAClF,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE;oBACxB,SAAS,EAAE,gBAAgB;iBAC9B,CAAC,CAAC;gBACH,MAAM,eAAe,GAAG,IAAA,eAAM,EAAC,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBACzF,KAAK,MAAM,IAAI,IAAI,eAAe,EAAE;oBAC/B,MAAc,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,CAAE,MAAc,CAAC,IAAI,CAAC,EAAG,QAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;iBAC1F;gBAED,MAAM,qBAAqB,GAAG,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;oBAC5D,MAAM,EAAE,IAAI,CAAC,uBAAuB,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;oBACjE,QAAQ;iBACX,CAAC,CAAC,CAAC;gBAEJ,IAAI,OAAO,CAAC,yBAAyB,KAAK,IAAI,EAAE;oBAC5C,KAAK,MAAM,oBAAoB,IAAI,qBAAqB,EAAE;wBACtD,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC;wBAC3C,IAAI,MAAM,EAAE;4BACR,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gCACvB,IAAI,MAAM,CAAC,CAAC,CAAC,YAAY,uCAAc,EAAE;oCACrC,MAAM,OAAO,CAAC,GAAG,CACb,MAAM,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAClB,IAAI,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,CAAC,EAAE,GAAG,CAAC,CAC9D,CACJ,CAAC;iCACL;6BACJ;iCAAM;gCACH,IAAI,MAAM,YAAY,uCAAc,EAAE;oCAClC,MAAM,IAAI,CAAC,sBAAsB,CAAC,uBAAuB,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;iCAC1E;6BACJ;yBACJ;qBACJ;iBACJ;gBAED,MAAM,sBAAsB,GAAG,qBAAqB;qBAC/C,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;qBAChD,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;gBAE3C,IAAI,CAAC,wBAAwB,CACzB,MAAM,EACN,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,MAAa,EAAE,GAAG,EAAE,sBAA6B,CAAC,CAC/E,CAAC;aACL;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,wBAAwB,CAA+B,MAAc,EAAE,MAAc;QACzF,KAAK,MAAM,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,yBAAyB,CAAC,MAAM,CAAC,CAAC,EAAE;YACtF,IAAI,OAAO,UAAU,CAAC,GAAG,KAAK,UAAU,IAAI,OAAO,UAAU,CAAC,GAAG,KAAK,UAAU,EAAE;gBAC9E,sEAAsE;gBACtE,oCAAoC;gBACpC,oEAAoE;gBACpE,SAAS;aACZ;YACD,MAAM,CAAC,GAAmB,CAAC,GAAG,MAAM,CAAC,GAAmB,CAAC,CAAC;SAC7D;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;OAGG;IACK,mBAAmB,CACvB,MAAc,EACd,OAA+B;QAE/B,MAAM,gBAAgB,GAAa,EAAE,CAAC;QACtC,KAAK,MAAM,QAAQ,IAAI,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE;YACrD,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;gBAC9B,MAAM,KAAK,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACtF,IAAI,MAAM,GAAoC,MAAM,CAAC;gBACrD,MAAM,IAAI,GAAG,EAAE,CAAC;gBAChB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;oBACtB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAChB,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,EAAE;wBACxB,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;qBACzE;yBAAM;wBACH,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE;4BAC1C,IAAI,CAAC,KAAK,CAAC,EAAE;gCACT,OAAO,CAAC,CAAC,CAAC,CAAC;6BACd;iCAAM;gCACH,OAAO,CAAC,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;6BAChE;wBACL,CAAC,EAAE,EAAc,CAAC,CAAC;wBACnB,gBAAgB,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;wBACnC,MAAM,GAAG,SAAS,CAAC;qBACtB;iBACJ;aACJ;SACJ;QACD,OAAO,IAAA,eAAM,EAAC,gBAAgB,CAAC,CAAC;IACpC,CAAC;IAEO,kCAAkC,CACtC,MAAc,EACd,gBAA0B;QAE1B,MAAM,cAAc,GAAa,EAAE,CAAC;QACpC,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE;YACrC,MAAM,UAAU,GAAG,IAAI,CAAC,2BAA2B,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACtE,IAAI,UAAU,KAAK,uCAAc,EAAE;gBAC/B,cAAc,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;aAC5D;SACJ;QACD,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACK,uBAAuB,CAC3B,MAAqB,EACrB,IAAc;QAEd,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,MAAM,MAAM,GAAoB,EAAE,CAAC;QAEnC,SAAS,KAAK,CAAC,MAAW,EAAE,KAAe;YACvC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;gBACpB,OAAO;aACV;YACD,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,EAAY,CAAC;YACrC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;YAC5B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBACvB,aAAa,GAAG,IAAI,CAAC;gBACrB,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oBACpB,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;iBAC1B;qBAAM;oBACH,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE;wBACvB,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;qBAC9B;iBACJ;aACJ;iBAAM;gBACH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;oBACpB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;iBACvB;qBAAM;oBACH,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC;iBAChC;aACJ;QACL,CAAC;QACD,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC5B,OAAO,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC9C,CAAC;IAEO,2BAA2B,CAAC,MAAqB,EAAE,IAAY;QACnE,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;QAC1D,MAAM,cAAc,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,CAAC,WAAW,CAAC,CAAC;QAClF,IAAI,CAAC,cAAc,EAAE;YACjB,MAAM,IAAI,4BAAmB,CACzB,2CAA2C,MAAM,CAAC,WAAW,CAAC,IAAI,GAAG,CACxE,CAAC;SACL;QACD,IAAI,eAAe,GAAG,cAAc,CAAC;QACrC,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;YACpC,MAAM,gBAAgB,GAAG,eAAe,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC;YAChF,IAAI,gBAAgB,EAAE;gBAClB,eAAe,GAAG,gBAAgB,CAAC,qBAAqB,CAAC;aAC5D;iBAAM;gBACH,MAAM,IAAI,4BAAmB,CACzB,6CAA6C,eAAe,CAAC,UAAU,cAAc,QAAQ,GAAG,CACnG,CAAC;aACL;SACJ;QACD,OAAO,eAAe,CAAC,MAA6B,CAAC;IACzD,CAAC;IAEO,cAAc,CAA0B,KAA0B;;QACtE,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;YACvB,CAAC,CAAC,MAAA,MAAA,KAAK,CAAC,CAAC,CAAC,0CAAE,cAAc,CAAC,cAAc,CAAC,mCAAI,KAAK;YACnD,CAAC,CAAC,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,cAAc,CAAC,cAAc,CAAC,mCAAI,KAAK,CAAC;IACzD,CAAC;IAED;;;;;OAKG;IACK,SAAS,CAAmC,CAAgB,EAAE,CAAI;;QACtE,IAAI,CAAC,CAAC,EAAE;YACJ,OAAO,CAAC,CAAC;SACZ;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;YAC/E,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;gBAC3B,qEAAqE;gBACrE,2EAA2E;gBAC3E,uBAAuB;gBACvB,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9B,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9B,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;oBAC/C,oEAAoE;oBACpE,wEAAwE;oBACxE,0CAA0C;oBAC1C,MAAM,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC;oBAC/B,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;wBACtB,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;oBACrC,CAAC,CAAC,CAAC;oBACH,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE;wBACd,OAAO,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;oBAC7D,CAAC,CAAC,CAAC;iBACN;aACJ;SACJ;QACD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC1C,IAAI,MAAA,MAAM,CAAC,wBAAwB,CAAC,CAAC,EAAE,GAAG,CAAC,0CAAE,QAAQ,EAAE;gBACnD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;oBACrB,CAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,WACrC,OAAA,IAAI,CAAC,SAAS,CAAC,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,GAAG,CAAC,0CAAG,KAAK,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA,EAAA,CACnD,CAAC;iBACL;qBAAM,IAAI,IAAA,uBAAQ,EAAC,KAAK,CAAC,EAAE;oBACvB,CAAS,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAG,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;iBACtD;qBAAM;oBACF,CAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;iBAC5B;aACJ;SACJ;QACD,OAAO,CAAC,aAAD,CAAC,cAAD,CAAC,GAAI,CAAC,CAAC;IAClB,CAAC;CACJ,CAAA;AAzQY,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAGe,kDAAuB;QACX,iDAAsB;QAClC,sCAAiB;GAJhC,cAAc,CAyQ1B;AAzQY,wCAAc"}
|
|
@@ -1,16 +1,14 @@
|
|
|
1
1
|
import { RequestContext } from '../../../api/common/request-context';
|
|
2
2
|
import { StateMachineConfig } from '../../../common/finite-state-machine/types';
|
|
3
3
|
import { ConfigService } from '../../../config/config.service';
|
|
4
|
-
import { TransactionalConnection } from '../../../connection/index';
|
|
5
4
|
import { Fulfillment } from '../../../entity/fulfillment/fulfillment.entity';
|
|
6
5
|
import { Order } from '../../../entity/order/order.entity';
|
|
7
6
|
import { FulfillmentState, FulfillmentTransitionData } from './fulfillment-state';
|
|
8
7
|
export declare class FulfillmentStateMachine {
|
|
9
8
|
private configService;
|
|
10
|
-
private connection;
|
|
11
9
|
readonly config: StateMachineConfig<FulfillmentState, FulfillmentTransitionData>;
|
|
12
10
|
private readonly initialState;
|
|
13
|
-
constructor(configService: ConfigService
|
|
11
|
+
constructor(configService: ConfigService);
|
|
14
12
|
getInitialState(): FulfillmentState;
|
|
15
13
|
canTransition(currentState: FulfillmentState, newState: FulfillmentState): boolean;
|
|
16
14
|
getNextStates(fulfillment: Fulfillment): readonly FulfillmentState[];
|
|
@@ -17,11 +17,10 @@ const merge_transition_definitions_1 = require("../../../common/finite-state-mac
|
|
|
17
17
|
const validate_transition_definition_1 = require("../../../common/finite-state-machine/validate-transition-definition");
|
|
18
18
|
const utils_1 = require("../../../common/utils");
|
|
19
19
|
const config_service_1 = require("../../../config/config.service");
|
|
20
|
-
const
|
|
20
|
+
const vendure_logger_1 = require("../../../config/logger/vendure-logger");
|
|
21
21
|
let FulfillmentStateMachine = class FulfillmentStateMachine {
|
|
22
|
-
constructor(configService
|
|
22
|
+
constructor(configService) {
|
|
23
23
|
this.configService = configService;
|
|
24
|
-
this.connection = connection;
|
|
25
24
|
this.initialState = 'Created';
|
|
26
25
|
this.config = this.initConfig();
|
|
27
26
|
}
|
|
@@ -47,7 +46,14 @@ let FulfillmentStateMachine = class FulfillmentStateMachine {
|
|
|
47
46
|
const customProcesses = (_a = this.configService.shippingOptions.customFulfillmentProcess) !== null && _a !== void 0 ? _a : [];
|
|
48
47
|
const processes = [...customProcesses, ...((_b = this.configService.shippingOptions.process) !== null && _b !== void 0 ? _b : [])];
|
|
49
48
|
const allTransitions = processes.reduce((transitions, process) => (0, merge_transition_definitions_1.mergeTransitionDefinitions)(transitions, process.transitions), {});
|
|
50
|
-
const validationResult = (0, validate_transition_definition_1.validateTransitionDefinition)(allTransitions,
|
|
49
|
+
const validationResult = (0, validate_transition_definition_1.validateTransitionDefinition)(allTransitions, this.initialState);
|
|
50
|
+
if (!validationResult.valid && validationResult.error) {
|
|
51
|
+
vendure_logger_1.Logger.error(`The fulfillment process has an invalid configuration:`);
|
|
52
|
+
throw new Error(validationResult.error);
|
|
53
|
+
}
|
|
54
|
+
if (validationResult.valid && validationResult.error) {
|
|
55
|
+
vendure_logger_1.Logger.warn(`Fulfillment process: ${validationResult.error}`);
|
|
56
|
+
}
|
|
51
57
|
return {
|
|
52
58
|
transitions: allTransitions,
|
|
53
59
|
onTransitionStart: async (fromState, toState, data) => {
|
|
@@ -83,7 +89,7 @@ let FulfillmentStateMachine = class FulfillmentStateMachine {
|
|
|
83
89
|
};
|
|
84
90
|
FulfillmentStateMachine = __decorate([
|
|
85
91
|
(0, common_1.Injectable)(),
|
|
86
|
-
__metadata("design:paramtypes", [config_service_1.ConfigService
|
|
92
|
+
__metadata("design:paramtypes", [config_service_1.ConfigService])
|
|
87
93
|
], FulfillmentStateMachine);
|
|
88
94
|
exports.FulfillmentStateMachine = FulfillmentStateMachine;
|
|
89
95
|
//# sourceMappingURL=fulfillment-state-machine.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fulfillment-state-machine.js","sourceRoot":"","sources":["../../../../src/service/helpers/fulfillment-state-machine/fulfillment-state-machine.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,yDAAqE;AACrE,oGAAgF;AAChF,oHAA+G;AAE/G,wHAAmH;AACnH,iDAAiE;AACjE,mEAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"fulfillment-state-machine.js","sourceRoot":"","sources":["../../../../src/service/helpers/fulfillment-state-machine/fulfillment-state-machine.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,13 @@
|
|
|
1
1
|
import { RequestContext } from '../../../api/common/request-context';
|
|
2
2
|
import { StateMachineConfig } from '../../../common/finite-state-machine/types';
|
|
3
3
|
import { ConfigService } from '../../../config/config.service';
|
|
4
|
-
import { TransactionalConnection } from '../../../connection/transactional-connection';
|
|
5
4
|
import { Order } from '../../../entity/order/order.entity';
|
|
6
5
|
import { OrderState, OrderTransitionData } from './order-state';
|
|
7
6
|
export declare class OrderStateMachine {
|
|
8
7
|
private configService;
|
|
9
|
-
private connection;
|
|
10
8
|
readonly config: StateMachineConfig<OrderState, OrderTransitionData>;
|
|
11
9
|
private readonly initialState;
|
|
12
|
-
constructor(configService: ConfigService
|
|
10
|
+
constructor(configService: ConfigService);
|
|
13
11
|
getInitialState(): OrderState;
|
|
14
12
|
canTransition(currentState: OrderState, newState: OrderState): boolean;
|
|
15
13
|
getNextStates(order: Order): readonly OrderState[];
|
|
@@ -17,11 +17,10 @@ const merge_transition_definitions_1 = require("../../../common/finite-state-mac
|
|
|
17
17
|
const validate_transition_definition_1 = require("../../../common/finite-state-machine/validate-transition-definition");
|
|
18
18
|
const utils_1 = require("../../../common/utils");
|
|
19
19
|
const config_service_1 = require("../../../config/config.service");
|
|
20
|
-
const
|
|
20
|
+
const vendure_logger_1 = require("../../../config/logger/vendure-logger");
|
|
21
21
|
let OrderStateMachine = class OrderStateMachine {
|
|
22
|
-
constructor(configService
|
|
22
|
+
constructor(configService) {
|
|
23
23
|
this.configService = configService;
|
|
24
|
-
this.connection = connection;
|
|
25
24
|
this.initialState = 'Created';
|
|
26
25
|
this.config = this.initConfig();
|
|
27
26
|
}
|
|
@@ -44,9 +43,15 @@ let OrderStateMachine = class OrderStateMachine {
|
|
|
44
43
|
initConfig() {
|
|
45
44
|
var _a;
|
|
46
45
|
const orderProcesses = (_a = this.configService.orderOptions.process) !== null && _a !== void 0 ? _a : [];
|
|
47
|
-
const emptyProcess = { transitions: {} };
|
|
48
46
|
const allTransitions = orderProcesses.reduce((transitions, process) => (0, merge_transition_definitions_1.mergeTransitionDefinitions)(transitions, process.transitions), {});
|
|
49
|
-
const validationResult = (0, validate_transition_definition_1.validateTransitionDefinition)(allTransitions,
|
|
47
|
+
const validationResult = (0, validate_transition_definition_1.validateTransitionDefinition)(allTransitions, this.initialState);
|
|
48
|
+
if (!validationResult.valid && validationResult.error) {
|
|
49
|
+
vendure_logger_1.Logger.error(`The order process has an invalid configuration:`);
|
|
50
|
+
throw new Error(validationResult.error);
|
|
51
|
+
}
|
|
52
|
+
if (validationResult.valid && validationResult.error) {
|
|
53
|
+
vendure_logger_1.Logger.warn(`Order process: ${validationResult.error}`);
|
|
54
|
+
}
|
|
50
55
|
return {
|
|
51
56
|
transitions: allTransitions,
|
|
52
57
|
onTransitionStart: async (fromState, toState, data) => {
|
|
@@ -82,7 +87,7 @@ let OrderStateMachine = class OrderStateMachine {
|
|
|
82
87
|
};
|
|
83
88
|
OrderStateMachine = __decorate([
|
|
84
89
|
(0, common_1.Injectable)(),
|
|
85
|
-
__metadata("design:paramtypes", [config_service_1.ConfigService
|
|
90
|
+
__metadata("design:paramtypes", [config_service_1.ConfigService])
|
|
86
91
|
], OrderStateMachine);
|
|
87
92
|
exports.OrderStateMachine = OrderStateMachine;
|
|
88
93
|
//# sourceMappingURL=order-state-machine.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-state-machine.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-state-machine/order-state-machine.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,yDAAqE;AACrE,oGAAgF;AAChF,oHAA+G;AAE/G,wHAAmH;AACnH,iDAAiE;AACjE,mEAA+D;
|
|
1
|
+
{"version":3,"file":"order-state-machine.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-state-machine/order-state-machine.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ const merge_transition_definitions_1 = require("../../../common/finite-state-mac
|
|
|
17
17
|
const validate_transition_definition_1 = require("../../../common/finite-state-machine/validate-transition-definition");
|
|
18
18
|
const utils_1 = require("../../../common/utils");
|
|
19
19
|
const config_service_1 = require("../../../config/config.service");
|
|
20
|
+
const vendure_logger_1 = require("../../../config/logger/vendure-logger");
|
|
20
21
|
let PaymentStateMachine = class PaymentStateMachine {
|
|
21
22
|
constructor(configService) {
|
|
22
23
|
this.configService = configService;
|
|
@@ -45,7 +46,14 @@ let PaymentStateMachine = class PaymentStateMachine {
|
|
|
45
46
|
const customProcesses = (_a = this.configService.paymentOptions.customPaymentProcess) !== null && _a !== void 0 ? _a : [];
|
|
46
47
|
const processes = [...customProcesses, ...((_b = this.configService.paymentOptions.process) !== null && _b !== void 0 ? _b : [])];
|
|
47
48
|
const allTransitions = processes.reduce((transitions, process) => (0, merge_transition_definitions_1.mergeTransitionDefinitions)(transitions, process.transitions), {});
|
|
48
|
-
(0, validate_transition_definition_1.validateTransitionDefinition)(allTransitions, this.initialState);
|
|
49
|
+
const validationResult = (0, validate_transition_definition_1.validateTransitionDefinition)(allTransitions, this.initialState);
|
|
50
|
+
if (!validationResult.valid && validationResult.error) {
|
|
51
|
+
vendure_logger_1.Logger.error(`The payment process has an invalid configuration:`);
|
|
52
|
+
throw new Error(validationResult.error);
|
|
53
|
+
}
|
|
54
|
+
if (validationResult.valid && validationResult.error) {
|
|
55
|
+
vendure_logger_1.Logger.warn(`Payment process: ${validationResult.error}`);
|
|
56
|
+
}
|
|
49
57
|
return {
|
|
50
58
|
transitions: allTransitions,
|
|
51
59
|
onTransitionStart: async (fromState, toState, data) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payment-state-machine.js","sourceRoot":"","sources":["../../../../src/service/helpers/payment-state-machine/payment-state-machine.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,yDAAqE;AACrE,oGAAgF;AAChF,oHAA+G;AAE/G,wHAAmH;AACnH,iDAAiE;AACjE,mEAA+D;AAOxD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAI5B,YAAoB,aAA4B;QAA5B,kBAAa,GAAb,aAAa,CAAe;QAF/B,iBAAY,GAAiB,SAAS,CAAC;QAGpD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IACpC,CAAC;IAED,eAAe;QACX,OAAO,IAAI,CAAC,YAAY,CAAC;IAC7B,CAAC;IAED,aAAa,CAAC,YAA0B,EAAE,QAAsB;QAC5D,OAAO,IAAI,0BAAG,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;IACxE,CAAC;IAED,aAAa,CAAC,OAAgB;QAC1B,MAAM,GAAG,GAAG,IAAI,0BAAG,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAChD,OAAO,GAAG,CAAC,aAAa,EAAE,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAmB,EAAE,KAAY,EAAE,OAAgB,EAAE,KAAmB;QACrF,MAAM,GAAG,GAAG,IAAI,0BAAG,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,YAAY,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;QACtE,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;QACtB,OAAO,MAAM,CAAC;IAClB,CAAC;IAEO,UAAU;;QACd,MAAM,EAAE,qBAAqB,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC;QACpE,MAAM,eAAe,GAAG,MAAA,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,oBAAoB,mCAAI,EAAE,CAAC;QACrF,MAAM,SAAS,GAAG,CAAC,GAAG,eAAe,EAAE,GAAG,CAAC,MAAA,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,OAAO,mCAAI,EAAE,CAAC,CAAC,CAAC;QAC7F,MAAM,cAAc,GAAG,SAAS,CAAC,MAAM,CACnC,CAAC,WAAW,EAAE,OAAO,EAAE,EAAE,CACrB,IAAA,yDAA0B,EAAC,WAAW,EAAE,OAAO,CAAC,WAA+B,CAAC,EACpF,EAA+B,CAClC,CAAC;QAEF,IAAA,6DAA4B,EAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"payment-state-machine.js","sourceRoot":"","sources":["../../../../src/service/helpers/payment-state-machine/payment-state-machine.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@ const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
|
18
18
|
const ms_1 = __importDefault(require("ms"));
|
|
19
19
|
const get_api_type_1 = require("../../../api/common/get-api-type");
|
|
20
20
|
const request_context_1 = require("../../../api/common/request-context");
|
|
21
|
+
const index_1 = require("../../../common/index");
|
|
21
22
|
const utils_1 = require("../../../common/utils");
|
|
22
23
|
const config_service_1 = require("../../../config/config.service");
|
|
23
24
|
const channel_entity_1 = require("../../../entity/channel/channel.entity");
|
|
@@ -128,8 +129,13 @@ let RequestContextService = class RequestContextService {
|
|
|
128
129
|
return ((_b = (_a = (req.query && req.query.languageCode)) !== null && _a !== void 0 ? _a : channel.defaultLanguageCode) !== null && _b !== void 0 ? _b : this.configService.defaultLanguageCode);
|
|
129
130
|
}
|
|
130
131
|
getCurrencyCode(req, channel) {
|
|
131
|
-
|
|
132
|
-
|
|
132
|
+
const queryCurrencyCode = req.query && req.query.currencyCode;
|
|
133
|
+
if (queryCurrencyCode && !channel.availableCurrencyCodes.includes(queryCurrencyCode)) {
|
|
134
|
+
throw new index_1.UserInputError('error.currency-not-available-in-channel', {
|
|
135
|
+
currencyCode: queryCurrencyCode,
|
|
136
|
+
});
|
|
137
|
+
}
|
|
138
|
+
return queryCurrencyCode !== null && queryCurrencyCode !== void 0 ? queryCurrencyCode : channel.defaultCurrencyCode;
|
|
133
139
|
}
|
|
134
140
|
/**
|
|
135
141
|
* TODO: Deprecate and remove, since this function is now handled internally in the RequestContext.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-context.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/request-context/request-context.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAA6F;AAI7F,4CAAoB;AAEpB,mEAAuE;AACvE,yEAAqE;AACrE,iDAAoD;AACpD,mEAA+D;AAE/D,2EAAiE;AAEjE,oEAAgE;AAChE,0FAAoF;AAEpF;;;;;GAKG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAC9B,gBAAgB;IAChB,YAAoB,cAA8B,EAAU,aAA4B;QAApE,mBAAc,GAAd,cAAc,CAAgB;QAAU,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE5F;;;;;;;OAOG;IACH,KAAK,CAAC,MAAM,CAAC,MAQZ;QACG,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;QACjG,IAAI,OAAgB,CAAC;QACrB,IAAI,cAAc,YAAY,wBAAO,EAAE;YACnC,OAAO,GAAG,cAAc,CAAC;SAC5B;aAAM,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;YAC3C,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;SAC3E;aAAM;YACH,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC;SAC3D;QACD,IAAI,OAAkC,CAAC;QACvC,IAAI,IAAI,EAAE;YACN,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,0DAA0B,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9E,OAAO,GAAG;gBACN,IAAI,EAAE;oBACF,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,kBAAkB;iBACrB;gBACD,EAAE,EAAE,sBAAsB;gBAC1B,KAAK,EAAE,yBAAyB;gBAChC,OAAO,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAA,YAAE,EAAC,IAAI,CAAC,CAAC;gBACxC,WAAW,EAAE,IAAA,YAAE,EAAC,IAAI,CAAC;gBACrB,aAAa;aAChB,CAAC;SACL;QACD,OAAO,IAAI,gCAAc,CAAC;YACtB,GAAG;YACH,OAAO;YACP,OAAO;YACP,YAAY;YACZ,YAAY;YACZ,OAAO;YACP,YAAY,EAAE,IAAI;YAClB,qBAAqB,EAAE,KAAK;SAC/B,CAAC,CAAC;IACP,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CACb,GAAY,EACZ,IAAyB,EACzB,mBAAkC,EAClC,OAAuB;QAEvB,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAC5E,MAAM,OAAO,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAC;QAEjC,MAAM,kBAAkB,GAAG,CAAC,CAAC,mBAAmB,IAAI,mBAAmB,CAAC,QAAQ,CAAC,4BAAU,CAAC,KAAK,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;QACrC,MAAM,YAAY,GAAG,IAAI,CAAC,mCAAmC,CAAC,mBAAmB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAClG,MAAM,qBAAqB,GAAG,CAAC,YAAY,IAAI,kBAAkB,CAAC;QAClE,MAAM,aAAa,GAAI,GAAW,CAAC,CAAC,CAAC;QACrC,OAAO,IAAI,gCAAc,CAAC;YACtB,GAAG;YACH,OAAO;YACP,OAAO;YACP,YAAY;YACZ,YAAY;YACZ,OAAO;YACP,YAAY;YACZ,qBAAqB;YACrB,aAAa;SAChB,CAAC,CAAC;IACP,CAAC;IAEO,eAAe,CAAC,GAAmD;QACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,eAAe,CAAC;QAC/D,IAAI,YAAY,GAAG,EAAE,CAAC;QAEtB,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YACzC,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SACtC;aAAM,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACpD,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAW,CAAC;SAClD;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,eAAe,CAAC,GAAY,EAAE,OAAgB;;QAClD,OAAO,CACH,MAAA,MAAA,CAAC,GAAG,CAAC,KAAK,IAAK,GAAG,CAAC,KAAK,CAAC,YAA6B,CAAC,mCACvD,OAAO,CAAC,mBAAmB,mCAC3B,IAAI,CAAC,aAAa,CAAC,mBAAmB,CACzC,CAAC;IACN,CAAC;IAEO,eAAe,CAAC,GAAY,EAAE,OAAgB
|
|
1
|
+
{"version":3,"file":"request-context.service.js","sourceRoot":"","sources":["../../../../src/service/helpers/request-context/request-context.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAA6F;AAI7F,4CAAoB;AAEpB,mEAAuE;AACvE,yEAAqE;AACrE,iDAAuD;AACvD,iDAAoD;AACpD,mEAA+D;AAE/D,2EAAiE;AAEjE,oEAAgE;AAChE,0FAAoF;AAEpF;;;;;GAKG;AAEI,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAC9B,gBAAgB;IAChB,YAAoB,cAA8B,EAAU,aAA4B;QAApE,mBAAc,GAAd,cAAc,CAAgB;QAAU,kBAAa,GAAb,aAAa,CAAe;IAAG,CAAC;IAE5F;;;;;;;OAOG;IACH,KAAK,CAAC,MAAM,CAAC,MAQZ;QACG,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC;QACjG,IAAI,OAAgB,CAAC;QACrB,IAAI,cAAc,YAAY,wBAAO,EAAE;YACnC,OAAO,GAAG,cAAc,CAAC;SAC5B;aAAM,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;YAC3C,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC;SAC3E;aAAM;YACH,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC;SAC3D;QACD,IAAI,OAAkC,CAAC;QACvC,IAAI,IAAI,EAAE;YACN,MAAM,kBAAkB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAA,0DAA0B,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9E,OAAO,GAAG;gBACN,IAAI,EAAE;oBACF,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,kBAAkB;iBACrB;gBACD,EAAE,EAAE,sBAAsB;gBAC1B,KAAK,EAAE,yBAAyB;gBAChC,OAAO,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAA,YAAE,EAAC,IAAI,CAAC,CAAC;gBACxC,WAAW,EAAE,IAAA,YAAE,EAAC,IAAI,CAAC;gBACrB,aAAa;aAChB,CAAC;SACL;QACD,OAAO,IAAI,gCAAc,CAAC;YACtB,GAAG;YACH,OAAO;YACP,OAAO;YACP,YAAY;YACZ,YAAY;YACZ,OAAO;YACP,YAAY,EAAE,IAAI;YAClB,qBAAqB,EAAE,KAAK;SAC/B,CAAC,CAAC;IACP,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CACb,GAAY,EACZ,IAAyB,EACzB,mBAAkC,EAClC,OAAuB;QAEvB,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;QAC5E,MAAM,OAAO,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAC;QAEjC,MAAM,kBAAkB,GAAG,CAAC,CAAC,mBAAmB,IAAI,mBAAmB,CAAC,QAAQ,CAAC,4BAAU,CAAC,KAAK,CAAC,CAAC;QACnG,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QACxD,MAAM,IAAI,GAAG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;QACrC,MAAM,YAAY,GAAG,IAAI,CAAC,mCAAmC,CAAC,mBAAmB,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;QAClG,MAAM,qBAAqB,GAAG,CAAC,YAAY,IAAI,kBAAkB,CAAC;QAClE,MAAM,aAAa,GAAI,GAAW,CAAC,CAAC,CAAC;QACrC,OAAO,IAAI,gCAAc,CAAC;YACtB,GAAG;YACH,OAAO;YACP,OAAO;YACP,YAAY;YACZ,YAAY;YACZ,OAAO;YACP,YAAY;YACZ,qBAAqB;YACrB,aAAa;SAChB,CAAC,CAAC;IACP,CAAC;IAEO,eAAe,CAAC,GAAmD;QACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,eAAe,CAAC;QAC/D,IAAI,YAAY,GAAG,EAAE,CAAC;QAEtB,IAAI,GAAG,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE;YACzC,YAAY,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;SACtC;aAAM,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YACpD,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAW,CAAC;SAClD;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,eAAe,CAAC,GAAY,EAAE,OAAgB;;QAClD,OAAO,CACH,MAAA,MAAA,CAAC,GAAG,CAAC,KAAK,IAAK,GAAG,CAAC,KAAK,CAAC,YAA6B,CAAC,mCACvD,OAAO,CAAC,mBAAmB,mCAC3B,IAAI,CAAC,aAAa,CAAC,mBAAmB,CACzC,CAAC;IACN,CAAC;IAEO,eAAe,CAAC,GAAY,EAAE,OAAgB;QAClD,MAAM,iBAAiB,GAAG,GAAG,CAAC,KAAK,IAAK,GAAG,CAAC,KAAK,CAAC,YAA6B,CAAC;QAChF,IAAI,iBAAiB,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;YAClF,MAAM,IAAI,sBAAc,CAAC,yCAAyC,EAAE;gBAChE,YAAY,EAAE,iBAAiB;aAClC,CAAC,CAAC;SACN;QACD,OAAO,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,OAAO,CAAC,mBAAmB,CAAC;IAC5D,CAAC;IAED;;;OAGG;IACK,mCAAmC,CACvC,cAA4B,EAAE,EAC9B,OAAiB,EACjB,IAAwB;QAExB,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE;YACnB,OAAO,KAAK,CAAC;SAChB;QACD,MAAM,oBAAoB,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,mBAAW,EAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC9F,IAAI,oBAAoB,EAAE;YACtB,OAAO,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;SAC9E;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACK,eAAe,CAAI,IAAS,EAAE,IAAS;QAC3C,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE;YACpC,OAAO,UAAU,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC7C,CAAC,EAAE,KAAgB,CAAC,CAAC;IACzB,CAAC;CACJ,CAAA;AAxJY,qBAAqB;IADjC,IAAA,mBAAU,GAAE;qCAG2B,gCAAc,EAAyB,8BAAa;GAF/E,qBAAqB,CAwJjC;AAxJY,sDAAqB"}
|
|
@@ -25,6 +25,7 @@ const transactional_connection_1 = require("../../connection/transactional-conne
|
|
|
25
25
|
const channel_entity_1 = require("../../entity/channel/channel.entity");
|
|
26
26
|
const order_entity_1 = require("../../entity/order/order.entity");
|
|
27
27
|
const product_variant_price_entity_1 = require("../../entity/product-variant/product-variant-price.entity");
|
|
28
|
+
const product_variant_entity_1 = require("../../entity/product-variant/product-variant.entity");
|
|
28
29
|
const seller_entity_1 = require("../../entity/seller/seller.entity");
|
|
29
30
|
const session_entity_1 = require("../../entity/session/session.entity");
|
|
30
31
|
const zone_entity_1 = require("../../entity/zone/zone.entity");
|
|
@@ -242,21 +243,52 @@ let ChannelService = class ChannelService {
|
|
|
242
243
|
}
|
|
243
244
|
if (input.currencyCode || input.defaultCurrencyCode) {
|
|
244
245
|
const newCurrencyCode = input.defaultCurrencyCode || input.currencyCode;
|
|
246
|
+
updatedChannel.availableCurrencyCodes = (0, unique_1.unique)([
|
|
247
|
+
...updatedChannel.availableCurrencyCodes,
|
|
248
|
+
updatedChannel.defaultCurrencyCode,
|
|
249
|
+
]);
|
|
245
250
|
if (originalDefaultCurrencyCode !== newCurrencyCode) {
|
|
246
251
|
// When updating the default currency code for a Channel, we also need to update
|
|
247
252
|
// and ProductVariantPrices in that channel which use the old currency code.
|
|
253
|
+
const [selectQbQuery, selectQbParams] = this.connection
|
|
254
|
+
.getRepository(ctx, product_variant_entity_1.ProductVariant)
|
|
255
|
+
.createQueryBuilder('variant')
|
|
256
|
+
.select('variant.id', 'id')
|
|
257
|
+
.innerJoin(product_variant_price_entity_1.ProductVariantPrice, 'pvp', 'pvp.variantId = variant.id')
|
|
258
|
+
.andWhere('pvp.channelId = :channelId')
|
|
259
|
+
.andWhere('pvp.currencyCode = :newCurrencyCode')
|
|
260
|
+
.groupBy('variant.id')
|
|
261
|
+
.getQueryAndParameters();
|
|
248
262
|
const qb = this.connection
|
|
249
263
|
.getRepository(ctx, product_variant_price_entity_1.ProductVariantPrice)
|
|
250
264
|
.createQueryBuilder('pvp')
|
|
251
265
|
.update()
|
|
252
|
-
.where('channelId = :channelId'
|
|
253
|
-
.andWhere('currencyCode = :
|
|
254
|
-
currencyCode:
|
|
255
|
-
|
|
256
|
-
|
|
266
|
+
.where('channelId = :channelId')
|
|
267
|
+
.andWhere('currencyCode = :oldCurrencyCode')
|
|
268
|
+
.set({ currencyCode: newCurrencyCode })
|
|
269
|
+
.setParameters({
|
|
270
|
+
channelId: channel.id,
|
|
271
|
+
oldCurrencyCode: originalDefaultCurrencyCode,
|
|
272
|
+
newCurrencyCode,
|
|
273
|
+
});
|
|
274
|
+
if (this.connection.rawConnection.options.type === 'mysql') {
|
|
275
|
+
// MySQL does not support sub-queries joining the table that is being updated,
|
|
276
|
+
// it will cause a "You can't specify target table 'product_variant_price' for update in FROM clause" error.
|
|
277
|
+
// This is a work-around from https://stackoverflow.com/a/9843719/772859
|
|
278
|
+
qb.andWhere(`variantId NOT IN (SELECT id FROM (${selectQbQuery}) as temp)`, selectQbParams);
|
|
279
|
+
}
|
|
280
|
+
else {
|
|
281
|
+
qb.andWhere(`variantId NOT IN (${selectQbQuery})`, selectQbParams);
|
|
282
|
+
}
|
|
257
283
|
await qb.execute();
|
|
258
284
|
}
|
|
259
285
|
}
|
|
286
|
+
if (input.availableCurrencyCodes &&
|
|
287
|
+
!updatedChannel.availableCurrencyCodes.includes(updatedChannel.defaultCurrencyCode)) {
|
|
288
|
+
throw new errors_1.UserInputError(`error.available-currency-codes-must-include-default`, {
|
|
289
|
+
defaultCurrencyCode: updatedChannel.defaultCurrencyCode,
|
|
290
|
+
});
|
|
291
|
+
}
|
|
260
292
|
await this.connection.getRepository(ctx, channel_entity_1.Channel).save(updatedChannel, { reload: false });
|
|
261
293
|
await this.customFieldRelationService.updateRelations(ctx, channel_entity_1.Channel, input, updatedChannel);
|
|
262
294
|
await this.allChannels.refresh(ctx);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"channel.service.js","sourceRoot":"","sources":["../../../src/service/services/channel.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"channel.service.js","sourceRoot":"","sources":["../../../src/service/services/channel.service.ts"],"names":[],"mappings":"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"}
|