@vendure/core 1.7.3 → 1.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/api-internal-modules.js +2 -0
- package/dist/api/api-internal-modules.js.map +1 -1
- package/dist/api/config/generate-resolvers.d.ts +18 -0
- package/dist/api/config/graphql-custom-fields.js +16 -0
- package/dist/api/config/graphql-custom-fields.js.map +1 -1
- package/dist/api/resolvers/admin/collection.resolver.d.ts +4 -5
- package/dist/api/resolvers/admin/collection.resolver.js +44 -17
- package/dist/api/resolvers/admin/collection.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/draft-order.resolver.d.ts +25 -0
- package/dist/api/resolvers/admin/draft-order.resolver.js +232 -0
- package/dist/api/resolvers/admin/draft-order.resolver.js.map +1 -0
- package/dist/api/resolvers/admin/facet.resolver.d.ts +5 -1
- package/dist/api/resolvers/admin/facet.resolver.js +39 -1
- package/dist/api/resolvers/admin/facet.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/product.resolver.d.ts +4 -1
- package/dist/api/resolvers/admin/product.resolver.js +40 -0
- package/dist/api/resolvers/admin/product.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/collection-entity.resolver.d.ts +5 -2
- package/dist/api/resolvers/entity/collection-entity.resolver.js +24 -2
- package/dist/api/resolvers/entity/collection-entity.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/collection.api.graphql +19 -0
- package/dist/api/schema/admin-api/facet.api.graphql +30 -0
- package/dist/api/schema/admin-api/order.api.graphql +40 -0
- package/dist/api/schema/admin-api/product.api.graphql +9 -0
- package/dist/api/schema/common/common-error-results.graphql +21 -0
- package/dist/api/schema/common/common-types.graphql +15 -0
- package/dist/api/schema/shop-api/shop-error-results.graphql +0 -21
- package/dist/api/schema/shop-api/shop.api.graphql +0 -13
- package/dist/common/configurable-operation.js +1 -1
- package/dist/common/configurable-operation.js.map +1 -1
- package/dist/common/error/generated-graphql-admin-errors.d.ts +45 -0
- package/dist/common/error/generated-graphql-admin-errors.js +71 -2
- package/dist/common/error/generated-graphql-admin-errors.js.map +1 -1
- package/dist/config/order/changed-price-handling-strategy.d.ts +2 -1
- package/dist/config/order/order-item-price-calculation-strategy.d.ts +2 -1
- package/dist/config/promotion/actions/facet-values-percentage-discount-action.d.ts +1 -1
- package/dist/config/promotion/actions/facet-values-percentage-discount-action.js +1 -1
- package/dist/config/promotion/actions/facet-values-percentage-discount-action.js.map +1 -1
- package/dist/config/promotion/actions/order-fixed-discount-action.js +2 -1
- package/dist/config/promotion/actions/order-fixed-discount-action.js.map +1 -1
- package/dist/config/promotion/actions/order-percentage-discount-action.d.ts +1 -1
- package/dist/config/promotion/actions/order-percentage-discount-action.js +1 -1
- package/dist/config/promotion/actions/order-percentage-discount-action.js.map +1 -1
- package/dist/config/promotion/actions/product-percentage-discount-action.d.ts +1 -1
- package/dist/config/promotion/actions/product-percentage-discount-action.js +1 -1
- package/dist/config/promotion/actions/product-percentage-discount-action.js.map +1 -1
- package/dist/config/promotion/index.d.ts +10 -2
- package/dist/config/promotion/promotion-action.d.ts +55 -7
- package/dist/config/promotion/promotion-action.js +24 -8
- package/dist/config/promotion/promotion-action.js.map +1 -1
- package/dist/config/promotion/promotion-condition.d.ts +3 -2
- package/dist/config/promotion/promotion-condition.js +2 -2
- package/dist/config/promotion/promotion-condition.js.map +1 -1
- package/dist/config/session-cache/session-cache-strategy.d.ts +75 -1
- package/dist/entity/promotion/promotion.entity.d.ts +2 -0
- package/dist/entity/promotion/promotion.entity.js +16 -4
- package/dist/entity/promotion/promotion.entity.js.map +1 -1
- package/dist/i18n/messages/en.json +5 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +6 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js.map +1 -1
- package/dist/service/helpers/list-query-builder/list-query-builder.js +13 -1
- package/dist/service/helpers/list-query-builder/list-query-builder.js.map +1 -1
- package/dist/service/helpers/order-calculator/order-calculator.d.ts +1 -0
- package/dist/service/helpers/order-calculator/order-calculator.js +11 -0
- package/dist/service/helpers/order-calculator/order-calculator.js.map +1 -1
- package/dist/service/helpers/order-modifier/order-modifier.js +7 -17
- package/dist/service/helpers/order-modifier/order-modifier.js.map +1 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.js +0 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.js.map +1 -1
- package/dist/service/helpers/order-state-machine/order-state.d.ts +1 -1
- package/dist/service/helpers/order-state-machine/order-state.js +4 -1
- package/dist/service/helpers/order-state-machine/order-state.js.map +1 -1
- package/dist/service/index.d.ts +2 -0
- package/dist/service/index.js +2 -0
- package/dist/service/index.js.map +1 -1
- package/dist/service/services/collection.service.d.ts +14 -2
- package/dist/service/services/collection.service.js +69 -3
- package/dist/service/services/collection.service.js.map +1 -1
- package/dist/service/services/facet-value.service.d.ts +1 -1
- package/dist/service/services/facet-value.service.js +21 -7
- package/dist/service/services/facet-value.service.js.map +1 -1
- package/dist/service/services/facet.service.d.ts +15 -2
- package/dist/service/services/facet.service.js +80 -3
- package/dist/service/services/facet.service.js.map +1 -1
- package/dist/service/services/order-testing.service.js +1 -1
- package/dist/service/services/order-testing.service.js.map +1 -1
- package/dist/service/services/order.service.d.ts +3 -1
- package/dist/service/services/order.service.js +57 -35
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/product.service.js +14 -19
- package/dist/service/services/product.service.js.map +1 -1
- package/dist/service/services/promotion.service.d.ts +8 -1
- package/dist/service/services/promotion.service.js +45 -2
- package/dist/service/services/promotion.service.js.map +1 -1
- package/dist/service/services/role.service.d.ts +5 -0
- package/dist/service/services/role.service.js +13 -1
- package/dist/service/services/role.service.js.map +1 -1
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"facet-value.service.js","sourceRoot":"","sources":["../../../src/service/services/facet-value.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"facet-value.service.js","sourceRoot":"","sources":["../../../src/service/services/facet-value.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { CreateFacetInput, DeletionResponse, LanguageCode, UpdateFacetInput } from '@vendure/common/lib/generated-types';
|
|
1
|
+
import { AssignFacetsToChannelInput, CreateFacetInput, DeletionResponse, LanguageCode, RemoveFacetFromChannelResult, RemoveFacetsFromChannelInput, UpdateFacetInput } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { RequestContext } from '../../api/common/request-context';
|
|
4
4
|
import { RelationPaths } from '../../api/index';
|
|
5
|
+
import { ErrorResultUnion } from '../../common';
|
|
5
6
|
import { ListQueryOptions } from '../../common/types/common-types';
|
|
6
7
|
import { Translated } from '../../common/types/locale-types';
|
|
7
8
|
import { ConfigService } from '../../config/config.service';
|
|
@@ -14,6 +15,7 @@ import { TranslatableSaver } from '../helpers/translatable-saver/translatable-sa
|
|
|
14
15
|
import { TranslatorService } from '../helpers/translator/translator.service';
|
|
15
16
|
import { ChannelService } from './channel.service';
|
|
16
17
|
import { FacetValueService } from './facet-value.service';
|
|
18
|
+
import { RoleService } from './role.service';
|
|
17
19
|
/**
|
|
18
20
|
* @description
|
|
19
21
|
* Contains methods relating to {@link Facet} entities.
|
|
@@ -30,7 +32,8 @@ export declare class FacetService {
|
|
|
30
32
|
private customFieldRelationService;
|
|
31
33
|
private eventBus;
|
|
32
34
|
private translator;
|
|
33
|
-
|
|
35
|
+
private roleService;
|
|
36
|
+
constructor(connection: TransactionalConnection, facetValueService: FacetValueService, translatableSaver: TranslatableSaver, listQueryBuilder: ListQueryBuilder, configService: ConfigService, channelService: ChannelService, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus, translator: TranslatorService, roleService: RoleService);
|
|
34
37
|
findAll(ctx: RequestContext, options?: ListQueryOptions<Facet>, relations?: RelationPaths<Facet>): Promise<PaginatedList<Translated<Facet>>>;
|
|
35
38
|
findOne(ctx: RequestContext, facetId: ID, relations?: RelationPaths<Facet>): Promise<Translated<Facet> | undefined>;
|
|
36
39
|
/**
|
|
@@ -51,4 +54,14 @@ export declare class FacetService {
|
|
|
51
54
|
* with an incrementing integer.
|
|
52
55
|
*/
|
|
53
56
|
private ensureUniqueCode;
|
|
57
|
+
/**
|
|
58
|
+
* @description
|
|
59
|
+
* Assigns Facets to the specified Channel
|
|
60
|
+
*/
|
|
61
|
+
assignFacetsToChannel(ctx: RequestContext, input: AssignFacetsToChannelInput): Promise<Array<Translated<Facet>>>;
|
|
62
|
+
/**
|
|
63
|
+
* @description
|
|
64
|
+
* Remove Facets from the specified Channel
|
|
65
|
+
*/
|
|
66
|
+
removeFacetsFromChannel(ctx: RequestContext, input: RemoveFacetsFromChannelInput): Promise<Array<ErrorResultUnion<RemoveFacetFromChannelResult, Facet>>>;
|
|
54
67
|
}
|
|
@@ -13,11 +13,13 @@ exports.FacetService = void 0;
|
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
15
15
|
const request_context_1 = require("../../api/common/request-context");
|
|
16
|
+
const common_2 = require("../../common");
|
|
16
17
|
const utils_1 = require("../../common/utils");
|
|
17
18
|
const config_service_1 = require("../../config/config.service");
|
|
18
19
|
const transactional_connection_1 = require("../../connection/transactional-connection");
|
|
19
20
|
const facet_translation_entity_1 = require("../../entity/facet/facet-translation.entity");
|
|
20
21
|
const facet_entity_1 = require("../../entity/facet/facet.entity");
|
|
22
|
+
const index_1 = require("../../entity/index");
|
|
21
23
|
const event_bus_1 = require("../../event-bus");
|
|
22
24
|
const facet_event_1 = require("../../event-bus/events/facet-event");
|
|
23
25
|
const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
|
|
@@ -27,6 +29,7 @@ const translator_service_1 = require("../helpers/translator/translator.service")
|
|
|
27
29
|
const translate_entity_1 = require("../helpers/utils/translate-entity");
|
|
28
30
|
const channel_service_1 = require("./channel.service");
|
|
29
31
|
const facet_value_service_1 = require("./facet-value.service");
|
|
32
|
+
const role_service_1 = require("./role.service");
|
|
30
33
|
/**
|
|
31
34
|
* @description
|
|
32
35
|
* Contains methods relating to {@link Facet} entities.
|
|
@@ -34,7 +37,7 @@ const facet_value_service_1 = require("./facet-value.service");
|
|
|
34
37
|
* @docsCategory services
|
|
35
38
|
*/
|
|
36
39
|
let FacetService = class FacetService {
|
|
37
|
-
constructor(connection, facetValueService, translatableSaver, listQueryBuilder, configService, channelService, customFieldRelationService, eventBus, translator) {
|
|
40
|
+
constructor(connection, facetValueService, translatableSaver, listQueryBuilder, configService, channelService, customFieldRelationService, eventBus, translator, roleService) {
|
|
38
41
|
this.connection = connection;
|
|
39
42
|
this.facetValueService = facetValueService;
|
|
40
43
|
this.translatableSaver = translatableSaver;
|
|
@@ -44,6 +47,7 @@ let FacetService = class FacetService {
|
|
|
44
47
|
this.customFieldRelationService = customFieldRelationService;
|
|
45
48
|
this.eventBus = eventBus;
|
|
46
49
|
this.translator = translator;
|
|
50
|
+
this.roleService = roleService;
|
|
47
51
|
}
|
|
48
52
|
findAll(ctx, options, relations) {
|
|
49
53
|
return this.listQueryBuilder
|
|
@@ -147,7 +151,7 @@ let FacetService = class FacetService {
|
|
|
147
151
|
}
|
|
148
152
|
const isInUse = !!(productCount || variantCount);
|
|
149
153
|
const both = !!(productCount && variantCount) ? 'both' : 'single';
|
|
150
|
-
const i18nVars = { products: productCount, variants: variantCount, both };
|
|
154
|
+
const i18nVars = { products: productCount, variants: variantCount, both, facetCode: facet.code };
|
|
151
155
|
let message = '';
|
|
152
156
|
let result;
|
|
153
157
|
if (!isInUse) {
|
|
@@ -195,6 +199,78 @@ let FacetService = class FacetService {
|
|
|
195
199
|
} while (conflict);
|
|
196
200
|
return candidate;
|
|
197
201
|
}
|
|
202
|
+
/**
|
|
203
|
+
* @description
|
|
204
|
+
* Assigns Facets to the specified Channel
|
|
205
|
+
*/
|
|
206
|
+
async assignFacetsToChannel(ctx, input) {
|
|
207
|
+
const hasPermission = await this.roleService.userHasAnyPermissionsOnChannel(ctx, input.channelId, [
|
|
208
|
+
generated_types_1.Permission.UpdateFacet,
|
|
209
|
+
generated_types_1.Permission.UpdateCatalog,
|
|
210
|
+
]);
|
|
211
|
+
if (!hasPermission) {
|
|
212
|
+
throw new common_2.ForbiddenError();
|
|
213
|
+
}
|
|
214
|
+
const facetsToAssign = await this.connection
|
|
215
|
+
.getRepository(ctx, facet_entity_1.Facet)
|
|
216
|
+
.findByIds(input.facetIds, { relations: ['values'] });
|
|
217
|
+
const valuesToAssign = facetsToAssign.reduce((values, facet) => [...values, ...facet.values], []);
|
|
218
|
+
await Promise.all([
|
|
219
|
+
...facetsToAssign.map(async (facet) => {
|
|
220
|
+
return this.channelService.assignToChannels(ctx, facet_entity_1.Facet, facet.id, [input.channelId]);
|
|
221
|
+
}),
|
|
222
|
+
...valuesToAssign.map(async (value) => this.channelService.assignToChannels(ctx, index_1.FacetValue, value.id, [input.channelId])),
|
|
223
|
+
]);
|
|
224
|
+
return this.connection
|
|
225
|
+
.findByIdsInChannel(ctx, facet_entity_1.Facet, facetsToAssign.map(f => f.id), ctx.channelId, {})
|
|
226
|
+
.then(facets => facets.map(facet => translate_entity_1.translateDeep(facet, ctx.languageCode)));
|
|
227
|
+
}
|
|
228
|
+
/**
|
|
229
|
+
* @description
|
|
230
|
+
* Remove Facets from the specified Channel
|
|
231
|
+
*/
|
|
232
|
+
async removeFacetsFromChannel(ctx, input) {
|
|
233
|
+
const hasPermission = await this.roleService.userHasAnyPermissionsOnChannel(ctx, input.channelId, [
|
|
234
|
+
generated_types_1.Permission.DeleteFacet,
|
|
235
|
+
generated_types_1.Permission.DeleteCatalog,
|
|
236
|
+
]);
|
|
237
|
+
if (!hasPermission) {
|
|
238
|
+
throw new common_2.ForbiddenError();
|
|
239
|
+
}
|
|
240
|
+
const defaultChannel = await this.channelService.getDefaultChannel(ctx);
|
|
241
|
+
if (utils_1.idsAreEqual(input.channelId, defaultChannel.id)) {
|
|
242
|
+
throw new common_2.UserInputError('error.facets-cannot-be-removed-from-default-channel');
|
|
243
|
+
}
|
|
244
|
+
const facetsToRemove = await this.connection
|
|
245
|
+
.getRepository(ctx, facet_entity_1.Facet)
|
|
246
|
+
.findByIds(input.facetIds, { relations: ['values'] });
|
|
247
|
+
const results = [];
|
|
248
|
+
for (const facet of facetsToRemove) {
|
|
249
|
+
let productCount = 0;
|
|
250
|
+
let variantCount = 0;
|
|
251
|
+
if (facet.values.length) {
|
|
252
|
+
const counts = await this.facetValueService.checkFacetValueUsage(ctx, facet.values.map(fv => fv.id), input.channelId);
|
|
253
|
+
productCount = counts.productCount;
|
|
254
|
+
variantCount = counts.variantCount;
|
|
255
|
+
const isInUse = !!(productCount || variantCount);
|
|
256
|
+
const both = !!(productCount && variantCount) ? 'both' : 'single';
|
|
257
|
+
const i18nVars = { products: productCount, variants: variantCount, both };
|
|
258
|
+
let result;
|
|
259
|
+
if (!isInUse || input.force) {
|
|
260
|
+
await this.channelService.removeFromChannels(ctx, facet_entity_1.Facet, facet.id, [input.channelId]);
|
|
261
|
+
await Promise.all(facet.values.map(fv => this.channelService.removeFromChannels(ctx, index_1.FacetValue, fv.id, [input.channelId])));
|
|
262
|
+
result = await this.findOne(ctx, facet.id);
|
|
263
|
+
if (result) {
|
|
264
|
+
results.push(result);
|
|
265
|
+
}
|
|
266
|
+
}
|
|
267
|
+
else {
|
|
268
|
+
results.push(new common_2.FacetInUseError(facet.code, productCount, variantCount));
|
|
269
|
+
}
|
|
270
|
+
}
|
|
271
|
+
}
|
|
272
|
+
return results;
|
|
273
|
+
}
|
|
198
274
|
};
|
|
199
275
|
FacetService = __decorate([
|
|
200
276
|
common_1.Injectable(),
|
|
@@ -206,7 +282,8 @@ FacetService = __decorate([
|
|
|
206
282
|
channel_service_1.ChannelService,
|
|
207
283
|
custom_field_relation_service_1.CustomFieldRelationService,
|
|
208
284
|
event_bus_1.EventBus,
|
|
209
|
-
translator_service_1.TranslatorService
|
|
285
|
+
translator_service_1.TranslatorService,
|
|
286
|
+
role_service_1.RoleService])
|
|
210
287
|
], FacetService);
|
|
211
288
|
exports.FacetService = FacetService;
|
|
212
289
|
//# sourceMappingURL=facet.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"facet.service.js","sourceRoot":"","sources":["../../../src/service/services/facet.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"facet.service.js","sourceRoot":"","sources":["../../../src/service/services/facet.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -112,7 +112,7 @@ let OrderTestingService = class OrderTestingService {
|
|
|
112
112
|
taxCategory: productVariant.taxCategory,
|
|
113
113
|
});
|
|
114
114
|
mockOrder.lines.push(orderLine);
|
|
115
|
-
const { price, priceIncludesTax } = await orderItemPriceCalculationStrategy.calculateUnitPrice(ctx, productVariant, orderLine.customFields || {});
|
|
115
|
+
const { price, priceIncludesTax } = await orderItemPriceCalculationStrategy.calculateUnitPrice(ctx, productVariant, orderLine.customFields || {}, mockOrder);
|
|
116
116
|
const taxRate = productVariant.taxRateApplied;
|
|
117
117
|
const unitPrice = priceIncludesTax ? taxRate.netPriceOf(price) : price;
|
|
118
118
|
for (let i = 0; i < line.quantity; i++) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-testing.service.js","sourceRoot":"","sources":["../../../src/service/services/order-testing.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"order-testing.service.js","sourceRoot":"","sources":["../../../src/service/services/order-testing.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -122,6 +122,8 @@ export declare class OrderService {
|
|
|
122
122
|
* User's Customer account.
|
|
123
123
|
*/
|
|
124
124
|
create(ctx: RequestContext, userId?: ID): Promise<Order>;
|
|
125
|
+
createDraft(ctx: RequestContext): Promise<Order>;
|
|
126
|
+
private createEmptyOrderEntity;
|
|
125
127
|
/**
|
|
126
128
|
* @description
|
|
127
129
|
* Updates the custom fields of an Order.
|
|
@@ -354,7 +356,7 @@ export declare class OrderService {
|
|
|
354
356
|
*/
|
|
355
357
|
private assertQuantityIsPositive;
|
|
356
358
|
/**
|
|
357
|
-
* Returns error if the Order is not in the "AddingItems" state.
|
|
359
|
+
* Returns error if the Order is not in the "AddingItems" or "Draft" state.
|
|
358
360
|
*/
|
|
359
361
|
private assertAddingItemsState;
|
|
360
362
|
/**
|
|
@@ -31,7 +31,6 @@ const order_modification_entity_1 = require("../../entity/order-modification/ord
|
|
|
31
31
|
const order_entity_1 = require("../../entity/order/order.entity");
|
|
32
32
|
const payment_entity_1 = require("../../entity/payment/payment.entity");
|
|
33
33
|
const product_variant_entity_1 = require("../../entity/product-variant/product-variant.entity");
|
|
34
|
-
const promotion_entity_1 = require("../../entity/promotion/promotion.entity");
|
|
35
34
|
const refund_entity_1 = require("../../entity/refund/refund.entity");
|
|
36
35
|
const shipping_line_entity_1 = require("../../entity/shipping-line/shipping-line.entity");
|
|
37
36
|
const allocation_entity_1 = require("../../entity/stock-movement/allocation.entity");
|
|
@@ -208,6 +207,7 @@ let OrderService = class OrderService {
|
|
|
208
207
|
channelId: ctx.channelId,
|
|
209
208
|
ctx,
|
|
210
209
|
})
|
|
210
|
+
.andWhere('order.state != :draftState', { draftState: 'Draft' })
|
|
211
211
|
.andWhere('order.customer.id = :customerId', { customerId })
|
|
212
212
|
.getManyAndCount()
|
|
213
213
|
.then(([items, totalItems]) => {
|
|
@@ -293,19 +293,7 @@ let OrderService = class OrderService {
|
|
|
293
293
|
* User's Customer account.
|
|
294
294
|
*/
|
|
295
295
|
async create(ctx, userId) {
|
|
296
|
-
const newOrder =
|
|
297
|
-
code: await this.configService.orderOptions.orderCodeStrategy.generate(ctx),
|
|
298
|
-
state: this.orderStateMachine.getInitialState(),
|
|
299
|
-
lines: [],
|
|
300
|
-
surcharges: [],
|
|
301
|
-
couponCodes: [],
|
|
302
|
-
modifications: [],
|
|
303
|
-
shippingAddress: {},
|
|
304
|
-
billingAddress: {},
|
|
305
|
-
subTotal: 0,
|
|
306
|
-
subTotalWithTax: 0,
|
|
307
|
-
currencyCode: ctx.channel.currencyCode,
|
|
308
|
-
});
|
|
296
|
+
const newOrder = await this.createEmptyOrderEntity(ctx);
|
|
309
297
|
if (userId) {
|
|
310
298
|
const customer = await this.customerService.findOneByUserId(ctx, userId);
|
|
311
299
|
if (customer) {
|
|
@@ -322,6 +310,34 @@ let OrderService = class OrderService {
|
|
|
322
310
|
}
|
|
323
311
|
return transitionResult;
|
|
324
312
|
}
|
|
313
|
+
async createDraft(ctx) {
|
|
314
|
+
const newOrder = await this.createEmptyOrderEntity(ctx);
|
|
315
|
+
newOrder.active = false;
|
|
316
|
+
await this.channelService.assignToCurrentChannel(newOrder, ctx);
|
|
317
|
+
const order = await this.connection.getRepository(ctx, order_entity_1.Order).save(newOrder);
|
|
318
|
+
this.eventBus.publish(new index_3.OrderEvent(ctx, order, 'created'));
|
|
319
|
+
const transitionResult = await this.transitionToState(ctx, order.id, 'Draft');
|
|
320
|
+
if (error_result_1.isGraphQlErrorResult(transitionResult)) {
|
|
321
|
+
// this should never occur, so we will throw rather than return
|
|
322
|
+
throw transitionResult;
|
|
323
|
+
}
|
|
324
|
+
return transitionResult;
|
|
325
|
+
}
|
|
326
|
+
async createEmptyOrderEntity(ctx) {
|
|
327
|
+
return new order_entity_1.Order({
|
|
328
|
+
code: await this.configService.orderOptions.orderCodeStrategy.generate(ctx),
|
|
329
|
+
state: this.orderStateMachine.getInitialState(),
|
|
330
|
+
lines: [],
|
|
331
|
+
surcharges: [],
|
|
332
|
+
couponCodes: [],
|
|
333
|
+
modifications: [],
|
|
334
|
+
shippingAddress: {},
|
|
335
|
+
billingAddress: {},
|
|
336
|
+
subTotal: 0,
|
|
337
|
+
subTotalWithTax: 0,
|
|
338
|
+
currencyCode: ctx.channel.currencyCode,
|
|
339
|
+
});
|
|
340
|
+
}
|
|
325
341
|
/**
|
|
326
342
|
* @description
|
|
327
343
|
* Updates the custom fields of an Order.
|
|
@@ -558,10 +574,16 @@ let OrderService = class OrderService {
|
|
|
558
574
|
async setShippingAddress(ctx, orderId, input) {
|
|
559
575
|
const order = await this.getOrderOrThrow(ctx, orderId);
|
|
560
576
|
const country = await this.countryService.findOneByCode(ctx, input.countryCode);
|
|
561
|
-
|
|
562
|
-
await this.connection
|
|
577
|
+
const shippingAddress = Object.assign(Object.assign({}, input), { countryCode: input.countryCode, country: country.name });
|
|
578
|
+
await this.connection
|
|
579
|
+
.getRepository(ctx, order_entity_1.Order)
|
|
580
|
+
.createQueryBuilder('order')
|
|
581
|
+
.update(order_entity_1.Order)
|
|
582
|
+
.set({ shippingAddress })
|
|
583
|
+
.where('id = :id', { id: order.id });
|
|
584
|
+
order.shippingAddress = shippingAddress;
|
|
563
585
|
// Since a changed ShippingAddress could alter the activeTaxZone,
|
|
564
|
-
// we will remove any cached activeTaxZone so it can be re-calculated
|
|
586
|
+
// we will remove any cached activeTaxZone, so it can be re-calculated
|
|
565
587
|
// as needed.
|
|
566
588
|
this.requestCache.set(ctx, 'activeTaxZone', undefined);
|
|
567
589
|
return this.applyPriceAdjustments(ctx, order, order.lines);
|
|
@@ -573,10 +595,16 @@ let OrderService = class OrderService {
|
|
|
573
595
|
async setBillingAddress(ctx, orderId, input) {
|
|
574
596
|
const order = await this.getOrderOrThrow(ctx, orderId);
|
|
575
597
|
const country = await this.countryService.findOneByCode(ctx, input.countryCode);
|
|
576
|
-
|
|
577
|
-
await this.connection
|
|
578
|
-
|
|
579
|
-
|
|
598
|
+
const billingAddress = Object.assign(Object.assign({}, input), { countryCode: input.countryCode, country: country.name });
|
|
599
|
+
await this.connection
|
|
600
|
+
.getRepository(ctx, order_entity_1.Order)
|
|
601
|
+
.createQueryBuilder('order')
|
|
602
|
+
.update(order_entity_1.Order)
|
|
603
|
+
.set({ billingAddress })
|
|
604
|
+
.where('id = :id', { id: order.id });
|
|
605
|
+
order.billingAddress = billingAddress;
|
|
606
|
+
// Since a changed BillingAddress could alter the activeTaxZone,
|
|
607
|
+
// we will remove any cached activeTaxZone, so it can be re-calculated
|
|
580
608
|
// as needed.
|
|
581
609
|
this.requestCache.set(ctx, 'activeTaxZone', undefined);
|
|
582
610
|
return this.applyPriceAdjustments(ctx, order, order.lines);
|
|
@@ -1294,10 +1322,10 @@ let OrderService = class OrderService {
|
|
|
1294
1322
|
}
|
|
1295
1323
|
}
|
|
1296
1324
|
/**
|
|
1297
|
-
* Returns error if the Order is not in the "AddingItems" state.
|
|
1325
|
+
* Returns error if the Order is not in the "AddingItems" or "Draft" state.
|
|
1298
1326
|
*/
|
|
1299
1327
|
assertAddingItemsState(order) {
|
|
1300
|
-
if (order.state !== 'AddingItems') {
|
|
1328
|
+
if (order.state !== 'AddingItems' && order.state !== 'Draft') {
|
|
1301
1329
|
return new generated_graphql_shop_errors_1.OrderModificationError();
|
|
1302
1330
|
}
|
|
1303
1331
|
}
|
|
@@ -1330,14 +1358,16 @@ let OrderService = class OrderService {
|
|
|
1330
1358
|
*/
|
|
1331
1359
|
async applyPriceAdjustments(ctx, order, updatedOrderLines) {
|
|
1332
1360
|
var _a, _b;
|
|
1361
|
+
const promotions = await this.promotionService.getActivePromotionsInChannel(ctx);
|
|
1362
|
+
const activePromotionsPre = await this.promotionService.getActivePromotionsOnOrder(ctx, order.id);
|
|
1333
1363
|
if (updatedOrderLines === null || updatedOrderLines === void 0 ? void 0 : updatedOrderLines.length) {
|
|
1334
1364
|
const { orderItemPriceCalculationStrategy, changedPriceHandlingStrategy } = this.configService.orderOptions;
|
|
1335
1365
|
for (const updatedOrderLine of updatedOrderLines) {
|
|
1336
1366
|
const variant = await this.productVariantService.applyChannelPriceAndTax(updatedOrderLine.productVariant, ctx, order);
|
|
1337
|
-
let priceResult = await orderItemPriceCalculationStrategy.calculateUnitPrice(ctx, variant, updatedOrderLine.customFields || {});
|
|
1367
|
+
let priceResult = await orderItemPriceCalculationStrategy.calculateUnitPrice(ctx, variant, updatedOrderLine.customFields || {}, order);
|
|
1338
1368
|
const initialListPrice = (_b = (_a = updatedOrderLine.items.find(i => i.initialListPrice != null)) === null || _a === void 0 ? void 0 : _a.initialListPrice) !== null && _b !== void 0 ? _b : priceResult.price;
|
|
1339
1369
|
if (initialListPrice !== priceResult.price) {
|
|
1340
|
-
priceResult = await changedPriceHandlingStrategy.handlePriceChange(ctx, priceResult, updatedOrderLine.items);
|
|
1370
|
+
priceResult = await changedPriceHandlingStrategy.handlePriceChange(ctx, priceResult, updatedOrderLine.items, order);
|
|
1341
1371
|
}
|
|
1342
1372
|
for (const item of updatedOrderLine.items) {
|
|
1343
1373
|
if (item.initialListPrice == null) {
|
|
@@ -1348,15 +1378,6 @@ let OrderService = class OrderService {
|
|
|
1348
1378
|
}
|
|
1349
1379
|
}
|
|
1350
1380
|
}
|
|
1351
|
-
const promotions = await this.connection
|
|
1352
|
-
.getRepository(ctx, promotion_entity_1.Promotion)
|
|
1353
|
-
.createQueryBuilder('promotion')
|
|
1354
|
-
.leftJoin('promotion.channels', 'channel')
|
|
1355
|
-
.where('channel.id = :channelId', { channelId: ctx.channelId })
|
|
1356
|
-
.andWhere('promotion.deletedAt IS NULL')
|
|
1357
|
-
.andWhere('promotion.enabled = :enabled', { enabled: true })
|
|
1358
|
-
.orderBy('promotion.priorityScore', 'ASC')
|
|
1359
|
-
.getMany();
|
|
1360
1381
|
const updatedItems = await this.orderCalculator.applyPriceAdjustments(ctx, order, promotions, updatedOrderLines !== null && updatedOrderLines !== void 0 ? updatedOrderLines : []);
|
|
1361
1382
|
const updateFields = [
|
|
1362
1383
|
'initialListPrice',
|
|
@@ -1379,7 +1400,8 @@ let OrderService = class OrderService {
|
|
|
1379
1400
|
.execute();
|
|
1380
1401
|
await this.connection.getRepository(ctx, order_entity_1.Order).save(order, { reload: false });
|
|
1381
1402
|
await this.connection.getRepository(ctx, shipping_line_entity_1.ShippingLine).save(order.shippingLines, { reload: false });
|
|
1382
|
-
|
|
1403
|
+
await this.promotionService.runPromotionSideEffects(ctx, order, activePromotionsPre);
|
|
1404
|
+
return utils_1.assertFound(this.findOne(ctx, order.id));
|
|
1383
1405
|
}
|
|
1384
1406
|
async getOrderWithFulfillments(ctx, orderId) {
|
|
1385
1407
|
return await this.connection.getEntityOrThrow(ctx, order_entity_1.Order, orderId, {
|