@vendure/core 2.0.0-next.10 → 2.0.0-next.13
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/common/custom-field-relation-resolver.service.d.ts +3 -1
- package/dist/api/common/custom-field-relation-resolver.service.js +7 -5
- package/dist/api/common/custom-field-relation-resolver.service.js.map +1 -1
- package/dist/api/config/generate-resolvers.d.ts +3 -0
- package/dist/api/config/generate-resolvers.js +7 -1
- package/dist/api/config/generate-resolvers.js.map +1 -1
- package/dist/api/resolvers/admin/collection.resolver.js +8 -2
- package/dist/api/resolvers/admin/collection.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/order.resolver.d.ts +2 -1
- package/dist/api/resolvers/admin/order.resolver.js +13 -0
- package/dist/api/resolvers/admin/order.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/product-option.resolver.d.ts +2 -1
- package/dist/api/resolvers/admin/product-option.resolver.js +13 -0
- package/dist/api/resolvers/admin/product-option.resolver.js.map +1 -1
- package/dist/api/resolvers/base/base-auth.resolver.d.ts +2 -2
- package/dist/api/resolvers/base/base-auth.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/fulfillment-entity.resolver.d.ts +8 -2
- package/dist/api/resolvers/entity/fulfillment-entity.resolver.js +17 -3
- package/dist/api/resolvers/entity/fulfillment-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/order-item-entity.resolver.d.ts +3 -1
- package/dist/api/resolvers/entity/order-item-entity.resolver.js +9 -3
- package/dist/api/resolvers/entity/order-item-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/order-line-entity.resolver.d.ts +5 -3
- package/dist/api/resolvers/entity/order-line-entity.resolver.js +19 -2
- package/dist/api/resolvers/entity/order-line-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/payment-entity.resolver.d.ts +3 -1
- package/dist/api/resolvers/entity/payment-entity.resolver.js +6 -3
- package/dist/api/resolvers/entity/payment-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/product-option-group-entity.resolver.js +8 -3
- package/dist/api/resolvers/entity/product-option-group-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/shop/shop-order.resolver.js +3 -11
- package/dist/api/resolvers/shop/shop-order.resolver.js.map +1 -1
- package/dist/api/resolvers/shop/shop-products.resolver.js +8 -2
- package/dist/api/resolvers/shop/shop-products.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/order.api.graphql +11 -0
- package/dist/api/schema/admin-api/product-option-group.api.graphql +2 -0
- package/dist/api/schema/common/order.type.graphql +7 -0
- package/dist/bootstrap.js +2 -3
- package/dist/bootstrap.js.map +1 -1
- package/dist/common/configurable-operation.js +9 -4
- package/dist/common/configurable-operation.js.map +1 -1
- package/dist/common/error/generated-graphql-admin-errors.d.ts +12 -0
- package/dist/common/error/generated-graphql-admin-errors.js +17 -2
- package/dist/common/error/generated-graphql-admin-errors.js.map +1 -1
- package/dist/config/asset-naming-strategy/default-asset-naming-strategy.js +1 -1
- package/dist/config/asset-naming-strategy/default-asset-naming-strategy.js.map +1 -1
- 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/entity-id-strategy/entity-id-strategy.d.ts +7 -0
- package/dist/config/fulfillment/custom-fulfillment-process.d.ts +2 -2
- package/dist/config/logger/vendure-logger.d.ts +1 -0
- package/dist/config/logger/vendure-logger.js.map +1 -1
- package/dist/config/order/custom-order-process.d.ts +2 -2
- package/dist/config/order/order-item-price-calculation-strategy.d.ts +3 -0
- package/dist/config/payment/custom-payment-process.d.ts +2 -2
- package/dist/config/payment/dummy-payment-method-handler.js +8 -0
- package/dist/config/payment/dummy-payment-method-handler.js.map +1 -1
- package/dist/config/payment/payment-method-handler.d.ts +66 -0
- package/dist/config/payment/payment-method-handler.js +11 -1
- package/dist/config/payment/payment-method-handler.js.map +1 -1
- package/dist/config/promotion/actions/order-fixed-discount-action.js +1 -1
- package/dist/config/promotion/actions/order-fixed-discount-action.js.map +1 -1
- package/dist/config/vendure-config.d.ts +9 -0
- package/dist/connection/connection.module.d.ts +1 -1
- package/dist/connection/remove-custom-fields-with-eager-relations.d.ts +34 -0
- package/dist/connection/remove-custom-fields-with-eager-relations.js +55 -0
- package/dist/connection/remove-custom-fields-with-eager-relations.js.map +1 -0
- package/dist/connection/transactional-connection.js +22 -3
- package/dist/connection/transactional-connection.js.map +1 -1
- package/dist/entity/order-line/order-line.entity.js +4 -0
- package/dist/entity/order-line/order-line.entity.js.map +1 -1
- package/dist/entity/product-option/product-option-translation.entity.js.map +1 -1
- package/dist/entity/product-option-group/product-option-group-translation.entity.js.map +1 -1
- package/dist/event-bus/events/product-option-event.d.ts +1 -1
- package/dist/event-bus/events/product-option-event.js.map +1 -1
- package/dist/event-bus/events/product-option-group-event.d.ts +1 -1
- package/dist/event-bus/events/product-option-group-event.js.map +1 -1
- package/dist/i18n/messages/en.json +3 -0
- package/dist/migrate.js +14 -0
- package/dist/migrate.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +33 -33
- 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 +7 -7
- 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 +1 -0
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-common.js +8 -1
- 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.d.ts +11 -1
- package/dist/plugin/default-search-plugin/search-strategy/search-strategy-utils.js +31 -1
- 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 +29 -29
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js.map +1 -1
- package/dist/plugin/plugin-metadata.js +2 -1
- package/dist/plugin/plugin-metadata.js.map +1 -1
- package/dist/plugin/vendure-plugin.d.ts +11 -2
- package/dist/plugin/vendure-plugin.js.map +1 -1
- package/dist/service/helpers/config-arg/config-arg.service.d.ts +1 -0
- package/dist/service/helpers/config-arg/config-arg.service.js +12 -1
- package/dist/service/helpers/config-arg/config-arg.service.js.map +1 -1
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.d.ts +3 -1
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js +6 -4
- package/dist/service/helpers/entity-hydrator/entity-hydrator.service.js.map +1 -1
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state.d.ts +9 -1
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state.js.map +1 -1
- 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 +10 -5
- 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/locale-string-hydrator/locale-string-hydrator.d.ts +3 -1
- package/dist/service/helpers/locale-string-hydrator/locale-string-hydrator.js +6 -4
- package/dist/service/helpers/locale-string-hydrator/locale-string-hydrator.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 +19 -1
- package/dist/service/helpers/order-modifier/order-modifier.js +57 -21
- package/dist/service/helpers/order-modifier/order-modifier.js.map +1 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.js +1 -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 +9 -1
- package/dist/service/helpers/order-state-machine/order-state.js.map +1 -1
- package/dist/service/helpers/payment-state-machine/payment-state.d.ts +9 -1
- package/dist/service/helpers/payment-state-machine/payment-state.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 +11 -1
- 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/helpers/translator/translator.service.d.ts +10 -0
- package/dist/service/helpers/translator/translator.service.js +29 -0
- package/dist/service/helpers/translator/translator.service.js.map +1 -0
- package/dist/service/helpers/utils/translate-entity.d.ts +3 -3
- package/dist/service/helpers/utils/translate-entity.js +11 -2
- package/dist/service/helpers/utils/translate-entity.js.map +1 -1
- package/dist/service/index.d.ts +1 -0
- package/dist/service/index.js +1 -0
- package/dist/service/index.js.map +1 -1
- package/dist/service/service.module.js +2 -0
- package/dist/service/service.module.js.map +1 -1
- package/dist/service/services/collection.service.d.ts +3 -1
- package/dist/service/services/collection.service.js +14 -12
- package/dist/service/services/collection.service.js.map +1 -1
- package/dist/service/services/country.service.d.ts +3 -1
- package/dist/service/services/country.service.js +9 -7
- package/dist/service/services/country.service.js.map +1 -1
- package/dist/service/services/customer.service.d.ts +12 -1
- package/dist/service/services/customer.service.js +39 -6
- package/dist/service/services/customer.service.js.map +1 -1
- package/dist/service/services/facet-value.service.d.ts +3 -1
- package/dist/service/services/facet-value.service.js +9 -5
- package/dist/service/services/facet-value.service.js.map +1 -1
- package/dist/service/services/facet.service.d.ts +3 -1
- package/dist/service/services/facet.service.js +9 -5
- package/dist/service/services/facet.service.js.map +1 -1
- package/dist/service/services/fulfillment.service.d.ts +9 -0
- package/dist/service/services/fulfillment.service.js +48 -8
- package/dist/service/services/fulfillment.service.js.map +1 -1
- package/dist/service/services/order-testing.service.d.ts +3 -1
- package/dist/service/services/order-testing.service.js +6 -4
- package/dist/service/services/order-testing.service.js.map +1 -1
- package/dist/service/services/order.service.d.ts +10 -2
- package/dist/service/services/order.service.js +58 -28
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/payment.service.d.ts +2 -0
- package/dist/service/services/payment.service.js +30 -10
- package/dist/service/services/payment.service.js.map +1 -1
- package/dist/service/services/product-option-group.service.d.ts +24 -2
- package/dist/service/services/product-option-group.service.js +92 -6
- package/dist/service/services/product-option-group.service.js.map +1 -1
- package/dist/service/services/product-option.service.d.ts +15 -2
- package/dist/service/services/product-option.service.js +66 -5
- package/dist/service/services/product-option.service.js.map +1 -1
- package/dist/service/services/product-variant.service.d.ts +3 -1
- package/dist/service/services/product-variant.service.js +13 -22
- package/dist/service/services/product-variant.service.js.map +1 -1
- package/dist/service/services/product.service.d.ts +5 -1
- package/dist/service/services/product.service.js +55 -20
- 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/dist/service/services/shipping-method.service.d.ts +3 -1
- package/dist/service/services/shipping-method.service.js +8 -6
- package/dist/service/services/shipping-method.service.js.map +1 -1
- package/dist/service/services/stock-movement.service.js +8 -7
- package/dist/service/services/stock-movement.service.js.map +1 -1
- package/dist/service/services/user.service.d.ts +1 -1
- package/dist/service/services/user.service.js +13 -0
- package/dist/service/services/user.service.js.map +1 -1
- package/dist/service/services/zone.service.d.ts +3 -1
- package/dist/service/services/zone.service.js +8 -6
- package/dist/service/services/zone.service.js.map +1 -1
- package/package.json +3 -3
|
@@ -23,6 +23,7 @@ const event_bus_1 = require("../../event-bus");
|
|
|
23
23
|
const facet_value_event_1 = require("../../event-bus/events/facet-value-event");
|
|
24
24
|
const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
|
|
25
25
|
const translatable_saver_1 = require("../helpers/translatable-saver/translatable-saver");
|
|
26
|
+
const translator_service_1 = require("../helpers/translator/translator.service");
|
|
26
27
|
const translate_entity_1 = require("../helpers/utils/translate-entity");
|
|
27
28
|
const channel_service_1 = require("./channel.service");
|
|
28
29
|
/**
|
|
@@ -32,19 +33,21 @@ const channel_service_1 = require("./channel.service");
|
|
|
32
33
|
* @docsCategory services
|
|
33
34
|
*/
|
|
34
35
|
let FacetValueService = class FacetValueService {
|
|
35
|
-
constructor(connection, translatableSaver, configService, customFieldRelationService, channelService, eventBus) {
|
|
36
|
+
constructor(connection, translatableSaver, configService, customFieldRelationService, channelService, eventBus, translator) {
|
|
36
37
|
this.connection = connection;
|
|
37
38
|
this.translatableSaver = translatableSaver;
|
|
38
39
|
this.configService = configService;
|
|
39
40
|
this.customFieldRelationService = customFieldRelationService;
|
|
40
41
|
this.channelService = channelService;
|
|
41
42
|
this.eventBus = eventBus;
|
|
43
|
+
this.translator = translator;
|
|
42
44
|
}
|
|
43
45
|
findAll(ctxOrLang, lang) {
|
|
44
46
|
const [repository, languageCode] = ctxOrLang instanceof request_context_1.RequestContext
|
|
45
47
|
? // tslint:disable-next-line:no-non-null-assertion
|
|
46
48
|
[this.connection.getRepository(ctxOrLang, facet_value_entity_1.FacetValue), lang]
|
|
47
49
|
: [this.connection.rawConnection.getRepository(facet_value_entity_1.FacetValue), ctxOrLang];
|
|
50
|
+
// TODO: Implement usage of channelLanguageCode
|
|
48
51
|
return repository
|
|
49
52
|
.find({
|
|
50
53
|
relations: ['facet'],
|
|
@@ -57,13 +60,13 @@ let FacetValueService = class FacetValueService {
|
|
|
57
60
|
.findOne(id, {
|
|
58
61
|
relations: ['facet'],
|
|
59
62
|
})
|
|
60
|
-
.then(facetValue => facetValue &&
|
|
63
|
+
.then(facetValue => facetValue && this.translator.translate(facetValue, ctx, ['facet']));
|
|
61
64
|
}
|
|
62
65
|
findByIds(ctx, ids) {
|
|
63
66
|
const facetValues = this.connection.findByIdsInChannel(ctx, facet_value_entity_1.FacetValue, ids, ctx.channelId, {
|
|
64
67
|
relations: ['facet'],
|
|
65
68
|
});
|
|
66
|
-
return facetValues.then(values => values.map(facetValue =>
|
|
69
|
+
return facetValues.then(values => values.map(facetValue => this.translator.translate(facetValue, ctx, ['facet'])));
|
|
67
70
|
}
|
|
68
71
|
/**
|
|
69
72
|
* @description
|
|
@@ -77,7 +80,7 @@ let FacetValueService = class FacetValueService {
|
|
|
77
80
|
facet: { id },
|
|
78
81
|
},
|
|
79
82
|
})
|
|
80
|
-
.then(values => values.map(facetValue =>
|
|
83
|
+
.then(values => values.map(facetValue => this.translator.translate(facetValue, ctx)));
|
|
81
84
|
}
|
|
82
85
|
async create(ctx, facet, input) {
|
|
83
86
|
const facetValue = await this.translatableSaver.create({
|
|
@@ -163,7 +166,8 @@ FacetValueService = __decorate([
|
|
|
163
166
|
config_service_1.ConfigService,
|
|
164
167
|
custom_field_relation_service_1.CustomFieldRelationService,
|
|
165
168
|
channel_service_1.ChannelService,
|
|
166
|
-
event_bus_1.EventBus
|
|
169
|
+
event_bus_1.EventBus,
|
|
170
|
+
translator_service_1.TranslatorService])
|
|
167
171
|
], FacetValueService);
|
|
168
172
|
exports.FacetValueService = FacetValueService;
|
|
169
173
|
//# sourceMappingURL=facet-value.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"facet-value.service.js","sourceRoot":"","sources":["../../../src/service/services/facet-value.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAO6C;AAG7C,sEAAkE;AAElE,8CAAiD;AACjD,gEAA4D;AAC5D,wFAAoF;AACpF,yCAAuD;AACvD,4GAAgG;AAChG,oFAAyE;AAEzE,+CAA2C;AAC3C,gFAA2E;AAC3E,kHAA4G;AAC5G,yFAAqF;AACrF,wEAAkE;AAElE,uDAAmD;AAEnD;;;;;GAKG;AAEH,IAAa,iBAAiB,GAA9B,MAAa,iBAAiB;IAC1B,YACY,UAAmC,EACnC,iBAAoC,EACpC,aAA4B,EAC5B,0BAAsD,EACtD,cAA8B,EAC9B,QAAkB;
|
|
1
|
+
{"version":3,"file":"facet-value.service.js","sourceRoot":"","sources":["../../../src/service/services/facet-value.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ import { EventBus } from '../../event-bus';
|
|
|
11
11
|
import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
|
|
12
12
|
import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
|
|
13
13
|
import { TranslatableSaver } from '../helpers/translatable-saver/translatable-saver';
|
|
14
|
+
import { TranslatorService } from '../helpers/translator/translator.service';
|
|
14
15
|
import { ChannelService } from './channel.service';
|
|
15
16
|
import { FacetValueService } from './facet-value.service';
|
|
16
17
|
/**
|
|
@@ -28,7 +29,8 @@ export declare class FacetService {
|
|
|
28
29
|
private channelService;
|
|
29
30
|
private customFieldRelationService;
|
|
30
31
|
private eventBus;
|
|
31
|
-
|
|
32
|
+
private translator;
|
|
33
|
+
constructor(connection: TransactionalConnection, facetValueService: FacetValueService, translatableSaver: TranslatableSaver, listQueryBuilder: ListQueryBuilder, configService: ConfigService, channelService: ChannelService, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus, translator: TranslatorService);
|
|
32
34
|
findAll(ctx: RequestContext, options?: ListQueryOptions<Facet>, relations?: RelationPaths<Facet>): Promise<PaginatedList<Translated<Facet>>>;
|
|
33
35
|
findOne(ctx: RequestContext, facetId: ID, relations?: RelationPaths<Facet>): Promise<Translated<Facet> | undefined>;
|
|
34
36
|
/**
|
|
@@ -23,6 +23,7 @@ const facet_event_1 = require("../../event-bus/events/facet-event");
|
|
|
23
23
|
const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
|
|
24
24
|
const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
|
|
25
25
|
const translatable_saver_1 = require("../helpers/translatable-saver/translatable-saver");
|
|
26
|
+
const translator_service_1 = require("../helpers/translator/translator.service");
|
|
26
27
|
const translate_entity_1 = require("../helpers/utils/translate-entity");
|
|
27
28
|
const channel_service_1 = require("./channel.service");
|
|
28
29
|
const facet_value_service_1 = require("./facet-value.service");
|
|
@@ -33,7 +34,7 @@ const facet_value_service_1 = require("./facet-value.service");
|
|
|
33
34
|
* @docsCategory services
|
|
34
35
|
*/
|
|
35
36
|
let FacetService = class FacetService {
|
|
36
|
-
constructor(connection, facetValueService, translatableSaver, listQueryBuilder, configService, channelService, customFieldRelationService, eventBus) {
|
|
37
|
+
constructor(connection, facetValueService, translatableSaver, listQueryBuilder, configService, channelService, customFieldRelationService, eventBus, translator) {
|
|
37
38
|
this.connection = connection;
|
|
38
39
|
this.facetValueService = facetValueService;
|
|
39
40
|
this.translatableSaver = translatableSaver;
|
|
@@ -42,6 +43,7 @@ let FacetService = class FacetService {
|
|
|
42
43
|
this.channelService = channelService;
|
|
43
44
|
this.customFieldRelationService = customFieldRelationService;
|
|
44
45
|
this.eventBus = eventBus;
|
|
46
|
+
this.translator = translator;
|
|
45
47
|
}
|
|
46
48
|
findAll(ctx, options, relations) {
|
|
47
49
|
return this.listQueryBuilder
|
|
@@ -52,7 +54,7 @@ let FacetService = class FacetService {
|
|
|
52
54
|
})
|
|
53
55
|
.getManyAndCount()
|
|
54
56
|
.then(([facets, totalItems]) => {
|
|
55
|
-
const items = facets.map(facet =>
|
|
57
|
+
const items = facets.map(facet => this.translator.translate(facet, ctx, ['values', ['values', 'facet']]));
|
|
56
58
|
return {
|
|
57
59
|
items,
|
|
58
60
|
totalItems,
|
|
@@ -64,7 +66,7 @@ let FacetService = class FacetService {
|
|
|
64
66
|
.findOneInChannel(ctx, facet_entity_1.Facet, facetId, ctx.channelId, {
|
|
65
67
|
relations: relations !== null && relations !== void 0 ? relations : ['values', 'values.facet', 'channels'],
|
|
66
68
|
})
|
|
67
|
-
.then(facet => facet &&
|
|
69
|
+
.then(facet => facet && this.translator.translate(facet, ctx, ['values', ['values', 'facet']]));
|
|
68
70
|
}
|
|
69
71
|
findByCode(ctxOrFacetCode, facetCodeOrLang, lang) {
|
|
70
72
|
const relations = ['values', 'values.facet'];
|
|
@@ -76,6 +78,7 @@ let FacetService = class FacetService {
|
|
|
76
78
|
ctxOrFacetCode,
|
|
77
79
|
facetCodeOrLang,
|
|
78
80
|
];
|
|
81
|
+
// TODO: Implement usage of channelLanguageCode
|
|
79
82
|
return repository
|
|
80
83
|
.findOne({
|
|
81
84
|
where: {
|
|
@@ -98,7 +101,7 @@ let FacetService = class FacetService {
|
|
|
98
101
|
.where('facetValue.id = :id', { id })
|
|
99
102
|
.getOne();
|
|
100
103
|
if (facet) {
|
|
101
|
-
return
|
|
104
|
+
return this.translator.translate(facet, ctx);
|
|
102
105
|
}
|
|
103
106
|
}
|
|
104
107
|
async create(ctx, input) {
|
|
@@ -202,7 +205,8 @@ FacetService = __decorate([
|
|
|
202
205
|
config_service_1.ConfigService,
|
|
203
206
|
channel_service_1.ChannelService,
|
|
204
207
|
custom_field_relation_service_1.CustomFieldRelationService,
|
|
205
|
-
event_bus_1.EventBus
|
|
208
|
+
event_bus_1.EventBus,
|
|
209
|
+
translator_service_1.TranslatorService])
|
|
206
210
|
], FacetService);
|
|
207
211
|
exports.FacetService = FacetService;
|
|
208
212
|
//# 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,yEAM6C;AAG7C,sEAAkE;AAIlE,8CAA8D;AAC9D,gEAA4D;AAC5D,wFAAoF;AACpF,0FAA+E;AAC/E,kEAAwD;AACxD,+CAA2C;AAC3C,oEAAgE;AAChE,kHAA4G;AAC5G,yFAAoF;AACpF,yFAAqF;AACrF,wEAAkE;AAElE,uDAAmD;AACnD,+DAA0D;AAE1D;;;;;GAKG;AAEH,IAAa,YAAY,GAAzB,MAAa,YAAY;IACrB,YACY,UAAmC,EACnC,iBAAoC,EACpC,iBAAoC,EACpC,gBAAkC,EAClC,aAA4B,EAC5B,cAA8B,EAC9B,0BAAsD,EACtD,QAAkB;
|
|
1
|
+
{"version":3,"file":"facet.service.js","sourceRoot":"","sources":["../../../src/service/services/facet.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { CreateFulfillmentError, FulfillmentStateTransitionError, InvalidFulfill
|
|
|
5
5
|
import { ConfigService } from '../../config/config.service';
|
|
6
6
|
import { TransactionalConnection } from '../../connection/transactional-connection';
|
|
7
7
|
import { Fulfillment } from '../../entity/fulfillment/fulfillment.entity';
|
|
8
|
+
import { OrderLine } from '../../entity/index';
|
|
8
9
|
import { OrderItem } from '../../entity/order-item/order-item.entity';
|
|
9
10
|
import { Order } from '../../entity/order/order.entity';
|
|
10
11
|
import { EventBus } from '../../event-bus/event-bus';
|
|
@@ -36,6 +37,14 @@ export declare class FulfillmentService {
|
|
|
36
37
|
* Returns all OrderItems associated with the specified Fulfillment.
|
|
37
38
|
*/
|
|
38
39
|
getOrderItemsByFulfillmentId(ctx: RequestContext, id: ID): Promise<OrderItem[]>;
|
|
40
|
+
getFulfillmentLineSummary(ctx: RequestContext, id: ID): Promise<Array<{
|
|
41
|
+
orderLine: OrderLine;
|
|
42
|
+
quantity: number;
|
|
43
|
+
}>>;
|
|
44
|
+
getFulfillmentsByOrderLineId(ctx: RequestContext, orderLineId: ID): Promise<Array<{
|
|
45
|
+
fulfillment: Fulfillment;
|
|
46
|
+
orderItemIds: Set<ID>;
|
|
47
|
+
}>>;
|
|
39
48
|
/**
|
|
40
49
|
* @description
|
|
41
50
|
* Returns the Fulfillment for the given OrderItem (if one exists).
|
|
@@ -12,11 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.FulfillmentService = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
14
|
const shared_utils_1 = require("@vendure/common/lib/shared-utils");
|
|
15
|
+
const unique_1 = require("@vendure/common/lib/unique");
|
|
15
16
|
const generated_graphql_admin_errors_1 = require("../../common/error/generated-graphql-admin-errors");
|
|
16
17
|
const config_service_1 = require("../../config/config.service");
|
|
17
18
|
const transactional_connection_1 = require("../../connection/transactional-connection");
|
|
18
19
|
const fulfillment_entity_1 = require("../../entity/fulfillment/fulfillment.entity");
|
|
20
|
+
const index_1 = require("../../entity/index");
|
|
19
21
|
const order_item_entity_1 = require("../../entity/order-item/order-item.entity");
|
|
22
|
+
const order_entity_1 = require("../../entity/order/order.entity");
|
|
20
23
|
const event_bus_1 = require("../../event-bus/event-bus");
|
|
21
24
|
const fulfillment_event_1 = require("../../event-bus/events/fulfillment-event");
|
|
22
25
|
const fulfillment_state_transition_event_1 = require("../../event-bus/events/fulfillment-state-transition-event");
|
|
@@ -79,6 +82,43 @@ let FulfillmentService = class FulfillmentService {
|
|
|
79
82
|
const fulfillment = await this.findOneOrThrow(ctx, id);
|
|
80
83
|
return fulfillment.orderItems;
|
|
81
84
|
}
|
|
85
|
+
async getFulfillmentLineSummary(ctx, id) {
|
|
86
|
+
const result = await this.connection
|
|
87
|
+
.getRepository(ctx, index_1.OrderLine)
|
|
88
|
+
.createQueryBuilder('line')
|
|
89
|
+
.leftJoinAndSelect('line.items', 'item')
|
|
90
|
+
.leftJoin('item.fulfillments', 'fulfillment')
|
|
91
|
+
.select('line.id', 'lineId')
|
|
92
|
+
.addSelect('COUNT(item.id)', 'itemCount')
|
|
93
|
+
.groupBy('line.id')
|
|
94
|
+
.where('fulfillment.id = :id', { id })
|
|
95
|
+
.getRawMany();
|
|
96
|
+
return Promise.all(result.map(async ({ lineId, itemCount }) => {
|
|
97
|
+
return {
|
|
98
|
+
orderLine: await this.connection.getEntityOrThrow(ctx, index_1.OrderLine, lineId),
|
|
99
|
+
quantity: +itemCount,
|
|
100
|
+
};
|
|
101
|
+
}));
|
|
102
|
+
}
|
|
103
|
+
async getFulfillmentsByOrderLineId(ctx, orderLineId) {
|
|
104
|
+
const itemIdsQb = await this.connection
|
|
105
|
+
.getRepository(ctx, order_item_entity_1.OrderItem)
|
|
106
|
+
.createQueryBuilder('item')
|
|
107
|
+
.select('item.id', 'id')
|
|
108
|
+
.where('item.lineId = :orderLineId', { orderLineId });
|
|
109
|
+
const fulfillments = await this.connection
|
|
110
|
+
.getRepository(ctx, fulfillment_entity_1.Fulfillment)
|
|
111
|
+
.createQueryBuilder('fulfillment')
|
|
112
|
+
.leftJoinAndSelect('fulfillment.orderItems', 'item')
|
|
113
|
+
.where(`item.id IN (${itemIdsQb.getQuery()})`)
|
|
114
|
+
.andWhere('fulfillment.state != :cancelledState', { cancelledState: 'Cancelled' })
|
|
115
|
+
.setParameters(itemIdsQb.getParameters())
|
|
116
|
+
.getMany();
|
|
117
|
+
return fulfillments.map(fulfillment => ({
|
|
118
|
+
fulfillment,
|
|
119
|
+
orderItemIds: new Set(fulfillment.orderItems.map(i => i.id)),
|
|
120
|
+
}));
|
|
121
|
+
}
|
|
82
122
|
/**
|
|
83
123
|
* @description
|
|
84
124
|
* Returns the Fulfillment for the given OrderItem (if one exists).
|
|
@@ -95,14 +135,14 @@ let FulfillmentService = class FulfillmentService {
|
|
|
95
135
|
* publishes a {@link FulfillmentStateTransitionEvent}.
|
|
96
136
|
*/
|
|
97
137
|
async transitionToState(ctx, fulfillmentId, state) {
|
|
98
|
-
const fulfillment = await this.findOneOrThrow(ctx, fulfillmentId, [
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
138
|
+
const fulfillment = await this.findOneOrThrow(ctx, fulfillmentId, ['orderItems']);
|
|
139
|
+
const lineIds = (0, unique_1.unique)(fulfillment.orderItems.map(item => item.lineId));
|
|
140
|
+
const orders = await this.connection
|
|
141
|
+
.getRepository(ctx, order_entity_1.Order)
|
|
142
|
+
.createQueryBuilder('order')
|
|
143
|
+
.leftJoinAndSelect('order.lines', 'line')
|
|
144
|
+
.where('line.id IN (:...lineIds)', { lineIds })
|
|
145
|
+
.getMany();
|
|
106
146
|
const fromState = fulfillment.state;
|
|
107
147
|
try {
|
|
108
148
|
await this.fulfillmentStateMachine.transition(ctx, fulfillment, orders, state);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fulfillment.service.js","sourceRoot":"","sources":["../../../src/service/services/fulfillment.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,mEAA4D;
|
|
1
|
+
{"version":3,"file":"fulfillment.service.js","sourceRoot":"","sources":["../../../src/service/services/fulfillment.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { ConfigArgService } from '../helpers/config-arg/config-arg.service';
|
|
|
6
6
|
import { OrderCalculator } from '../helpers/order-calculator/order-calculator';
|
|
7
7
|
import { ProductPriceApplicator } from '../helpers/product-price-applicator/product-price-applicator';
|
|
8
8
|
import { ShippingCalculator } from '../helpers/shipping-calculator/shipping-calculator';
|
|
9
|
+
import { TranslatorService } from '../helpers/translator/translator.service';
|
|
9
10
|
/**
|
|
10
11
|
* @description
|
|
11
12
|
* This service is responsible for creating temporary mock Orders against which tests can be run, such as
|
|
@@ -20,7 +21,8 @@ export declare class OrderTestingService {
|
|
|
20
21
|
private configArgService;
|
|
21
22
|
private configService;
|
|
22
23
|
private productPriceApplicator;
|
|
23
|
-
|
|
24
|
+
private translator;
|
|
25
|
+
constructor(connection: TransactionalConnection, orderCalculator: OrderCalculator, shippingCalculator: ShippingCalculator, configArgService: ConfigArgService, configService: ConfigService, productPriceApplicator: ProductPriceApplicator, translator: TranslatorService);
|
|
24
26
|
/**
|
|
25
27
|
* @description
|
|
26
28
|
* Runs a given ShippingMethod configuration against a mock Order to test for eligibility and resulting
|
|
@@ -24,7 +24,7 @@ const config_arg_service_1 = require("../helpers/config-arg/config-arg.service")
|
|
|
24
24
|
const order_calculator_1 = require("../helpers/order-calculator/order-calculator");
|
|
25
25
|
const product_price_applicator_1 = require("../helpers/product-price-applicator/product-price-applicator");
|
|
26
26
|
const shipping_calculator_1 = require("../helpers/shipping-calculator/shipping-calculator");
|
|
27
|
-
const
|
|
27
|
+
const translator_service_1 = require("../helpers/translator/translator.service");
|
|
28
28
|
/**
|
|
29
29
|
* @description
|
|
30
30
|
* This service is responsible for creating temporary mock Orders against which tests can be run, such as
|
|
@@ -33,13 +33,14 @@ const translate_entity_1 = require("../helpers/utils/translate-entity");
|
|
|
33
33
|
* @docsCategory services
|
|
34
34
|
*/
|
|
35
35
|
let OrderTestingService = class OrderTestingService {
|
|
36
|
-
constructor(connection, orderCalculator, shippingCalculator, configArgService, configService, productPriceApplicator) {
|
|
36
|
+
constructor(connection, orderCalculator, shippingCalculator, configArgService, configService, productPriceApplicator, translator) {
|
|
37
37
|
this.connection = connection;
|
|
38
38
|
this.orderCalculator = orderCalculator;
|
|
39
39
|
this.shippingCalculator = shippingCalculator;
|
|
40
40
|
this.configArgService = configArgService;
|
|
41
41
|
this.configService = configService;
|
|
42
42
|
this.productPriceApplicator = productPriceApplicator;
|
|
43
|
+
this.translator = translator;
|
|
43
44
|
}
|
|
44
45
|
/**
|
|
45
46
|
* @description
|
|
@@ -78,7 +79,7 @@ let OrderTestingService = class OrderTestingService {
|
|
|
78
79
|
const eligibleMethods = await this.shippingCalculator.getEligibleShippingMethods(ctx, mockOrder);
|
|
79
80
|
return eligibleMethods
|
|
80
81
|
.map(result => {
|
|
81
|
-
|
|
82
|
+
this.translator.translate(result.method, ctx);
|
|
82
83
|
return result;
|
|
83
84
|
})
|
|
84
85
|
.map(result => {
|
|
@@ -143,7 +144,8 @@ OrderTestingService = __decorate([
|
|
|
143
144
|
shipping_calculator_1.ShippingCalculator,
|
|
144
145
|
config_arg_service_1.ConfigArgService,
|
|
145
146
|
config_service_1.ConfigService,
|
|
146
|
-
product_price_applicator_1.ProductPriceApplicator
|
|
147
|
+
product_price_applicator_1.ProductPriceApplicator,
|
|
148
|
+
translator_service_1.TranslatorService])
|
|
147
149
|
], OrderTestingService);
|
|
148
150
|
exports.OrderTestingService = OrderTestingService;
|
|
149
151
|
//# sourceMappingURL=order-testing.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-testing.service.js","sourceRoot":"","sources":["../../../src/service/services/order-testing.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAY5C,sDAAkE;AAClE,gEAA4D;AAC5D,wFAAoF;AACpF,iFAAsE;AACtE,iFAAsE;AACtE,kEAAwD;AACxD,gGAAqF;AACrF,0FAA+E;AAC/E,gGAAqF;AACrF,iFAA4E;AAC5E,mFAA+E;AAC/E,2GAAsG;AACtG,4FAAwF;AACxF,
|
|
1
|
+
{"version":3,"file":"order-testing.service.js","sourceRoot":"","sources":["../../../src/service/services/order-testing.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { AddPaymentToOrderResult, ApplyCouponCodeResult, PaymentInput, PaymentMethodQuote, RemoveOrderItemsResult, SetOrderShippingMethodResult, UpdateOrderItemsResult } from '@vendure/common/lib/generated-shop-types';
|
|
2
|
-
import { AddFulfillmentToOrderResult, AddManualPaymentToOrderResult, AddNoteToOrderInput, CancelOrderInput, CancelOrderResult, CreateAddressInput, DeletionResponse, FulfillOrderInput, ManualPaymentInput, ModifyOrderInput, ModifyOrderResult, OrderListOptions, OrderProcessState, RefundOrderInput, RefundOrderResult, SettlePaymentResult, SettleRefundInput, ShippingMethodQuote, TransitionPaymentToStateResult, UpdateOrderNoteInput } from '@vendure/common/lib/generated-types';
|
|
2
|
+
import { AddFulfillmentToOrderResult, AddManualPaymentToOrderResult, AddNoteToOrderInput, CancelOrderInput, CancelOrderResult, CancelPaymentResult, CreateAddressInput, DeletionResponse, FulfillOrderInput, ManualPaymentInput, ModifyOrderInput, ModifyOrderResult, OrderListOptions, OrderProcessState, RefundOrderInput, RefundOrderResult, SettlePaymentResult, SettleRefundInput, ShippingMethodQuote, TransitionPaymentToStateResult, UpdateOrderNoteInput } from '@vendure/common/lib/generated-types';
|
|
3
3
|
import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
|
|
4
4
|
import { RequestContext } from '../../api/common/request-context';
|
|
5
5
|
import { RelationPaths } from '../../api/decorators/relations.decorator';
|
|
@@ -35,6 +35,7 @@ import { PaymentState } from '../helpers/payment-state-machine/payment-state';
|
|
|
35
35
|
import { PaymentStateMachine } from '../helpers/payment-state-machine/payment-state-machine';
|
|
36
36
|
import { RefundStateMachine } from '../helpers/refund-state-machine/refund-state-machine';
|
|
37
37
|
import { ShippingCalculator } from '../helpers/shipping-calculator/shipping-calculator';
|
|
38
|
+
import { TranslatorService } from '../helpers/translator/translator.service';
|
|
38
39
|
import { ChannelService } from './channel.service';
|
|
39
40
|
import { CountryService } from './country.service';
|
|
40
41
|
import { CustomerService } from './customer.service';
|
|
@@ -75,7 +76,8 @@ export declare class OrderService {
|
|
|
75
76
|
private orderModifier;
|
|
76
77
|
private customFieldRelationService;
|
|
77
78
|
private requestCache;
|
|
78
|
-
|
|
79
|
+
private translator;
|
|
80
|
+
constructor(connection: TransactionalConnection, configService: ConfigService, productVariantService: ProductVariantService, customerService: CustomerService, countryService: CountryService, orderCalculator: OrderCalculator, shippingCalculator: ShippingCalculator, orderStateMachine: OrderStateMachine, orderMerger: OrderMerger, paymentService: PaymentService, paymentStateMachine: PaymentStateMachine, paymentMethodService: PaymentMethodService, fulfillmentService: FulfillmentService, listQueryBuilder: ListQueryBuilder, stockMovementService: StockMovementService, refundStateMachine: RefundStateMachine, historyService: HistoryService, promotionService: PromotionService, eventBus: EventBus, channelService: ChannelService, orderModifier: OrderModifier, customFieldRelationService: CustomFieldRelationService, requestCache: RequestContextCacheService, translator: TranslatorService);
|
|
79
81
|
/**
|
|
80
82
|
* @description
|
|
81
83
|
* Returns an array of all the configured states and transitions of the order process. This is
|
|
@@ -276,6 +278,12 @@ export declare class OrderService {
|
|
|
276
278
|
* transitions the Order state if all Payments are settled.
|
|
277
279
|
*/
|
|
278
280
|
settlePayment(ctx: RequestContext, paymentId: ID): Promise<ErrorResultUnion<SettlePaymentResult, Payment>>;
|
|
281
|
+
/**
|
|
282
|
+
* @description
|
|
283
|
+
* Cancels a payment by invoking the {@link PaymentMethodHandler}'s `cancelPayment()` method (if defined), and transitions the Payment to
|
|
284
|
+
* the `Cancelled` state.
|
|
285
|
+
*/
|
|
286
|
+
cancelPayment(ctx: RequestContext, paymentId: ID): Promise<ErrorResultUnion<CancelPaymentResult, Payment>>;
|
|
279
287
|
/**
|
|
280
288
|
* @description
|
|
281
289
|
* Creates a new Fulfillment associated with the given Order and OrderItems.
|