fix(payment): Uncomment methods

packages/admin-ui/src/lib/core/src/common/generated-types.ts

@@ -428,6 +428,7 @@ export type Mutation = {
   settleRefund: SettleRefundResult;
   transitionFulfillmentToState: TransitionFulfillmentToStateResult;
   transitionOrderToState?: Maybe<TransitionOrderToStateResult>;
+  transitionPaymentToState: TransitionPaymentToStateResult;
   /** Update the active (currently logged-in) Administrator */
   updateActiveAdministrator: Administrator;
   /** Update an existing Administrator */
@@ -867,6 +868,12 @@ export type MutationTransitionOrderToStateArgs = {
 };
 
 
+export type MutationTransitionPaymentToStateArgs = {
+  id: Scalars['ID'];
+  state: Scalars['String'];
+};
+
+
 export type MutationUpdateActiveAdministratorArgs = {
   input: UpdateActiveAdministratorInput;
 };
@@ -1836,6 +1843,8 @@ export type SettleRefundResult = Refund | RefundStateTransitionError;
 
 export type TransitionFulfillmentToStateResult = Fulfillment | FulfillmentStateTransitionError;
 
+export type TransitionPaymentToStateResult = Payment | PaymentStateTransitionError;
+
 export type ModifyOrderResult = Order | NoChangesSpecifiedError | OrderModificationStateError | PaymentMethodMissingError | RefundPaymentIdMissingError | OrderLimitError | NegativeQuantityError | InsufficientStockError;
 
 export type AddManualPaymentToOrderResult = Order | ManualPaymentStateError;
@@ -1864,6 +1873,21 @@ export type PaymentMethod = Node & {
   definition: ConfigurableOperationDefinition;
 };
 
+export type Payment = Node & {
+  __typename?: 'Payment';
+  nextStates: Array<Scalars['String']>;
+  id: Scalars['ID'];
+  createdAt: Scalars['DateTime'];
+  updatedAt: Scalars['DateTime'];
+  method: Scalars['String'];
+  amount: Scalars['Int'];
+  state: Scalars['String'];
+  transactionId?: Maybe<Scalars['String']>;
+  errorMessage?: Maybe<Scalars['String']>;
+  refunds: Array<Refund>;
+  metadata?: Maybe<Scalars['JSON']>;
+};
+
 export type Product = Node & {
   __typename?: 'Product';
   enabled: Scalars['Boolean'];
@@ -3728,6 +3752,7 @@ export type OrderAddress = {
   country?: Maybe<Scalars['String']>;
   countryCode?: Maybe<Scalars['String']>;
   phoneNumber?: Maybe<Scalars['String']>;
+  customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type OrderList = PaginatedList & {
@@ -3856,20 +3881,6 @@ export type OrderLine = Node & {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
-export type Payment = Node & {
-  __typename?: 'Payment';
-  id: Scalars['ID'];
-  createdAt: Scalars['DateTime'];
-  updatedAt: Scalars['DateTime'];
-  method: Scalars['String'];
-  amount: Scalars['Int'];
-  state: Scalars['String'];
-  transactionId?: Maybe<Scalars['String']>;
-  errorMessage?: Maybe<Scalars['String']>;
-  refunds: Array<Refund>;
-  metadata?: Maybe<Scalars['JSON']>;
-};
-
 export type Refund = Node & {
   __typename?: 'Refund';
   id: Scalars['ID'];

packages/admin-ui/src/lib/core/src/common/introspection-result.ts

@@ -52,6 +52,7 @@ const result: PossibleTypesResultData = {
         ],
         SettleRefundResult: ['Refund', 'RefundStateTransitionError'],
         TransitionFulfillmentToStateResult: ['Fulfillment', 'FulfillmentStateTransitionError'],
+        TransitionPaymentToStateResult: ['Payment', 'PaymentStateTransitionError'],
         ModifyOrderResult: [
             'Order',
             'NoChangesSpecifiedError',
@@ -98,6 +99,7 @@ const result: PossibleTypesResultData = {
             'Fulfillment',
             'OrderModification',
             'PaymentMethod',
+            'Payment',
             'Product',
             'ProductVariant',
             'StockAdjustment',
@@ -114,7 +116,6 @@ const result: PossibleTypesResultData = {
             'FacetValue',
             'OrderItem',
             'OrderLine',
-            'Payment',
             'Refund',
             'Surcharge',
             'ProductOptionGroup',

packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts

@@ -336,6 +336,7 @@ export type Mutation = {
     deleteOrderNote: DeletionResponse;
     transitionOrderToState?: Maybe<TransitionOrderToStateResult>;
     transitionFulfillmentToState: TransitionFulfillmentToStateResult;
+    transitionPaymentToState: TransitionPaymentToStateResult;
     setOrderCustomFields?: Maybe<Order>;
     /**
      * Allows an Order to be modified after it has been completed by the Customer. The Order must first
@@ -658,6 +659,11 @@ export type MutationTransitionFulfillmentToStateArgs = {
     state: Scalars['String'];
 };
 
+export type MutationTransitionPaymentToStateArgs = {
+    id: Scalars['ID'];
+    state: Scalars['String'];
+};
+
 export type MutationSetOrderCustomFieldsArgs = {
     input: UpdateOrderInput;
 };
@@ -1642,6 +1648,8 @@ export type SettleRefundResult = Refund | RefundStateTransitionError;
 
 export type TransitionFulfillmentToStateResult = Fulfillment | FulfillmentStateTransitionError;
 
+export type TransitionPaymentToStateResult = Payment | PaymentStateTransitionError;
+
 export type ModifyOrderResult =
     | Order
     | NoChangesSpecifiedError
@@ -1676,6 +1684,20 @@ export type PaymentMethod = Node & {
     definition: ConfigurableOperationDefinition;
 };
 
+export type Payment = Node & {
+    nextStates: Array<Scalars['String']>;
+    id: Scalars['ID'];
+    createdAt: Scalars['DateTime'];
+    updatedAt: Scalars['DateTime'];
+    method: Scalars['String'];
+    amount: Scalars['Int'];
+    state: Scalars['String'];
+    transactionId?: Maybe<Scalars['String']>;
+    errorMessage?: Maybe<Scalars['String']>;
+    refunds: Array<Refund>;
+    metadata?: Maybe<Scalars['JSON']>;
+};
+
 export type Product = Node & {
     enabled: Scalars['Boolean'];
     channels: Array<Channel>;
@@ -3486,6 +3508,7 @@ export type OrderAddress = {
     country?: Maybe<Scalars['String']>;
     countryCode?: Maybe<Scalars['String']>;
     phoneNumber?: Maybe<Scalars['String']>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type OrderList = PaginatedList & {
@@ -3609,19 +3632,6 @@ export type OrderLine = Node & {
     customFields?: Maybe<Scalars['JSON']>;
 };
 
-export type Payment = Node & {
-    id: Scalars['ID'];
-    createdAt: Scalars['DateTime'];
-    updatedAt: Scalars['DateTime'];
-    method: Scalars['String'];
-    amount: Scalars['Int'];
-    state: Scalars['String'];
-    transactionId?: Maybe<Scalars['String']>;
-    errorMessage?: Maybe<Scalars['String']>;
-    refunds: Array<Refund>;
-    metadata?: Maybe<Scalars['JSON']>;
-};
-
 export type Refund = Node & {
     id: Scalars['ID'];
     createdAt: Scalars['DateTime'];

packages/common/src/generated-shop-types.ts

@@ -1799,6 +1799,7 @@ export type OrderAddress = {
     country?: Maybe<Scalars['String']>;
     countryCode?: Maybe<Scalars['String']>;
     phoneNumber?: Maybe<Scalars['String']>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type OrderList = PaginatedList & {

packages/common/src/generated-types.ts

@@ -378,6 +378,7 @@ export type Mutation = {
   deleteOrderNote: DeletionResponse;
   transitionOrderToState?: Maybe<TransitionOrderToStateResult>;
   transitionFulfillmentToState: TransitionFulfillmentToStateResult;
+  transitionPaymentToState: TransitionPaymentToStateResult;
   setOrderCustomFields?: Maybe<Order>;
   /**
    * Allows an Order to be modified after it has been completed by the Customer. The Order must first
@@ -756,6 +757,12 @@ export type MutationTransitionFulfillmentToStateArgs = {
 };
 
 
+export type MutationTransitionPaymentToStateArgs = {
+  id: Scalars['ID'];
+  state: Scalars['String'];
+};
+
+
 export type MutationSetOrderCustomFieldsArgs = {
   input: UpdateOrderInput;
 };
@@ -1799,6 +1806,8 @@ export type SettleRefundResult = Refund | RefundStateTransitionError;
 
 export type TransitionFulfillmentToStateResult = Fulfillment | FulfillmentStateTransitionError;
 
+export type TransitionPaymentToStateResult = Payment | PaymentStateTransitionError;
+
 export type ModifyOrderResult = Order | NoChangesSpecifiedError | OrderModificationStateError | PaymentMethodMissingError | RefundPaymentIdMissingError | OrderLimitError | NegativeQuantityError | InsufficientStockError;
 
 export type AddManualPaymentToOrderResult = Order | ManualPaymentStateError;
@@ -1827,6 +1836,21 @@ export type PaymentMethod = Node & {
   definition: ConfigurableOperationDefinition;
 };
 
+export type Payment = Node & {
+  __typename?: 'Payment';
+  nextStates: Array<Scalars['String']>;
+  id: Scalars['ID'];
+  createdAt: Scalars['DateTime'];
+  updatedAt: Scalars['DateTime'];
+  method: Scalars['String'];
+  amount: Scalars['Int'];
+  state: Scalars['String'];
+  transactionId?: Maybe<Scalars['String']>;
+  errorMessage?: Maybe<Scalars['String']>;
+  refunds: Array<Refund>;
+  metadata?: Maybe<Scalars['JSON']>;
+};
+
 export type Product = Node & {
   __typename?: 'Product';
   enabled: Scalars['Boolean'];
@@ -3690,6 +3714,7 @@ export type OrderAddress = {
   country?: Maybe<Scalars['String']>;
   countryCode?: Maybe<Scalars['String']>;
   phoneNumber?: Maybe<Scalars['String']>;
+  customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type OrderList = PaginatedList & {
@@ -3818,20 +3843,6 @@ export type OrderLine = Node & {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
-export type Payment = Node & {
-  __typename?: 'Payment';
-  id: Scalars['ID'];
-  createdAt: Scalars['DateTime'];
-  updatedAt: Scalars['DateTime'];
-  method: Scalars['String'];
-  amount: Scalars['Int'];
-  state: Scalars['String'];
-  transactionId?: Maybe<Scalars['String']>;
-  errorMessage?: Maybe<Scalars['String']>;
-  refunds: Array<Refund>;
-  metadata?: Maybe<Scalars['JSON']>;
-};
-
 export type Refund = Node & {
   __typename?: 'Refund';
   id: Scalars['ID'];

packages/core/e2e/graphql/generated-e2e-admin-types.ts

@@ -336,6 +336,7 @@ export type Mutation = {
     deleteOrderNote: DeletionResponse;
     transitionOrderToState?: Maybe<TransitionOrderToStateResult>;
     transitionFulfillmentToState: TransitionFulfillmentToStateResult;
+    transitionPaymentToState: TransitionPaymentToStateResult;
     setOrderCustomFields?: Maybe<Order>;
     /**
      * Allows an Order to be modified after it has been completed by the Customer. The Order must first
@@ -658,6 +659,11 @@ export type MutationTransitionFulfillmentToStateArgs = {
     state: Scalars['String'];
 };
 
+export type MutationTransitionPaymentToStateArgs = {
+    id: Scalars['ID'];
+    state: Scalars['String'];
+};
+
 export type MutationSetOrderCustomFieldsArgs = {
     input: UpdateOrderInput;
 };
@@ -1642,6 +1648,8 @@ export type SettleRefundResult = Refund | RefundStateTransitionError;
 
 export type TransitionFulfillmentToStateResult = Fulfillment | FulfillmentStateTransitionError;
 
+export type TransitionPaymentToStateResult = Payment | PaymentStateTransitionError;
+
 export type ModifyOrderResult =
     | Order
     | NoChangesSpecifiedError
@@ -1676,6 +1684,20 @@ export type PaymentMethod = Node & {
     definition: ConfigurableOperationDefinition;
 };
 
+export type Payment = Node & {
+    nextStates: Array<Scalars['String']>;
+    id: Scalars['ID'];
+    createdAt: Scalars['DateTime'];
+    updatedAt: Scalars['DateTime'];
+    method: Scalars['String'];
+    amount: Scalars['Int'];
+    state: Scalars['String'];
+    transactionId?: Maybe<Scalars['String']>;
+    errorMessage?: Maybe<Scalars['String']>;
+    refunds: Array<Refund>;
+    metadata?: Maybe<Scalars['JSON']>;
+};
+
 export type Product = Node & {
     enabled: Scalars['Boolean'];
     channels: Array<Channel>;
@@ -3486,6 +3508,7 @@ export type OrderAddress = {
     country?: Maybe<Scalars['String']>;
     countryCode?: Maybe<Scalars['String']>;
     phoneNumber?: Maybe<Scalars['String']>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type OrderList = PaginatedList & {
@@ -3609,19 +3632,6 @@ export type OrderLine = Node & {
     customFields?: Maybe<Scalars['JSON']>;
 };
 
-export type Payment = Node & {
-    id: Scalars['ID'];
-    createdAt: Scalars['DateTime'];
-    updatedAt: Scalars['DateTime'];
-    method: Scalars['String'];
-    amount: Scalars['Int'];
-    state: Scalars['String'];
-    transactionId?: Maybe<Scalars['String']>;
-    errorMessage?: Maybe<Scalars['String']>;
-    refunds: Array<Refund>;
-    metadata?: Maybe<Scalars['JSON']>;
-};
-
 export type Refund = Node & {
     id: Scalars['ID'];
     createdAt: Scalars['DateTime'];

packages/core/e2e/graphql/generated-e2e-shop-types.ts

@@ -1746,6 +1746,7 @@ export type OrderAddress = {
     country?: Maybe<Scalars['String']>;
     countryCode?: Maybe<Scalars['String']>;
     phoneNumber?: Maybe<Scalars['String']>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type OrderList = PaginatedList & {

packages/core/src/api/resolvers/admin/order.resolver.ts

@@ -3,18 +3,18 @@ import {
     AddFulfillmentToOrderResult,
     CancelOrderResult,
     MutationAddFulfillmentToOrderArgs,
-    // MutationAddManualPaymentToOrderArgs, TODO
+    MutationAddManualPaymentToOrderArgs,
     MutationAddNoteToOrderArgs,
     MutationCancelOrderArgs,
     MutationDeleteOrderNoteArgs,
-    // MutationModifyOrderArgs,
+    MutationModifyOrderArgs,
     MutationRefundOrderArgs,
     MutationSetOrderCustomFieldsArgs,
     MutationSettlePaymentArgs,
     MutationSettleRefundArgs,
     MutationTransitionFulfillmentToStateArgs,
     MutationTransitionOrderToStateArgs,
-    // MutationTransitionPaymentToStateArgs,
+    MutationTransitionPaymentToStateArgs,
     MutationUpdateOrderNoteArgs,
     Permission,
     QueryOrderArgs,
@@ -116,12 +116,12 @@ export class OrderResolver {
         return this.orderService.updateOrderNote(ctx, args.input);
     }
 
-    // @Transaction()
-    // @Mutation()
-    // @Allow(Permission.UpdateOrder)
-    // async deleteOrderNote(@Ctx() ctx: RequestContext, @Args() args: MutationDeleteOrderNoteArgs) {
-    //     return this.orderService.deleteOrderNote(ctx, args.id);
-    // }
+    @Transaction()
+    @Mutation()
+    @Allow(Permission.UpdateOrder)
+    async deleteOrderNote(@Ctx() ctx: RequestContext, @Args() args: MutationDeleteOrderNoteArgs) {
+        return this.orderService.deleteOrderNote(ctx, args.id);
+    }
 
     @Transaction()
     @Mutation()
@@ -150,30 +150,30 @@ export class OrderResolver {
         return this.orderService.transitionFulfillmentToState(ctx, args.id, args.state as FulfillmentState);
     }
 
-    // @Transaction()
-    // @Mutation()
-    // @Allow(Permission.UpdateOrder)
-    // async transitionPaymentToState(
-    //     @Ctx() ctx: RequestContext,
-    //     @Args() args: MutationTransitionPaymentToStateArgs,
-    // ) {
-    //     return this.orderService.transitionPaymentToState(ctx, args.id, args.state as PaymentState);
-    // }
-
-    // @Transaction('manual')
-    // @Mutation()
-    // @Allow(Permission.UpdateOrder)
-    // async modifyOrder(@Ctx() ctx: RequestContext, @Args() args: MutationModifyOrderArgs) {
-    //     return this.orderService.modifyOrder(ctx, args.input);
-    // }
-
-    // @Transaction()
-    // @Mutation()
-    // @Allow(Permission.UpdateOrder)
-    // async addManualPaymentToOrder(
-    //     @Ctx() ctx: RequestContext,
-    //     @Args() args: MutationAddManualPaymentToOrderArgs,
-    // ) {
-    //     return this.orderService.addManualPaymentToOrder(ctx, args.input);
-    // }
+    @Transaction()
+    @Mutation()
+    @Allow(Permission.UpdateOrder)
+    async transitionPaymentToState(
+        @Ctx() ctx: RequestContext,
+        @Args() args: MutationTransitionPaymentToStateArgs,
+    ) {
+        return this.orderService.transitionPaymentToState(ctx, args.id, args.state as PaymentState);
+    }
+
+    @Transaction('manual')
+    @Mutation()
+    @Allow(Permission.UpdateOrder)
+    async modifyOrder(@Ctx() ctx: RequestContext, @Args() args: MutationModifyOrderArgs) {
+        return this.orderService.modifyOrder(ctx, args.input);
+    }
+
+    @Transaction()
+    @Mutation()
+    @Allow(Permission.UpdateOrder)
+    async addManualPaymentToOrder(
+        @Ctx() ctx: RequestContext,
+        @Args() args: MutationAddManualPaymentToOrderArgs,
+    ) {
+        return this.orderService.addManualPaymentToOrder(ctx, args.input);
+    }
 }

packages/core/src/common/error/generated-graphql-admin-errors.ts

@@ -461,6 +461,11 @@ export const adminErrorOperationTypeResolvers = {
       return isGraphQLError(value) ? (value as any).__typename : 'Fulfillment';
     },
   },
+  TransitionPaymentToStateResult: {
+    __resolveType(value: any) {
+      return isGraphQLError(value) ? (value as any).__typename : 'Payment';
+    },
+  },
   ModifyOrderResult: {
     __resolveType(value: any) {
       return isGraphQLError(value) ? (value as any).__typename : 'Order';

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

@@ -116,6 +116,7 @@ export const defaultConfig: RuntimeVendureConfig = {
     },
     paymentOptions: {
         paymentMethodHandlers: [],
+        customPaymentProcess: [],
     },
     taxOptions: {
         taxZoneStrategy: new DefaultTaxZoneStrategy(),

packages/elasticsearch-plugin/e2e/graphql/generated-e2e-elasticsearch-plugin-types.ts

@@ -336,6 +336,7 @@ export type Mutation = {
     deleteOrderNote: DeletionResponse;
     transitionOrderToState?: Maybe<TransitionOrderToStateResult>;
     transitionFulfillmentToState: TransitionFulfillmentToStateResult;
+    transitionPaymentToState: TransitionPaymentToStateResult;
     setOrderCustomFields?: Maybe<Order>;
     /**
      * Allows an Order to be modified after it has been completed by the Customer. The Order must first
@@ -658,6 +659,11 @@ export type MutationTransitionFulfillmentToStateArgs = {
     state: Scalars['String'];
 };
 
+export type MutationTransitionPaymentToStateArgs = {
+    id: Scalars['ID'];
+    state: Scalars['String'];
+};
+
 export type MutationSetOrderCustomFieldsArgs = {
     input: UpdateOrderInput;
 };
@@ -1642,6 +1648,8 @@ export type SettleRefundResult = Refund | RefundStateTransitionError;
 
 export type TransitionFulfillmentToStateResult = Fulfillment | FulfillmentStateTransitionError;
 
+export type TransitionPaymentToStateResult = Payment | PaymentStateTransitionError;
+
 export type ModifyOrderResult =
     | Order
     | NoChangesSpecifiedError
@@ -1676,6 +1684,20 @@ export type PaymentMethod = Node & {
     definition: ConfigurableOperationDefinition;
 };
 
+export type Payment = Node & {
+    nextStates: Array<Scalars['String']>;
+    id: Scalars['ID'];
+    createdAt: Scalars['DateTime'];
+    updatedAt: Scalars['DateTime'];
+    method: Scalars['String'];
+    amount: Scalars['Int'];
+    state: Scalars['String'];
+    transactionId?: Maybe<Scalars['String']>;
+    errorMessage?: Maybe<Scalars['String']>;
+    refunds: Array<Refund>;
+    metadata?: Maybe<Scalars['JSON']>;
+};
+
 export type Product = Node & {
     enabled: Scalars['Boolean'];
     channels: Array<Channel>;
@@ -3486,6 +3508,7 @@ export type OrderAddress = {
     country?: Maybe<Scalars['String']>;
     countryCode?: Maybe<Scalars['String']>;
     phoneNumber?: Maybe<Scalars['String']>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type OrderList = PaginatedList & {
@@ -3609,19 +3632,6 @@ export type OrderLine = Node & {
     customFields?: Maybe<Scalars['JSON']>;
 };
 
-export type Payment = Node & {
-    id: Scalars['ID'];
-    createdAt: Scalars['DateTime'];
-    updatedAt: Scalars['DateTime'];
-    method: Scalars['String'];
-    amount: Scalars['Int'];
-    state: Scalars['String'];
-    transactionId?: Maybe<Scalars['String']>;
-    errorMessage?: Maybe<Scalars['String']>;
-    refunds: Array<Refund>;
-    metadata?: Maybe<Scalars['JSON']>;
-};
-
 export type Refund = Node & {
     id: Scalars['ID'];
     createdAt: Scalars['DateTime'];