@vendure/core 2.0.0-next.1 → 2.0.0-next.12
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/configurable-operation-codec.js +2 -2
- package/dist/api/common/configurable-operation-codec.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/common/id-codec.js +6 -2
- package/dist/api/common/id-codec.js.map +1 -1
- package/dist/api/config/configure-graphql-module.js +2 -0
- package/dist/api/config/configure-graphql-module.js.map +1 -1
- package/dist/api/config/generate-permissions.js +29 -4
- package/dist/api/config/generate-permissions.js.map +1 -1
- package/dist/api/config/generate-resolvers.d.ts +3 -0
- package/dist/api/config/generate-resolvers.js +16 -5
- package/dist/api/config/generate-resolvers.js.map +1 -1
- package/dist/api/decorators/relations.decorator.d.ts +116 -0
- package/dist/api/decorators/relations.decorator.js +202 -0
- package/dist/api/decorators/relations.decorator.js.map +1 -0
- package/dist/api/decorators/request-context.decorator.js +9 -2
- package/dist/api/decorators/request-context.decorator.js.map +1 -1
- package/dist/api/index.d.ts +1 -0
- package/dist/api/index.js +1 -0
- package/dist/api/index.js.map +1 -1
- package/dist/api/middleware/transaction-interceptor.d.ts +9 -0
- package/dist/api/middleware/transaction-interceptor.js +16 -1
- package/dist/api/middleware/transaction-interceptor.js.map +1 -1
- package/dist/api/resolvers/admin/administrator.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/administrator.resolver.js +10 -6
- package/dist/api/resolvers/admin/administrator.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/asset.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/asset.resolver.js +10 -6
- package/dist/api/resolvers/admin/asset.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/channel.resolver.js +2 -2
- package/dist/api/resolvers/admin/channel.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/collection.resolver.d.ts +5 -3
- package/dist/api/resolvers/admin/collection.resolver.js +30 -7
- package/dist/api/resolvers/admin/collection.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/country.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/country.resolver.js +10 -6
- package/dist/api/resolvers/admin/country.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/customer-group.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/customer-group.resolver.js +8 -4
- package/dist/api/resolvers/admin/customer-group.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/customer.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/customer.resolver.js +10 -6
- package/dist/api/resolvers/admin/customer.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/facet.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/facet.resolver.js +10 -6
- package/dist/api/resolvers/admin/facet.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/order.resolver.d.ts +8 -6
- package/dist/api/resolvers/admin/order.resolver.js +37 -11
- package/dist/api/resolvers/admin/order.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/payment-method.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/payment-method.resolver.js +10 -6
- package/dist/api/resolvers/admin/payment-method.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/product-option.resolver.d.ts +5 -3
- package/dist/api/resolvers/admin/product-option.resolver.js +21 -4
- package/dist/api/resolvers/admin/product-option.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/product.resolver.d.ts +4 -3
- package/dist/api/resolvers/admin/product.resolver.js +16 -10
- package/dist/api/resolvers/admin/product.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/promotion.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/promotion.resolver.js +9 -6
- package/dist/api/resolvers/admin/promotion.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/role.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/role.resolver.js +10 -6
- package/dist/api/resolvers/admin/role.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/shipping-method.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/shipping-method.resolver.js +10 -6
- package/dist/api/resolvers/admin/shipping-method.resolver.js.map +1 -1
- package/dist/api/resolvers/admin/tax-rate.resolver.d.ts +3 -2
- package/dist/api/resolvers/admin/tax-rate.resolver.js +10 -6
- package/dist/api/resolvers/admin/tax-rate.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/collection-entity.resolver.d.ts +3 -1
- package/dist/api/resolvers/entity/collection-entity.resolver.js +17 -4
- 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/customer-entity.resolver.d.ts +2 -1
- package/dist/api/resolvers/entity/customer-entity.resolver.js +5 -3
- package/dist/api/resolvers/entity/customer-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 +8 -3
- package/dist/api/resolvers/entity/order-line-entity.resolver.js +36 -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 +4 -2
- package/dist/api/resolvers/entity/product-entity.resolver.js +21 -6
- 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-order.resolver.d.ts +4 -3
- package/dist/api/resolvers/shop/shop-order.resolver.js +16 -8
- package/dist/api/resolvers/shop/shop-order.resolver.js.map +1 -1
- package/dist/api/resolvers/shop/shop-products.resolver.d.ts +8 -8
- package/dist/api/resolvers/shop/shop-products.resolver.js +38 -21
- package/dist/api/resolvers/shop/shop-products.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/collection.api.graphql +8 -0
- package/dist/api/schema/admin-api/order.api.graphql +15 -0
- package/dist/api/schema/admin-api/product-option-group.api.graphql +2 -0
- package/dist/api/schema/common/common-error-results.graphql +22 -0
- package/dist/api/schema/common/order.type.graphql +7 -0
- package/dist/api/schema/common/shipping-method.type.graphql +1 -0
- package/dist/api/schema/shop-api/shop-error-results.graphql +0 -29
- package/dist/bootstrap.js +10 -6
- package/dist/bootstrap.js.map +1 -1
- package/dist/common/calculated-decorator.d.ts +16 -3
- package/dist/common/calculated-decorator.js +3 -0
- package/dist/common/calculated-decorator.js.map +1 -1
- package/dist/common/configurable-operation.js +9 -4
- package/dist/common/configurable-operation.js.map +1 -1
- package/dist/common/constants.d.ts +1 -0
- package/dist/common/constants.js +2 -1
- package/dist/common/constants.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 +41 -0
- package/dist/common/error/generated-graphql-admin-errors.js +48 -2
- package/dist/common/error/generated-graphql-admin-errors.js.map +1 -1
- package/dist/common/finite-state-machine/finite-state-machine.js +2 -1
- package/dist/common/finite-state-machine/finite-state-machine.js.map +1 -1
- package/dist/common/self-refreshing-cache.d.ts +5 -2
- package/dist/common/self-refreshing-cache.js +9 -7
- package/dist/common/self-refreshing-cache.js.map +1 -1
- package/dist/common/types/entity-relation-paths.d.ts +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 +89 -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/catalog/collection-filter.d.ts +32 -0
- package/dist/config/catalog/collection-filter.js +32 -0
- package/dist/config/catalog/collection-filter.js.map +1 -1
- package/dist/config/catalog/default-collection-filters.d.ts +100 -0
- package/dist/config/catalog/default-collection-filters.js +154 -21
- package/dist/config/catalog/default-collection-filters.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 +13 -0
- package/dist/config/config.module.js.map +1 -1
- package/dist/config/config.service.d.ts +2 -1
- package/dist/config/config.service.js +3 -0
- package/dist/config/config.service.js.map +1 -1
- package/dist/config/custom-field/custom-field-types.d.ts +3 -0
- package/dist/config/default-config.js +8 -0
- 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/entity-metadata/add-foreign-key-indices.d.ts +12 -0
- package/dist/config/entity-metadata/add-foreign-key-indices.js +33 -0
- package/dist/config/entity-metadata/add-foreign-key-indices.js.map +1 -0
- package/dist/config/entity-metadata/entity-metadata-modifier.d.ts +55 -0
- package/dist/config/entity-metadata/entity-metadata-modifier.js +3 -0
- package/dist/config/entity-metadata/entity-metadata-modifier.js.map +1 -0
- package/dist/config/fulfillment/custom-fulfillment-process.d.ts +2 -2
- package/dist/config/index.d.ts +4 -0
- package/dist/config/index.js +4 -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 +10 -2
- package/dist/config/payment/dummy-payment-method-handler.js.map +1 -1
- package/dist/config/payment/example-payment-method-handler.js +2 -2
- package/dist/config/payment/example-payment-method-handler.js.map +1 -1
- package/dist/config/payment/payment-method-eligibility-checker.d.ts +3 -3
- package/dist/config/payment/payment-method-eligibility-checker.js +2 -2
- package/dist/config/payment/payment-method-eligibility-checker.js.map +1 -1
- package/dist/config/payment/payment-method-handler.d.ts +73 -8
- package/dist/config/payment/payment-method-handler.js +17 -7
- package/dist/config/payment/payment-method-handler.js.map +1 -1
- package/dist/config/promotion/actions/facet-values-percentage-discount-action.js +1 -1
- package/dist/config/promotion/actions/facet-values-percentage-discount-action.js.map +1 -1
- package/dist/config/promotion/actions/order-fixed-discount-action.js +1 -1
- package/dist/config/promotion/actions/order-fixed-discount-action.js.map +1 -1
- package/dist/config/promotion/conditions/has-facet-values-condition.js +1 -1
- package/dist/config/promotion/conditions/has-facet-values-condition.js.map +1 -1
- package/dist/config/promotion/index.d.ts +4 -0
- package/dist/config/promotion/index.js +4 -0
- package/dist/config/promotion/index.js.map +1 -1
- package/dist/config/promotion/utils/facet-value-checker.d.ts +2 -1
- package/dist/config/promotion/utils/facet-value-checker.js +2 -2
- package/dist/config/promotion/utils/facet-value-checker.js.map +1 -1
- package/dist/config/shipping-method/shipping-calculator.d.ts +3 -3
- package/dist/config/shipping-method/shipping-calculator.js +2 -2
- package/dist/config/shipping-method/shipping-calculator.js.map +1 -1
- package/dist/config/shipping-method/shipping-eligibility-checker.d.ts +4 -4
- package/dist/config/shipping-method/shipping-eligibility-checker.js +5 -5
- package/dist/config/shipping-method/shipping-eligibility-checker.js.map +1 -1
- package/dist/config/system/health-check-strategy.d.ts +47 -0
- package/dist/config/system/health-check-strategy.js +3 -0
- package/dist/config/system/health-check-strategy.js.map +1 -0
- package/dist/config/vendure-config.d.ts +79 -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/transaction-subscriber.d.ts +16 -2
- package/dist/connection/transaction-subscriber.js +27 -6
- package/dist/connection/transaction-subscriber.js.map +1 -1
- package/dist/connection/transaction-wrapper.d.ts +5 -1
- package/dist/connection/transaction-wrapper.js +14 -11
- package/dist/connection/transaction-wrapper.js.map +1 -1
- package/dist/connection/transactional-connection.d.ts +9 -3
- package/dist/connection/transactional-connection.js +27 -8
- 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/data-import/providers/importer/fast-importer.service.js +11 -5
- package/dist/data-import/providers/importer/fast-importer.service.js.map +1 -1
- package/dist/data-import/providers/importer/importer.d.ts +3 -2
- package/dist/data-import/providers/importer/importer.js +15 -9
- package/dist/data-import/providers/importer/importer.js.map +1 -1
- package/dist/data-import/providers/populator/populator.js +1 -1
- package/dist/data-import/providers/populator/populator.js.map +1 -1
- package/dist/entity/address/address.entity.js +2 -0
- package/dist/entity/address/address.entity.js.map +1 -1
- package/dist/entity/asset/orderable-asset.entity.js +1 -0
- package/dist/entity/asset/orderable-asset.entity.js.map +1 -1
- package/dist/entity/authentication-method/authentication-method.entity.js +1 -0
- package/dist/entity/authentication-method/authentication-method.entity.js.map +1 -1
- package/dist/entity/channel/channel.entity.js +2 -0
- package/dist/entity/channel/channel.entity.js.map +1 -1
- package/dist/entity/collection/collection-translation.entity.js +1 -0
- package/dist/entity/collection/collection-translation.entity.js.map +1 -1
- package/dist/entity/collection/collection.entity.js +1 -0
- package/dist/entity/collection/collection.entity.js.map +1 -1
- package/dist/entity/country/country-translation.entity.js +1 -0
- package/dist/entity/country/country-translation.entity.js.map +1 -1
- package/dist/entity/facet/facet-translation.entity.js +1 -0
- package/dist/entity/facet/facet-translation.entity.js.map +1 -1
- package/dist/entity/facet-value/facet-value-translation.entity.js +1 -0
- package/dist/entity/facet-value/facet-value-translation.entity.js.map +1 -1
- package/dist/entity/facet-value/facet-value.entity.js +1 -0
- package/dist/entity/facet-value/facet-value.entity.js.map +1 -1
- package/dist/entity/history-entry/customer-history-entry.entity.js +1 -0
- package/dist/entity/history-entry/customer-history-entry.entity.js.map +1 -1
- package/dist/entity/history-entry/history-entry.entity.js +1 -0
- package/dist/entity/history-entry/history-entry.entity.js.map +1 -1
- package/dist/entity/history-entry/order-history-entry.entity.js +1 -0
- package/dist/entity/history-entry/order-history-entry.entity.js.map +1 -1
- package/dist/entity/order/order.entity.js +5 -2
- package/dist/entity/order/order.entity.js.map +1 -1
- package/dist/entity/order-item/order-item.entity.js +2 -0
- package/dist/entity/order-item/order-item.entity.js.map +1 -1
- package/dist/entity/order-line/order-line.entity.js +30 -22
- package/dist/entity/order-line/order-line.entity.js.map +1 -1
- package/dist/entity/order-modification/order-modification.entity.js +1 -0
- package/dist/entity/order-modification/order-modification.entity.js.map +1 -1
- package/dist/entity/payment/payment.entity.js +1 -0
- package/dist/entity/payment/payment.entity.js.map +1 -1
- package/dist/entity/product/product-translation.entity.js +1 -0
- package/dist/entity/product/product-translation.entity.js.map +1 -1
- package/dist/entity/product/product.entity.js +1 -0
- package/dist/entity/product/product.entity.js.map +1 -1
- package/dist/entity/product-option/product-option-translation.entity.js +1 -0
- package/dist/entity/product-option/product-option-translation.entity.js.map +1 -1
- package/dist/entity/product-option/product-option.entity.js +1 -0
- package/dist/entity/product-option/product-option.entity.js.map +1 -1
- package/dist/entity/product-option-group/product-option-group-translation.entity.js +1 -0
- package/dist/entity/product-option-group/product-option-group-translation.entity.js.map +1 -1
- package/dist/entity/product-option-group/product-option-group.entity.js +1 -0
- package/dist/entity/product-option-group/product-option-group.entity.js.map +1 -1
- package/dist/entity/product-variant/product-variant-price.entity.js +1 -0
- package/dist/entity/product-variant/product-variant-price.entity.js.map +1 -1
- package/dist/entity/product-variant/product-variant-translation.entity.js +1 -0
- package/dist/entity/product-variant/product-variant-translation.entity.js.map +1 -1
- package/dist/entity/product-variant/product-variant.entity.js +3 -0
- package/dist/entity/product-variant/product-variant.entity.js.map +1 -1
- package/dist/entity/refund/refund.entity.js +1 -0
- package/dist/entity/refund/refund.entity.js.map +1 -1
- package/dist/entity/register-custom-entity-fields.js +17 -2
- package/dist/entity/register-custom-entity-fields.js.map +1 -1
- package/dist/entity/run-entity-metadata-modifiers.d.ts +2 -0
- package/dist/entity/run-entity-metadata-modifiers.js +15 -0
- package/dist/entity/run-entity-metadata-modifiers.js.map +1 -0
- package/dist/entity/session/authenticated-session.entity.js +1 -0
- package/dist/entity/session/authenticated-session.entity.js.map +1 -1
- package/dist/entity/session/session.entity.js +2 -0
- package/dist/entity/session/session.entity.js.map +1 -1
- package/dist/entity/shipping-line/shipping-line.entity.js +2 -0
- package/dist/entity/shipping-line/shipping-line.entity.js.map +1 -1
- package/dist/entity/shipping-method/shipping-method-translation.entity.js +1 -0
- package/dist/entity/shipping-method/shipping-method-translation.entity.js.map +1 -1
- package/dist/entity/shipping-method/shipping-method.entity.js +2 -2
- package/dist/entity/shipping-method/shipping-method.entity.js.map +1 -1
- package/dist/entity/stock-movement/allocation.entity.js +1 -0
- package/dist/entity/stock-movement/allocation.entity.js.map +1 -1
- package/dist/entity/stock-movement/cancellation.entity.js.map +1 -1
- package/dist/entity/stock-movement/release.entity.js +1 -0
- package/dist/entity/stock-movement/release.entity.js.map +1 -1
- package/dist/entity/stock-movement/sale.entity.js.map +1 -1
- package/dist/entity/stock-movement/stock-movement.entity.js +1 -0
- package/dist/entity/stock-movement/stock-movement.entity.js.map +1 -1
- package/dist/entity/surcharge/surcharge.entity.js +2 -0
- package/dist/entity/surcharge/surcharge.entity.js.map +1 -1
- package/dist/entity/tax-rate/tax-rate.entity.js +3 -0
- package/dist/entity/tax-rate/tax-rate.entity.js.map +1 -1
- package/dist/event-bus/event-bus.js +24 -4
- 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/events/role-event.d.ts +1 -1
- package/dist/event-bus/events/role-event.js +1 -1
- package/dist/event-bus/events/search-event.d.ts +20 -0
- package/dist/event-bus/events/search-event.js +21 -0
- package/dist/event-bus/events/search-event.js.map +1 -0
- package/dist/event-bus/index.d.ts +2 -0
- package/dist/event-bus/index.js +2 -0
- package/dist/event-bus/index.js.map +1 -1
- package/dist/health-check/health-check-registry.service.d.ts +7 -1
- package/dist/health-check/health-check-registry.service.js +7 -1
- package/dist/health-check/health-check-registry.service.js.map +1 -1
- package/dist/health-check/health-check.module.d.ts +1 -3
- package/dist/health-check/health-check.module.js +6 -5
- package/dist/health-check/health-check.module.js.map +1 -1
- package/dist/health-check/http-health-check-strategy.d.ts +36 -0
- package/dist/health-check/http-health-check-strategy.js +41 -0
- package/dist/health-check/http-health-check-strategy.js.map +1 -0
- package/dist/health-check/index.d.ts +2 -0
- package/dist/health-check/index.js +2 -0
- package/dist/health-check/index.js.map +1 -1
- package/dist/health-check/typeorm-health-check-strategy.d.ts +36 -0
- package/dist/health-check/typeorm-health-check-strategy.js +44 -0
- package/dist/health-check/typeorm-health-check-strategy.js.map +1 -0
- package/dist/i18n/messages/en.json +3 -0
- package/dist/job-queue/subscribable-job.d.ts +23 -6
- package/dist/job-queue/subscribable-job.js +4 -4
- package/dist/job-queue/subscribable-job.js.map +1 -1
- package/dist/migrate.js +14 -0
- package/dist/migrate.js.map +1 -1
- package/dist/plugin/default-job-queue-plugin/sql-job-buffer-storage-strategy.js +5 -3
- package/dist/plugin/default-job-queue-plugin/sql-job-buffer-storage-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/default-search-plugin.d.ts +9 -3
- package/dist/plugin/default-search-plugin/default-search-plugin.js +25 -2
- package/dist/plugin/default-search-plugin/default-search-plugin.js.map +1 -1
- package/dist/plugin/default-search-plugin/fulltext-search.service.d.ts +3 -1
- package/dist/plugin/default-search-plugin/fulltext-search.service.js +29 -19
- package/dist/plugin/default-search-plugin/fulltext-search.service.js.map +1 -1
- package/dist/plugin/default-search-plugin/indexer/indexer.controller.js +31 -25
- package/dist/plugin/default-search-plugin/indexer/indexer.controller.js.map +1 -1
- package/dist/plugin/default-search-plugin/indexer/search-index.service.js +1 -1
- package/dist/plugin/default-search-plugin/indexer/search-index.service.js.map +1 -1
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.d.ts +4 -4
- package/dist/plugin/default-search-plugin/search-strategy/mysql-search-strategy.js +46 -42
- 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.d.ts +4 -4
- package/dist/plugin/default-search-plugin/search-strategy/postgres-search-strategy.js +23 -19
- 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/search-strategy.d.ts +2 -1
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.d.ts +4 -4
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js +41 -37
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/types.d.ts +85 -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/external-authentication/external-authentication.service.js +1 -1
- package/dist/service/helpers/external-authentication/external-authentication.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 +50 -6
- package/dist/service/helpers/list-query-builder/list-query-builder.js +167 -28
- package/dist/service/helpers/list-query-builder/list-query-builder.js.map +1 -1
- package/dist/service/helpers/list-query-builder/parse-channel-param.d.ts +1 -1
- package/dist/service/helpers/list-query-builder/parse-channel-param.js +2 -2
- package/dist/service/helpers/list-query-builder/parse-channel-param.js.map +1 -1
- package/dist/service/helpers/list-query-builder/parse-filter-params.d.ts +1 -1
- package/dist/service/helpers/list-query-builder/parse-filter-params.js +3 -2
- package/dist/service/helpers/list-query-builder/parse-filter-params.js.map +1 -1
- package/dist/service/helpers/list-query-builder/parse-sort-params.d.ts +2 -1
- package/dist/service/helpers/list-query-builder/parse-sort-params.js +12 -4
- package/dist/service/helpers/list-query-builder/parse-sort-params.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 +22 -4
- package/dist/service/helpers/order-calculator/order-calculator.js.map +1 -1
- package/dist/service/helpers/order-calculator/prorate.js +1 -1
- package/dist/service/helpers/order-calculator/prorate.js.map +1 -1
- package/dist/service/helpers/order-modifier/order-modifier.d.ts +26 -1
- package/dist/service/helpers/order-modifier/order-modifier.js +147 -19
- 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 +26 -7
- 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/order-utils.js +1 -1
- package/dist/service/helpers/utils/order-utils.js.map +1 -1
- package/dist/service/helpers/utils/translate-entity.d.ts +3 -3
- package/dist/service/helpers/utils/translate-entity.js +12 -4
- package/dist/service/helpers/utils/translate-entity.js.map +1 -1
- package/dist/service/index.d.ts +2 -0
- package/dist/service/index.js +2 -0
- package/dist/service/index.js.map +1 -1
- package/dist/service/initializer.service.d.ts +3 -1
- package/dist/service/initializer.service.js +8 -3
- 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/administrator.service.d.ts +4 -3
- package/dist/service/services/administrator.service.js +16 -13
- package/dist/service/services/administrator.service.js.map +1 -1
- package/dist/service/services/asset.service.d.ts +5 -3
- package/dist/service/services/asset.service.js +25 -8
- package/dist/service/services/asset.service.js.map +1 -1
- package/dist/service/services/channel.service.d.ts +2 -1
- package/dist/service/services/channel.service.js +29 -18
- package/dist/service/services/channel.service.js.map +1 -1
- package/dist/service/services/collection.service.d.ts +11 -6
- package/dist/service/services/collection.service.js +63 -29
- package/dist/service/services/collection.service.js.map +1 -1
- package/dist/service/services/country.service.d.ts +6 -3
- package/dist/service/services/country.service.js +13 -11
- package/dist/service/services/country.service.js.map +1 -1
- package/dist/service/services/customer-group.service.d.ts +6 -3
- package/dist/service/services/customer-group.service.js +12 -7
- package/dist/service/services/customer-group.service.js.map +1 -1
- package/dist/service/services/customer.service.d.ts +6 -3
- package/dist/service/services/customer.service.js +12 -10
- package/dist/service/services/customer.service.js.map +1 -1
- package/dist/service/services/facet-value.service.d.ts +7 -1
- package/dist/service/services/facet-value.service.js +17 -9
- package/dist/service/services/facet-value.service.js.map +1 -1
- package/dist/service/services/facet.service.d.ts +10 -3
- package/dist/service/services/facet.service.js +31 -15
- 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/global-settings.service.js +5 -3
- package/dist/service/services/global-settings.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 +40 -9
- package/dist/service/services/order.service.js +194 -95
- package/dist/service/services/order.service.js.map +1 -1
- package/dist/service/services/payment-method.service.d.ts +6 -3
- package/dist/service/services/payment-method.service.js +15 -8
- package/dist/service/services/payment-method.service.js.map +1 -1
- package/dist/service/services/payment.service.d.ts +2 -0
- package/dist/service/services/payment.service.js +34 -14
- package/dist/service/services/payment.service.js.map +1 -1
- package/dist/service/services/product-option-group.service.d.ts +27 -4
- package/dist/service/services/product-option-group.service.js +96 -10
- 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 +14 -4
- package/dist/service/services/product-variant.service.js +68 -50
- package/dist/service/services/product-variant.service.js.map +1 -1
- package/dist/service/services/product.service.d.ts +10 -5
- package/dist/service/services/product.service.js +72 -27
- package/dist/service/services/product.service.js.map +1 -1
- package/dist/service/services/promotion.service.d.ts +3 -2
- package/dist/service/services/promotion.service.js +12 -7
- package/dist/service/services/promotion.service.js.map +1 -1
- package/dist/service/services/role.service.d.ts +5 -4
- package/dist/service/services/role.service.js +16 -13
- package/dist/service/services/role.service.js.map +1 -1
- package/dist/service/services/session.service.js +7 -7
- package/dist/service/services/session.service.js.map +1 -1
- package/dist/service/services/shipping-method.service.d.ts +6 -3
- package/dist/service/services/shipping-method.service.js +14 -12
- 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/tax-rate.service.d.ts +3 -2
- package/dist/service/services/tax-rate.service.js +4 -4
- package/dist/service/services/tax-rate.service.js.map +1 -1
- package/dist/service/services/user.service.d.ts +1 -1
- package/dist/service/services/user.service.js +15 -1
- package/dist/service/services/user.service.js.map +1 -1
- package/dist/service/services/zone.service.d.ts +5 -3
- package/dist/service/services/zone.service.js +10 -8
- package/dist/service/services/zone.service.js.map +1 -1
- package/package.json +5 -4
|
@@ -99,7 +99,7 @@ let SessionService = class SessionService {
|
|
|
99
99
|
invalidated: false,
|
|
100
100
|
});
|
|
101
101
|
// save the new session
|
|
102
|
-
const newSession = await this.connection.getRepository(anonymous_session_entity_1.AnonymousSession).save(session);
|
|
102
|
+
const newSession = await this.connection.rawConnection.getRepository(anonymous_session_entity_1.AnonymousSession).save(session);
|
|
103
103
|
const serializedSession = this.serializeSession(newSession);
|
|
104
104
|
await this.sessionCacheStrategy.set(serializedSession);
|
|
105
105
|
return serializedSession;
|
|
@@ -155,7 +155,7 @@ let SessionService = class SessionService {
|
|
|
155
155
|
* Looks for a valid session with the given token and returns one if found.
|
|
156
156
|
*/
|
|
157
157
|
async findSessionByToken(token) {
|
|
158
|
-
const session = await this.connection
|
|
158
|
+
const session = await this.connection.rawConnection
|
|
159
159
|
.getRepository(session_entity_1.Session)
|
|
160
160
|
.createQueryBuilder('session')
|
|
161
161
|
.leftJoinAndSelect('session.user', 'user')
|
|
@@ -175,7 +175,7 @@ let SessionService = class SessionService {
|
|
|
175
175
|
*/
|
|
176
176
|
async setActiveOrder(ctx, serializedSession, order) {
|
|
177
177
|
const session = await this.connection
|
|
178
|
-
.getRepository(session_entity_1.Session)
|
|
178
|
+
.getRepository(ctx, session_entity_1.Session)
|
|
179
179
|
.findOne(serializedSession.id, { relations: ['user', 'user.roles', 'user.roles.channels'] });
|
|
180
180
|
if (session) {
|
|
181
181
|
session.activeOrder = order;
|
|
@@ -193,7 +193,7 @@ let SessionService = class SessionService {
|
|
|
193
193
|
async unsetActiveOrder(ctx, serializedSession) {
|
|
194
194
|
if (serializedSession.activeOrderId) {
|
|
195
195
|
const session = await this.connection
|
|
196
|
-
.getRepository(session_entity_1.Session)
|
|
196
|
+
.getRepository(ctx, session_entity_1.Session)
|
|
197
197
|
.findOne(serializedSession.id, { relations: ['user', 'user.roles', 'user.roles.channels'] });
|
|
198
198
|
if (session) {
|
|
199
199
|
session.activeOrder = null;
|
|
@@ -210,12 +210,12 @@ let SessionService = class SessionService {
|
|
|
210
210
|
* Sets the `activeChannel` on the given cached session object and updates the cache.
|
|
211
211
|
*/
|
|
212
212
|
async setActiveChannel(serializedSession, channel) {
|
|
213
|
-
const session = await this.connection
|
|
213
|
+
const session = await this.connection.rawConnection
|
|
214
214
|
.getRepository(session_entity_1.Session)
|
|
215
215
|
.findOne(serializedSession.id, { relations: ['user', 'user.roles', 'user.roles.channels'] });
|
|
216
216
|
if (session) {
|
|
217
217
|
session.activeChannel = channel;
|
|
218
|
-
await this.connection.getRepository(session_entity_1.Session).save(session, { reload: false });
|
|
218
|
+
await this.connection.rawConnection.getRepository(session_entity_1.Session).save(session, { reload: false });
|
|
219
219
|
const updatedSerializedSession = this.serializeSession(session);
|
|
220
220
|
await this.sessionCacheStrategy.set(updatedSerializedSession);
|
|
221
221
|
return updatedSerializedSession;
|
|
@@ -257,7 +257,7 @@ let SessionService = class SessionService {
|
|
|
257
257
|
if (session.expires.getTime() - now < this.sessionDurationInMs / 2) {
|
|
258
258
|
const newExpiryDate = this.getExpiryDate(this.sessionDurationInMs);
|
|
259
259
|
session.expires = newExpiryDate;
|
|
260
|
-
await this.connection
|
|
260
|
+
await this.connection.rawConnection
|
|
261
261
|
.getRepository(session_entity_1.Session)
|
|
262
262
|
.update({ id: session.id }, { expires: newExpiryDate });
|
|
263
263
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../../src/service/services/session.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../../src/service/services/session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAE5C,oDAA4B;AAC5B,4CAAoB;AAIpB,gEAA4D;AAE5D,wFAAoF;AACpF,wEAA8D;AAE9D,+DAAqD;AACrD,4FAAiF;AACjF,oGAAyF;AACzF,wEAA8D;AAE9D,kGAA4F;AAE5F,mDAA+C;AAE/C;;;;;GAKG;AAEH,IAAa,cAAc,GAA3B,MAAa,cAAc;IAIvB,YACY,UAAmC,EACnC,aAA4B,EAC5B,YAA0B;QAF1B,eAAU,GAAV,UAAU,CAAyB;QACnC,kBAAa,GAAb,aAAa,CAAe;QAC5B,iBAAY,GAAZ,YAAY,CAAc;QAElC,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,oBAAoB,CAAC;QAChF,IAAI,CAAC,mBAAmB,GAAG,IAAA,YAAE,EAAC,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,eAAyB,CAAC,CAAC;QACxF,oFAAoF;QACpF,6FAA6F;QAC7F,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,gBAAgB;IAChB,WAAW,CAAC,KAAuB;QAC/B,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,gBAAgB;IAChB,WAAW,CAAC,KAAuB;QAC/B,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAED,gBAAgB;IAChB,WAAW,CAAC,KAAuB;QAC/B,IAAI,CAAC,6BAA6B,CAAC,KAAK,CAAC,CAAC;IAC9C,CAAC;IAEO,KAAK,CAAC,6BAA6B,CACvC,KAA6D;QAE7D,IAAI,KAAK,CAAC,MAAM,EAAE;YACd,8EAA8E;YAC9E,oFAAoF;YACpF,iFAAiF;YACjF,IAAI,KAAK,CAAC,MAAM,YAAY,wBAAO,IAAI,KAAK,CAAC,MAAM,YAAY,kBAAI,EAAE;gBACjE,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAAE,CAAC;aAC3C;SACJ;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,6BAA6B,CAC/B,GAAmB,EACnB,IAAU,EACV,0BAAkC;QAElC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAChD,MAAM,UAAU,GACZ,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,aAAa;YACpC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;YACjE,CAAC,CAAC,SAAS,CAAC;QACpB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QAClF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;QAC9F,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,mDAAoB,CAAC,CAAC,IAAI,CAC5F,IAAI,mDAAoB,CAAC;YACrB,KAAK;YACL,IAAI;YACJ,WAAW;YACX,sBAAsB,EAAE,0BAA0B;YAClD,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC;YACrD,WAAW,EAAE,KAAK;SACrB,CAAC,CACL,CAAC;QACF,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACjF,OAAO,oBAAoB,CAAC;IAChC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,sBAAsB;QACxB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAChD,MAAM,OAAO,GAAG,IAAI,2CAAgB,CAAC;YACjC,KAAK;YACL,OAAO,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC;YACrD,WAAW,EAAE,KAAK;SACrB,CAAC,CAAC;QACH,uBAAuB;QACvB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,2CAAgB,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACrG,MAAM,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAC5D,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACvD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,mBAAmB,CAAC,YAAoB;QAC1C,IAAI,iBAAiB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC1E,MAAM,KAAK,GAAG,CAAC,CAAC,CAAC,iBAAiB,IAAI,iBAAiB,CAAC,WAAW,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACnG,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,iBAAiB,IAAI,iBAAiB,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,CAAC;QAChF,IAAI,CAAC,iBAAiB,IAAI,KAAK,IAAI,OAAO,EAAE;YACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,YAAY,CAAC,CAAC;YAC5D,IAAI,OAAO,EAAE;gBACT,iBAAiB,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;gBACnD,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;gBACvD,OAAO,iBAAiB,CAAC;aAC5B;iBAAM;gBACH,OAAO;aACV;SACJ;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACH,gBAAgB,CAAC,OAAgD;QAC7D,MAAM,MAAM,GACR,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,eAAe,CAAC;QAC7F,MAAM,iBAAiB,GAAkB;YACrC,WAAW,EAAE,MAAM;YACnB,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,aAAa,EAAE,OAAO,CAAC,aAAa;YACpC,eAAe,EAAE,OAAO,CAAC,eAAe;SAC3C,CAAC;QACF,IAAI,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAAE;YACtC,iBAAiB,CAAC,sBAAsB,GAAG,OAAO,CAAC,sBAAsB,CAAC;YAC1E,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;YACzB,iBAAiB,CAAC,IAAI,GAAG;gBACrB,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;gBACvB,kBAAkB,EAAE,IAAA,0DAA0B,EAAC,IAAI,CAAC;aACvD,CAAC;SACL;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,kBAAkB,CAAC,KAAa;QAC1C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa;aAC9C,aAAa,CAAC,wBAAO,CAAC;aACtB,kBAAkB,CAAC,SAAS,CAAC;aAC7B,iBAAiB,CAAC,cAAc,EAAE,MAAM,CAAC;aACzC,iBAAiB,CAAC,YAAY,EAAE,OAAO,CAAC;aACxC,iBAAiB,CAAC,gBAAgB,EAAE,UAAU,CAAC;aAC/C,KAAK,CAAC,wBAAwB,EAAE,EAAE,KAAK,EAAE,CAAC;aAC1C,QAAQ,CAAC,6BAA6B,CAAC;aACvC,MAAM,EAAE,CAAC;QAEd,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,GAAG,IAAI,IAAI,EAAE,EAAE;YACzC,MAAM,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YACxC,OAAO,OAAO,CAAC;SAClB;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,cAAc,CAChB,GAAmB,EACnB,iBAAgC,EAChC,KAAY;QAEZ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;aAChC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC;aAC3B,OAAO,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,qBAAqB,CAAC,EAAE,CAAC,CAAC;QACjG,IAAI,OAAO,EAAE;YACT,OAAO,CAAC,WAAW,GAAG,KAAK,CAAC;YAC5B,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YACnF,MAAM,wBAAwB,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAChE,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YAC9D,OAAO,wBAAwB,CAAC;SACnC;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,gBAAgB,CAAC,GAAmB,EAAE,iBAAgC;QACxE,IAAI,iBAAiB,CAAC,aAAa,EAAE;YACjC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;iBAChC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC;iBAC3B,OAAO,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,qBAAqB,CAAC,EAAE,CAAC,CAAC;YACjG,IAAI,OAAO,EAAE;gBACT,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;gBAC3B,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAChE,MAAM,wBAAwB,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;gBAChE,MAAM,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,oBAAoB,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;gBACxF,OAAO,wBAAwB,CAAC;aACnC;SACJ;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,gBAAgB,CAAC,iBAAgC,EAAE,OAAgB;QACrE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa;aAC9C,aAAa,CAAC,wBAAO,CAAC;aACtB,OAAO,CAAC,iBAAiB,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,MAAM,EAAE,YAAY,EAAE,qBAAqB,CAAC,EAAE,CAAC,CAAC;QACjG,IAAI,OAAO,EAAE;YACT,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC;YAChC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,aAAa,CAAC,wBAAO,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YAC5F,MAAM,wBAAwB,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAChE,MAAM,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;YAC9D,OAAO,wBAAwB,CAAC;SACnC;QACD,OAAO,iBAAiB,CAAC;IAC7B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,oBAAoB,CAAC,GAAmB,EAAE,IAAU;QACtD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,UAAU;aACrC,aAAa,CAAC,GAAG,EAAE,mDAAoB,CAAC;aACxC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QAC/B,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,mDAAoB,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACpF,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE;YAChC,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACzD;IACL,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,6BAA6B,CAAC,GAAmB,EAAE,aAAiB;QACtE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,CAAC,CAAC;QACtG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,GAAG,EAAE,wBAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACnE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC5B,MAAM,IAAI,CAAC,oBAAoB,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;SACzD;IACL,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,mBAAmB,CAAC,OAAgB;QAC9C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QACjC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,GAAG,GAAG,IAAI,CAAC,mBAAmB,GAAG,CAAC,EAAE;YAChE,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACnE,OAAO,CAAC,OAAO,GAAG,aAAa,CAAC;YAChC,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa;iBAC9B,aAAa,CAAC,wBAAO,CAAC;iBACtB,MAAM,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;SAC/D;IACL,CAAC;IAED;;OAEG;IACK,aAAa,CAAC,gBAAwB;QAC1C,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,gBAAgB,CAAC,CAAC;IACnD,CAAC;IAED;;OAEG;IACK,oBAAoB;QACxB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACnC,gBAAM,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBAChC,IAAI,GAAG,EAAE;oBACL,MAAM,CAAC,GAAG,CAAC,CAAC;iBACf;gBACD,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;YACjC,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,sBAAsB,CAAC,OAAgB;QAC3C,OAAO,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;CACJ,CAAA;AAjSY,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAMe,kDAAuB;QACpB,8BAAa;QACd,4BAAY;GAP7B,cAAc,CAiS1B;AAjSY,wCAAc"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ConfigurableOperationDefinition, CreateShippingMethodInput, DeletionResponse, UpdateShippingMethodInput } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { RequestContext } from '../../api/common/request-context';
|
|
4
|
+
import { RelationPaths } from '../../api/index';
|
|
4
5
|
import { ListQueryOptions } from '../../common/types/common-types';
|
|
5
6
|
import { ConfigService } from '../../config/config.service';
|
|
6
7
|
import { TransactionalConnection } from '../../connection/transactional-connection';
|
|
@@ -10,6 +11,7 @@ import { ConfigArgService } from '../helpers/config-arg/config-arg.service';
|
|
|
10
11
|
import { CustomFieldRelationService } from '../helpers/custom-field-relation/custom-field-relation.service';
|
|
11
12
|
import { ListQueryBuilder } from '../helpers/list-query-builder/list-query-builder';
|
|
12
13
|
import { TranslatableSaver } from '../helpers/translatable-saver/translatable-saver';
|
|
14
|
+
import { TranslatorService } from '../helpers/translator/translator.service';
|
|
13
15
|
import { ChannelService } from './channel.service';
|
|
14
16
|
/**
|
|
15
17
|
* @description
|
|
@@ -26,11 +28,12 @@ export declare class ShippingMethodService {
|
|
|
26
28
|
private translatableSaver;
|
|
27
29
|
private customFieldRelationService;
|
|
28
30
|
private eventBus;
|
|
29
|
-
|
|
31
|
+
private translator;
|
|
32
|
+
constructor(connection: TransactionalConnection, configService: ConfigService, listQueryBuilder: ListQueryBuilder, channelService: ChannelService, configArgService: ConfigArgService, translatableSaver: TranslatableSaver, customFieldRelationService: CustomFieldRelationService, eventBus: EventBus, translator: TranslatorService);
|
|
30
33
|
/** @internal */
|
|
31
34
|
initShippingMethods(): Promise<void>;
|
|
32
|
-
findAll(ctx: RequestContext, options?: ListQueryOptions<ShippingMethod>): Promise<PaginatedList<ShippingMethod>>;
|
|
33
|
-
findOne(ctx: RequestContext, shippingMethodId: ID, includeDeleted?: boolean): Promise<ShippingMethod | undefined>;
|
|
35
|
+
findAll(ctx: RequestContext, options?: ListQueryOptions<ShippingMethod>, relations?: RelationPaths<ShippingMethod>): Promise<PaginatedList<ShippingMethod>>;
|
|
36
|
+
findOne(ctx: RequestContext, shippingMethodId: ID, includeDeleted?: boolean, relations?: RelationPaths<ShippingMethod>): Promise<ShippingMethod | undefined>;
|
|
34
37
|
create(ctx: RequestContext, input: CreateShippingMethodInput): Promise<ShippingMethod>;
|
|
35
38
|
update(ctx: RequestContext, input: UpdateShippingMethodInput): Promise<ShippingMethod>;
|
|
36
39
|
softDelete(ctx: RequestContext, id: ID): Promise<DeletionResponse>;
|
|
@@ -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() {
|
|
@@ -52,23 +53,23 @@ let ShippingMethodService = class ShippingMethodService {
|
|
|
52
53
|
}
|
|
53
54
|
await this.verifyShippingMethods();
|
|
54
55
|
}
|
|
55
|
-
findAll(ctx, options) {
|
|
56
|
+
findAll(ctx, options, relations = []) {
|
|
56
57
|
return this.listQueryBuilder
|
|
57
58
|
.build(shipping_method_entity_1.ShippingMethod, options, {
|
|
58
|
-
relations
|
|
59
|
+
relations,
|
|
59
60
|
where: { deletedAt: null },
|
|
60
61
|
channelId: ctx.channelId,
|
|
61
62
|
ctx,
|
|
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
|
-
async findOne(ctx, shippingMethodId, includeDeleted = false) {
|
|
70
|
-
const shippingMethod = await this.connection.findOneInChannel(ctx, shipping_method_entity_1.ShippingMethod, shippingMethodId, ctx.channelId, Object.assign({ relations
|
|
71
|
-
return shippingMethod &&
|
|
70
|
+
async findOne(ctx, shippingMethodId, includeDeleted = false, relations = []) {
|
|
71
|
+
const shippingMethod = await this.connection.findOneInChannel(ctx, shipping_method_entity_1.ShippingMethod, shippingMethodId, ctx.channelId, Object.assign({ relations }, (includeDeleted === false ? { where: { deletedAt: null } } : {})));
|
|
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,13 +148,13 @@ let ShippingMethodService = class ShippingMethodService {
|
|
|
147
148
|
});
|
|
148
149
|
return shippingMethods
|
|
149
150
|
.filter(sm => sm.channels.find(c => (0, 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
|
|
154
155
|
*/
|
|
155
156
|
async verifyShippingMethods() {
|
|
156
|
-
const activeShippingMethods = await this.connection.getRepository(shipping_method_entity_1.ShippingMethod).find({
|
|
157
|
+
const activeShippingMethods = await this.connection.rawConnection.getRepository(shipping_method_entity_1.ShippingMethod).find({
|
|
157
158
|
where: { deletedAt: null },
|
|
158
159
|
});
|
|
159
160
|
for (const method of activeShippingMethods) {
|
|
@@ -161,7 +162,7 @@ let ShippingMethodService = class ShippingMethodService {
|
|
|
161
162
|
const verifiedHandlerCode = this.ensureValidFulfillmentHandlerCode(method.code, handlerCode);
|
|
162
163
|
if (handlerCode !== verifiedHandlerCode) {
|
|
163
164
|
method.fulfillmentHandlerCode = verifiedHandlerCode;
|
|
164
|
-
await this.connection.getRepository(shipping_method_entity_1.ShippingMethod).save(method);
|
|
165
|
+
await this.connection.rawConnection.getRepository(shipping_method_entity_1.ShippingMethod).save(method);
|
|
165
166
|
}
|
|
166
167
|
}
|
|
167
168
|
}
|
|
@@ -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;
|
|
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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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { CreateTaxRateInput, DeletionResponse, UpdateTaxRateInput } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { RequestContext } from '../../api/common/request-context';
|
|
4
|
+
import { RelationPaths } from '../../api/index';
|
|
4
5
|
import { RequestContextCacheService } from '../../cache';
|
|
5
6
|
import { ListQueryOptions } from '../../common/types/common-types';
|
|
6
7
|
import { TransactionalConnection } from '../../connection/transactional-connection';
|
|
@@ -22,8 +23,8 @@ export declare class TaxRateService {
|
|
|
22
23
|
private cacheService;
|
|
23
24
|
private readonly defaultTaxRate;
|
|
24
25
|
constructor(connection: TransactionalConnection, eventBus: EventBus, listQueryBuilder: ListQueryBuilder, cacheService: RequestContextCacheService);
|
|
25
|
-
findAll(ctx: RequestContext, options?: ListQueryOptions<TaxRate>): Promise<PaginatedList<TaxRate>>;
|
|
26
|
-
findOne(ctx: RequestContext, taxRateId: ID): Promise<TaxRate | undefined>;
|
|
26
|
+
findAll(ctx: RequestContext, options?: ListQueryOptions<TaxRate>, relations?: RelationPaths<TaxRate>): Promise<PaginatedList<TaxRate>>;
|
|
27
|
+
findOne(ctx: RequestContext, taxRateId: ID, relations?: RelationPaths<TaxRate>): Promise<TaxRate | undefined>;
|
|
27
28
|
create(ctx: RequestContext, input: CreateTaxRateInput): Promise<TaxRate>;
|
|
28
29
|
update(ctx: RequestContext, input: UpdateTaxRateInput): Promise<TaxRate>;
|
|
29
30
|
delete(ctx: RequestContext, id: ID): Promise<DeletionResponse>;
|
|
@@ -45,18 +45,18 @@ let TaxRateService = class TaxRateService {
|
|
|
45
45
|
id: '0',
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
|
-
findAll(ctx, options) {
|
|
48
|
+
findAll(ctx, options, relations) {
|
|
49
49
|
return this.listQueryBuilder
|
|
50
|
-
.build(tax_rate_entity_1.TaxRate, options, { relations: ['category', 'zone', 'customerGroup'], ctx })
|
|
50
|
+
.build(tax_rate_entity_1.TaxRate, options, { relations: relations !== null && relations !== void 0 ? relations : ['category', 'zone', 'customerGroup'], ctx })
|
|
51
51
|
.getManyAndCount()
|
|
52
52
|
.then(([items, totalItems]) => ({
|
|
53
53
|
items,
|
|
54
54
|
totalItems,
|
|
55
55
|
}));
|
|
56
56
|
}
|
|
57
|
-
findOne(ctx, taxRateId) {
|
|
57
|
+
findOne(ctx, taxRateId, relations) {
|
|
58
58
|
return this.connection.getRepository(ctx, tax_rate_entity_1.TaxRate).findOne(taxRateId, {
|
|
59
|
-
relations: ['category', 'zone', 'customerGroup'],
|
|
59
|
+
relations: relations !== null && relations !== void 0 ? relations : ['category', 'zone', 'customerGroup'],
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
62
|
async create(ctx, input) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tax-rate.service.js","sourceRoot":"","sources":["../../../src/service/services/tax-rate.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAmE;AACnE,yEAK6C;
|
|
1
|
+
{"version":3,"file":"tax-rate.service.js","sourceRoot":"","sources":["../../../src/service/services/tax-rate.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,6 +95,6 @@ export declare class UserService {
|
|
|
95
95
|
* @description
|
|
96
96
|
* Updates the password for a User with the {@link NativeAuthenticationMethod}.
|
|
97
97
|
*/
|
|
98
|
-
updatePassword(ctx: RequestContext, userId: ID, currentPassword: string, newPassword: string): Promise<boolean | InvalidCredentialsError>;
|
|
98
|
+
updatePassword(ctx: RequestContext, userId: ID, currentPassword: string, newPassword: string): Promise<boolean | InvalidCredentialsError | PasswordValidationError>;
|
|
99
99
|
private validatePassword;
|
|
100
100
|
}
|
|
@@ -56,7 +56,7 @@ let UserService = class UserService {
|
|
|
56
56
|
async createCustomerUser(ctx, identifier, password) {
|
|
57
57
|
const user = new user_entity_1.User();
|
|
58
58
|
user.identifier = identifier;
|
|
59
|
-
const customerRole = await this.roleService.getCustomerRole();
|
|
59
|
+
const customerRole = await this.roleService.getCustomerRole(ctx);
|
|
60
60
|
user.roles = [customerRole];
|
|
61
61
|
const addNativeAuthResult = await this.addNativeAuthenticationMethod(ctx, user, identifier, password);
|
|
62
62
|
if ((0, error_result_1.isGraphQlErrorResult)(addNativeAuthResult)) {
|
|
@@ -99,6 +99,7 @@ let UserService = class UserService {
|
|
|
99
99
|
authenticationMethod.passwordHash = '';
|
|
100
100
|
}
|
|
101
101
|
authenticationMethod.identifier = identifier;
|
|
102
|
+
authenticationMethod.user = user;
|
|
102
103
|
await this.connection.getRepository(ctx, native_authentication_method_entity_1.NativeAuthenticationMethod).save(authenticationMethod);
|
|
103
104
|
user.authenticationMethods = [...((_a = user.authenticationMethods) !== null && _a !== void 0 ? _a : []), authenticationMethod];
|
|
104
105
|
return user;
|
|
@@ -224,6 +225,14 @@ let UserService = class UserService {
|
|
|
224
225
|
nativeAuthMethod.passwordHash = await this.passwordCipher.hash(password);
|
|
225
226
|
nativeAuthMethod.passwordResetToken = null;
|
|
226
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
|
+
}
|
|
227
236
|
return this.connection.getRepository(ctx, user_entity_1.User).save(user);
|
|
228
237
|
}
|
|
229
238
|
else {
|
|
@@ -317,6 +326,11 @@ let UserService = class UserService {
|
|
|
317
326
|
if (!user) {
|
|
318
327
|
throw new errors_1.EntityNotFoundError('User', userId);
|
|
319
328
|
}
|
|
329
|
+
const password = newPassword;
|
|
330
|
+
const passwordValidationResult = await this.validatePassword(ctx, password);
|
|
331
|
+
if (passwordValidationResult !== true) {
|
|
332
|
+
return passwordValidationResult;
|
|
333
|
+
}
|
|
320
334
|
const nativeAuthMethod = user.getNativeAuthenticationMethod();
|
|
321
335
|
const matches = await this.passwordCipher.check(currentPassword, nativeAuthMethod.passwordHash);
|
|
322
336
|
if (!matches) {
|
|
@@ -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
|
/**
|
|
@@ -38,7 +40,7 @@ export declare class ZoneService {
|
|
|
38
40
|
removeMembersFromZone(ctx: RequestContext, { memberIds, zoneId }: MutationRemoveMembersFromZoneArgs): Promise<Zone>;
|
|
39
41
|
private getCountriesFromIds;
|
|
40
42
|
/**
|
|
41
|
-
|
|
42
|
-
|
|
43
|
+
* Ensures zones cache exists. If not, this method creates one.
|
|
44
|
+
*/
|
|
43
45
|
private ensureCacheExists;
|
|
44
46
|
}
|
|
@@ -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
|
});
|
|
@@ -164,8 +165,8 @@ let ZoneService = class ZoneService {
|
|
|
164
165
|
return this.connection.getRepository(ctx, country_entity_1.Country).findByIds(ids);
|
|
165
166
|
}
|
|
166
167
|
/**
|
|
167
|
-
|
|
168
|
-
|
|
168
|
+
* Ensures zones cache exists. If not, this method creates one.
|
|
169
|
+
*/
|
|
169
170
|
async ensureCacheExists() {
|
|
170
171
|
if (this.zones) {
|
|
171
172
|
return;
|
|
@@ -177,7 +178,8 @@ ZoneService = __decorate([
|
|
|
177
178
|
(0, 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
|