@vendure/core 1.3.4 → 1.4.0-beta.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/common/validate-custom-field-value.d.ts +1 -1
- package/dist/api/common/validate-custom-field-value.js +12 -2
- package/dist/api/common/validate-custom-field-value.js.map +1 -1
- package/dist/api/resolvers/admin/search.resolver.js +1 -1
- package/dist/api/resolvers/admin/search.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/order.api.graphql +4 -1
- package/dist/api/schema/common/custom-field-types.graphql +9 -0
- package/dist/api/schema/shop-api/shop.api.graphql +1 -1
- package/dist/common/configurable-operation.d.ts +1 -23
- package/dist/common/configurable-operation.js.map +1 -1
- package/dist/common/self-refreshing-cache.d.ts +6 -1
- package/dist/common/self-refreshing-cache.js +23 -17
- package/dist/common/self-refreshing-cache.js.map +1 -1
- package/dist/config/catalog/default-collection-filters.js +4 -2
- package/dist/config/catalog/default-collection-filters.js.map +1 -1
- package/dist/config/custom-field/custom-field-types.d.ts +10 -2
- package/dist/config/default-config.js +8 -1
- package/dist/config/default-config.js.map +1 -1
- package/dist/config/merge-config.d.ts +7 -0
- package/dist/config/merge-config.js +7 -0
- package/dist/config/merge-config.js.map +1 -1
- package/dist/config/payment/payment-method-handler.d.ts +2 -2
- package/dist/connection/connection.module.d.ts +1 -1
- package/dist/connection/transaction-subscriber.js +8 -1
- package/dist/connection/transaction-subscriber.js.map +1 -1
- package/dist/data-import/providers/import-parser/import-parser.d.ts +40 -40
- package/dist/data-import/providers/import-parser/import-parser.js +343 -56
- package/dist/data-import/providers/import-parser/import-parser.js.map +1 -1
- package/dist/data-import/providers/importer/importer.d.ts +1 -0
- package/dist/data-import/providers/importer/importer.js +69 -41
- package/dist/data-import/providers/importer/importer.js.map +1 -1
- package/dist/entity/country/country-translation.entity.d.ts +4 -1
- package/dist/entity/country/country-translation.entity.js +5 -0
- package/dist/entity/country/country-translation.entity.js.map +1 -1
- package/dist/entity/country/country.entity.d.ts +4 -1
- package/dist/entity/country/country.entity.js +5 -0
- package/dist/entity/country/country.entity.js.map +1 -1
- package/dist/entity/custom-entity-fields.d.ts +28 -12
- package/dist/entity/custom-entity-fields.js +44 -20
- package/dist/entity/custom-entity-fields.js.map +1 -1
- package/dist/entity/customer-group/customer-group.entity.d.ts +4 -1
- package/dist/entity/customer-group/customer-group.entity.js +6 -1
- package/dist/entity/customer-group/customer-group.entity.js.map +1 -1
- package/dist/entity/payment-method/payment-method.entity.d.ts +4 -1
- package/dist/entity/payment-method/payment-method.entity.js +5 -0
- package/dist/entity/payment-method/payment-method.entity.js.map +1 -1
- package/dist/entity/promotion/promotion.entity.d.ts +4 -1
- package/dist/entity/promotion/promotion.entity.js +5 -0
- package/dist/entity/promotion/promotion.entity.js.map +1 -1
- package/dist/entity/register-custom-entity-fields.js +9 -1
- package/dist/entity/register-custom-entity-fields.js.map +1 -1
- package/dist/entity/tax-category/tax-category.entity.d.ts +4 -1
- package/dist/entity/tax-category/tax-category.entity.js +5 -0
- package/dist/entity/tax-category/tax-category.entity.js.map +1 -1
- package/dist/entity/tax-rate/tax-rate.entity.d.ts +4 -1
- package/dist/entity/tax-rate/tax-rate.entity.js +5 -0
- package/dist/entity/tax-rate/tax-rate.entity.js.map +1 -1
- package/dist/entity/zone/zone.entity.d.ts +4 -1
- package/dist/entity/zone/zone.entity.js +5 -0
- package/dist/entity/zone/zone.entity.js.map +1 -1
- package/dist/event-bus/events/account-verified-event.d.ts +16 -0
- package/dist/event-bus/events/account-verified-event.js +21 -0
- package/dist/event-bus/events/account-verified-event.js.map +1 -0
- package/dist/event-bus/events/administrator-event.d.ts +18 -0
- package/dist/event-bus/events/administrator-event.js +19 -0
- package/dist/event-bus/events/administrator-event.js.map +1 -0
- package/dist/event-bus/events/asset-event.d.ts +17 -9
- package/dist/event-bus/events/asset-event.js +15 -9
- package/dist/event-bus/events/asset-event.js.map +1 -1
- package/dist/event-bus/events/change-channel-event.d.ts +22 -0
- package/dist/event-bus/events/change-channel-event.js +25 -0
- package/dist/event-bus/events/change-channel-event.js.map +1 -0
- package/dist/event-bus/events/channel-event.d.ts +18 -0
- package/dist/event-bus/events/channel-event.js +19 -0
- package/dist/event-bus/events/channel-event.js.map +1 -0
- package/dist/event-bus/events/collection-event.d.ts +18 -0
- package/dist/event-bus/events/collection-event.js +19 -0
- package/dist/event-bus/events/collection-event.js.map +1 -0
- package/dist/event-bus/events/country-event.d.ts +18 -0
- package/dist/event-bus/events/country-event.js +19 -0
- package/dist/event-bus/events/country-event.js.map +1 -0
- package/dist/event-bus/events/coupon-code-event.d.ts +19 -0
- package/dist/event-bus/events/coupon-code-event.js +24 -0
- package/dist/event-bus/events/coupon-code-event.js.map +1 -0
- package/dist/event-bus/events/customer-address-event.d.ts +21 -6
- package/dist/event-bus/events/customer-address-event.js +16 -6
- package/dist/event-bus/events/customer-address-event.js.map +1 -1
- package/dist/event-bus/events/customer-event.d.ts +16 -6
- package/dist/event-bus/events/customer-event.js +13 -7
- package/dist/event-bus/events/customer-event.js.map +1 -1
- package/dist/event-bus/events/customer-group-entity-event.d.ts +19 -0
- package/dist/event-bus/events/customer-group-entity-event.js +21 -0
- package/dist/event-bus/events/customer-group-entity-event.js.map +1 -0
- package/dist/event-bus/events/customer-group-event.d.ts +17 -0
- package/dist/event-bus/events/customer-group-event.js +21 -1
- package/dist/event-bus/events/customer-group-event.js.map +1 -1
- package/dist/event-bus/events/facet-event.d.ts +18 -0
- package/dist/event-bus/events/facet-event.js +19 -0
- package/dist/event-bus/events/facet-event.js.map +1 -0
- package/dist/event-bus/events/facet-value-event.d.ts +18 -0
- package/dist/event-bus/events/facet-value-event.js +19 -0
- package/dist/event-bus/events/facet-value-event.js.map +1 -0
- package/dist/event-bus/events/fulfillment-event.d.ts +27 -0
- package/dist/event-bus/events/fulfillment-event.js +19 -0
- package/dist/event-bus/events/fulfillment-event.js.map +1 -0
- package/dist/event-bus/events/global-settings-event.d.ts +16 -0
- package/dist/event-bus/events/global-settings-event.js +20 -0
- package/dist/event-bus/events/global-settings-event.js.map +1 -0
- package/dist/event-bus/events/history-entry-event.d.ts +22 -0
- package/dist/event-bus/events/history-entry-event.js +20 -0
- package/dist/event-bus/events/history-entry-event.js.map +1 -0
- package/dist/event-bus/events/order-placed-event.d.ts +22 -0
- package/dist/event-bus/events/order-placed-event.js +26 -0
- package/dist/event-bus/events/order-placed-event.js.map +1 -0
- package/dist/event-bus/events/order-state-transition-event.js.map +1 -1
- package/dist/event-bus/events/password-reset-verified-event.d.ts +16 -0
- package/dist/event-bus/events/password-reset-verified-event.js +21 -0
- package/dist/event-bus/events/password-reset-verified-event.js.map +1 -0
- package/dist/event-bus/events/payment-method-event.d.ts +18 -0
- package/dist/event-bus/events/payment-method-event.js +19 -0
- package/dist/event-bus/events/payment-method-event.js.map +1 -0
- package/dist/event-bus/events/product-event.d.ts +14 -6
- package/dist/event-bus/events/product-event.js +13 -7
- package/dist/event-bus/events/product-event.js.map +1 -1
- package/dist/event-bus/events/product-option-event.d.ts +18 -0
- package/dist/event-bus/events/product-option-event.js +19 -0
- package/dist/event-bus/events/product-option-event.js.map +1 -0
- package/dist/event-bus/events/product-option-group-change-event.d.ts +19 -0
- package/dist/event-bus/events/product-option-group-change-event.js +23 -0
- package/dist/event-bus/events/product-option-group-change-event.js.map +1 -0
- package/dist/event-bus/events/product-option-group-event.d.ts +18 -0
- package/dist/event-bus/events/product-option-group-event.js +19 -0
- package/dist/event-bus/events/product-option-group-event.js.map +1 -0
- package/dist/event-bus/events/product-variant-event.d.ts +14 -6
- package/dist/event-bus/events/product-variant-event.js +13 -7
- package/dist/event-bus/events/product-variant-event.js.map +1 -1
- package/dist/event-bus/events/promotion-event.d.ts +18 -0
- package/dist/event-bus/events/promotion-event.js +19 -0
- package/dist/event-bus/events/promotion-event.js.map +1 -0
- package/dist/event-bus/events/role-change-event.d.ts +20 -0
- package/dist/event-bus/events/role-change-event.js +24 -0
- package/dist/event-bus/events/role-change-event.js.map +1 -0
- package/dist/event-bus/events/role-event.d.ts +18 -0
- package/dist/event-bus/events/role-event.js +19 -0
- package/dist/event-bus/events/role-event.js.map +1 -0
- package/dist/event-bus/events/shipping-method-event.d.ts +18 -0
- package/dist/event-bus/events/shipping-method-event.js +19 -0
- package/dist/event-bus/events/shipping-method-event.js.map +1 -0
- package/dist/event-bus/events/tax-category-event.d.ts +18 -0
- package/dist/event-bus/events/tax-category-event.js +19 -0
- package/dist/event-bus/events/tax-category-event.js.map +1 -0
- package/dist/event-bus/events/tax-rate-event.d.ts +18 -0
- package/dist/event-bus/events/tax-rate-event.js +19 -0
- package/dist/event-bus/events/tax-rate-event.js.map +1 -0
- package/dist/event-bus/events/tax-rate-modification-event.d.ts +1 -0
- package/dist/event-bus/events/tax-rate-modification-event.js +1 -0
- package/dist/event-bus/events/tax-rate-modification-event.js.map +1 -1
- package/dist/event-bus/events/zone-event.d.ts +18 -0
- package/dist/event-bus/events/zone-event.js +19 -0
- package/dist/event-bus/events/zone-event.js.map +1 -0
- package/dist/event-bus/events/zone-members-event.d.ts +19 -0
- package/dist/event-bus/events/zone-members-event.js +23 -0
- package/dist/event-bus/events/zone-members-event.js.map +1 -0
- package/dist/event-bus/index.d.ts +32 -4
- package/dist/event-bus/index.js +32 -4
- package/dist/event-bus/index.js.map +1 -1
- package/dist/event-bus/vendure-entity-event.d.ts +17 -0
- package/dist/event-bus/vendure-entity-event.js +23 -0
- package/dist/event-bus/vendure-entity-event.js.map +1 -0
- package/dist/i18n/messages/en.json +2 -1
- package/dist/plugin/default-search-plugin/api/fulltext-search.resolver.js +1 -1
- package/dist/plugin/default-search-plugin/api/fulltext-search.resolver.js.map +1 -1
- package/dist/plugin/default-search-plugin/indexer/indexer.controller.js +1 -1
- package/dist/plugin/default-search-plugin/indexer/indexer.controller.js.map +1 -1
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state-machine.d.ts +1 -3
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state-machine.js +2 -10
- package/dist/service/helpers/fulfillment-state-machine/fulfillment-state-machine.js.map +1 -1
- package/dist/service/helpers/order-calculator/order-calculator.js +3 -0
- package/dist/service/helpers/order-calculator/order-calculator.js.map +1 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.d.ts +3 -1
- package/dist/service/helpers/order-state-machine/order-state-machine.js +10 -2
- package/dist/service/helpers/order-state-machine/order-state-machine.js.map +1 -1
- package/dist/service/services/administrator.service.d.ts +3 -1
- package/dist/service/services/administrator.service.js +16 -2
- package/dist/service/services/administrator.service.js.map +1 -1
- package/dist/service/services/asset.service.js +14 -6
- package/dist/service/services/asset.service.js.map +1 -1
- package/dist/service/services/channel.service.d.ts +4 -2
- package/dist/service/services/channel.service.js +14 -3
- package/dist/service/services/channel.service.js.map +1 -1
- package/dist/service/services/collection.service.js +6 -2
- package/dist/service/services/collection.service.js.map +1 -1
- package/dist/service/services/country.service.d.ts +3 -3
- package/dist/service/services/country.service.js +8 -4
- package/dist/service/services/country.service.js.map +1 -1
- package/dist/service/services/customer-group.service.js +8 -1
- package/dist/service/services/customer-group.service.js.map +1 -1
- package/dist/service/services/customer.service.js +13 -8
- 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 +10 -3
- 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 +10 -3
- package/dist/service/services/facet.service.js.map +1 -1
- package/dist/service/services/fulfillment.service.js +7 -1
- package/dist/service/services/fulfillment.service.js.map +1 -1
- package/dist/service/services/global-settings.service.d.ts +3 -1
- package/dist/service/services/global-settings.service.js +7 -2
- package/dist/service/services/global-settings.service.js.map +1 -1
- package/dist/service/services/history.service.d.ts +3 -1
- package/dist/service/services/history.service.js +20 -6
- package/dist/service/services/history.service.js.map +1 -1
- package/dist/service/services/order.service.d.ts +1 -0
- package/dist/service/services/order.service.js +31 -1
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/payment-method.service.js +9 -1
- package/dist/service/services/payment-method.service.js.map +1 -1
- package/dist/service/services/product-option-group.service.d.ts +3 -1
- package/dist/service/services/product-option-group.service.js +9 -3
- package/dist/service/services/product-option-group.service.js.map +1 -1
- package/dist/service/services/product-option.service.d.ts +3 -1
- package/dist/service/services/product-option.service.js +9 -3
- package/dist/service/services/product-option.service.js.map +1 -1
- package/dist/service/services/product-variant.service.js +3 -3
- package/dist/service/services/product-variant.service.js.map +1 -1
- package/dist/service/services/product.service.js +6 -3
- package/dist/service/services/product.service.js.map +1 -1
- package/dist/service/services/promotion.service.d.ts +3 -1
- package/dist/service/services/promotion.service.js +10 -3
- package/dist/service/services/promotion.service.js.map +1 -1
- package/dist/service/services/role.service.d.ts +3 -1
- package/dist/service/services/role.service.js +12 -4
- package/dist/service/services/role.service.js.map +1 -1
- package/dist/service/services/shipping-method.service.d.ts +3 -1
- package/dist/service/services/shipping-method.service.js +10 -3
- package/dist/service/services/shipping-method.service.js.map +1 -1
- package/dist/service/services/stock-movement.service.d.ts +11 -0
- package/dist/service/services/stock-movement.service.js +15 -5
- package/dist/service/services/stock-movement.service.js.map +1 -1
- package/dist/service/services/tax-category.service.d.ts +3 -1
- package/dist/service/services/tax-category.service.js +8 -2
- package/dist/service/services/tax-category.service.js.map +1 -1
- package/dist/service/services/tax-rate.service.js +4 -0
- package/dist/service/services/tax-rate.service.js.map +1 -1
- package/dist/service/services/zone.service.d.ts +5 -3
- package/dist/service/services/zone.service.js +24 -12
- package/dist/service/services/zone.service.js.map +1 -1
- package/package.json +4 -4
|
@@ -17,6 +17,8 @@ const config_service_1 = require("../../config/config.service");
|
|
|
17
17
|
const transactional_connection_1 = require("../../connection/transactional-connection");
|
|
18
18
|
const facet_translation_entity_1 = require("../../entity/facet/facet-translation.entity");
|
|
19
19
|
const facet_entity_1 = require("../../entity/facet/facet.entity");
|
|
20
|
+
const event_bus_1 = require("../../event-bus");
|
|
21
|
+
const facet_event_1 = require("../../event-bus/events/facet-event");
|
|
20
22
|
const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
|
|
21
23
|
const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
|
|
22
24
|
const translatable_saver_1 = require("../helpers/translatable-saver/translatable-saver");
|
|
@@ -30,7 +32,7 @@ const facet_value_service_1 = require("./facet-value.service");
|
|
|
30
32
|
* @docsCategory services
|
|
31
33
|
*/
|
|
32
34
|
let FacetService = class FacetService {
|
|
33
|
-
constructor(connection, facetValueService, translatableSaver, listQueryBuilder, configService, channelService, customFieldRelationService) {
|
|
35
|
+
constructor(connection, facetValueService, translatableSaver, listQueryBuilder, configService, channelService, customFieldRelationService, eventBus) {
|
|
34
36
|
this.connection = connection;
|
|
35
37
|
this.facetValueService = facetValueService;
|
|
36
38
|
this.translatableSaver = translatableSaver;
|
|
@@ -38,6 +40,7 @@ let FacetService = class FacetService {
|
|
|
38
40
|
this.configService = configService;
|
|
39
41
|
this.channelService = channelService;
|
|
40
42
|
this.customFieldRelationService = customFieldRelationService;
|
|
43
|
+
this.eventBus = eventBus;
|
|
41
44
|
}
|
|
42
45
|
findAll(ctx, options) {
|
|
43
46
|
const relations = ['values', 'values.facet', 'channels'];
|
|
@@ -97,7 +100,8 @@ let FacetService = class FacetService {
|
|
|
97
100
|
await this.channelService.assignToCurrentChannel(f, ctx);
|
|
98
101
|
},
|
|
99
102
|
});
|
|
100
|
-
await this.customFieldRelationService.updateRelations(ctx, facet_entity_1.Facet, input, facet);
|
|
103
|
+
const facetWithRelations = await this.customFieldRelationService.updateRelations(ctx, facet_entity_1.Facet, input, facet);
|
|
104
|
+
this.eventBus.publish(new facet_event_1.FacetEvent(ctx, facetWithRelations, 'created', input));
|
|
101
105
|
return utils_1.assertFound(this.findOne(ctx, facet.id));
|
|
102
106
|
}
|
|
103
107
|
async update(ctx, input) {
|
|
@@ -111,6 +115,7 @@ let FacetService = class FacetService {
|
|
|
111
115
|
},
|
|
112
116
|
});
|
|
113
117
|
await this.customFieldRelationService.updateRelations(ctx, facet_entity_1.Facet, input, facet);
|
|
118
|
+
this.eventBus.publish(new facet_event_1.FacetEvent(ctx, facet, 'updated', input));
|
|
114
119
|
return utils_1.assertFound(this.findOne(ctx, facet.id));
|
|
115
120
|
}
|
|
116
121
|
async delete(ctx, id, force = false) {
|
|
@@ -138,6 +143,7 @@ let FacetService = class FacetService {
|
|
|
138
143
|
await this.connection.getRepository(ctx, facet_entity_1.Facet).remove(facet);
|
|
139
144
|
message = ctx.translate('message.facet-force-deleted', i18nVars);
|
|
140
145
|
result = generated_types_1.DeletionResult.DELETED;
|
|
146
|
+
this.eventBus.publish(new facet_event_1.FacetEvent(ctx, facet, 'deleted', id));
|
|
141
147
|
}
|
|
142
148
|
else {
|
|
143
149
|
message = ctx.translate('message.facet-used', i18nVars);
|
|
@@ -183,7 +189,8 @@ FacetService = __decorate([
|
|
|
183
189
|
list_query_builder_1.ListQueryBuilder,
|
|
184
190
|
config_service_1.ConfigService,
|
|
185
191
|
channel_service_1.ChannelService,
|
|
186
|
-
custom_field_relation_service_1.CustomFieldRelationService
|
|
192
|
+
custom_field_relation_service_1.CustomFieldRelationService,
|
|
193
|
+
event_bus_1.EventBus])
|
|
187
194
|
], FacetService);
|
|
188
195
|
exports.FacetService = FacetService;
|
|
189
196
|
//# 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;
|
|
1
|
+
{"version":3,"file":"facet.service.js","sourceRoot":"","sources":["../../../src/service/services/facet.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ const config_service_1 = require("../../config/config.service");
|
|
|
17
17
|
const transactional_connection_1 = require("../../connection/transactional-connection");
|
|
18
18
|
const fulfillment_entity_1 = require("../../entity/fulfillment/fulfillment.entity");
|
|
19
19
|
const event_bus_1 = require("../../event-bus/event-bus");
|
|
20
|
+
const fulfillment_event_1 = require("../../event-bus/events/fulfillment-event");
|
|
20
21
|
const fulfillment_state_transition_event_1 = require("../../event-bus/events/fulfillment-state-transition-event");
|
|
21
22
|
const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
|
|
22
23
|
const fulfillment_state_machine_1 = require("../helpers/fulfillment-state-machine/fulfillment-state-machine");
|
|
@@ -56,7 +57,12 @@ let FulfillmentService = class FulfillmentService {
|
|
|
56
57
|
return new generated_graphql_admin_errors_1.CreateFulfillmentError(message);
|
|
57
58
|
}
|
|
58
59
|
const newFulfillment = await this.connection.getRepository(ctx, fulfillment_entity_1.Fulfillment).save(new fulfillment_entity_1.Fulfillment(Object.assign(Object.assign({ method: '', trackingCode: '' }, fulfillmentPartial), { orderItems: items, state: this.fulfillmentStateMachine.getInitialState(), handlerCode: fulfillmentHandler.code })));
|
|
59
|
-
await this.customFieldRelationService.updateRelations(ctx, fulfillment_entity_1.Fulfillment, fulfillmentPartial, newFulfillment);
|
|
60
|
+
const fulfillmentWithRelations = await this.customFieldRelationService.updateRelations(ctx, fulfillment_entity_1.Fulfillment, fulfillmentPartial, newFulfillment);
|
|
61
|
+
this.eventBus.publish(new fulfillment_event_1.FulfillmentEvent(ctx, fulfillmentWithRelations, {
|
|
62
|
+
orders,
|
|
63
|
+
items,
|
|
64
|
+
handler,
|
|
65
|
+
}));
|
|
60
66
|
return newFulfillment;
|
|
61
67
|
}
|
|
62
68
|
async findOneOrThrow(ctx, id, relations = ['orderItems']) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fulfillment.service.js","sourceRoot":"","sources":["../../../src/service/services/fulfillment.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAG5C,mEAA4D;AAG5D,sGAI2D;
|
|
1
|
+
{"version":3,"file":"fulfillment.service.js","sourceRoot":"","sources":["../../../src/service/services/fulfillment.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ import { RequestContext } from '../../api/common/request-context';
|
|
|
3
3
|
import { ConfigService } from '../../config/config.service';
|
|
4
4
|
import { TransactionalConnection } from '../../connection/transactional-connection';
|
|
5
5
|
import { GlobalSettings } from '../../entity/global-settings/global-settings.entity';
|
|
6
|
+
import { EventBus } from '../../event-bus';
|
|
6
7
|
import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
|
|
7
8
|
/**
|
|
8
9
|
* @description
|
|
@@ -14,7 +15,8 @@ export declare class GlobalSettingsService {
|
|
|
14
15
|
private connection;
|
|
15
16
|
private configService;
|
|
16
17
|
private customFieldRelationService;
|
|
17
|
-
|
|
18
|
+
private eventBus;
|
|
19
|
+
constructor(connection: TransactionalConnection, configService: ConfigService, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus);
|
|
18
20
|
/**
|
|
19
21
|
* Ensure there is a single global settings row in the database.
|
|
20
22
|
* @internal
|
|
@@ -15,6 +15,8 @@ const errors_1 = require("../../common/error/errors");
|
|
|
15
15
|
const config_service_1 = require("../../config/config.service");
|
|
16
16
|
const transactional_connection_1 = require("../../connection/transactional-connection");
|
|
17
17
|
const global_settings_entity_1 = require("../../entity/global-settings/global-settings.entity");
|
|
18
|
+
const event_bus_1 = require("../../event-bus");
|
|
19
|
+
const global_settings_event_1 = require("../../event-bus/events/global-settings-event");
|
|
18
20
|
const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
|
|
19
21
|
const patch_entity_1 = require("../helpers/utils/patch-entity");
|
|
20
22
|
/**
|
|
@@ -24,10 +26,11 @@ const patch_entity_1 = require("../helpers/utils/patch-entity");
|
|
|
24
26
|
* @docsCategory services
|
|
25
27
|
*/
|
|
26
28
|
let GlobalSettingsService = class GlobalSettingsService {
|
|
27
|
-
constructor(connection, configService, customFieldRelationService) {
|
|
29
|
+
constructor(connection, configService, customFieldRelationService, eventBus) {
|
|
28
30
|
this.connection = connection;
|
|
29
31
|
this.configService = configService;
|
|
30
32
|
this.customFieldRelationService = customFieldRelationService;
|
|
33
|
+
this.eventBus = eventBus;
|
|
31
34
|
}
|
|
32
35
|
/**
|
|
33
36
|
* Ensure there is a single global settings row in the database.
|
|
@@ -69,6 +72,7 @@ let GlobalSettingsService = class GlobalSettingsService {
|
|
|
69
72
|
}
|
|
70
73
|
async updateSettings(ctx, input) {
|
|
71
74
|
const settings = await this.getSettings(ctx);
|
|
75
|
+
this.eventBus.publish(new global_settings_event_1.GlobalSettingsEvent(ctx, settings, input));
|
|
72
76
|
patch_entity_1.patchEntity(settings, input);
|
|
73
77
|
await this.customFieldRelationService.updateRelations(ctx, global_settings_entity_1.GlobalSettings, input, settings);
|
|
74
78
|
return this.connection.getRepository(ctx, global_settings_entity_1.GlobalSettings).save(settings);
|
|
@@ -78,7 +82,8 @@ GlobalSettingsService = __decorate([
|
|
|
78
82
|
common_1.Injectable(),
|
|
79
83
|
__metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
|
|
80
84
|
config_service_1.ConfigService,
|
|
81
|
-
custom_field_relation_service_1.CustomFieldRelationService
|
|
85
|
+
custom_field_relation_service_1.CustomFieldRelationService,
|
|
86
|
+
event_bus_1.EventBus])
|
|
82
87
|
], GlobalSettingsService);
|
|
83
88
|
exports.GlobalSettingsService = GlobalSettingsService;
|
|
84
89
|
//# sourceMappingURL=global-settings.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global-settings.service.js","sourceRoot":"","sources":["../../../src/service/services/global-settings.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAI5C,sDAAgE;AAChE,gEAA4D;AAC5D,wFAAoF;AACpF,gGAAqF;AACrF,kHAA4G;AAC5G,gEAA4D;AAE5D;;;;;GAKG;AAEH,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAC9B,YACY,UAAmC,EACnC,aAA4B,EAC5B,0BAAsD;
|
|
1
|
+
{"version":3,"file":"global-settings.service.js","sourceRoot":"","sources":["../../../src/service/services/global-settings.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAI5C,sDAAgE;AAChE,gEAA4D;AAC5D,wFAAoF;AACpF,gGAAqF;AACrF,+CAA2C;AAC3C,wFAAmF;AACnF,kHAA4G;AAC5G,gEAA4D;AAE5D;;;;;GAKG;AAEH,IAAa,qBAAqB,GAAlC,MAAa,qBAAqB;IAC9B,YACY,UAAmC,EACnC,aAA4B,EAC5B,0BAAsD,EACtD,QAAkB;QAHlB,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,+BAA0B,GAA1B,0BAA0B,CAA4B;QACtD,aAAQ,GAAR,QAAQ,CAAU;IAC3B,CAAC;IAEJ;;;OAGG;IACH,KAAK,CAAC,kBAAkB;QACpB,IAAI;YACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,uCAAc,CAAC,CAAC,IAAI,EAAE,CAAC;YAC1E,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;aACzC;YACD,IAAI,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;gBACnB,iFAAiF;gBACjF,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACjC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,uCAAc,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;aACxE;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,QAAQ,GAAG,IAAI,uCAAc,CAAC;gBAChC,kBAAkB,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;aAC/D,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,uCAAc,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;SACzF;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,WAAW,CAAC,GAAmB;QACjC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC,CAAC,OAAO,CAAC;YAC9E,KAAK,EAAE;gBACH,SAAS,EAAE,KAAK;aACnB;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,EAAE;YACX,MAAM,IAAI,4BAAmB,CAAC,iCAAiC,CAAC,CAAC;SACpE;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,GAAmB,EAAE,KAAgC;QACtE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,2CAAmB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC;QACrE,0BAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QAC7B,MAAM,IAAI,CAAC,0BAA0B,CAAC,eAAe,CAAC,GAAG,EAAE,uCAAc,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC5F,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,uCAAc,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC7E,CAAC;CACJ,CAAA;AAtDY,qBAAqB;IADjC,mBAAU,EAAE;qCAGe,kDAAuB;QACpB,8BAAa;QACA,0DAA0B;QAC5C,oBAAQ;GALrB,qBAAqB,CAsDjC;AAtDY,sDAAqB"}
|
|
@@ -5,6 +5,7 @@ import { RequestContext } from '../../api/common/request-context';
|
|
|
5
5
|
import { TransactionalConnection } from '../../connection/transactional-connection';
|
|
6
6
|
import { CustomerHistoryEntry } from '../../entity/history-entry/customer-history-entry.entity';
|
|
7
7
|
import { OrderHistoryEntry } from '../../entity/history-entry/order-history-entry.entity';
|
|
8
|
+
import { EventBus } from '../../event-bus';
|
|
8
9
|
import { FulfillmentState } from '../helpers/fulfillment-state-machine/fulfillment-state';
|
|
9
10
|
import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
|
|
10
11
|
import { OrderState } from '../helpers/order-state-machine/order-state';
|
|
@@ -131,7 +132,8 @@ export declare class HistoryService {
|
|
|
131
132
|
private connection;
|
|
132
133
|
private administratorService;
|
|
133
134
|
private listQueryBuilder;
|
|
134
|
-
|
|
135
|
+
private eventBus;
|
|
136
|
+
constructor(connection: TransactionalConnection, administratorService: AdministratorService, listQueryBuilder: ListQueryBuilder, eventBus: EventBus);
|
|
135
137
|
getHistoryForOrder(ctx: RequestContext, orderId: ID, publicOnly: boolean, options?: HistoryEntryListOptions): Promise<PaginatedList<OrderHistoryEntry>>;
|
|
136
138
|
createHistoryEntryForOrder<T extends keyof OrderHistoryEntryData>(args: CreateOrderHistoryEntryArgs<T>, isPublic?: boolean): Promise<OrderHistoryEntry>;
|
|
137
139
|
getHistoryForCustomer(ctx: RequestContext, customerId: ID, publicOnly: boolean, options?: HistoryEntryListOptions): Promise<PaginatedList<CustomerHistoryEntry>>;
|
|
@@ -16,6 +16,8 @@ const transactional_connection_1 = require("../../connection/transactional-conne
|
|
|
16
16
|
const customer_history_entry_entity_1 = require("../../entity/history-entry/customer-history-entry.entity");
|
|
17
17
|
const history_entry_entity_1 = require("../../entity/history-entry/history-entry.entity");
|
|
18
18
|
const order_history_entry_entity_1 = require("../../entity/history-entry/order-history-entry.entity");
|
|
19
|
+
const event_bus_1 = require("../../event-bus");
|
|
20
|
+
const history_entry_event_1 = require("../../event-bus/events/history-entry-event");
|
|
19
21
|
const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
|
|
20
22
|
const administrator_service_1 = require("./administrator.service");
|
|
21
23
|
/**
|
|
@@ -27,10 +29,11 @@ const administrator_service_1 = require("./administrator.service");
|
|
|
27
29
|
* @docsCategory services
|
|
28
30
|
*/
|
|
29
31
|
let HistoryService = class HistoryService {
|
|
30
|
-
constructor(connection, administratorService, listQueryBuilder) {
|
|
32
|
+
constructor(connection, administratorService, listQueryBuilder, eventBus) {
|
|
31
33
|
this.connection = connection;
|
|
32
34
|
this.administratorService = administratorService;
|
|
33
35
|
this.listQueryBuilder = listQueryBuilder;
|
|
36
|
+
this.eventBus = eventBus;
|
|
34
37
|
}
|
|
35
38
|
async getHistoryForOrder(ctx, orderId, publicOnly, options) {
|
|
36
39
|
return this.listQueryBuilder
|
|
@@ -55,7 +58,9 @@ let HistoryService = class HistoryService {
|
|
|
55
58
|
order: { id: orderId },
|
|
56
59
|
administrator,
|
|
57
60
|
});
|
|
58
|
-
|
|
61
|
+
const history = await this.connection.getRepository(ctx, order_history_entry_entity_1.OrderHistoryEntry).save(entry);
|
|
62
|
+
this.eventBus.publish(new history_entry_event_1.HistoryEntryEvent(ctx, history, 'created', 'order', { type, data }));
|
|
63
|
+
return history;
|
|
59
64
|
}
|
|
60
65
|
async getHistoryForCustomer(ctx, customerId, publicOnly, options) {
|
|
61
66
|
return this.listQueryBuilder
|
|
@@ -81,7 +86,9 @@ let HistoryService = class HistoryService {
|
|
|
81
86
|
customer: { id: customerId },
|
|
82
87
|
administrator,
|
|
83
88
|
});
|
|
84
|
-
|
|
89
|
+
const history = await this.connection.getRepository(ctx, customer_history_entry_entity_1.CustomerHistoryEntry).save(entry);
|
|
90
|
+
this.eventBus.publish(new history_entry_event_1.HistoryEntryEvent(ctx, history, 'created', 'customer', { type, data }));
|
|
91
|
+
return history;
|
|
85
92
|
}
|
|
86
93
|
async updateOrderHistoryEntry(ctx, args) {
|
|
87
94
|
const entry = await this.connection.getEntityOrThrow(ctx, order_history_entry_entity_1.OrderHistoryEntry, args.entryId, {
|
|
@@ -97,11 +104,14 @@ let HistoryService = class HistoryService {
|
|
|
97
104
|
if (administrator) {
|
|
98
105
|
entry.administrator = administrator;
|
|
99
106
|
}
|
|
100
|
-
|
|
107
|
+
const newEntry = await this.connection.getRepository(ctx, order_history_entry_entity_1.OrderHistoryEntry).save(entry);
|
|
108
|
+
this.eventBus.publish(new history_entry_event_1.HistoryEntryEvent(ctx, entry, 'updated', 'order', args));
|
|
109
|
+
return newEntry;
|
|
101
110
|
}
|
|
102
111
|
async deleteOrderHistoryEntry(ctx, id) {
|
|
103
112
|
const entry = await this.connection.getEntityOrThrow(ctx, order_history_entry_entity_1.OrderHistoryEntry, id);
|
|
104
113
|
await this.connection.getRepository(ctx, order_history_entry_entity_1.OrderHistoryEntry).remove(entry);
|
|
114
|
+
this.eventBus.publish(new history_entry_event_1.HistoryEntryEvent(ctx, entry, 'deleted', 'order', id));
|
|
105
115
|
}
|
|
106
116
|
async updateCustomerHistoryEntry(ctx, args) {
|
|
107
117
|
const entry = await this.connection.getEntityOrThrow(ctx, customer_history_entry_entity_1.CustomerHistoryEntry, args.entryId, {
|
|
@@ -114,11 +124,14 @@ let HistoryService = class HistoryService {
|
|
|
114
124
|
if (administrator) {
|
|
115
125
|
entry.administrator = administrator;
|
|
116
126
|
}
|
|
117
|
-
|
|
127
|
+
const newEntry = await this.connection.getRepository(ctx, customer_history_entry_entity_1.CustomerHistoryEntry).save(entry);
|
|
128
|
+
this.eventBus.publish(new history_entry_event_1.HistoryEntryEvent(ctx, entry, 'updated', 'customer', args));
|
|
129
|
+
return newEntry;
|
|
118
130
|
}
|
|
119
131
|
async deleteCustomerHistoryEntry(ctx, id) {
|
|
120
132
|
const entry = await this.connection.getEntityOrThrow(ctx, customer_history_entry_entity_1.CustomerHistoryEntry, id);
|
|
121
133
|
await this.connection.getRepository(ctx, customer_history_entry_entity_1.CustomerHistoryEntry).remove(entry);
|
|
134
|
+
this.eventBus.publish(new history_entry_event_1.HistoryEntryEvent(ctx, entry, 'deleted', 'customer', id));
|
|
122
135
|
}
|
|
123
136
|
async getAdministratorFromContext(ctx) {
|
|
124
137
|
const administrator = ctx.activeUserId
|
|
@@ -131,7 +144,8 @@ HistoryService = __decorate([
|
|
|
131
144
|
common_1.Injectable(),
|
|
132
145
|
__metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
|
|
133
146
|
administrator_service_1.AdministratorService,
|
|
134
|
-
list_query_builder_1.ListQueryBuilder
|
|
147
|
+
list_query_builder_1.ListQueryBuilder,
|
|
148
|
+
event_bus_1.EventBus])
|
|
135
149
|
], HistoryService);
|
|
136
150
|
exports.HistoryService = HistoryService;
|
|
137
151
|
//# sourceMappingURL=history.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"history.service.js","sourceRoot":"","sources":["../../../src/service/services/history.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,yEAK6C;AAI7C,wFAAoF;AAEpF,4GAAgG;AAChG,0FAA+E;AAC/E,sGAA0F;
|
|
1
|
+
{"version":3,"file":"history.service.js","sourceRoot":"","sources":["../../../src/service/services/history.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,7 @@ const refund_entity_1 = require("../../entity/refund/refund.entity");
|
|
|
34
34
|
const shipping_line_entity_1 = require("../../entity/shipping-line/shipping-line.entity");
|
|
35
35
|
const surcharge_entity_1 = require("../../entity/surcharge/surcharge.entity");
|
|
36
36
|
const event_bus_1 = require("../../event-bus/event-bus");
|
|
37
|
+
const coupon_code_event_1 = require("../../event-bus/events/coupon-code-event");
|
|
37
38
|
const order_state_transition_event_1 = require("../../event-bus/events/order-state-transition-event");
|
|
38
39
|
const refund_state_transition_event_1 = require("../../event-bus/events/refund-state-transition-event");
|
|
39
40
|
const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
|
|
@@ -474,6 +475,7 @@ let OrderService = class OrderService {
|
|
|
474
475
|
type: generated_types_1.HistoryEntryType.ORDER_COUPON_APPLIED,
|
|
475
476
|
data: { couponCode, promotionId: validationResult.id },
|
|
476
477
|
});
|
|
478
|
+
this.eventBus.publish(new coupon_code_event_1.CouponCodeEvent(ctx, couponCode, orderId, 'assigned'));
|
|
477
479
|
return this.applyPriceAdjustments(ctx, order);
|
|
478
480
|
}
|
|
479
481
|
/**
|
|
@@ -497,6 +499,7 @@ let OrderService = class OrderService {
|
|
|
497
499
|
type: generated_types_1.HistoryEntryType.ORDER_COUPON_REMOVED,
|
|
498
500
|
data: { couponCode },
|
|
499
501
|
});
|
|
502
|
+
this.eventBus.publish(new coupon_code_event_1.CouponCodeEvent(ctx, couponCode, orderId, 'removed'));
|
|
500
503
|
const result = await this.applyPriceAdjustments(ctx, order);
|
|
501
504
|
await this.connection.getRepository(ctx, order_item_entity_1.OrderItem).save(affectedOrderItems);
|
|
502
505
|
return result;
|
|
@@ -650,6 +653,11 @@ let OrderService = class OrderService {
|
|
|
650
653
|
return result;
|
|
651
654
|
}
|
|
652
655
|
const { fulfillment, fromState, toState, orders } = result;
|
|
656
|
+
if (toState === 'Cancelled') {
|
|
657
|
+
await this.stockMovementService.createCancellationsForOrderItems(ctx, fulfillment.orderItems);
|
|
658
|
+
const lines = await this.groupOrderItemsIntoLines(ctx, fulfillment.orderItems);
|
|
659
|
+
await this.stockMovementService.createAllocationsForOrderLines(ctx, lines);
|
|
660
|
+
}
|
|
653
661
|
await Promise.all(orders.map(order => this.handleFulfillmentStateTransitByOrder(ctx, order, fromState, toState)));
|
|
654
662
|
return fulfillment;
|
|
655
663
|
}
|
|
@@ -776,7 +784,7 @@ let OrderService = class OrderService {
|
|
|
776
784
|
*/
|
|
777
785
|
async addManualPaymentToOrder(ctx, input) {
|
|
778
786
|
const order = await this.getOrderOrThrow(ctx, input.orderId);
|
|
779
|
-
if (order.state !== 'ArrangingAdditionalPayment') {
|
|
787
|
+
if (order.state !== 'ArrangingAdditionalPayment' && order.state !== 'ArrangingPayment') {
|
|
780
788
|
return new generated_graphql_admin_errors_1.ManualPaymentStateError();
|
|
781
789
|
}
|
|
782
790
|
const existingPayments = await this.getOrderPayments(ctx, order.id);
|
|
@@ -1304,6 +1312,28 @@ let OrderService = class OrderService {
|
|
|
1304
1312
|
}
|
|
1305
1313
|
return merged;
|
|
1306
1314
|
}
|
|
1315
|
+
async groupOrderItemsIntoLines(ctx, orderItems) {
|
|
1316
|
+
const orderLineIdQuantityMap = new Map();
|
|
1317
|
+
for (const item of orderItems) {
|
|
1318
|
+
const quantity = orderLineIdQuantityMap.get(item.lineId);
|
|
1319
|
+
if (quantity == null) {
|
|
1320
|
+
orderLineIdQuantityMap.set(item.lineId, 1);
|
|
1321
|
+
}
|
|
1322
|
+
else {
|
|
1323
|
+
orderLineIdQuantityMap.set(item.lineId, quantity + 1);
|
|
1324
|
+
}
|
|
1325
|
+
}
|
|
1326
|
+
const orderLines = await this.connection
|
|
1327
|
+
.getRepository(ctx, order_line_entity_1.OrderLine)
|
|
1328
|
+
.findByIds([...orderLineIdQuantityMap.keys()], {
|
|
1329
|
+
relations: ['productVariant'],
|
|
1330
|
+
});
|
|
1331
|
+
return orderLines.map(orderLine => ({
|
|
1332
|
+
orderLine,
|
|
1333
|
+
// tslint:disable-next-line:no-non-null-assertion
|
|
1334
|
+
quantity: orderLineIdQuantityMap.get(orderLine.id),
|
|
1335
|
+
}));
|
|
1336
|
+
}
|
|
1307
1337
|
};
|
|
1308
1338
|
OrderService = __decorate([
|
|
1309
1339
|
common_1.Injectable(),
|