@vendure/core 1.6.3 → 1.7.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.d.ts +2 -1
- package/dist/api/api-internal-modules.js +2 -0
- package/dist/api/api-internal-modules.js.map +1 -1
- 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 +3 -2
- package/dist/api/resolvers/admin/order.resolver.js +15 -3
- 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/entity/collection-entity.resolver.d.ts +1 -0
- package/dist/api/resolvers/entity/collection-entity.resolver.js +11 -0
- package/dist/api/resolvers/entity/collection-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/country-entity.resolver.d.ts +1 -0
- package/dist/api/resolvers/entity/country-entity.resolver.js +11 -0
- package/dist/api/resolvers/entity/country-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/facet-entity.resolver.d.ts +1 -0
- package/dist/api/resolvers/entity/facet-entity.resolver.js +11 -0
- package/dist/api/resolvers/entity/facet-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/facet-value-entity.resolver.d.ts +1 -0
- package/dist/api/resolvers/entity/facet-value-entity.resolver.js +11 -0
- package/dist/api/resolvers/entity/facet-value-entity.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-entity.resolver.d.ts +1 -0
- package/dist/api/resolvers/entity/product-entity.resolver.js +11 -0
- package/dist/api/resolvers/entity/product-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/product-option-entity.resolver.d.ts +1 -0
- package/dist/api/resolvers/entity/product-option-entity.resolver.js +11 -0
- package/dist/api/resolvers/entity/product-option-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/product-option-group-entity.resolver.d.ts +1 -0
- package/dist/api/resolvers/entity/product-option-group-entity.resolver.js +19 -3
- package/dist/api/resolvers/entity/product-option-group-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/product-variant-entity.resolver.d.ts +1 -0
- package/dist/api/resolvers/entity/product-variant-entity.resolver.js +12 -0
- package/dist/api/resolvers/entity/product-variant-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/shipping-method-entity.resolver.d.ts +10 -0
- package/dist/api/resolvers/entity/shipping-method-entity.resolver.js +64 -0
- package/dist/api/resolvers/entity/shipping-method-entity.resolver.js.map +1 -0
- 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/api/schema/common/shipping-method.type.graphql +1 -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/errors.d.ts +1 -0
- package/dist/common/error/errors.js.map +1 -1
- package/dist/common/error/generated-graphql-admin-errors.d.ts +10 -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-import-strategy/asset-import-strategy.d.ts +24 -0
- package/dist/config/asset-import-strategy/asset-import-strategy.js +3 -0
- package/dist/config/asset-import-strategy/asset-import-strategy.js.map +1 -0
- package/dist/config/asset-import-strategy/default-asset-import-strategy.d.ts +24 -0
- package/dist/config/asset-import-strategy/default-asset-import-strategy.js +91 -0
- package/dist/config/asset-import-strategy/default-asset-import-strategy.js.map +1 -0
- 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 +11 -0
- package/dist/config/config.module.js.map +1 -1
- package/dist/config/default-config.js +3 -1
- package/dist/config/default-config.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/index.d.ts +1 -0
- package/dist/config/index.js +1 -0
- package/dist/config/index.js.map +1 -1
- 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 +18 -0
- package/dist/connection/connection.module.d.ts +1 -1
- package/dist/connection/transaction-subscriber.d.ts +16 -2
- package/dist/connection/transaction-subscriber.js +27 -7
- package/dist/connection/transaction-subscriber.js.map +1 -1
- package/dist/connection/transaction-wrapper.js +6 -9
- package/dist/connection/transaction-wrapper.js.map +1 -1
- package/dist/connection/transactional-connection.d.ts +35 -0
- package/dist/connection/transactional-connection.js +53 -2
- package/dist/connection/transactional-connection.js.map +1 -1
- package/dist/data-import/providers/asset-importer/asset-importer.js +12 -18
- package/dist/data-import/providers/asset-importer/asset-importer.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/event-bus.js +14 -3
- package/dist/event-bus/event-bus.js.map +1 -1
- package/dist/event-bus/events/initializer-event.d.ts +12 -0
- package/dist/event-bus/events/initializer-event.js +19 -0
- package/dist/event-bus/events/initializer-event.js.map +1 -0
- 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/event-bus/index.d.ts +1 -0
- package/dist/event-bus/index.js +1 -0
- package/dist/event-bus/index.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 +31 -31
- 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 +5 -5
- 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 +33 -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 +31 -28
- 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 +7 -2
- package/dist/service/helpers/locale-string-hydrator/locale-string-hydrator.js +10 -5
- 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/initializer.service.d.ts +3 -1
- package/dist/service/initializer.service.js +7 -2
- package/dist/service/initializer.service.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/asset.service.d.ts +2 -1
- package/dist/service/services/asset.service.js +19 -4
- package/dist/service/services/asset.service.js.map +1 -1
- package/dist/service/services/collection.service.d.ts +3 -1
- package/dist/service/services/collection.service.js +16 -16
- 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 +3 -1
- package/dist/service/services/customer.service.js +8 -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 +11 -6
- 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 +18 -8
- 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 +57 -27
- 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 +12 -10
- 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 +53 -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.js +8 -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 +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"product.service.js","sourceRoot":"","sources":["../../../src/service/services/product.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"product.service.js","sourceRoot":"","sources":["../../../src/service/services/product.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -161,8 +161,11 @@ let PromotionService = class PromotionService {
|
|
|
161
161
|
enabled: true,
|
|
162
162
|
deletedAt: null,
|
|
163
163
|
},
|
|
164
|
+
relations: ['channels'],
|
|
164
165
|
});
|
|
165
|
-
if (!promotion ||
|
|
166
|
+
if (!promotion ||
|
|
167
|
+
promotion.couponCode !== couponCode ||
|
|
168
|
+
!promotion.channels.find(c => utils_1.idsAreEqual(c.id, ctx.channelId))) {
|
|
166
169
|
return new generated_graphql_shop_errors_1.CouponCodeInvalidError(couponCode);
|
|
167
170
|
}
|
|
168
171
|
if (promotion.endsAt && +promotion.endsAt < +new Date()) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"promotion.service.js","sourceRoot":"","sources":["../../../src/service/services/promotion.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"promotion.service.js","sourceRoot":"","sources":["../../../src/service/services/promotion.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ import { ConfigArgService } from '../helpers/config-arg/config-arg.service';
|
|
|
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
|
/**
|
|
16
17
|
* @description
|
|
@@ -27,7 +28,8 @@ export declare class ShippingMethodService {
|
|
|
27
28
|
private translatableSaver;
|
|
28
29
|
private customFieldRelationService;
|
|
29
30
|
private eventBus;
|
|
30
|
-
|
|
31
|
+
private translator;
|
|
32
|
+
constructor(connection: TransactionalConnection, configService: ConfigService, listQueryBuilder: ListQueryBuilder, channelService: ChannelService, configArgService: ConfigArgService, translatableSaver: TranslatableSaver, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus, translator: TranslatorService);
|
|
31
33
|
/** @internal */
|
|
32
34
|
initShippingMethods(): Promise<void>;
|
|
33
35
|
findAll(ctx: RequestContext, options?: ListQueryOptions<ShippingMethod>, relations?: RelationPaths<ShippingMethod>): Promise<PaginatedList<ShippingMethod>>;
|
|
@@ -26,7 +26,7 @@ const config_arg_service_1 = require("../helpers/config-arg/config-arg.service")
|
|
|
26
26
|
const custom_field_relation_service_1 = require("../helpers/custom-field-relation/custom-field-relation.service");
|
|
27
27
|
const list_query_builder_1 = require("../helpers/list-query-builder/list-query-builder");
|
|
28
28
|
const translatable_saver_1 = require("../helpers/translatable-saver/translatable-saver");
|
|
29
|
-
const
|
|
29
|
+
const translator_service_1 = require("../helpers/translator/translator.service");
|
|
30
30
|
const channel_service_1 = require("./channel.service");
|
|
31
31
|
/**
|
|
32
32
|
* @description
|
|
@@ -35,7 +35,7 @@ const channel_service_1 = require("./channel.service");
|
|
|
35
35
|
* @docsCategory services
|
|
36
36
|
*/
|
|
37
37
|
let ShippingMethodService = class ShippingMethodService {
|
|
38
|
-
constructor(connection, configService, listQueryBuilder, channelService, configArgService, translatableSaver, customFieldRelationService, eventBus) {
|
|
38
|
+
constructor(connection, configService, listQueryBuilder, channelService, configArgService, translatableSaver, customFieldRelationService, eventBus, translator) {
|
|
39
39
|
this.connection = connection;
|
|
40
40
|
this.configService = configService;
|
|
41
41
|
this.listQueryBuilder = listQueryBuilder;
|
|
@@ -44,6 +44,7 @@ let ShippingMethodService = class ShippingMethodService {
|
|
|
44
44
|
this.translatableSaver = translatableSaver;
|
|
45
45
|
this.customFieldRelationService = customFieldRelationService;
|
|
46
46
|
this.eventBus = eventBus;
|
|
47
|
+
this.translator = translator;
|
|
47
48
|
}
|
|
48
49
|
/** @internal */
|
|
49
50
|
async initShippingMethods() {
|
|
@@ -62,13 +63,13 @@ let ShippingMethodService = class ShippingMethodService {
|
|
|
62
63
|
})
|
|
63
64
|
.getManyAndCount()
|
|
64
65
|
.then(([items, totalItems]) => ({
|
|
65
|
-
items: items.map(i =>
|
|
66
|
+
items: items.map(i => this.translator.translate(i, ctx)),
|
|
66
67
|
totalItems,
|
|
67
68
|
}));
|
|
68
69
|
}
|
|
69
70
|
async findOne(ctx, shippingMethodId, includeDeleted = false, relations = []) {
|
|
70
71
|
const shippingMethod = await this.connection.findOneInChannel(ctx, shipping_method_entity_1.ShippingMethod, shippingMethodId, ctx.channelId, Object.assign({ relations }, (includeDeleted === false ? { where: { deletedAt: null } } : {})));
|
|
71
|
-
return shippingMethod &&
|
|
72
|
+
return shippingMethod && this.translator.translate(shippingMethod, ctx);
|
|
72
73
|
}
|
|
73
74
|
async create(ctx, input) {
|
|
74
75
|
const shippingMethod = await this.translatableSaver.create({
|
|
@@ -147,7 +148,7 @@ let ShippingMethodService = class ShippingMethodService {
|
|
|
147
148
|
});
|
|
148
149
|
return shippingMethods
|
|
149
150
|
.filter(sm => sm.channels.find(c => utils_1.idsAreEqual(c.id, ctx.channelId)))
|
|
150
|
-
.map(m =>
|
|
151
|
+
.map(m => this.translator.translate(m, ctx));
|
|
151
152
|
}
|
|
152
153
|
/**
|
|
153
154
|
* Ensures that all ShippingMethods have a valid fulfillmentHandlerCode
|
|
@@ -185,7 +186,8 @@ ShippingMethodService = __decorate([
|
|
|
185
186
|
config_arg_service_1.ConfigArgService,
|
|
186
187
|
translatable_saver_1.TranslatableSaver,
|
|
187
188
|
custom_field_relation_service_1.CustomFieldRelationService,
|
|
188
|
-
event_bus_1.EventBus
|
|
189
|
+
event_bus_1.EventBus,
|
|
190
|
+
translator_service_1.TranslatorService])
|
|
189
191
|
], ShippingMethodService);
|
|
190
192
|
exports.ShippingMethodService = ShippingMethodService;
|
|
191
193
|
//# sourceMappingURL=shipping-method.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shipping-method.service.js","sourceRoot":"","sources":["../../../src/service/services/shipping-method.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAM6C;AAC7C,mDAAgD;AAKhD,sDAAgE;AAEhE,8CAA8D;AAC9D,gEAA4D;AAC5D,uEAA4D;AAC5D,wFAAoF;AAEpF,wHAA4G;AAC5G,gGAAqF;AACrF,+CAA2C;AAC3C,wFAAmF;AACnF,iFAA4E;AAC5E,kHAA4G;AAC5G,yFAAoF;AACpF,yFAAqF;AACrF,
|
|
1
|
+
{"version":3,"file":"shipping-method.service.js","sourceRoot":"","sources":["../../../src/service/services/shipping-method.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ const generated_types_1 = require("@vendure/common/lib/generated-types");
|
|
|
15
15
|
const errors_1 = require("../../common/error/errors");
|
|
16
16
|
const transactional_connection_1 = require("../../connection/transactional-connection");
|
|
17
17
|
const order_item_entity_1 = require("../../entity/order-item/order-item.entity");
|
|
18
|
+
const order_line_entity_1 = require("../../entity/order-line/order-line.entity");
|
|
18
19
|
const product_variant_entity_1 = require("../../entity/product-variant/product-variant.entity");
|
|
19
20
|
const allocation_entity_1 = require("../../entity/stock-movement/allocation.entity");
|
|
20
21
|
const cancellation_entity_1 = require("../../entity/stock-movement/cancellation.entity");
|
|
@@ -126,15 +127,15 @@ let StockMovementService = class StockMovementService {
|
|
|
126
127
|
async createSalesForOrder(ctx, orderItems) {
|
|
127
128
|
const sales = [];
|
|
128
129
|
const globalTrackInventory = (await this.globalSettingsService.getSettings(ctx)).trackInventory;
|
|
129
|
-
const orderItemsWithVariants = await this.connection.getRepository(ctx, order_item_entity_1.OrderItem).findByIds(orderItems.map(i => i.id), {
|
|
130
|
-
relations: ['line', 'line.productVariant'],
|
|
131
|
-
});
|
|
132
130
|
const orderLinesMap = new Map();
|
|
133
|
-
for (const orderItem of
|
|
134
|
-
let value = orderLinesMap.get(orderItem.
|
|
131
|
+
for (const orderItem of orderItems) {
|
|
132
|
+
let value = orderLinesMap.get(orderItem.lineId);
|
|
135
133
|
if (!value) {
|
|
136
|
-
|
|
137
|
-
|
|
134
|
+
const line = await this.connection.getEntityOrThrow(ctx, order_line_entity_1.OrderLine, orderItem.lineId, {
|
|
135
|
+
relations: ['productVariant'],
|
|
136
|
+
});
|
|
137
|
+
value = { line, items: [] };
|
|
138
|
+
orderLinesMap.set(orderItem.lineId, value);
|
|
138
139
|
}
|
|
139
140
|
value.items.push(orderItem);
|
|
140
141
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stock-movement.service.js","sourceRoot":"","sources":["../../../src/service/services/stock-movement.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAA2F;AAI3F,sDAAgE;AAGhE,wFAAoF;AACpF,iFAAsE;
|
|
1
|
+
{"version":3,"file":"stock-movement.service.js","sourceRoot":"","sources":["../../../src/service/services/stock-movement.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -225,6 +225,14 @@ let UserService = class UserService {
|
|
|
225
225
|
nativeAuthMethod.passwordHash = await this.passwordCipher.hash(password);
|
|
226
226
|
nativeAuthMethod.passwordResetToken = null;
|
|
227
227
|
await this.connection.getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod).save(nativeAuthMethod);
|
|
228
|
+
if (user.verified === false && this.configService.authOptions.requireVerification) {
|
|
229
|
+
// This code path represents an edge-case in which the Customer creates an account,
|
|
230
|
+
// but prior to verifying their email address, they start the password reset flow.
|
|
231
|
+
// Since the password reset flow makes the exact same guarantee as the email verification
|
|
232
|
+
// flow (i.e. the person controls the specified email account), we can also consider it
|
|
233
|
+
// a verification.
|
|
234
|
+
user.verified = true;
|
|
235
|
+
}
|
|
228
236
|
return this.connection.getRepository(ctx, user_entity_1.User).save(user);
|
|
229
237
|
}
|
|
230
238
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/service/services/user.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/service/services/user.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ import { ConfigService } from '../../config/config.service';
|
|
|
6
6
|
import { TransactionalConnection } from '../../connection/transactional-connection';
|
|
7
7
|
import { Zone } from '../../entity/zone/zone.entity';
|
|
8
8
|
import { EventBus } from '../../event-bus';
|
|
9
|
+
import { TranslatorService } from '../helpers/translator/translator.service';
|
|
9
10
|
/**
|
|
10
11
|
* @description
|
|
11
12
|
* Contains methods relating to {@link Zone} entities.
|
|
@@ -16,11 +17,12 @@ export declare class ZoneService {
|
|
|
16
17
|
private connection;
|
|
17
18
|
private configService;
|
|
18
19
|
private eventBus;
|
|
20
|
+
private translator;
|
|
19
21
|
/**
|
|
20
22
|
* We cache all Zones to avoid hitting the DB many times per request.
|
|
21
23
|
*/
|
|
22
24
|
private zones;
|
|
23
|
-
constructor(connection: TransactionalConnection, configService: ConfigService, eventBus: EventBus);
|
|
25
|
+
constructor(connection: TransactionalConnection, configService: ConfigService, eventBus: EventBus, translator: TranslatorService);
|
|
24
26
|
/** @internal */
|
|
25
27
|
initZones(): Promise<void>;
|
|
26
28
|
/**
|
|
@@ -24,8 +24,8 @@ const zone_entity_1 = require("../../entity/zone/zone.entity");
|
|
|
24
24
|
const event_bus_1 = require("../../event-bus");
|
|
25
25
|
const zone_event_1 = require("../../event-bus/events/zone-event");
|
|
26
26
|
const zone_members_event_1 = require("../../event-bus/events/zone-members-event");
|
|
27
|
+
const translator_service_1 = require("../helpers/translator/translator.service");
|
|
27
28
|
const patch_entity_1 = require("../helpers/utils/patch-entity");
|
|
28
|
-
const translate_entity_1 = require("../helpers/utils/translate-entity");
|
|
29
29
|
/**
|
|
30
30
|
* @description
|
|
31
31
|
* Contains methods relating to {@link Zone} entities.
|
|
@@ -33,10 +33,11 @@ const translate_entity_1 = require("../helpers/utils/translate-entity");
|
|
|
33
33
|
* @docsCategory services
|
|
34
34
|
*/
|
|
35
35
|
let ZoneService = class ZoneService {
|
|
36
|
-
constructor(connection, configService, eventBus) {
|
|
36
|
+
constructor(connection, configService, eventBus, translator) {
|
|
37
37
|
this.connection = connection;
|
|
38
38
|
this.configService = configService;
|
|
39
39
|
this.eventBus = eventBus;
|
|
40
|
+
this.translator = translator;
|
|
40
41
|
}
|
|
41
42
|
/** @internal */
|
|
42
43
|
async initZones() {
|
|
@@ -60,10 +61,10 @@ let ZoneService = class ZoneService {
|
|
|
60
61
|
});
|
|
61
62
|
}
|
|
62
63
|
async findAll(ctx) {
|
|
63
|
-
return this.zones.memoize([
|
|
64
|
+
return this.zones.memoize([], [ctx], zones => {
|
|
64
65
|
return zones.map((zone, i) => {
|
|
65
66
|
const cloneZone = Object.assign({}, zone);
|
|
66
|
-
cloneZone.members = zone.members.map(country =>
|
|
67
|
+
cloneZone.members = zone.members.map(country => this.translator.translate(country, ctx));
|
|
67
68
|
return cloneZone;
|
|
68
69
|
});
|
|
69
70
|
});
|
|
@@ -76,7 +77,7 @@ let ZoneService = class ZoneService {
|
|
|
76
77
|
})
|
|
77
78
|
.then(zone => {
|
|
78
79
|
if (zone) {
|
|
79
|
-
zone.members = zone.members.map(country =>
|
|
80
|
+
zone.members = zone.members.map(country => this.translator.translate(country, ctx));
|
|
80
81
|
return zone;
|
|
81
82
|
}
|
|
82
83
|
});
|
|
@@ -177,7 +178,8 @@ ZoneService = __decorate([
|
|
|
177
178
|
common_1.Injectable(),
|
|
178
179
|
__metadata("design:paramtypes", [transactional_connection_1.TransactionalConnection,
|
|
179
180
|
config_service_1.ConfigService,
|
|
180
|
-
event_bus_1.EventBus
|
|
181
|
+
event_bus_1.EventBus,
|
|
182
|
+
translator_service_1.TranslatorService])
|
|
181
183
|
], ZoneService);
|
|
182
184
|
exports.ZoneService = ZoneService;
|
|
183
185
|
//# sourceMappingURL=zone.service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zone.service.js","sourceRoot":"","sources":["../../../src/service/services/zone.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yEAO6C;AAE7C,uDAAoD;AAEpD,sEAAkE;AAClE,8EAAoG;AACpG,8CAAiD;AACjD,gEAA4D;AAC5D,wFAAoF;AACpF,yCAAgD;AAChD,wEAA8D;AAC9D,+DAAqD;AACrD,+CAA2C;AAC3C,kEAA8D;AAC9D,kFAA6E;AAC7E,
|
|
1
|
+
{"version":3,"file":"zone.service.js","sourceRoot":"","sources":["../../../src/service/services/zone.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vendure/core",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.0",
|
|
4
4
|
"description": "A modern, headless ecommerce framework",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
"@nestjs/testing": "7.6.17",
|
|
50
50
|
"@nestjs/typeorm": "7.1.5",
|
|
51
51
|
"@types/fs-extra": "^9.0.1",
|
|
52
|
-
"@vendure/common": "^1.
|
|
52
|
+
"@vendure/common": "^1.7.0",
|
|
53
53
|
"apollo-server-express": "2.24.1",
|
|
54
54
|
"bcrypt": "^5.0.0",
|
|
55
55
|
"body-parser": "^1.19.0",
|
|
@@ -76,7 +76,7 @@
|
|
|
76
76
|
"progress": "^2.0.3",
|
|
77
77
|
"reflect-metadata": "^0.1.13",
|
|
78
78
|
"rxjs": "^6.6.3",
|
|
79
|
-
"typeorm": "0.2.
|
|
79
|
+
"typeorm": "0.2.45"
|
|
80
80
|
},
|
|
81
81
|
"devDependencies": {
|
|
82
82
|
"@types/bcrypt": "^3.0.0",
|
|
@@ -101,5 +101,5 @@
|
|
|
101
101
|
"sqlite3": "^5.0.0",
|
|
102
102
|
"typescript": "4.3.5"
|
|
103
103
|
},
|
|
104
|
-
"gitHead": "
|
|
104
|
+
"gitHead": "050ab2dae650b905f766d13cd4cb7219b0dc90fc"
|
|
105
105
|
}
|