@vendure/core 1.5.2 → 1.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/common/configurable-operation-codec.js +2 -2
- package/dist/api/common/configurable-operation-codec.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/decorators/relations.decorator.d.ts +116 -0
- package/dist/api/decorators/relations.decorator.js +204 -0
- package/dist/api/decorators/relations.decorator.js.map +1 -0
- 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/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/collection.resolver.d.ts +5 -3
- package/dist/api/resolvers/admin/collection.resolver.js +24 -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 +6 -5
- package/dist/api/resolvers/admin/order.resolver.js +25 -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 +3 -2
- package/dist/api/resolvers/admin/product-option.resolver.js +8 -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/entity/collection-entity.resolver.d.ts +2 -1
- package/dist/api/resolvers/entity/collection-entity.resolver.js +6 -4
- package/dist/api/resolvers/entity/collection-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/order-line-entity.resolver.d.ts +2 -1
- package/dist/api/resolvers/entity/order-line-entity.resolver.js +6 -3
- package/dist/api/resolvers/entity/order-line-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/product-entity.resolver.d.ts +3 -2
- package/dist/api/resolvers/entity/product-entity.resolver.js +10 -6
- package/dist/api/resolvers/entity/product-entity.resolver.js.map +1 -1
- package/dist/api/resolvers/entity/product-option-group-entity.resolver.js +1 -1
- package/dist/api/resolvers/entity/product-option-group-entity.resolver.js.map +1 -1
- 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 +32 -21
- package/dist/api/resolvers/shop/shop-products.resolver.js.map +1 -1
- package/dist/api/schema/admin-api/collection.api.graphql +7 -0
- package/dist/bootstrap.js +2 -0
- 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/types/entity-relation-paths.d.ts +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.module.js +2 -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 +5 -0
- package/dist/config/default-config.js.map +1 -1
- 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/index.d.ts +3 -0
- package/dist/config/index.js +3 -0
- package/dist/config/index.js.map +1 -1
- package/dist/config/payment/dummy-payment-method-handler.js +2 -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 +7 -8
- package/dist/config/payment/payment-method-handler.js +6 -6
- package/dist/config/payment/payment-method-handler.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 +39 -0
- package/dist/connection/connection.module.d.ts +1 -1
- package/dist/connection/transactional-connection.js +5 -0
- package/dist/connection/transactional-connection.js.map +1 -1
- package/dist/data-import/providers/importer/importer.d.ts +3 -2
- package/dist/data-import/providers/importer/importer.js +2 -1
- package/dist/data-import/providers/importer/importer.js.map +1 -1
- package/dist/entity/order/order.entity.js +3 -2
- package/dist/entity/order/order.entity.js.map +1 -1
- package/dist/entity/order-line/order-line.entity.js +22 -22
- package/dist/entity/order-line/order-line.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/shipping-method/shipping-method.entity.js +2 -2
- package/dist/entity/shipping-method/shipping-method.entity.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 +1 -0
- package/dist/event-bus/index.js +1 -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/job-queue/subscribable-job.js +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/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 +7 -3
- 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 +7 -3
- 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.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 +7 -3
- package/dist/plugin/default-search-plugin/search-strategy/sqlite-search-strategy.js.map +1 -1
- package/dist/plugin/default-search-plugin/types.d.ts +84 -0
- package/dist/service/helpers/list-query-builder/list-query-builder.d.ts +39 -0
- package/dist/service/helpers/list-query-builder/list-query-builder.js +150 -19
- 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/order-modifier/order-modifier.js +2 -1
- 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/services/administrator.service.d.ts +4 -3
- package/dist/service/services/administrator.service.js +6 -5
- package/dist/service/services/administrator.service.js.map +1 -1
- package/dist/service/services/asset.service.d.ts +3 -2
- package/dist/service/services/asset.service.js +6 -4
- package/dist/service/services/asset.service.js.map +1 -1
- package/dist/service/services/collection.service.d.ts +8 -5
- package/dist/service/services/collection.service.js +42 -12
- package/dist/service/services/collection.service.js.map +1 -1
- package/dist/service/services/country.service.d.ts +3 -2
- package/dist/service/services/country.service.js +4 -4
- package/dist/service/services/country.service.js.map +1 -1
- package/dist/service/services/customer-group.service.d.ts +3 -2
- package/dist/service/services/customer-group.service.js +4 -4
- package/dist/service/services/customer-group.service.js.map +1 -1
- package/dist/service/services/customer.service.d.ts +3 -2
- package/dist/service/services/customer.service.js +3 -3
- package/dist/service/services/customer.service.js.map +1 -1
- package/dist/service/services/facet.service.d.ts +3 -2
- package/dist/service/services/facet.service.js +10 -6
- package/dist/service/services/facet.service.js.map +1 -1
- package/dist/service/services/order.service.d.ts +15 -8
- package/dist/service/services/order.service.js +57 -40
- 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.js +4 -4
- package/dist/service/services/payment.service.js.map +1 -1
- package/dist/service/services/product-option-group.service.d.ts +3 -2
- package/dist/service/services/product-option-group.service.js +4 -4
- package/dist/service/services/product-option-group.service.js.map +1 -1
- package/dist/service/services/product-variant.service.d.ts +10 -3
- package/dist/service/services/product-variant.service.js +38 -35
- package/dist/service/services/product-variant.service.js.map +1 -1
- package/dist/service/services/product.service.d.ts +5 -4
- package/dist/service/services/product.service.js +18 -8
- 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 +4 -3
- package/dist/service/services/promotion.service.js.map +1 -1
- package/dist/service/services/role.service.d.ts +3 -2
- package/dist/service/services/role.service.js +4 -4
- package/dist/service/services/role.service.js.map +1 -1
- package/dist/service/services/shipping-method.service.d.ts +3 -2
- package/dist/service/services/shipping-method.service.js +4 -4
- package/dist/service/services/shipping-method.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.js +1 -0
- package/dist/service/services/user.service.js.map +1 -1
- package/dist/service/services/zone.service.d.ts +2 -2
- package/dist/service/services/zone.service.js +2 -2
- package/dist/service/services/zone.service.js.map +1 -1
- package/package.json +5 -3
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ConfigArg } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { RequestContext } from '../../api/common/request-context';
|
|
3
3
|
import { ConfigArgs, ConfigArgValues, ConfigurableOperationDef, ConfigurableOperationDefOptions } from '../../common/configurable-operation';
|
|
4
|
-
import { Order } from '../../entity
|
|
4
|
+
import { PaymentMethod, Order } from '../../entity';
|
|
5
5
|
/**
|
|
6
6
|
* @description
|
|
7
7
|
* Configuration passed into the constructor of a {@link PaymentMethodEligibilityChecker} to
|
|
@@ -45,7 +45,7 @@ export declare class PaymentMethodEligibilityChecker<T extends ConfigArgs = Conf
|
|
|
45
45
|
*
|
|
46
46
|
* @internal
|
|
47
47
|
*/
|
|
48
|
-
check(ctx: RequestContext, order: Order, args: ConfigArg[]): Promise<boolean | string>;
|
|
48
|
+
check(ctx: RequestContext, order: Order, args: ConfigArg[], method: PaymentMethod): Promise<boolean | string>;
|
|
49
49
|
}
|
|
50
50
|
/**
|
|
51
51
|
* @description
|
|
@@ -57,4 +57,4 @@ export declare class PaymentMethodEligibilityChecker<T extends ConfigArgs = Conf
|
|
|
57
57
|
* @docsCategory payment
|
|
58
58
|
* @docsPage PaymentMethodEligibilityChecker
|
|
59
59
|
*/
|
|
60
|
-
export declare type CheckPaymentMethodEligibilityCheckerFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, args: ConfigArgValues<T
|
|
60
|
+
export declare type CheckPaymentMethodEligibilityCheckerFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, args: ConfigArgValues<T>, method: PaymentMethod) => boolean | string | Promise<boolean | string>;
|
|
@@ -36,8 +36,8 @@ class PaymentMethodEligibilityChecker extends configurable_operation_1.Configura
|
|
|
36
36
|
*
|
|
37
37
|
* @internal
|
|
38
38
|
*/
|
|
39
|
-
async check(ctx, order, args) {
|
|
40
|
-
return this.checkFn(ctx, order, this.argsArrayToHash(args));
|
|
39
|
+
async check(ctx, order, args, method) {
|
|
40
|
+
return this.checkFn(ctx, order, this.argsArrayToHash(args), method);
|
|
41
41
|
}
|
|
42
42
|
}
|
|
43
43
|
exports.PaymentMethodEligibilityChecker = PaymentMethodEligibilityChecker;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payment-method-eligibility-checker.js","sourceRoot":"","sources":["../../../src/config/payment/payment-method-eligibility-checker.ts"],"names":[],"mappings":";;;AAGA,gFAK6C;AAe7C;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAa,+BAEX,SAAQ,iDAA2B;IAGjC,YAAY,MAAgD;QACxD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC;IAChC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAK,CAAC,GAAmB,EAAE,KAAY,EAAE,IAAiB;
|
|
1
|
+
{"version":3,"file":"payment-method-eligibility-checker.js","sourceRoot":"","sources":["../../../src/config/payment/payment-method-eligibility-checker.ts"],"names":[],"mappings":";;;AAGA,gFAK6C;AAe7C;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAa,+BAEX,SAAQ,iDAA2B;IAGjC,YAAY,MAAgD;QACxD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC;IAChC,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAK,CAAC,GAAmB,EAAE,KAAY,EAAE,IAAiB,EAAE,MAAqB;QACnF,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;IACxE,CAAC;CACJ;AAnBD,0EAmBC"}
|
|
@@ -3,8 +3,7 @@ import { RequestContext } from '../../api/common/request-context';
|
|
|
3
3
|
import { ConfigArgs, ConfigArgValues, ConfigurableOperationDef, ConfigurableOperationDefOptions } from '../../common/configurable-operation';
|
|
4
4
|
import { OnTransitionStartFn, StateMachineConfig } from '../../common/finite-state-machine/types';
|
|
5
5
|
import { PaymentMetadata } from '../../common/types/common-types';
|
|
6
|
-
import { Order } from '../../entity
|
|
7
|
-
import { Payment } from '../../entity/payment/payment.entity';
|
|
6
|
+
import { Order, Payment, PaymentMethod } from '../../entity';
|
|
8
7
|
import { PaymentState, PaymentTransitionData } from '../../service/helpers/payment-state-machine/payment-state';
|
|
9
8
|
import { RefundState } from '../../service/helpers/refund-state-machine/refund-state';
|
|
10
9
|
export declare type OnPaymentTransitionStartReturnType = ReturnType<Required<StateMachineConfig<any>>['onTransitionStart']>;
|
|
@@ -134,7 +133,7 @@ export interface SettlePaymentErrorResult {
|
|
|
134
133
|
* @docsCategory payment
|
|
135
134
|
* @docsPage Payment Method Types
|
|
136
135
|
*/
|
|
137
|
-
export declare type CreatePaymentFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, amount: number, args: ConfigArgValues<T>, metadata: PaymentMetadata) => CreatePaymentResult | CreatePaymentErrorResult | Promise<CreatePaymentResult | CreatePaymentErrorResult>;
|
|
136
|
+
export declare type CreatePaymentFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, amount: number, args: ConfigArgValues<T>, metadata: PaymentMetadata, method: PaymentMethod) => CreatePaymentResult | CreatePaymentErrorResult | Promise<CreatePaymentResult | CreatePaymentErrorResult>;
|
|
138
137
|
/**
|
|
139
138
|
* @description
|
|
140
139
|
* This function contains the logic for settling a payment. See {@link PaymentMethodHandler} for an example.
|
|
@@ -142,7 +141,7 @@ export declare type CreatePaymentFn<T extends ConfigArgs> = (ctx: RequestContext
|
|
|
142
141
|
* @docsCategory payment
|
|
143
142
|
* @docsPage Payment Method Types
|
|
144
143
|
*/
|
|
145
|
-
export declare type SettlePaymentFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, payment: Payment, args: ConfigArgValues<T
|
|
144
|
+
export declare type SettlePaymentFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, payment: Payment, args: ConfigArgValues<T>, method: PaymentMethod) => SettlePaymentResult | SettlePaymentErrorResult | Promise<SettlePaymentResult | SettlePaymentErrorResult>;
|
|
146
145
|
/**
|
|
147
146
|
* @description
|
|
148
147
|
* This function contains the logic for creating a refund. See {@link PaymentMethodHandler} for an example.
|
|
@@ -150,7 +149,7 @@ export declare type SettlePaymentFn<T extends ConfigArgs> = (ctx: RequestContext
|
|
|
150
149
|
* @docsCategory payment
|
|
151
150
|
* @docsPage Payment Method Types
|
|
152
151
|
*/
|
|
153
|
-
export declare type CreateRefundFn<T extends ConfigArgs> = (ctx: RequestContext, input: RefundOrderInput, amount: number, order: Order, payment: Payment, args: ConfigArgValues<T
|
|
152
|
+
export declare type CreateRefundFn<T extends ConfigArgs> = (ctx: RequestContext, input: RefundOrderInput, amount: number, order: Order, payment: Payment, args: ConfigArgValues<T>, method: PaymentMethod) => CreateRefundResult | Promise<CreateRefundResult>;
|
|
154
153
|
/**
|
|
155
154
|
* @description
|
|
156
155
|
* Defines the object which is used to construct the {@link PaymentMethodHandler}.
|
|
@@ -256,7 +255,7 @@ export declare class PaymentMethodHandler<T extends ConfigArgs = ConfigArgs> ext
|
|
|
256
255
|
*
|
|
257
256
|
* @internal
|
|
258
257
|
*/
|
|
259
|
-
createPayment(ctx: RequestContext, order: Order, amount: number, args: ConfigArg[], metadata: PaymentMetadata): Promise<{
|
|
258
|
+
createPayment(ctx: RequestContext, order: Order, amount: number, args: ConfigArg[], metadata: PaymentMetadata, method: PaymentMethod): Promise<{
|
|
260
259
|
/**
|
|
261
260
|
* @description
|
|
262
261
|
* The amount (as an integer - i.e. $10 = `1000`) that this payment is for.
|
|
@@ -304,14 +303,14 @@ export declare class PaymentMethodHandler<T extends ConfigArgs = ConfigArgs> ext
|
|
|
304
303
|
*
|
|
305
304
|
* @internal
|
|
306
305
|
*/
|
|
307
|
-
settlePayment(ctx: RequestContext, order: Order, payment: Payment, args: ConfigArg[]): Promise<SettlePaymentResult | SettlePaymentErrorResult>;
|
|
306
|
+
settlePayment(ctx: RequestContext, order: Order, payment: Payment, args: ConfigArg[], method: PaymentMethod): Promise<SettlePaymentResult | SettlePaymentErrorResult>;
|
|
308
307
|
/**
|
|
309
308
|
* @description
|
|
310
309
|
* Called internally to create a refund
|
|
311
310
|
*
|
|
312
311
|
* @internal
|
|
313
312
|
*/
|
|
314
|
-
createRefund(ctx: RequestContext, input: RefundOrderInput, amount: number, order: Order, payment: Payment, args: ConfigArg[]): Promise<false | CreateRefundResult>;
|
|
313
|
+
createRefund(ctx: RequestContext, input: RefundOrderInput, amount: number, order: Order, payment: Payment, args: ConfigArg[], method: PaymentMethod): Promise<false | CreateRefundResult>;
|
|
315
314
|
/**
|
|
316
315
|
* @description
|
|
317
316
|
* This function is called before the state of a Payment is transitioned. If the PaymentMethodHandler
|
|
@@ -73,8 +73,8 @@ class PaymentMethodHandler extends configurable_operation_1.ConfigurableOperatio
|
|
|
73
73
|
*
|
|
74
74
|
* @internal
|
|
75
75
|
*/
|
|
76
|
-
async createPayment(ctx, order, amount, args, metadata) {
|
|
77
|
-
const paymentConfig = await this.createPaymentFn(ctx, order, amount, this.argsArrayToHash(args), metadata);
|
|
76
|
+
async createPayment(ctx, order, amount, args, metadata, method) {
|
|
77
|
+
const paymentConfig = await this.createPaymentFn(ctx, order, amount, this.argsArrayToHash(args), metadata, method);
|
|
78
78
|
return Object.assign({ method: this.code, metadata: {} }, paymentConfig);
|
|
79
79
|
}
|
|
80
80
|
/**
|
|
@@ -83,8 +83,8 @@ class PaymentMethodHandler extends configurable_operation_1.ConfigurableOperatio
|
|
|
83
83
|
*
|
|
84
84
|
* @internal
|
|
85
85
|
*/
|
|
86
|
-
async settlePayment(ctx, order, payment, args) {
|
|
87
|
-
return this.settlePaymentFn(ctx, order, payment, this.argsArrayToHash(args));
|
|
86
|
+
async settlePayment(ctx, order, payment, args, method) {
|
|
87
|
+
return this.settlePaymentFn(ctx, order, payment, this.argsArrayToHash(args), method);
|
|
88
88
|
}
|
|
89
89
|
/**
|
|
90
90
|
* @description
|
|
@@ -92,9 +92,9 @@ class PaymentMethodHandler extends configurable_operation_1.ConfigurableOperatio
|
|
|
92
92
|
*
|
|
93
93
|
* @internal
|
|
94
94
|
*/
|
|
95
|
-
async createRefund(ctx, input, amount, order, payment, args) {
|
|
95
|
+
async createRefund(ctx, input, amount, order, payment, args, method) {
|
|
96
96
|
return this.createRefundFn
|
|
97
|
-
? this.createRefundFn(ctx, input, amount, order, payment, this.argsArrayToHash(args))
|
|
97
|
+
? this.createRefundFn(ctx, input, amount, order, payment, this.argsArrayToHash(args), method)
|
|
98
98
|
: false;
|
|
99
99
|
}
|
|
100
100
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"payment-method-handler.js","sourceRoot":"","sources":["../../../src/config/payment/payment-method-handler.ts"],"names":[],"mappings":";;;AAGA,gFAK6C;
|
|
1
|
+
{"version":3,"file":"payment-method-handler.js","sourceRoot":"","sources":["../../../src/config/payment/payment-method-handler.ts"],"names":[],"mappings":";;;AAGA,gFAK6C;AAgO7C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AACH,MAAa,oBAAwD,SAAQ,iDAA2B;IAMpG,YAAY,MAAqC;QAC7C,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,aAAa,CAAC;QAC5C,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,aAAa,CAAC;QAC5C,IAAI,CAAC,eAAe,GAAG,MAAM,CAAC,aAAa,CAAC;QAC5C,IAAI,CAAC,cAAc,GAAG,MAAM,CAAC,YAAY,CAAC;QAC1C,IAAI,CAAC,mBAAmB,GAAG,MAAM,CAAC,sBAAsB,CAAC;IAC7D,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,aAAa,CACf,GAAmB,EACnB,KAAY,EACZ,MAAc,EACd,IAAiB,EACjB,QAAyB,EACzB,MAAqB;QAErB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,eAAe,CAC5C,GAAG,EACH,KAAK,EACL,MAAM,EACN,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAC1B,QAAQ,EACR,MAAM,CACT,CAAC;QACF,uBACI,MAAM,EAAE,IAAI,CAAC,IAAI,EACjB,QAAQ,EAAE,EAAE,IACT,aAAa,EAClB;IACN,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,aAAa,CACf,GAAmB,EACnB,KAAY,EACZ,OAAgB,EAChB,IAAiB,EACjB,MAAqB;QAErB,OAAO,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;IACzF,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,YAAY,CACd,GAAmB,EACnB,KAAuB,EACvB,MAAc,EACd,KAAY,EACZ,OAAgB,EAChB,IAAiB,EACjB,MAAqB;QAErB,OAAO,IAAI,CAAC,cAAc;YACtB,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;YAC7F,CAAC,CAAC,KAAK,CAAC;IAChB,CAAC;IAED;;;;;;;OAOG;IACH,sBAAsB,CAClB,SAAuB,EACvB,OAAqB,EACrB,IAA2B;QAE3B,IAAI,OAAO,IAAI,CAAC,mBAAmB,KAAK,UAAU,EAAE;YAChD,OAAO,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;SAC7D;aAAM;YACH,OAAO,IAAI,CAAC;SACf;IACL,CAAC;CACJ;AAnGD,oDAmGC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ConfigArg } from '@vendure/common/lib/generated-types';
|
|
2
2
|
import { RequestContext } from '../../api/common/request-context';
|
|
3
3
|
import { ConfigArgs, ConfigArgValues, ConfigurableOperationDef, ConfigurableOperationDefOptions } from '../../common/configurable-operation';
|
|
4
|
-
import { Order } from '../../entity
|
|
4
|
+
import { ShippingMethod, Order } from '../../entity';
|
|
5
5
|
export interface ShippingCalculatorConfig<T extends ConfigArgs> extends ConfigurableOperationDefOptions<T> {
|
|
6
6
|
calculate: CalculateShippingFn<T>;
|
|
7
7
|
}
|
|
@@ -46,7 +46,7 @@ export declare class ShippingCalculator<T extends ConfigArgs = ConfigArgs> exten
|
|
|
46
46
|
*
|
|
47
47
|
* @internal
|
|
48
48
|
*/
|
|
49
|
-
calculate(ctx: RequestContext, order: Order, args: ConfigArg[]): CalculateShippingFnResult;
|
|
49
|
+
calculate(ctx: RequestContext, order: Order, args: ConfigArg[], method: ShippingMethod): CalculateShippingFnResult;
|
|
50
50
|
}
|
|
51
51
|
/**
|
|
52
52
|
* @description
|
|
@@ -90,4 +90,4 @@ export declare type CalculateShippingFnResult = ShippingCalculationResult | Prom
|
|
|
90
90
|
* @docsCategory shipping
|
|
91
91
|
* @docsPage ShippingCalculator
|
|
92
92
|
*/
|
|
93
|
-
export declare type CalculateShippingFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, args: ConfigArgValues<T
|
|
93
|
+
export declare type CalculateShippingFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, args: ConfigArgValues<T>, method: ShippingMethod) => CalculateShippingFnResult;
|
|
@@ -45,8 +45,8 @@ class ShippingCalculator extends configurable_operation_1.ConfigurableOperationD
|
|
|
45
45
|
*
|
|
46
46
|
* @internal
|
|
47
47
|
*/
|
|
48
|
-
calculate(ctx, order, args) {
|
|
49
|
-
return this.calculateFn(ctx, order, this.argsArrayToHash(args));
|
|
48
|
+
calculate(ctx, order, args, method) {
|
|
49
|
+
return this.calculateFn(ctx, order, this.argsArrayToHash(args), method);
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
exports.ShippingCalculator = ShippingCalculator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shipping-calculator.js","sourceRoot":"","sources":["../../../src/config/shipping-method/shipping-calculator.ts"],"names":[],"mappings":";;;AAGA,gFAK6C;AAO7C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAa,kBAAsD,SAAQ,iDAA2B;IAGlG,YAAY,MAAmC;QAC3C,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC;IACxC,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,GAAmB,EAAE,KAAY,EAAE,IAAiB;
|
|
1
|
+
{"version":3,"file":"shipping-calculator.js","sourceRoot":"","sources":["../../../src/config/shipping-method/shipping-calculator.ts"],"names":[],"mappings":";;;AAGA,gFAK6C;AAO7C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAa,kBAAsD,SAAQ,iDAA2B;IAGlG,YAAY,MAAmC;QAC3C,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,SAAS,CAAC;IACxC,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,GAAmB,EAAE,KAAY,EAAE,IAAiB,EAAE,MAAsB;QAClF,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;IAC5E,CAAC;CACJ;AAjBD,gDAiBC"}
|
|
@@ -2,7 +2,7 @@ import { ConfigArg } from '@vendure/common/lib/generated-types';
|
|
|
2
2
|
import { Json } from '@vendure/common/lib/shared-types';
|
|
3
3
|
import { RequestContext } from '../../api/common/request-context';
|
|
4
4
|
import { ConfigArgs, ConfigArgValues, ConfigurableOperationDef, ConfigurableOperationDefOptions } from '../../common/configurable-operation';
|
|
5
|
-
import { Order } from '../../entity
|
|
5
|
+
import { ShippingMethod, Order } from '../../entity';
|
|
6
6
|
/**
|
|
7
7
|
* @description
|
|
8
8
|
* Configuration passed into the constructor of a {@link ShippingEligibilityChecker} to
|
|
@@ -47,7 +47,7 @@ export declare class ShippingEligibilityChecker<T extends ConfigArgs = ConfigArg
|
|
|
47
47
|
*
|
|
48
48
|
* @internal
|
|
49
49
|
*/
|
|
50
|
-
check(ctx: RequestContext, order: Order, args: ConfigArg[]): Promise<boolean>;
|
|
50
|
+
check(ctx: RequestContext, order: Order, args: ConfigArg[], method: ShippingMethod): Promise<boolean>;
|
|
51
51
|
/**
|
|
52
52
|
* Determines whether the check function needs to be run, based on the presence and
|
|
53
53
|
* result of any defined `shouldRunCheckFn`.
|
|
@@ -66,7 +66,7 @@ export declare class ShippingEligibilityChecker<T extends ConfigArgs = ConfigArg
|
|
|
66
66
|
*
|
|
67
67
|
* @docsCategory shipping
|
|
68
68
|
*/
|
|
69
|
-
export declare type CheckShippingEligibilityCheckerFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, args: ConfigArgValues<T
|
|
69
|
+
export declare type CheckShippingEligibilityCheckerFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, args: ConfigArgValues<T>, method: ShippingMethod) => boolean | Promise<boolean>;
|
|
70
70
|
/**
|
|
71
71
|
* @description
|
|
72
72
|
* An optional method which is used to decide whether to run the `check()` function.
|
|
@@ -95,4 +95,4 @@ export declare type CheckShippingEligibilityCheckerFn<T extends ConfigArgs> = (c
|
|
|
95
95
|
*
|
|
96
96
|
* @docsCategory shipping
|
|
97
97
|
*/
|
|
98
|
-
export declare type ShouldRunCheckFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, args: ConfigArgValues<T
|
|
98
|
+
export declare type ShouldRunCheckFn<T extends ConfigArgs> = (ctx: RequestContext, order: Order, args: ConfigArgValues<T>, method: ShippingMethod) => Json | Promise<Json>;
|
|
@@ -39,20 +39,20 @@ class ShippingEligibilityChecker extends configurable_operation_1.ConfigurableOp
|
|
|
39
39
|
*
|
|
40
40
|
* @internal
|
|
41
41
|
*/
|
|
42
|
-
async check(ctx, order, args) {
|
|
43
|
-
const shouldRunCheck = await this.shouldRunCheck(ctx, order, args);
|
|
44
|
-
return shouldRunCheck ? this.checkFn(ctx, order, this.argsArrayToHash(args)) : true;
|
|
42
|
+
async check(ctx, order, args, method) {
|
|
43
|
+
const shouldRunCheck = await this.shouldRunCheck(ctx, order, args, method);
|
|
44
|
+
return shouldRunCheck ? this.checkFn(ctx, order, this.argsArrayToHash(args), method) : true;
|
|
45
45
|
}
|
|
46
46
|
/**
|
|
47
47
|
* Determines whether the check function needs to be run, based on the presence and
|
|
48
48
|
* result of any defined `shouldRunCheckFn`.
|
|
49
49
|
*/
|
|
50
|
-
async shouldRunCheck(ctx, order, args) {
|
|
50
|
+
async shouldRunCheck(ctx, order, args, method) {
|
|
51
51
|
var _a;
|
|
52
52
|
if (typeof this.shouldRunCheckFn === 'function') {
|
|
53
53
|
const cacheKey = (_a = ctx.session) === null || _a === void 0 ? void 0 : _a.id;
|
|
54
54
|
if (cacheKey) {
|
|
55
|
-
const checkResult = await this.shouldRunCheckFn(ctx, order, this.argsArrayToHash(args));
|
|
55
|
+
const checkResult = await this.shouldRunCheckFn(ctx, order, this.argsArrayToHash(args), method);
|
|
56
56
|
const checkResultHash = crypto_1.createHash('sha1')
|
|
57
57
|
.update(JSON.stringify(checkResult))
|
|
58
58
|
.digest('base64');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shipping-eligibility-checker.js","sourceRoot":"","sources":["../../../src/config/shipping-method/shipping-eligibility-checker.ts"],"names":[],"mappings":";;;AAEA,mCAAoC;AAGpC,gFAK6C;AAC7C,sDAAkD;AAelD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAa,0BAA8D,SAAQ,iDAElF;IAKG,YAAY,MAA2C;QACnD,KAAK,CAAC,MAAM,CAAC,CAAC;QAHV,wBAAmB,GAAG,IAAI,oBAAQ,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QAIrF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,cAAc,CAAC;IAClD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAK,CAAC,GAAmB,EAAE,KAAY,EAAE,IAAiB;
|
|
1
|
+
{"version":3,"file":"shipping-eligibility-checker.js","sourceRoot":"","sources":["../../../src/config/shipping-method/shipping-eligibility-checker.ts"],"names":[],"mappings":";;;AAEA,mCAAoC;AAGpC,gFAK6C;AAC7C,sDAAkD;AAelD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAa,0BAA8D,SAAQ,iDAElF;IAKG,YAAY,MAA2C;QACnD,KAAK,CAAC,MAAM,CAAC,CAAC;QAHV,wBAAmB,GAAG,IAAI,oBAAQ,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QAIrF,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC;QAC5B,IAAI,CAAC,gBAAgB,GAAG,MAAM,CAAC,cAAc,CAAC;IAClD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,KAAK,CAAC,GAAmB,EAAE,KAAY,EAAE,IAAiB,EAAE,MAAsB;QACpF,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;QAC3E,OAAO,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAChG,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,cAAc,CAAC,GAAmB,EAAE,KAAY,EAAE,IAAiB,EAAE,MAAsB;;QACrG,IAAI,OAAO,IAAI,CAAC,gBAAgB,KAAK,UAAU,EAAE;YAC7C,MAAM,QAAQ,GAAG,MAAA,GAAG,CAAC,OAAO,0CAAE,EAAE,CAAC;YACjC,IAAI,QAAQ,EAAE;gBACV,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC;gBAChG,MAAM,eAAe,GAAG,mBAAU,CAAC,MAAM,CAAC;qBACrC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;qBACnC,MAAM,CAAC,QAAQ,CAAC,CAAC;gBACtB,MAAM,cAAc,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC9D,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;gBACxD,IAAI,eAAe,KAAK,cAAc,EAAE;oBACpC,OAAO,KAAK,CAAC;iBAChB;aACJ;SACJ;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ;AA7CD,gEA6CC"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { HealthIndicatorFunction } from '@nestjs/terminus';
|
|
2
|
+
import { InjectableStrategy } from '../../common/types/injectable-strategy';
|
|
3
|
+
/**
|
|
4
|
+
* @description
|
|
5
|
+
* This strategy defines health checks which are included as part of the
|
|
6
|
+
* `/health` endpoint. They should only be used to monitor _critical_ systems
|
|
7
|
+
* on which proper functioning of the Vendure server depends.
|
|
8
|
+
*
|
|
9
|
+
* For more information on the underlying mechanism, see the
|
|
10
|
+
* [NestJS Terminus module docs](https://docs.nestjs.com/recipes/terminus).
|
|
11
|
+
*
|
|
12
|
+
* Custom strategies should be added to the `systemOptions.healthChecks` array.
|
|
13
|
+
* By default, Vendure includes the `TypeORMHealthCheckStrategy`, so if you set the value of the `healthChecks`
|
|
14
|
+
* array, be sure to include it manually.
|
|
15
|
+
*
|
|
16
|
+
* Vendure also ships with the {@link HttpHealthCheckStrategy}, which is convenient
|
|
17
|
+
* for adding a health check dependent on an HTTP ping.
|
|
18
|
+
*
|
|
19
|
+
*
|
|
20
|
+
*
|
|
21
|
+
* @example
|
|
22
|
+
* ```TypeScript
|
|
23
|
+
* import { HttpHealthCheckStrategy, TypeORMHealthCheckStrategy } from '\@vendure/core';
|
|
24
|
+
* import { MyCustomHealthCheckStrategy } from './config/custom-health-check-strategy';
|
|
25
|
+
*
|
|
26
|
+
* export const config = {
|
|
27
|
+
* // ...
|
|
28
|
+
* systemOptions: {
|
|
29
|
+
* healthChecks: [
|
|
30
|
+
* new TypeORMHealthCheckStrategy(),
|
|
31
|
+
* new HttpHealthCheckStrategy({ key: 'my-service', url: 'https://my-service.com' }),
|
|
32
|
+
* new MyCustomHealthCheckStrategy(),
|
|
33
|
+
* ],
|
|
34
|
+
* },
|
|
35
|
+
* };
|
|
36
|
+
* ```
|
|
37
|
+
*
|
|
38
|
+
* @docsCategory health-check
|
|
39
|
+
*/
|
|
40
|
+
export interface HealthCheckStrategy extends InjectableStrategy {
|
|
41
|
+
/**
|
|
42
|
+
* @description
|
|
43
|
+
* Should return a `HealthIndicatorFunction`, as defined by the
|
|
44
|
+
* [NestJS Terminus module](https://docs.nestjs.com/recipes/terminus).
|
|
45
|
+
*/
|
|
46
|
+
getHealthIndicator(): HealthIndicatorFunction;
|
|
47
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"health-check-strategy.js","sourceRoot":"","sources":["../../../src/config/system/health-check-strategy.ts"],"names":[],"mappings":""}
|
|
@@ -18,6 +18,7 @@ import { ProductVariantPriceCalculationStrategy } from './catalog/product-varian
|
|
|
18
18
|
import { StockDisplayStrategy } from './catalog/stock-display-strategy';
|
|
19
19
|
import { CustomFields } from './custom-field/custom-field-types';
|
|
20
20
|
import { EntityIdStrategy } from './entity-id-strategy/entity-id-strategy';
|
|
21
|
+
import { EntityMetadataModifier } from './entity-metadata/entity-metadata-modifier';
|
|
21
22
|
import { CustomFulfillmentProcess } from './fulfillment/custom-fulfillment-process';
|
|
22
23
|
import { FulfillmentHandler } from './fulfillment/fulfillment-handler';
|
|
23
24
|
import { JobQueueStrategy } from './job-queue/job-queue-strategy';
|
|
@@ -38,6 +39,7 @@ import { PromotionCondition } from './promotion/promotion-condition';
|
|
|
38
39
|
import { SessionCacheStrategy } from './session-cache/session-cache-strategy';
|
|
39
40
|
import { ShippingCalculator } from './shipping-method/shipping-calculator';
|
|
40
41
|
import { ShippingEligibilityChecker } from './shipping-method/shipping-eligibility-checker';
|
|
42
|
+
import { HealthCheckStrategy } from './system/health-check-strategy';
|
|
41
43
|
import { TaxLineCalculationStrategy } from './tax/tax-line-calculation-strategy';
|
|
42
44
|
import { TaxZoneStrategy } from './tax/tax-zone-strategy';
|
|
43
45
|
/**
|
|
@@ -838,6 +840,35 @@ export interface EntityOptions {
|
|
|
838
840
|
* @default 30000
|
|
839
841
|
*/
|
|
840
842
|
zoneCacheTtl?: number;
|
|
843
|
+
/**
|
|
844
|
+
* @description
|
|
845
|
+
* Allows the metadata of the built-in TypeORM entities to be manipulated. This allows you
|
|
846
|
+
* to do things like altering data types, adding indices etc. This is an advanced feature
|
|
847
|
+
* which should be used with some caution as it will result in DB schema changes. For examples
|
|
848
|
+
* see {@link EntityMetadataModifier}.
|
|
849
|
+
*
|
|
850
|
+
* @since 1.6.0
|
|
851
|
+
* @default []
|
|
852
|
+
*/
|
|
853
|
+
metadataModifiers?: EntityMetadataModifier[];
|
|
854
|
+
}
|
|
855
|
+
/**
|
|
856
|
+
* @description
|
|
857
|
+
* Options relating to system functions.
|
|
858
|
+
*
|
|
859
|
+
* @since 1.6.0
|
|
860
|
+
* @docsCategory configuration
|
|
861
|
+
*/
|
|
862
|
+
export interface SystemOptions {
|
|
863
|
+
/**
|
|
864
|
+
* @description
|
|
865
|
+
* Defines an array of {@link HealthCheckStrategy} instances which are used by the `/health` endpoint to verify
|
|
866
|
+
* that any critical systems which the Vendure server depends on are also healthy.
|
|
867
|
+
*
|
|
868
|
+
* @default [TypeORMHealthCheckStrategy]
|
|
869
|
+
* @since 1.6.0
|
|
870
|
+
*/
|
|
871
|
+
healthChecks?: HealthCheckStrategy[];
|
|
841
872
|
}
|
|
842
873
|
/**
|
|
843
874
|
* @description
|
|
@@ -960,6 +991,13 @@ export interface VendureConfig {
|
|
|
960
991
|
* Configures how the job queue is persisted and processed.
|
|
961
992
|
*/
|
|
962
993
|
jobQueueOptions?: JobQueueOptions;
|
|
994
|
+
/**
|
|
995
|
+
* @description
|
|
996
|
+
* Configures system options
|
|
997
|
+
*
|
|
998
|
+
* @since 1.6.0
|
|
999
|
+
*/
|
|
1000
|
+
systemOptions?: SystemOptions;
|
|
963
1001
|
}
|
|
964
1002
|
/**
|
|
965
1003
|
* @description
|
|
@@ -981,6 +1019,7 @@ export interface RuntimeVendureConfig extends Required<VendureConfig> {
|
|
|
981
1019
|
promotionOptions: Required<PromotionOptions>;
|
|
982
1020
|
shippingOptions: Required<ShippingOptions>;
|
|
983
1021
|
taxOptions: Required<TaxOptions>;
|
|
1022
|
+
systemOptions: Required<SystemOptions>;
|
|
984
1023
|
}
|
|
985
1024
|
declare type DeepPartialSimple<T> = {
|
|
986
1025
|
[P in keyof T]?: null | (T[P] extends Array<infer U> ? Array<DeepPartialSimple<U>> : T[P] extends ReadonlyArray<infer X> ? ReadonlyArray<DeepPartialSimple<X>> : T[P] extends Type<any> ? T[P] : DeepPartialSimple<T[P]>);
|
|
@@ -3,5 +3,5 @@ import { ConnectionOptions } from 'typeorm';
|
|
|
3
3
|
export declare class ConnectionModule {
|
|
4
4
|
static forRoot(): DynamicModule;
|
|
5
5
|
static forPlugin(): DynamicModule;
|
|
6
|
-
static getTypeOrmLogger(dbConnectionOptions: ConnectionOptions): import("typeorm").Logger | "
|
|
6
|
+
static getTypeOrmLogger(dbConnectionOptions: ConnectionOptions): "debug" | import("typeorm").Logger | "advanced-console" | "simple-console" | "file";
|
|
7
7
|
}
|
|
@@ -180,6 +180,11 @@ let TransactionalConnection = class TransactionalConnection {
|
|
|
180
180
|
*/
|
|
181
181
|
findOneInChannel(ctx, entity, id, channelId, options = {}) {
|
|
182
182
|
const qb = this.getRepository(ctx, entity).createQueryBuilder('entity');
|
|
183
|
+
if (options.relations) {
|
|
184
|
+
// Joining custom field relations here does not seem to work well,
|
|
185
|
+
// so we simply omit them and rely on the custom field relation resolvers.
|
|
186
|
+
options.relations = options.relations.filter(r => !r.startsWith('customFields.'));
|
|
187
|
+
}
|
|
183
188
|
typeorm_2.FindOptionsUtils.applyFindManyOptionsOrConditionsToQueryBuilder(qb, options);
|
|
184
189
|
if (options.loadEagerRelations !== false) {
|
|
185
190
|
// tslint:disable-next-line:no-non-null-assertion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactional-connection.js","sourceRoot":"","sources":["../../src/connection/transactional-connection.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"transactional-connection.js","sourceRoot":"","sources":["../../src/connection/transactional-connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AAEnD,qCASiB;AAEjB,mEAA+D;AAC/D,mDAA8D;AAC9D,mDAA6D;AAI7D,+DAA2D;AAG3D;;;;;;;;;;;GAWG;AAEH,IAAa,uBAAuB,GAApC,MAAa,uBAAuB;IAChC,YACgC,UAAsB,EAC1C,kBAAsC;QADlB,eAAU,GAAV,UAAU,CAAY;QAC1C,uBAAkB,GAAlB,kBAAkB,CAAoB;IAC/C,CAAC;IAEJ;;;;;OAKG;IACH,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAmBD,aAAa,CACT,WAA4F,EAC5F,WAAgE;QAEhE,IAAI,WAAW,YAAY,gCAAc,EAAE;YACvC,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;YACnE,IAAI,kBAAkB,EAAE;gBACpB,iDAAiD;gBACjD,OAAO,kBAAkB,CAAC,aAAa,CAAC,WAAY,CAAC,CAAC;aACzD;iBAAM;gBACH,iDAAiD;gBACjD,OAAO,uBAAa,CAAC,WAAY,CAAC,CAAC;aACtC;SACJ;aAAM;YACH,iDAAiD;YACjD,OAAO,uBAAa,CAAC,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,WAAY,CAAC,CAAC;SACrD;IACL,CAAC;IA6CD,KAAK,CAAC,eAAe,CACjB,SAAiE,EACjE,SAA+C;QAE/C,IAAI,GAAmB,CAAC;QACxB,IAAI,IAAyC,CAAC;QAC9C,IAAI,SAAS,YAAY,gCAAc,EAAE;YACrC,GAAG,GAAG,SAAS,CAAC;YAChB,iDAAiD;YACjD,IAAI,GAAG,SAAU,CAAC;SACrB;aAAM;YACH,GAAG,GAAG,gCAAc,CAAC,KAAK,EAAE,CAAC;YAC7B,IAAI,GAAG,SAAS,CAAC;SACpB;QACD,OAAO,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAC/F,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,gBAAgB,CAAC,GAAmB;;QACtC,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,CAAA,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,WAAW,0CAAE,mBAAmB,MAAK,KAAK,EAAE;YAChE,MAAM,kBAAkB,CAAC,WAAW,CAAC,gBAAgB,EAAE,CAAC;SAC3D;IACL,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,qBAAqB,CAAC,GAAmB;;QAC3C,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,WAAW,0CAAE,mBAAmB,EAAE;YACtD,MAAM,kBAAkB,CAAC,WAAW,CAAC,iBAAiB,EAAE,CAAC;SAC5D;IACL,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,mBAAmB,CAAC,GAAmB;;QACzC,MAAM,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAAC;QAC3D,IAAI,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,WAAW,0CAAE,mBAAmB,EAAE;YACtD,MAAM,kBAAkB,CAAC,WAAW,CAAC,mBAAmB,EAAE,CAAC;SAC9D;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,gBAAgB,CAClB,GAAmB,EACnB,UAAmB,EACnB,EAAM,EACN,UAAsC,EAAE;QAExC,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;QACxC,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,IAAI,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;SACtE;aAAM;YACH,IAAI,GAAQ,CAAC;YACb,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;YACvD,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,UAAU,EAAE,OAAO,EAAE,EAAE;gBACnD,IAAI;oBACA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;oBACjF,OAAO,MAAM,CAAC;iBACjB;gBAAC,OAAO,CAAC,EAAE;oBACR,GAAG,GAAG,CAAC,CAAC;oBACR,IAAI,OAAO,GAAG,UAAU,GAAG,CAAC,EAAE;wBAC1B,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;qBAC5D;iBACJ;aACJ;YACD,MAAM,GAAG,CAAC;SACb;IACL,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAClC,GAAmB,EACnB,UAAmB,EACnB,EAAM,EACN,UAAmC,EAAE;QAErC,IAAI,MAAqB,CAAC;QAC1B,IAAI,OAAO,CAAC,SAAS,IAAI,IAAI,EAAE;YAC3B,MAAM,EAAE,SAAS,KAAiC,OAAO,EAAnC,uBAAuB,UAAK,OAAO,EAAnD,aAAyC,CAAU,CAAC;YAC1D,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAChC,GAAG,EACH,UAAoC,EACpC,EAAE,EACF,OAAO,CAAC,SAAS,EACjB,uBAAuB,CAC1B,CAAC;SACL;aAAM;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,EAAE,EAAE,OAAyB,CAAC,CAAC;SAC7F;QACD,IACI,CAAC,MAAM;YACP,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC;gBAC9B,MAA4B,CAAC,SAAS,KAAK,IAAI;gBAChD,OAAO,CAAC,kBAAkB,KAAK,IAAI,CAAC,EAC1C;YACE,MAAM,IAAI,4BAAmB,CAAC,UAAU,CAAC,IAAW,EAAE,EAAE,CAAC,CAAC;SAC7D;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACH,gBAAgB,CACZ,GAAmB,EACnB,MAAe,EACf,EAAM,EACN,SAAa,EACb,UAA0B,EAAE;QAE5B,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACxE,IAAI,OAAO,CAAC,SAAS,EAAE;YACnB,kEAAkE;YAClE,0EAA0E;YAC1E,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,eAAe,CAAC,CAAC,CAAC;SACrF;QACD,0BAAgB,CAAC,8CAA8C,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7E,IAAI,OAAO,CAAC,kBAAkB,KAAK,KAAK,EAAE;YACtC,iDAAiD;YACjD,0BAAgB,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,SAAU,CAAC,QAAQ,CAAC,CAAC;SAC3F;QACD,OAAO,EAAE;aACJ,QAAQ,CAAC,iBAAiB,EAAE,SAAS,CAAC;aACtC,QAAQ,CAAC,iBAAiB,EAAE,EAAE,EAAE,EAAE,CAAC;aACnC,QAAQ,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,CAAC;aAClD,MAAM,EAAE,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACH,kBAAkB,CACd,GAAmB,EACnB,MAAe,EACf,GAAS,EACT,SAAa,EACb,OAAuB;QAEvB,gGAAgG;QAChG,+BAA+B;QAC/B,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;YAClB,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;SAC9B;QAED,MAAM,EAAE,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QACxE,0BAAgB,CAAC,8CAA8C,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7E,IAAI,OAAO,CAAC,kBAAkB,KAAK,KAAK,EAAE;YACtC,iDAAiD;YACjD,0BAAgB,CAAC,kBAAkB,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,SAAU,CAAC,QAAQ,CAAC,CAAC;SAC3F;QACD,OAAO,EAAE;aACJ,QAAQ,CAAC,iBAAiB,EAAE,SAAS,CAAC;aACtC,QAAQ,CAAC,wBAAwB,EAAE,EAAE,GAAG,EAAE,CAAC;aAC3C,QAAQ,CAAC,yBAAyB,EAAE,EAAE,SAAS,EAAE,CAAC;aAClD,OAAO,EAAE,CAAC;IACnB,CAAC;IAEO,qBAAqB,CAAC,GAAmB;QAC7C,OAAQ,GAAW,CAAC,mCAAuB,CAAC,CAAC;IACjD,CAAC;CACJ,CAAA;AAtRY,uBAAuB;IADnC,mBAAU,EAAE;IAGJ,WAAA,0BAAgB,EAAE,CAAA;qCAAqB,oBAAU;QACtB,wCAAkB;GAHzC,uBAAuB,CAsRnC;AAtRY,0DAAuB"}
|
|
@@ -9,7 +9,7 @@ import { FacetValueService } from '../../../service/services/facet-value.service
|
|
|
9
9
|
import { FacetService } from '../../../service/services/facet.service';
|
|
10
10
|
import { TaxCategoryService } from '../../../service/services/tax-category.service';
|
|
11
11
|
import { AssetImporter } from '../asset-importer/asset-importer';
|
|
12
|
-
import { ImportParser } from '../import-parser/import-parser';
|
|
12
|
+
import { ImportParser, ParsedProductWithVariants } from '../import-parser/import-parser';
|
|
13
13
|
import { FastImporterService } from './fast-importer.service';
|
|
14
14
|
export interface ImportProgress extends ImportInfo {
|
|
15
15
|
currentProduct: string;
|
|
@@ -50,9 +50,10 @@ export declare class Importer {
|
|
|
50
50
|
private doParseAndImport;
|
|
51
51
|
private getRequestContext;
|
|
52
52
|
/**
|
|
53
|
+
* @description
|
|
53
54
|
* Imports the products specified in the rows object. Return an array of error messages.
|
|
54
55
|
*/
|
|
55
|
-
|
|
56
|
+
importProducts(ctx: RequestContext, rows: ParsedProductWithVariants[], onProgress: OnProgressFn): Promise<string[]>;
|
|
56
57
|
private getFacetValueIds;
|
|
57
58
|
private processCustomFieldValues;
|
|
58
59
|
/**
|
|
@@ -129,6 +129,7 @@ let Importer = class Importer {
|
|
|
129
129
|
}
|
|
130
130
|
}
|
|
131
131
|
/**
|
|
132
|
+
* @description
|
|
132
133
|
* Imports the products specified in the rows object. Return an array of error messages.
|
|
133
134
|
*/
|
|
134
135
|
async importProducts(ctx, rows, onProgress) {
|
|
@@ -249,7 +250,7 @@ let Importer = class Importer {
|
|
|
249
250
|
facetEntity = cachedFacet;
|
|
250
251
|
}
|
|
251
252
|
else {
|
|
252
|
-
const existing = await this.facetService.findByCode(normalize_string_1.normalizeString(facetName), languageCode);
|
|
253
|
+
const existing = await this.facetService.findByCode(normalize_string_1.normalizeString(facetName, '-'), languageCode);
|
|
253
254
|
if (existing) {
|
|
254
255
|
facetEntity = existing;
|
|
255
256
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"importer.js","sourceRoot":"","sources":["../../../../src/data-import/providers/importer/importer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"importer.js","sourceRoot":"","sources":["../../../../src/data-import/providers/importer/importer.ts"],"names":[],"mappings":"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"}
|
|
@@ -235,7 +235,7 @@ __decorate([
|
|
|
235
235
|
__metadata("design:type", Number)
|
|
236
236
|
], Order.prototype, "shippingWithTax", void 0);
|
|
237
237
|
__decorate([
|
|
238
|
-
calculated_decorator_1.Calculated(),
|
|
238
|
+
calculated_decorator_1.Calculated({ relations: ['lines', 'lines.items', 'shippingLines'] }),
|
|
239
239
|
__metadata("design:type", Array),
|
|
240
240
|
__metadata("design:paramtypes", [])
|
|
241
241
|
], Order.prototype, "discounts", null);
|
|
@@ -271,6 +271,7 @@ __decorate([
|
|
|
271
271
|
], Order.prototype, "totalWithTax", null);
|
|
272
272
|
__decorate([
|
|
273
273
|
calculated_decorator_1.Calculated({
|
|
274
|
+
relations: ['lines', 'lines.items'],
|
|
274
275
|
query: qb => {
|
|
275
276
|
qb.leftJoin(qb1 => {
|
|
276
277
|
return qb1
|
|
@@ -288,7 +289,7 @@ __decorate([
|
|
|
288
289
|
__metadata("design:paramtypes", [])
|
|
289
290
|
], Order.prototype, "totalQuantity", null);
|
|
290
291
|
__decorate([
|
|
291
|
-
calculated_decorator_1.Calculated(),
|
|
292
|
+
calculated_decorator_1.Calculated({ relations: ['lines', 'lines.items'] }),
|
|
292
293
|
__metadata("design:type", Array),
|
|
293
294
|
__metadata("design:paramtypes", [])
|
|
294
295
|
], Order.prototype, "taxSummary", null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.entity.js","sourceRoot":"","sources":["../../../src/entity/order/order.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yEAO6C;AAE7C,mEAA2D;AAC3D,qCAAsF;AAEtF,4EAA+D;AAC/D,sDAAgE;AAIhE,qDAAoD;AACpD,8DAAoD;AACpD,kEAA4D;AAC5D,iEAAuD;AACvD,gEAAkD;AAElD,uEAA4D;AAC5D,+FAAoF;AACpF,8DAAoD;AACpD,oEAA0D;AAC1D,gFAAqE;AACrE,oEAA0D;AAE1D;;;;;;;;;;GAUG;AAEH,IAAa,KAAK,aAAlB,MAAa,KAAM,SAAQ,2BAAa;IACpC,YAAY,KAA0B;QAClC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC;IAyHD,IAAI,SAAS;QACT,IAAI,CAAC,qBAAqB,CAAC,WAAW,CAAC,CAAC;QACxC,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAoB,CAAC;QACvD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC3B,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE;gBACnC,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;gBACrE,IAAI,UAAU,EAAE;oBACZ,UAAU,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;oBACrC,UAAU,CAAC,aAAa,IAAI,QAAQ,CAAC,aAAa,CAAC;iBACtD;qBAAM;oBACH,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,oBAAO,QAAQ,EAAG,CAAC;iBACtE;aACJ;SACJ;QACD,KAAK,MAAM,YAAY,IAAI,IAAI,CAAC,aAAa,EAAE;YAC3C,KAAK,MAAM,QAAQ,IAAI,YAAY,CAAC,SAAS,EAAE;gBAC3C,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;gBACrE,IAAI,UAAU,EAAE;oBACZ,UAAU,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC;oBACrC,UAAU,CAAC,aAAa,IAAI,QAAQ,CAAC,aAAa,CAAC;iBACtD;qBAAM;oBACH,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,gBAAgB,oBAAO,QAAQ,EAAG,CAAC;iBACtE;aACJ;SACJ;QACD,OAAO,CAAC,GAAG,kBAAkB,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;IAED;;;OAGG;IAiBH,IAAI,KAAK;QACL,OAAO,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;IAED;;;OAGG;IAiBH,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,eAAe,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,CAAC;IAC9D,CAAC;
|
|
1
|
+
{"version":3,"file":"order.entity.js","sourceRoot":"","sources":["../../../src/entity/order/order.entity.ts"],"names":[],"mappings":"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"}
|