@vendure/core 1.6.4 → 1.6.5
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/config/config-helpers.d.ts +4 -0
- package/dist/config/config-helpers.js +8 -1
- package/dist/config/config-helpers.js.map +1 -1
- package/dist/config/config.module.js +9 -0
- package/dist/config/config.module.js.map +1 -1
- package/dist/config/order/order-item-price-calculation-strategy.d.ts +3 -0
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +3 -3
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js +5 -5
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js +4 -4
- package/dist/service/helpers/list-query-builder/connection-utils.js +7 -1
- package/dist/service/helpers/list-query-builder/connection-utils.js.map +1 -1
- package/dist/service/helpers/list-query-builder/list-query-builder.d.ts +4 -3
- package/dist/service/helpers/list-query-builder/list-query-builder.js +17 -8
- package/dist/service/helpers/list-query-builder/list-query-builder.js.map +1 -1
- package/dist/service/helpers/order-calculator/order-calculator.d.ts +18 -0
- package/dist/service/helpers/order-calculator/order-calculator.js +18 -0
- package/dist/service/helpers/order-calculator/order-calculator.js.map +1 -1
- package/dist/service/helpers/order-modifier/order-modifier.d.ts +16 -0
- package/dist/service/helpers/order-modifier/order-modifier.js +34 -12
- package/dist/service/helpers/order-modifier/order-modifier.js.map +1 -1
- package/dist/service/helpers/product-price-applicator/product-price-applicator.d.ts +26 -2
- package/dist/service/helpers/product-price-applicator/product-price-applicator.js +26 -2
- package/dist/service/helpers/product-price-applicator/product-price-applicator.js.map +1 -1
- package/dist/service/helpers/slug-validator/slug-validator.d.ts +16 -0
- package/dist/service/helpers/slug-validator/slug-validator.js +8 -0
- package/dist/service/helpers/slug-validator/slug-validator.js.map +1 -1
- package/dist/service/helpers/translatable-saver/translatable-saver.d.ts +28 -1
- package/dist/service/helpers/translatable-saver/translatable-saver.js +28 -1
- package/dist/service/helpers/translatable-saver/translatable-saver.js.map +1 -1
- package/dist/service/services/product.service.js +11 -8
- package/dist/service/services/product.service.js.map +1 -1
- package/dist/service/services/promotion.service.js +4 -1
- package/dist/service/services/promotion.service.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { PartialVendureConfig, RuntimeVendureConfig } from './vendure-config';
|
|
2
|
+
/**
|
|
3
|
+
* Reset the activeConfig object back to the initial default state.
|
|
4
|
+
*/
|
|
5
|
+
export declare function resetConfig(): void;
|
|
2
6
|
/**
|
|
3
7
|
* Override the default config by merging in the supplied values. Should only be used prior to
|
|
4
8
|
* bootstrapping the app.
|
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.getConfig = exports.setConfig = void 0;
|
|
3
|
+
exports.getConfig = exports.setConfig = exports.resetConfig = void 0;
|
|
4
4
|
const default_config_1 = require("./default-config");
|
|
5
5
|
const merge_config_1 = require("./merge-config");
|
|
6
6
|
let activeConfig = default_config_1.defaultConfig;
|
|
7
|
+
/**
|
|
8
|
+
* Reset the activeConfig object back to the initial default state.
|
|
9
|
+
*/
|
|
10
|
+
function resetConfig() {
|
|
11
|
+
activeConfig = default_config_1.defaultConfig;
|
|
12
|
+
}
|
|
13
|
+
exports.resetConfig = resetConfig;
|
|
7
14
|
/**
|
|
8
15
|
* Override the default config by merging in the supplied values. Should only be used prior to
|
|
9
16
|
* bootstrapping the app.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-helpers.js","sourceRoot":"","sources":["../../src/config/config-helpers.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,iDAA6C;AAG7C,IAAI,YAAY,GAAG,8BAAa,CAAC;AAEjC;;;GAGG;AACH,SAAgB,SAAS,CAAC,UAAgC;IACtD,YAAY,GAAG,0BAAW,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;AACzD,CAAC;AAFD,8BAEC;AAED;;;;GAIG;AACH,SAAgB,SAAS;IACrB,OAAO,YAAY,CAAC;AACxB,CAAC;AAFD,8BAEC"}
|
|
1
|
+
{"version":3,"file":"config-helpers.js","sourceRoot":"","sources":["../../src/config/config-helpers.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,iDAA6C;AAG7C,IAAI,YAAY,GAAG,8BAAa,CAAC;AAEjC;;GAEG;AACH,SAAgB,WAAW;IACvB,YAAY,GAAG,8BAAa,CAAC;AACjC,CAAC;AAFD,kCAEC;AAED;;;GAGG;AACH,SAAgB,SAAS,CAAC,UAAgC;IACtD,YAAY,GAAG,0BAAW,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;AACzD,CAAC;AAFD,8BAEC;AAED;;;;GAIG;AACH,SAAgB,SAAS;IACrB,OAAO,YAAY,CAAC;AACxB,CAAC;AAFD,8BAEC"}
|
|
@@ -14,6 +14,7 @@ const common_1 = require("@nestjs/common");
|
|
|
14
14
|
const core_1 = require("@nestjs/core");
|
|
15
15
|
const shared_utils_1 = require("@vendure/common/lib/shared-utils");
|
|
16
16
|
const injector_1 = require("../common/injector");
|
|
17
|
+
const config_helpers_1 = require("./config-helpers");
|
|
17
18
|
const config_service_1 = require("./config.service");
|
|
18
19
|
let ConfigModule = class ConfigModule {
|
|
19
20
|
constructor(configService, moduleRef) {
|
|
@@ -27,6 +28,14 @@ let ConfigModule = class ConfigModule {
|
|
|
27
28
|
async onApplicationShutdown(signal) {
|
|
28
29
|
await this.destroyInjectableStrategies();
|
|
29
30
|
await this.destroyConfigurableOperations();
|
|
31
|
+
/**
|
|
32
|
+
* When the application shuts down, we reset the activeConfig to the default. Usually this is
|
|
33
|
+
* redundant, as the app shutdown would normally coincide with the process ending. However, in some
|
|
34
|
+
* circumstances, such as when running migrations immediately followed by app bootstrap, the activeConfig
|
|
35
|
+
* will persist between these two applications and mutations e.g. to the CustomFields will result in
|
|
36
|
+
* hard-to-debug errors. So resetting is a precaution against this scenario.
|
|
37
|
+
*/
|
|
38
|
+
config_helpers_1.resetConfig();
|
|
30
39
|
}
|
|
31
40
|
async initInjectableStrategies() {
|
|
32
41
|
const injector = new injector_1.Injector(this.moduleRef);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.module.js","sourceRoot":"","sources":["../../src/config/config.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAuF;AACvF,uCAAyC;AACzC,mEAAsE;AAGtE,iDAA8C;AAG9C,qDAAiD;AAMjD,IAAa,YAAY,GAAzB,MAAa,YAAY;IACrB,YAAoB,aAA4B,EAAU,SAAoB;QAA1D,kBAAa,GAAb,aAAa,CAAe;QAAU,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAElF,KAAK,CAAC,sBAAsB;QACxB,MAAM,IAAI,CAAC,wBAAwB,EAAE,CAAC;QACtC,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAe;QACvC,MAAM,IAAI,CAAC,2BAA2B,EAAE,CAAC;QACzC,MAAM,IAAI,CAAC,6BAA6B,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"config.module.js","sourceRoot":"","sources":["../../src/config/config.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,6 +47,9 @@ export interface OrderItemPriceCalculationStrategy extends InjectableStrategy {
|
|
|
47
47
|
* @description
|
|
48
48
|
* Receives the ProductVariant to be added to the Order as well as any OrderLine custom fields and returns
|
|
49
49
|
* the price for a single unit.
|
|
50
|
+
*
|
|
51
|
+
* Note: if you have any `relation` type custom fields defined on the OrderLine entity, they will only be
|
|
52
|
+
* passed in to this method if they are set to `eager: true`.
|
|
50
53
|
*/
|
|
51
54
|
calculateUnitPrice(ctx: RequestContext, productVariant: ProductVariant, orderLineCustomFields: {
|
|
52
55
|
[key: string]: any;
|
|
@@ -113,9 +113,9 @@ class MysqlSearchStrategy {
|
|
|
113
113
|
.select('si_inner.productId', 'inner_productId')
|
|
114
114
|
.addSelect('si_inner.productVariantId', 'inner_productVariantId')
|
|
115
115
|
.addSelect(`IF (sku LIKE :like_term, 10, 0)`, 'sku_score')
|
|
116
|
-
.addSelect(`(SELECT sku_score) +
|
|
117
|
-
MATCH (productName) AGAINST (:term IN BOOLEAN MODE) * 2 +
|
|
118
|
-
MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE) * 1.5 +
|
|
116
|
+
.addSelect(`(SELECT sku_score) +
|
|
117
|
+
MATCH (productName) AGAINST (:term IN BOOLEAN MODE) * 2 +
|
|
118
|
+
MATCH (productVariantName) AGAINST (:term IN BOOLEAN MODE) * 1.5 +
|
|
119
119
|
MATCH (description) AGAINST (:term IN BOOLEAN MODE) * 1`, 'score')
|
|
120
120
|
.where(new typeorm_1.Brackets(qb1 => {
|
|
121
121
|
qb1.where('sku LIKE :like_term')
|
|
@@ -120,11 +120,11 @@ class PostgresSearchStrategy {
|
|
|
120
120
|
qb.where('1 = 1');
|
|
121
121
|
if (term && term.length > this.minTermLength) {
|
|
122
122
|
const minIfGrouped = (colName) => input.groupByProduct || forceGroup ? `MIN(${colName})` : colName;
|
|
123
|
-
qb.addSelect(`
|
|
124
|
-
(ts_rank_cd(to_tsvector(${minIfGrouped('si.sku')}), to_tsquery(:term)) * 10 +
|
|
125
|
-
ts_rank_cd(to_tsvector(${minIfGrouped('si.productName')}), to_tsquery(:term)) * 2 +
|
|
126
|
-
ts_rank_cd(to_tsvector(${minIfGrouped('si.productVariantName')}), to_tsquery(:term)) * 1.5 +
|
|
127
|
-
ts_rank_cd(to_tsvector(${minIfGrouped('si.description')}), to_tsquery(:term)) * 1)
|
|
123
|
+
qb.addSelect(`
|
|
124
|
+
(ts_rank_cd(to_tsvector(${minIfGrouped('si.sku')}), to_tsquery(:term)) * 10 +
|
|
125
|
+
ts_rank_cd(to_tsvector(${minIfGrouped('si.productName')}), to_tsquery(:term)) * 2 +
|
|
126
|
+
ts_rank_cd(to_tsvector(${minIfGrouped('si.productVariantName')}), to_tsquery(:term)) * 1.5 +
|
|
127
|
+
ts_rank_cd(to_tsvector(${minIfGrouped('si.description')}), to_tsquery(:term)) * 1)
|
|
128
128
|
`, 'score')
|
|
129
129
|
.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
130
130
|
qb1.where('to_tsvector(si.sku) @@ to_tsquery(:term)')
|
|
@@ -103,10 +103,10 @@ class SqliteSearchStrategy {
|
|
|
103
103
|
if (term && term.length > this.minTermLength) {
|
|
104
104
|
// Note: SQLite does not natively have fulltext search capabilities,
|
|
105
105
|
// so we just use a weighted LIKE match
|
|
106
|
-
qb.addSelect(`
|
|
107
|
-
CASE WHEN sku LIKE :like_term THEN 10 ELSE 0 END +
|
|
108
|
-
CASE WHEN productName LIKE :like_term THEN 3 ELSE 0 END +
|
|
109
|
-
CASE WHEN productVariantName LIKE :like_term THEN 2 ELSE 0 END +
|
|
106
|
+
qb.addSelect(`
|
|
107
|
+
CASE WHEN sku LIKE :like_term THEN 10 ELSE 0 END +
|
|
108
|
+
CASE WHEN productName LIKE :like_term THEN 3 ELSE 0 END +
|
|
109
|
+
CASE WHEN productVariantName LIKE :like_term THEN 2 ELSE 0 END +
|
|
110
110
|
CASE WHEN description LIKE :like_term THEN 1 ELSE 0 END`, 'score')
|
|
111
111
|
.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
112
112
|
qb1.where('sku LIKE :like_term')
|
|
@@ -12,8 +12,14 @@ function getColumnMetadata(connection, entity) {
|
|
|
12
12
|
const relations = metadata.relations;
|
|
13
13
|
const translationRelation = relations.find(r => r.propertyName === 'translations');
|
|
14
14
|
if (translationRelation) {
|
|
15
|
+
const commonFields = [
|
|
16
|
+
'id',
|
|
17
|
+
'createdAt',
|
|
18
|
+
'updatedAt',
|
|
19
|
+
'languageCode',
|
|
20
|
+
];
|
|
15
21
|
const translationMetadata = connection.getMetadata(translationRelation.type);
|
|
16
|
-
translationColumns = translationColumns.concat(translationMetadata.columns.filter(c => !c.relationMetadata));
|
|
22
|
+
translationColumns = translationColumns.concat(translationMetadata.columns.filter(c => !c.relationMetadata && !commonFields.includes(c.propertyName)));
|
|
17
23
|
}
|
|
18
24
|
const alias = metadata.name.toLowerCase();
|
|
19
25
|
return { columns, translationColumns, alias };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-utils.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/connection-utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"connection-utils.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/connection-utils.ts"],"names":[],"mappings":";;;AAOA;;;GAGG;AACH,SAAgB,iBAAiB,CAAI,UAAsB,EAAE,MAAe;IACxE,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC;IACjC,IAAI,kBAAkB,GAAqB,EAAE,CAAC;IAC9C,MAAM,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IAErC,MAAM,mBAAmB,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,KAAK,cAAc,CAAC,CAAC;IACnF,IAAI,mBAAmB,EAAE;QACrB,MAAM,YAAY,GAAkD;YAChE,IAAI;YACJ,WAAW;YACX,WAAW;YACX,cAAc;SACjB,CAAC;QACF,MAAM,mBAAmB,GAAG,UAAU,CAAC,WAAW,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAC7E,kBAAkB,GAAG,kBAAkB,CAAC,MAAM,CAC1C,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAC9B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,gBAAgB,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAmB,CAAC,CAC5E,CACJ,CAAC;KACL;IACD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;IAC1C,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC;AAClD,CAAC;AAvBD,8CAuBC;AAED,SAAgB,cAAc,CAAI,UAAsB,EAAE,MAAe;IACrE,OAAO,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;AAC7D,CAAC;AAFD,wCAEC;AAED;;;GAGG;AACH,SAAgB,gCAAgC,CAAC,UAAsB,EAAE,UAAkB;IACvF,OAAO,UAAU,CAAC,OAAO,CAAC,uBAAuB,EAAE,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;AACzG,CAAC;AAFD,4EAEC"}
|
|
@@ -206,9 +206,10 @@ export declare class ListQueryBuilder implements OnApplicationBootstrap {
|
|
|
206
206
|
*/
|
|
207
207
|
private joinCalculatedColumnRelations;
|
|
208
208
|
/**
|
|
209
|
-
*
|
|
210
|
-
*
|
|
211
|
-
*
|
|
209
|
+
* @description
|
|
210
|
+
* If this entity is Translatable, and we are sorting on one of the translatable fields,
|
|
211
|
+
* then we need to apply appropriate WHERE clauses to limit
|
|
212
|
+
* the joined translation relations.
|
|
212
213
|
*/
|
|
213
214
|
private applyTranslationConditions;
|
|
214
215
|
/**
|
|
@@ -127,7 +127,6 @@ let ListQueryBuilder = class ListQueryBuilder {
|
|
|
127
127
|
});
|
|
128
128
|
// tslint:disable-next-line:no-non-null-assertion
|
|
129
129
|
FindOptionsUtils_1.FindOptionsUtils.joinEagerRelations(qb, qb.alias, qb.expressionMap.mainAlias.metadata);
|
|
130
|
-
this.applyTranslationConditions(qb, entity, extendedOptions.ctx, extendedOptions.entityAlias);
|
|
131
130
|
// join the tables required by calculated columns
|
|
132
131
|
this.joinCalculatedColumnRelations(qb, entity, options);
|
|
133
132
|
const { customPropertyMap, entityAlias } = extendedOptions;
|
|
@@ -135,7 +134,9 @@ let ListQueryBuilder = class ListQueryBuilder {
|
|
|
135
134
|
this.normalizeCustomPropertyMap(customPropertyMap, options, qb);
|
|
136
135
|
}
|
|
137
136
|
const customFieldsForType = this.configService.customFields[entity.name];
|
|
138
|
-
const
|
|
137
|
+
const sortParams = Object.assign({}, options.sort, extendedOptions.orderBy);
|
|
138
|
+
this.applyTranslationConditions(qb, entity, sortParams, extendedOptions.ctx, extendedOptions.entityAlias);
|
|
139
|
+
const sort = parse_sort_params_1.parseSortParams(rawConnection, entity, sortParams, customPropertyMap, entityAlias, customFieldsForType);
|
|
139
140
|
const filter = parse_filter_params_1.parseFilterParams(rawConnection, entity, options.filter, customPropertyMap, entityAlias);
|
|
140
141
|
if (filter.length) {
|
|
141
142
|
const filterOperator = (_c = options.filterOperator) !== null && _c !== void 0 ? _c : generated_types_1.LogicalOperator.AND;
|
|
@@ -357,15 +358,23 @@ let ListQueryBuilder = class ListQueryBuilder {
|
|
|
357
358
|
}
|
|
358
359
|
}
|
|
359
360
|
/**
|
|
360
|
-
*
|
|
361
|
-
*
|
|
362
|
-
*
|
|
361
|
+
* @description
|
|
362
|
+
* If this entity is Translatable, and we are sorting on one of the translatable fields,
|
|
363
|
+
* then we need to apply appropriate WHERE clauses to limit
|
|
364
|
+
* the joined translation relations.
|
|
363
365
|
*/
|
|
364
|
-
applyTranslationConditions(qb, entity, ctx, entityAlias) {
|
|
366
|
+
applyTranslationConditions(qb, entity, sortParams, ctx, entityAlias) {
|
|
365
367
|
const languageCode = (ctx === null || ctx === void 0 ? void 0 : ctx.languageCode) || this.configService.defaultLanguageCode;
|
|
366
368
|
const { columns, translationColumns, alias: defaultAlias, } = connection_utils_1.getColumnMetadata(this.connection.rawConnection, entity);
|
|
367
369
|
const alias = entityAlias !== null && entityAlias !== void 0 ? entityAlias : defaultAlias;
|
|
368
|
-
|
|
370
|
+
const sortKeys = Object.keys(sortParams);
|
|
371
|
+
let sortingOnTranslatableKey = false;
|
|
372
|
+
for (const translationColumn of translationColumns) {
|
|
373
|
+
if (sortKeys.includes(translationColumn.propertyName)) {
|
|
374
|
+
sortingOnTranslatableKey = true;
|
|
375
|
+
}
|
|
376
|
+
}
|
|
377
|
+
if (translationColumns.length && sortingOnTranslatableKey) {
|
|
369
378
|
const translationsAlias = qb.connection.namingStrategy.eagerJoinRelationAlias(alias, 'translations');
|
|
370
379
|
qb.andWhere(new typeorm_1.Brackets(qb1 => {
|
|
371
380
|
var _a;
|
|
@@ -403,7 +412,7 @@ let ListQueryBuilder = class ListQueryBuilder {
|
|
|
403
412
|
}
|
|
404
413
|
qb.setParameters({
|
|
405
414
|
nonDefaultLanguageCode: languageCode,
|
|
406
|
-
defaultLanguageCode
|
|
415
|
+
defaultLanguageCode,
|
|
407
416
|
});
|
|
408
417
|
}));
|
|
409
418
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list-query-builder.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/list-query-builder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"list-query-builder.js","sourceRoot":"","sources":["../../../../src/service/helpers/list-query-builder/list-query-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,17 @@ import { ShippingMethodService } from '../../services/shipping-method.service';
|
|
|
8
8
|
import { TaxRateService } from '../../services/tax-rate.service';
|
|
9
9
|
import { ZoneService } from '../../services/zone.service';
|
|
10
10
|
import { ShippingCalculator } from '../shipping-calculator/shipping-calculator';
|
|
11
|
+
/**
|
|
12
|
+
* @description
|
|
13
|
+
* This helper is used when making changes to an Order, to apply all applicable price adjustments to that Order,
|
|
14
|
+
* including:
|
|
15
|
+
*
|
|
16
|
+
* - Promotions
|
|
17
|
+
* - Taxes
|
|
18
|
+
* - Shipping
|
|
19
|
+
*
|
|
20
|
+
* @docsCategory service-helpers
|
|
21
|
+
*/
|
|
11
22
|
export declare class OrderCalculator {
|
|
12
23
|
private configService;
|
|
13
24
|
private zoneService;
|
|
@@ -17,6 +28,7 @@ export declare class OrderCalculator {
|
|
|
17
28
|
private requestContextCache;
|
|
18
29
|
constructor(configService: ConfigService, zoneService: ZoneService, taxRateService: TaxRateService, shippingMethodService: ShippingMethodService, shippingCalculator: ShippingCalculator, requestContextCache: RequestContextCacheService);
|
|
19
30
|
/**
|
|
31
|
+
* @description
|
|
20
32
|
* Applies taxes and promotions to an Order. Mutates the order object.
|
|
21
33
|
* Returns an array of any OrderItems which had new adjustments
|
|
22
34
|
* applied, either tax or promotions.
|
|
@@ -25,30 +37,36 @@ export declare class OrderCalculator {
|
|
|
25
37
|
recalculateShipping?: boolean;
|
|
26
38
|
}): Promise<OrderItem[]>;
|
|
27
39
|
/**
|
|
40
|
+
* @description
|
|
28
41
|
* Applies the correct TaxRate to each OrderItem in the order.
|
|
29
42
|
*/
|
|
30
43
|
private applyTaxes;
|
|
31
44
|
/**
|
|
45
|
+
* @description
|
|
32
46
|
* Applies the correct TaxRate to an OrderLine
|
|
33
47
|
*/
|
|
34
48
|
private applyTaxesToOrderLine;
|
|
35
49
|
/**
|
|
50
|
+
* @description
|
|
36
51
|
* Returns a memoized function for performing an efficient
|
|
37
52
|
* lookup of the correct TaxRate for a given TaxCategory.
|
|
38
53
|
*/
|
|
39
54
|
private createTaxRateGetter;
|
|
40
55
|
/**
|
|
56
|
+
* @description
|
|
41
57
|
* Applies any eligible promotions to each OrderItem in the order. Returns an array of
|
|
42
58
|
* any OrderItems which had their Adjustments modified.
|
|
43
59
|
*/
|
|
44
60
|
private applyPromotions;
|
|
45
61
|
/**
|
|
62
|
+
* @description
|
|
46
63
|
* Applies promotions to OrderItems. This is a quite complex function, due to the inherent complexity
|
|
47
64
|
* of applying the promotions, and also due to added complexity in the name of performance
|
|
48
65
|
* optimization. Therefore it is heavily annotated so that the purpose of each step is clear.
|
|
49
66
|
*/
|
|
50
67
|
private applyOrderItemPromotions;
|
|
51
68
|
/**
|
|
69
|
+
* @description
|
|
52
70
|
* An OrderLine may have promotion adjustments from Promotions which are no longer applicable.
|
|
53
71
|
* For example, a coupon code might have caused a discount to be applied, and now that code has
|
|
54
72
|
* been removed from the order. The adjustment will still be there on each OrderItem it was applied
|
|
@@ -23,6 +23,17 @@ const tax_rate_service_1 = require("../../services/tax-rate.service");
|
|
|
23
23
|
const zone_service_1 = require("../../services/zone.service");
|
|
24
24
|
const shipping_calculator_1 = require("../shipping-calculator/shipping-calculator");
|
|
25
25
|
const prorate_1 = require("./prorate");
|
|
26
|
+
/**
|
|
27
|
+
* @description
|
|
28
|
+
* This helper is used when making changes to an Order, to apply all applicable price adjustments to that Order,
|
|
29
|
+
* including:
|
|
30
|
+
*
|
|
31
|
+
* - Promotions
|
|
32
|
+
* - Taxes
|
|
33
|
+
* - Shipping
|
|
34
|
+
*
|
|
35
|
+
* @docsCategory service-helpers
|
|
36
|
+
*/
|
|
26
37
|
let OrderCalculator = class OrderCalculator {
|
|
27
38
|
constructor(configService, zoneService, taxRateService, shippingMethodService, shippingCalculator, requestContextCache) {
|
|
28
39
|
this.configService = configService;
|
|
@@ -33,6 +44,7 @@ let OrderCalculator = class OrderCalculator {
|
|
|
33
44
|
this.requestContextCache = requestContextCache;
|
|
34
45
|
}
|
|
35
46
|
/**
|
|
47
|
+
* @description
|
|
36
48
|
* Applies taxes and promotions to an Order. Mutates the order object.
|
|
37
49
|
* Returns an array of any OrderItems which had new adjustments
|
|
38
50
|
* applied, either tax or promotions.
|
|
@@ -78,6 +90,7 @@ let OrderCalculator = class OrderCalculator {
|
|
|
78
90
|
return taxZoneChanged ? order.getOrderItems() : Array.from(updatedOrderItems);
|
|
79
91
|
}
|
|
80
92
|
/**
|
|
93
|
+
* @description
|
|
81
94
|
* Applies the correct TaxRate to each OrderItem in the order.
|
|
82
95
|
*/
|
|
83
96
|
async applyTaxes(ctx, order, activeZone) {
|
|
@@ -88,6 +101,7 @@ let OrderCalculator = class OrderCalculator {
|
|
|
88
101
|
this.calculateOrderTotals(order);
|
|
89
102
|
}
|
|
90
103
|
/**
|
|
104
|
+
* @description
|
|
91
105
|
* Applies the correct TaxRate to an OrderLine
|
|
92
106
|
*/
|
|
93
107
|
async applyTaxesToOrderLine(ctx, order, line, activeZone, getTaxRate) {
|
|
@@ -104,6 +118,7 @@ let OrderCalculator = class OrderCalculator {
|
|
|
104
118
|
}
|
|
105
119
|
}
|
|
106
120
|
/**
|
|
121
|
+
* @description
|
|
107
122
|
* Returns a memoized function for performing an efficient
|
|
108
123
|
* lookup of the correct TaxRate for a given TaxCategory.
|
|
109
124
|
*/
|
|
@@ -120,6 +135,7 @@ let OrderCalculator = class OrderCalculator {
|
|
|
120
135
|
};
|
|
121
136
|
}
|
|
122
137
|
/**
|
|
138
|
+
* @description
|
|
123
139
|
* Applies any eligible promotions to each OrderItem in the order. Returns an array of
|
|
124
140
|
* any OrderItems which had their Adjustments modified.
|
|
125
141
|
*/
|
|
@@ -134,6 +150,7 @@ let OrderCalculator = class OrderCalculator {
|
|
|
134
150
|
}
|
|
135
151
|
}
|
|
136
152
|
/**
|
|
153
|
+
* @description
|
|
137
154
|
* Applies promotions to OrderItems. This is a quite complex function, due to the inherent complexity
|
|
138
155
|
* of applying the promotions, and also due to added complexity in the name of performance
|
|
139
156
|
* optimization. Therefore it is heavily annotated so that the purpose of each step is clear.
|
|
@@ -202,6 +219,7 @@ let OrderCalculator = class OrderCalculator {
|
|
|
202
219
|
return Array.from(updatedOrderItems.values());
|
|
203
220
|
}
|
|
204
221
|
/**
|
|
222
|
+
* @description
|
|
205
223
|
* An OrderLine may have promotion adjustments from Promotions which are no longer applicable.
|
|
206
224
|
* For example, a coupon code might have caused a discount to be applied, and now that code has
|
|
207
225
|
* been removed from the order. The adjustment will still be there on each OrderItem it was applied
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-calculator.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-calculator/order-calculator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"order-calculator.js","sourceRoot":"","sources":["../../../../src/service/helpers/order-calculator/order-calculator.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,8 @@ import { OrderCalculator } from '../order-calculator/order-calculator';
|
|
|
28
28
|
* So this helper was mainly extracted to isolate the huge `modifyOrder` method since the
|
|
29
29
|
* OrderService was just growing too large. Future refactoring could improve the organization
|
|
30
30
|
* of these Order-related methods into a more clearly-delineated set of classes.
|
|
31
|
+
*
|
|
32
|
+
* @docsCategory service-helpers
|
|
31
33
|
*/
|
|
32
34
|
export declare class OrderModifier {
|
|
33
35
|
private connection;
|
|
@@ -44,14 +46,21 @@ export declare class OrderModifier {
|
|
|
44
46
|
private historyService;
|
|
45
47
|
constructor(connection: TransactionalConnection, configService: ConfigService, orderCalculator: OrderCalculator, paymentService: PaymentService, countryService: CountryService, stockMovementService: StockMovementService, productVariantService: ProductVariantService, customFieldRelationService: CustomFieldRelationService, promotionService: PromotionService, eventBus: EventBus, entityHydrator: EntityHydrator, historyService: HistoryService);
|
|
46
48
|
/**
|
|
49
|
+
* @description
|
|
47
50
|
* Ensure that the ProductVariant has sufficient saleable stock to add the given
|
|
48
51
|
* quantity to an Order.
|
|
49
52
|
*/
|
|
50
53
|
constrainQuantityToSaleable(ctx: RequestContext, variant: ProductVariant, quantity: number, existingQuantity?: number): Promise<number>;
|
|
54
|
+
/**
|
|
55
|
+
* @description
|
|
56
|
+
* Given a ProductVariant ID and optional custom fields, this method will return an existing OrderLine that
|
|
57
|
+
* matches, or `undefined` if no match is found.
|
|
58
|
+
*/
|
|
51
59
|
getExistingOrderLine(ctx: RequestContext, order: Order, productVariantId: ID, customFields?: {
|
|
52
60
|
[key: string]: any;
|
|
53
61
|
}): Promise<OrderLine | undefined>;
|
|
54
62
|
/**
|
|
63
|
+
* @description
|
|
55
64
|
* Returns the OrderLine to which a new OrderItem belongs, creating a new OrderLine
|
|
56
65
|
* if no existing line is found.
|
|
57
66
|
*/
|
|
@@ -59,6 +68,7 @@ export declare class OrderModifier {
|
|
|
59
68
|
[key: string]: any;
|
|
60
69
|
}): Promise<OrderLine>;
|
|
61
70
|
/**
|
|
71
|
+
* @description
|
|
62
72
|
* Updates the quantity of an OrderLine, taking into account the available saleable stock level.
|
|
63
73
|
* Returns the actual quantity that the OrderLine was updated to (which may be less than the
|
|
64
74
|
* `quantity` argument if insufficient stock was available.
|
|
@@ -72,5 +82,11 @@ export declare class OrderModifier {
|
|
|
72
82
|
private getAdjustmentFromNewlyAppliedPromotions;
|
|
73
83
|
private getOrderPayments;
|
|
74
84
|
private customFieldsAreEqual;
|
|
85
|
+
/**
|
|
86
|
+
* This function is required because with the MySQL driver, boolean customFields with a default
|
|
87
|
+
* of `false` were being represented as `0`, thus causing the equality check to fail.
|
|
88
|
+
* So if it's a boolean, we'll explicitly coerce the value to a boolean.
|
|
89
|
+
*/
|
|
90
|
+
private coerceValue;
|
|
75
91
|
private getProductVariantOrThrow;
|
|
76
92
|
}
|