chore: Clean up imports after merge

packages/core/src/api/common/configurable-operation-codec.ts

@@ -13,8 +13,8 @@ import {
 } from '../../config';
 import { CollectionFilter } from '../../config/catalog/collection-filter';
 import { ConfigService } from '../../config/config.service';
-import { PaymentMethodEligibilityChecker } from '../../config/payment-method/payment-method-eligibility-checker';
-import { PaymentMethodHandler } from '../../config/payment-method/payment-method-handler';
+import { PaymentMethodEligibilityChecker } from '../../config/payment/payment-method-eligibility-checker';
+import { PaymentMethodHandler } from '../../config/payment/payment-method-handler';
 
 import { IdCodecService } from './id-codec.service';
 

packages/core/src/config/index.ts

@@ -31,10 +31,10 @@ export * from './order/use-guest-strategy';
 export * from './order/use-guest-if-existing-empty-strategy';
 export * from './order/order-item-price-calculation-strategy';
 export * from './order/stock-allocation-strategy';
-export * from './payment-method/dummy-payment-method-handler';
-export * from './payment-method/example-payment-method-handler';
-export * from './payment-method/payment-method-handler';
-export * from './payment-method/payment-method-eligibility-checker';
+export * from './payment/dummy-payment-method-handler';
+export * from './payment/example-payment-method-handler';
+export * from './payment/payment-method-handler';
+export * from './payment/payment-method-eligibility-checker';
 export * from './promotion';
 export * from './session-cache/in-memory-session-cache-strategy';
 export * from './session-cache/noop-session-cache-strategy';

packages/core/src/config/vendure-config.ts

@@ -26,9 +26,9 @@ import { OrderCodeStrategy } from './order/order-code-strategy';
 import { OrderItemPriceCalculationStrategy } from './order/order-item-price-calculation-strategy';
 import { OrderMergeStrategy } from './order/order-merge-strategy';
 import { StockAllocationStrategy } from './order/stock-allocation-strategy';
-import { PaymentMethodEligibilityChecker } from './payment-method/payment-method-eligibility-checker';
-import { PaymentMethodHandler } from './payment-method/payment-method-handler';
 import { CustomPaymentProcess } from './payment/custom-payment-process';
+import { PaymentMethodEligibilityChecker } from './payment/payment-method-eligibility-checker';
+import { PaymentMethodHandler } from './payment/payment-method-handler';
 import { PromotionAction } from './promotion/promotion-action';
 import { PromotionCondition } from './promotion/promotion-condition';
 import { SessionCacheStrategy } from './session-cache/session-cache-strategy';

packages/core/src/service/helpers/config-arg/config-arg.service.ts

@@ -8,8 +8,8 @@ import { UserInputError } from '../../../common/error/errors';
 import { CollectionFilter } from '../../../config/catalog/collection-filter';
 import { ConfigService } from '../../../config/config.service';
 import { FulfillmentHandler } from '../../../config/fulfillment/fulfillment-handler';
-import { PaymentMethodEligibilityChecker } from '../../../config/payment-method/payment-method-eligibility-checker';
-import { PaymentMethodHandler } from '../../../config/payment-method/payment-method-handler';
+import { PaymentMethodEligibilityChecker } from '../../../config/payment/payment-method-eligibility-checker';
+import { PaymentMethodHandler } from '../../../config/payment/payment-method-handler';
 import { PromotionAction } from '../../../config/promotion/promotion-action';
 import { PromotionCondition } from '../../../config/promotion/promotion-condition';
 import { ShippingCalculator } from '../../../config/shipping-method/shipping-calculator';

packages/core/src/service/services/payment-method.service.ts

@@ -17,8 +17,8 @@ import { RefundStateTransitionError } from '../../common/error/generated-graphql
 import { IneligiblePaymentMethodError } from '../../common/error/generated-graphql-shop-errors';
 import { ListQueryOptions } from '../../common/types/common-types';
 import { ConfigService } from '../../config/config.service';
-import { PaymentMethodEligibilityChecker } from '../../config/payment-method/payment-method-eligibility-checker';
-import { PaymentMethodHandler } from '../../config/payment-method/payment-method-handler';
+import { PaymentMethodEligibilityChecker } from '../../config/payment/payment-method-eligibility-checker';
+import { PaymentMethodHandler } from '../../config/payment/payment-method-handler';
 import { OrderItem } from '../../entity/order-item/order-item.entity';
 import { Order } from '../../entity/order/order.entity';
 import { PaymentMethod } from '../../entity/payment-method/payment-method.entity';