feat(core): Add support for custom fields on draft orders

Relates to #1453

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

@@ -23,6 +23,12 @@ export type AddFulfillmentToOrderResult = Fulfillment | EmptyOrderLineSelectionE
 export type AddItemInput = {
   productVariantId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
+};
+
+export type AddItemToDraftOrderInput = {
+  productVariantId: Scalars['ID'];
+  quantity: Scalars['Int'];
 };
 
 export type AddManualPaymentToOrderResult = Order | ManualPaymentStateError;
@@ -57,9 +63,15 @@ export type Address = Node & {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type AdjustDraftOrderLineInput = {
+  orderLineId: Scalars['ID'];
+  quantity: Scalars['Int'];
+};
+
 export type AdjustOrderLineInput = {
   orderLineId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type Adjustment = {
@@ -2248,6 +2260,7 @@ export type ModifyOrderInput = {
   refund?: Maybe<AdministratorRefundInput>;
   options?: Maybe<ModifyOrderOptions>;
   couponCodes?: Maybe<Array<Scalars['String']>>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type ModifyOrderOptions = {
@@ -2400,7 +2413,7 @@ export type Mutation = {
   addManualPaymentToOrder: AddManualPaymentToOrderResult;
   /** Creates a draft Order */
   createDraftOrder: Order;
-  /** Adds an item to the draft Order. If custom fields are defined on the OrderLine entity, a third argument 'customFields' will be available. */
+  /** Adds an item to the draft Order. */
   addItemToDraftOrder: UpdateOrderItemsResult;
   /** Adjusts a draft OrderLine. If custom fields are defined on the OrderLine entity, a third argument 'customFields' of type `OrderLineCustomFieldsInput` will be available. */
   adjustDraftOrderLine: UpdateOrderItemsResult;
@@ -2874,15 +2887,13 @@ export type MutationAddManualPaymentToOrderArgs = {
 
 export type MutationAddItemToDraftOrderArgs = {
   orderId: Scalars['ID'];
-  productVariantId: Scalars['ID'];
-  quantity: Scalars['Int'];
+  input: AddItemToDraftOrderInput;
 };
 
 
 export type MutationAdjustDraftOrderLineArgs = {
   orderId: Scalars['ID'];
-  orderLineId: Scalars['ID'];
-  quantity: Scalars['Int'];
+  input: AdjustDraftOrderLineInput;
 };
 
 
@@ -3298,7 +3309,7 @@ export type Order = Node & {
   /** A summary of the taxes being applied to this Order */
   taxSummary: Array<OrderTaxSummary>;
   history: HistoryEntryList;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderCustomFields>;
 };
 
 
@@ -3320,6 +3331,10 @@ export type OrderAddress = {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type OrderCustomFields = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type OrderFilterParameter = {
   customerLastName?: Maybe<StringOperators>;
   transactionId?: Maybe<StringOperators>;
@@ -3338,6 +3353,7 @@ export type OrderFilterParameter = {
   shippingWithTax?: Maybe<NumberOperators>;
   total?: Maybe<NumberOperators>;
   totalWithTax?: Maybe<NumberOperators>;
+  tags?: Maybe<StringListOperators>;
 };
 
 export type OrderItem = Node & {
@@ -3441,7 +3457,17 @@ export type OrderLine = Node & {
   taxLines: Array<TaxLine>;
   order: Order;
   fulfillments?: Maybe<Array<Fulfillment>>;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderLineCustomFields>;
+};
+
+export type OrderLineCustomFields = {
+  referrer?: Maybe<Customer>;
+  description?: Maybe<Scalars['String']>;
+};
+
+export type OrderLineCustomFieldsInput = {
+  referrerId?: Maybe<Scalars['ID']>;
+  description?: Maybe<Scalars['String']>;
 };
 
 export type OrderLineInput = {
@@ -5242,9 +5268,13 @@ export type UpdateOrderAddressInput = {
   phoneNumber?: Maybe<Scalars['String']>;
 };
 
+export type UpdateOrderCustomFieldsInput = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type UpdateOrderInput = {
   id: Scalars['ID'];
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type UpdateOrderItemsResult = Order | OrderModificationError | OrderLimitError | NegativeQuantityError | InsufficientStockError;

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

@@ -1643,6 +1643,7 @@ export type Mutation = {
 export type MutationAddItemToOrderArgs = {
   productVariantId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 
@@ -1654,6 +1655,7 @@ export type MutationRemoveOrderLineArgs = {
 export type MutationAdjustOrderLineArgs = {
   orderLineId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 
@@ -1897,7 +1899,7 @@ export type Order = Node & {
   /** A summary of the taxes being applied to this Order */
   taxSummary: Array<OrderTaxSummary>;
   history: HistoryEntryList;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderCustomFields>;
 };
 
 
@@ -1920,6 +1922,11 @@ export type OrderAddress = {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type OrderCustomFields = {
+  __typename?: 'OrderCustomFields';
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type OrderFilterParameter = {
   id?: Maybe<IdOperators>;
   createdAt?: Maybe<DateOperators>;
@@ -1936,6 +1943,7 @@ export type OrderFilterParameter = {
   shippingWithTax?: Maybe<NumberOperators>;
   total?: Maybe<NumberOperators>;
   totalWithTax?: Maybe<NumberOperators>;
+  tags?: Maybe<StringListOperators>;
 };
 
 export type OrderItem = Node & {
@@ -2042,7 +2050,18 @@ export type OrderLine = Node & {
   taxLines: Array<TaxLine>;
   order: Order;
   fulfillments?: Maybe<Array<Fulfillment>>;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderLineCustomFields>;
+};
+
+export type OrderLineCustomFields = {
+  __typename?: 'OrderLineCustomFields';
+  referrer?: Maybe<Customer>;
+  description?: Maybe<Scalars['String']>;
+};
+
+export type OrderLineCustomFieldsInput = {
+  referrerId?: Maybe<Scalars['ID']>;
+  description?: Maybe<Scalars['String']>;
 };
 
 export type OrderList = PaginatedList & {
@@ -3112,8 +3131,12 @@ export type UpdateCustomerInput = {
 
 export type UpdateCustomerPasswordResult = Success | InvalidCredentialsError | PasswordValidationError | NativeAuthStrategyError;
 
+export type UpdateOrderCustomFieldsInput = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type UpdateOrderInput = {
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type UpdateOrderItemsResult = Order | OrderModificationError | OrderLimitError | NegativeQuantityError | InsufficientStockError;

packages/common/src/generated-types.ts

@@ -23,6 +23,12 @@ export type AddFulfillmentToOrderResult = Fulfillment | EmptyOrderLineSelectionE
 export type AddItemInput = {
   productVariantId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
+};
+
+export type AddItemToDraftOrderInput = {
+  productVariantId: Scalars['ID'];
+  quantity: Scalars['Int'];
 };
 
 export type AddManualPaymentToOrderResult = Order | ManualPaymentStateError;
@@ -58,9 +64,15 @@ export type Address = Node & {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type AdjustDraftOrderLineInput = {
+  orderLineId: Scalars['ID'];
+  quantity: Scalars['Int'];
+};
+
 export type AdjustOrderLineInput = {
   orderLineId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type Adjustment = {
@@ -2324,6 +2336,7 @@ export type ModifyOrderInput = {
   refund?: Maybe<AdministratorRefundInput>;
   options?: Maybe<ModifyOrderOptions>;
   couponCodes?: Maybe<Array<Scalars['String']>>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type ModifyOrderOptions = {
@@ -2478,7 +2491,7 @@ export type Mutation = {
   addManualPaymentToOrder: AddManualPaymentToOrderResult;
   /** Creates a draft Order */
   createDraftOrder: Order;
-  /** Adds an item to the draft Order. If custom fields are defined on the OrderLine entity, a third argument 'customFields' will be available. */
+  /** Adds an item to the draft Order. */
   addItemToDraftOrder: UpdateOrderItemsResult;
   /** Adjusts a draft OrderLine. If custom fields are defined on the OrderLine entity, a third argument 'customFields' of type `OrderLineCustomFieldsInput` will be available. */
   adjustDraftOrderLine: UpdateOrderItemsResult;
@@ -2952,15 +2965,13 @@ export type MutationAddManualPaymentToOrderArgs = {
 
 export type MutationAddItemToDraftOrderArgs = {
   orderId: Scalars['ID'];
-  productVariantId: Scalars['ID'];
-  quantity: Scalars['Int'];
+  input: AddItemToDraftOrderInput;
 };
 
 
 export type MutationAdjustDraftOrderLineArgs = {
   orderId: Scalars['ID'];
-  orderLineId: Scalars['ID'];
-  quantity: Scalars['Int'];
+  input: AdjustDraftOrderLineInput;
 };
 
 
@@ -3382,7 +3393,7 @@ export type Order = Node & {
   /** A summary of the taxes being applied to this Order */
   taxSummary: Array<OrderTaxSummary>;
   history: HistoryEntryList;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderCustomFields>;
 };
 
 
@@ -3405,6 +3416,11 @@ export type OrderAddress = {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type OrderCustomFields = {
+  __typename?: 'OrderCustomFields';
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type OrderFilterParameter = {
   customerLastName?: Maybe<StringOperators>;
   transactionId?: Maybe<StringOperators>;
@@ -3423,6 +3439,7 @@ export type OrderFilterParameter = {
   shippingWithTax?: Maybe<NumberOperators>;
   total?: Maybe<NumberOperators>;
   totalWithTax?: Maybe<NumberOperators>;
+  tags?: Maybe<StringListOperators>;
 };
 
 export type OrderItem = Node & {
@@ -3529,7 +3546,18 @@ export type OrderLine = Node & {
   taxLines: Array<TaxLine>;
   order: Order;
   fulfillments?: Maybe<Array<Fulfillment>>;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderLineCustomFields>;
+};
+
+export type OrderLineCustomFields = {
+  __typename?: 'OrderLineCustomFields';
+  referrer?: Maybe<Customer>;
+  description?: Maybe<Scalars['String']>;
+};
+
+export type OrderLineCustomFieldsInput = {
+  referrerId?: Maybe<Scalars['ID']>;
+  description?: Maybe<Scalars['String']>;
 };
 
 export type OrderLineInput = {
@@ -5398,9 +5426,13 @@ export type UpdateOrderAddressInput = {
   phoneNumber?: Maybe<Scalars['String']>;
 };
 
+export type UpdateOrderCustomFieldsInput = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type UpdateOrderInput = {
   id: Scalars['ID'];
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type UpdateOrderItemsResult = Order | OrderModificationError | OrderLimitError | NegativeQuantityError | InsufficientStockError;

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

@@ -23,6 +23,12 @@ export type AddFulfillmentToOrderResult = Fulfillment | EmptyOrderLineSelectionE
 export type AddItemInput = {
   productVariantId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
+};
+
+export type AddItemToDraftOrderInput = {
+  productVariantId: Scalars['ID'];
+  quantity: Scalars['Int'];
 };
 
 export type AddManualPaymentToOrderResult = Order | ManualPaymentStateError;
@@ -57,9 +63,15 @@ export type Address = Node & {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type AdjustDraftOrderLineInput = {
+  orderLineId: Scalars['ID'];
+  quantity: Scalars['Int'];
+};
+
 export type AdjustOrderLineInput = {
   orderLineId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type Adjustment = {
@@ -2248,6 +2260,7 @@ export type ModifyOrderInput = {
   refund?: Maybe<AdministratorRefundInput>;
   options?: Maybe<ModifyOrderOptions>;
   couponCodes?: Maybe<Array<Scalars['String']>>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type ModifyOrderOptions = {
@@ -2400,7 +2413,7 @@ export type Mutation = {
   addManualPaymentToOrder: AddManualPaymentToOrderResult;
   /** Creates a draft Order */
   createDraftOrder: Order;
-  /** Adds an item to the draft Order. If custom fields are defined on the OrderLine entity, a third argument 'customFields' will be available. */
+  /** Adds an item to the draft Order. */
   addItemToDraftOrder: UpdateOrderItemsResult;
   /** Adjusts a draft OrderLine. If custom fields are defined on the OrderLine entity, a third argument 'customFields' of type `OrderLineCustomFieldsInput` will be available. */
   adjustDraftOrderLine: UpdateOrderItemsResult;
@@ -2874,15 +2887,13 @@ export type MutationAddManualPaymentToOrderArgs = {
 
 export type MutationAddItemToDraftOrderArgs = {
   orderId: Scalars['ID'];
-  productVariantId: Scalars['ID'];
-  quantity: Scalars['Int'];
+  input: AddItemToDraftOrderInput;
 };
 
 
 export type MutationAdjustDraftOrderLineArgs = {
   orderId: Scalars['ID'];
-  orderLineId: Scalars['ID'];
-  quantity: Scalars['Int'];
+  input: AdjustDraftOrderLineInput;
 };
 
 
@@ -3298,7 +3309,7 @@ export type Order = Node & {
   /** A summary of the taxes being applied to this Order */
   taxSummary: Array<OrderTaxSummary>;
   history: HistoryEntryList;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderCustomFields>;
 };
 
 
@@ -3320,6 +3331,10 @@ export type OrderAddress = {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type OrderCustomFields = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type OrderFilterParameter = {
   customerLastName?: Maybe<StringOperators>;
   transactionId?: Maybe<StringOperators>;
@@ -3338,6 +3353,7 @@ export type OrderFilterParameter = {
   shippingWithTax?: Maybe<NumberOperators>;
   total?: Maybe<NumberOperators>;
   totalWithTax?: Maybe<NumberOperators>;
+  tags?: Maybe<StringListOperators>;
 };
 
 export type OrderItem = Node & {
@@ -3441,7 +3457,17 @@ export type OrderLine = Node & {
   taxLines: Array<TaxLine>;
   order: Order;
   fulfillments?: Maybe<Array<Fulfillment>>;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderLineCustomFields>;
+};
+
+export type OrderLineCustomFields = {
+  referrer?: Maybe<Customer>;
+  description?: Maybe<Scalars['String']>;
+};
+
+export type OrderLineCustomFieldsInput = {
+  referrerId?: Maybe<Scalars['ID']>;
+  description?: Maybe<Scalars['String']>;
 };
 
 export type OrderLineInput = {
@@ -5242,9 +5268,13 @@ export type UpdateOrderAddressInput = {
   phoneNumber?: Maybe<Scalars['String']>;
 };
 
+export type UpdateOrderCustomFieldsInput = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type UpdateOrderInput = {
   id: Scalars['ID'];
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type UpdateOrderItemsResult = Order | OrderModificationError | OrderLimitError | NegativeQuantityError | InsufficientStockError;

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

@@ -1588,6 +1588,7 @@ export type Mutation = {
 export type MutationAddItemToOrderArgs = {
   productVariantId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 
@@ -1599,6 +1600,7 @@ export type MutationRemoveOrderLineArgs = {
 export type MutationAdjustOrderLineArgs = {
   orderLineId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 
@@ -1837,7 +1839,7 @@ export type Order = Node & {
   /** A summary of the taxes being applied to this Order */
   taxSummary: Array<OrderTaxSummary>;
   history: HistoryEntryList;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderCustomFields>;
 };
 
 
@@ -1859,6 +1861,10 @@ export type OrderAddress = {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type OrderCustomFields = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type OrderFilterParameter = {
   id?: Maybe<IdOperators>;
   createdAt?: Maybe<DateOperators>;
@@ -1875,6 +1881,7 @@ export type OrderFilterParameter = {
   shippingWithTax?: Maybe<NumberOperators>;
   total?: Maybe<NumberOperators>;
   totalWithTax?: Maybe<NumberOperators>;
+  tags?: Maybe<StringListOperators>;
 };
 
 export type OrderItem = Node & {
@@ -1978,7 +1985,17 @@ export type OrderLine = Node & {
   taxLines: Array<TaxLine>;
   order: Order;
   fulfillments?: Maybe<Array<Fulfillment>>;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderLineCustomFields>;
+};
+
+export type OrderLineCustomFields = {
+  referrer?: Maybe<Customer>;
+  description?: Maybe<Scalars['String']>;
+};
+
+export type OrderLineCustomFieldsInput = {
+  referrerId?: Maybe<Scalars['ID']>;
+  description?: Maybe<Scalars['String']>;
 };
 
 export type OrderList = PaginatedList & {
@@ -2995,8 +3012,12 @@ export type UpdateCustomerInput = {
 
 export type UpdateCustomerPasswordResult = Success | InvalidCredentialsError | PasswordValidationError | NativeAuthStrategyError;
 
+export type UpdateOrderCustomFieldsInput = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type UpdateOrderInput = {
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type UpdateOrderItemsResult = Order | OrderModificationError | OrderLimitError | NegativeQuantityError | InsufficientStockError;

packages/core/src/api/config/graphql-custom-fields.ts

@@ -387,6 +387,24 @@ export function addOrderLineCustomFieldsInput(
 
         extendedSchema = extendSchema(extendedSchema, parse(customFieldTypeDefs));
     }
+    if (schema.getType('AddItemToDraftOrderInput')) {
+        const customFieldTypeDefs = `
+            extend input AddItemToDraftOrderInput {
+                customFields: OrderLineCustomFieldsInput
+            }
+        `;
+
+        extendedSchema = extendSchema(extendedSchema, parse(customFieldTypeDefs));
+    }
+    if (schema.getType('AdjustDraftOrderLineInput')) {
+        const customFieldTypeDefs = `
+            extend input AdjustDraftOrderLineInput {
+                customFields: OrderLineCustomFieldsInput
+            }
+        `;
+
+        extendedSchema = extendSchema(extendedSchema, parse(customFieldTypeDefs));
+    }
 
     return extendedSchema;
 }

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

@@ -1,10 +1,10 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
 import {
-    ApplyCouponCodeResult,
     ActiveOrderResult,
+    ApplyCouponCodeResult,
     RemoveOrderItemsResult,
-    UpdateOrderItemsResult,
     SetOrderShippingMethodResult,
+    UpdateOrderItemsResult,
 } from '@vendure/common/lib/generated-shop-types';
 import {
     MutationAddItemToDraftOrderArgs,
@@ -51,14 +51,14 @@ export class DraftOrderResolver {
     @Allow(Permission.CreateOrder)
     async addItemToDraftOrder(
         @Ctx() ctx: RequestContext,
-        @Args() args: MutationAddItemToDraftOrderArgs,
+        @Args() { orderId, input }: MutationAddItemToDraftOrderArgs,
     ): Promise<ErrorResultUnion<UpdateOrderItemsResult, Order>> {
         return this.orderService.addItemToOrder(
             ctx,
-            args.orderId,
-            args.productVariantId,
-            args.quantity,
-            (args as any).customFields,
+            orderId,
+            input.productVariantId,
+            input.quantity,
+            (input as any).customFields,
         );
     }
 
@@ -67,17 +67,17 @@ export class DraftOrderResolver {
     @Allow(Permission.UpdateOrder, Permission.Owner)
     async adjustDraftOrderLine(
         @Ctx() ctx: RequestContext,
-        @Args() args: MutationAdjustDraftOrderLineArgs,
+        @Args() { orderId, input }: MutationAdjustDraftOrderLineArgs,
     ): Promise<ErrorResultUnion<UpdateOrderItemsResult, Order>> {
-        if (args.quantity === 0) {
-            return this.removeDraftOrderLine(ctx, { orderId: args.orderId, orderLineId: args.orderLineId });
+        if (input.quantity === 0) {
+            return this.removeDraftOrderLine(ctx, { orderId, orderLineId: input.orderLineId });
         }
         return this.orderService.adjustOrderLine(
             ctx,
-            args.orderId,
-            args.orderLineId,
-            args.quantity,
-            (args as any).customFields,
+            orderId,
+            input.orderLineId,
+            input.quantity,
+            (input as any).customFields,
         );
     }
 

packages/core/src/api/schema/admin-api/order.api.graphql

@@ -36,10 +36,10 @@ type Mutation {
     addManualPaymentToOrder(input: ManualPaymentInput!): AddManualPaymentToOrderResult!
     "Creates a draft Order"
     createDraftOrder: Order!
-    "Adds an item to the draft Order. If custom fields are defined on the OrderLine entity, a third argument 'customFields' will be available."
-    addItemToDraftOrder(orderId: ID!, productVariantId: ID!, quantity: Int!): UpdateOrderItemsResult!
+    "Adds an item to the draft Order."
+    addItemToDraftOrder(orderId: ID!, input: AddItemToDraftOrderInput!): UpdateOrderItemsResult!
     "Adjusts a draft OrderLine. If custom fields are defined on the OrderLine entity, a third argument 'customFields' of type `OrderLineCustomFieldsInput` will be available."
-    adjustDraftOrderLine(orderId: ID!, orderLineId: ID!, quantity: Int!): UpdateOrderItemsResult!
+    adjustDraftOrderLine(orderId: ID!, input: AdjustDraftOrderLineInput!): UpdateOrderItemsResult!
     "Remove an OrderLine from the draft Order"
     removeDraftOrderLine(orderId: ID!, orderLineId: ID!): RemoveOrderItemsResult!
     setCustomerForDraftOrder(
@@ -200,6 +200,16 @@ input ManualPaymentInput {
     metadata: JSON
 }
 
+input AddItemToDraftOrderInput {
+    productVariantId: ID!
+    quantity: Int!
+}
+
+input AdjustDraftOrderLineInput {
+    orderLineId: ID!
+    quantity: Int!
+}
+
 "Returned if the Payment settlement fails"
 type SettlePaymentError implements ErrorResult {
     errorCode: ErrorCode!

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

@@ -23,6 +23,12 @@ export type AddFulfillmentToOrderResult = Fulfillment | EmptyOrderLineSelectionE
 export type AddItemInput = {
   productVariantId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
+};
+
+export type AddItemToDraftOrderInput = {
+  productVariantId: Scalars['ID'];
+  quantity: Scalars['Int'];
 };
 
 export type AddManualPaymentToOrderResult = Order | ManualPaymentStateError;
@@ -57,9 +63,15 @@ export type Address = Node & {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type AdjustDraftOrderLineInput = {
+  orderLineId: Scalars['ID'];
+  quantity: Scalars['Int'];
+};
+
 export type AdjustOrderLineInput = {
   orderLineId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type Adjustment = {
@@ -2248,6 +2260,7 @@ export type ModifyOrderInput = {
   refund?: Maybe<AdministratorRefundInput>;
   options?: Maybe<ModifyOrderOptions>;
   couponCodes?: Maybe<Array<Scalars['String']>>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type ModifyOrderOptions = {
@@ -2400,7 +2413,7 @@ export type Mutation = {
   addManualPaymentToOrder: AddManualPaymentToOrderResult;
   /** Creates a draft Order */
   createDraftOrder: Order;
-  /** Adds an item to the draft Order. If custom fields are defined on the OrderLine entity, a third argument 'customFields' will be available. */
+  /** Adds an item to the draft Order. */
   addItemToDraftOrder: UpdateOrderItemsResult;
   /** Adjusts a draft OrderLine. If custom fields are defined on the OrderLine entity, a third argument 'customFields' of type `OrderLineCustomFieldsInput` will be available. */
   adjustDraftOrderLine: UpdateOrderItemsResult;
@@ -2874,15 +2887,13 @@ export type MutationAddManualPaymentToOrderArgs = {
 
 export type MutationAddItemToDraftOrderArgs = {
   orderId: Scalars['ID'];
-  productVariantId: Scalars['ID'];
-  quantity: Scalars['Int'];
+  input: AddItemToDraftOrderInput;
 };
 
 
 export type MutationAdjustDraftOrderLineArgs = {
   orderId: Scalars['ID'];
-  orderLineId: Scalars['ID'];
-  quantity: Scalars['Int'];
+  input: AdjustDraftOrderLineInput;
 };
 
 
@@ -3298,7 +3309,7 @@ export type Order = Node & {
   /** A summary of the taxes being applied to this Order */
   taxSummary: Array<OrderTaxSummary>;
   history: HistoryEntryList;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderCustomFields>;
 };
 
 
@@ -3320,6 +3331,10 @@ export type OrderAddress = {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type OrderCustomFields = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type OrderFilterParameter = {
   customerLastName?: Maybe<StringOperators>;
   transactionId?: Maybe<StringOperators>;
@@ -3338,6 +3353,7 @@ export type OrderFilterParameter = {
   shippingWithTax?: Maybe<NumberOperators>;
   total?: Maybe<NumberOperators>;
   totalWithTax?: Maybe<NumberOperators>;
+  tags?: Maybe<StringListOperators>;
 };
 
 export type OrderItem = Node & {
@@ -3441,7 +3457,17 @@ export type OrderLine = Node & {
   taxLines: Array<TaxLine>;
   order: Order;
   fulfillments?: Maybe<Array<Fulfillment>>;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderLineCustomFields>;
+};
+
+export type OrderLineCustomFields = {
+  referrer?: Maybe<Customer>;
+  description?: Maybe<Scalars['String']>;
+};
+
+export type OrderLineCustomFieldsInput = {
+  referrerId?: Maybe<Scalars['ID']>;
+  description?: Maybe<Scalars['String']>;
 };
 
 export type OrderLineInput = {
@@ -5242,9 +5268,13 @@ export type UpdateOrderAddressInput = {
   phoneNumber?: Maybe<Scalars['String']>;
 };
 
+export type UpdateOrderCustomFieldsInput = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type UpdateOrderInput = {
   id: Scalars['ID'];
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type UpdateOrderItemsResult = Order | OrderModificationError | OrderLimitError | NegativeQuantityError | InsufficientStockError;

packages/payments-plugin/e2e/graphql/generated-admin-types.ts

@@ -23,6 +23,12 @@ export type AddFulfillmentToOrderResult = Fulfillment | EmptyOrderLineSelectionE
 export type AddItemInput = {
   productVariantId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
+};
+
+export type AddItemToDraftOrderInput = {
+  productVariantId: Scalars['ID'];
+  quantity: Scalars['Int'];
 };
 
 export type AddManualPaymentToOrderResult = Order | ManualPaymentStateError;
@@ -57,9 +63,15 @@ export type Address = Node & {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type AdjustDraftOrderLineInput = {
+  orderLineId: Scalars['ID'];
+  quantity: Scalars['Int'];
+};
+
 export type AdjustOrderLineInput = {
   orderLineId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type Adjustment = {
@@ -2248,6 +2260,7 @@ export type ModifyOrderInput = {
   refund?: Maybe<AdministratorRefundInput>;
   options?: Maybe<ModifyOrderOptions>;
   couponCodes?: Maybe<Array<Scalars['String']>>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type ModifyOrderOptions = {
@@ -2400,7 +2413,7 @@ export type Mutation = {
   addManualPaymentToOrder: AddManualPaymentToOrderResult;
   /** Creates a draft Order */
   createDraftOrder: Order;
-  /** Adds an item to the draft Order. If custom fields are defined on the OrderLine entity, a third argument 'customFields' will be available. */
+  /** Adds an item to the draft Order. */
   addItemToDraftOrder: UpdateOrderItemsResult;
   /** Adjusts a draft OrderLine. If custom fields are defined on the OrderLine entity, a third argument 'customFields' of type `OrderLineCustomFieldsInput` will be available. */
   adjustDraftOrderLine: UpdateOrderItemsResult;
@@ -2874,15 +2887,13 @@ export type MutationAddManualPaymentToOrderArgs = {
 
 export type MutationAddItemToDraftOrderArgs = {
   orderId: Scalars['ID'];
-  productVariantId: Scalars['ID'];
-  quantity: Scalars['Int'];
+  input: AddItemToDraftOrderInput;
 };
 
 
 export type MutationAdjustDraftOrderLineArgs = {
   orderId: Scalars['ID'];
-  orderLineId: Scalars['ID'];
-  quantity: Scalars['Int'];
+  input: AdjustDraftOrderLineInput;
 };
 
 
@@ -3298,7 +3309,7 @@ export type Order = Node & {
   /** A summary of the taxes being applied to this Order */
   taxSummary: Array<OrderTaxSummary>;
   history: HistoryEntryList;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderCustomFields>;
 };
 
 
@@ -3320,6 +3331,10 @@ export type OrderAddress = {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type OrderCustomFields = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type OrderFilterParameter = {
   customerLastName?: Maybe<StringOperators>;
   transactionId?: Maybe<StringOperators>;
@@ -3338,6 +3353,7 @@ export type OrderFilterParameter = {
   shippingWithTax?: Maybe<NumberOperators>;
   total?: Maybe<NumberOperators>;
   totalWithTax?: Maybe<NumberOperators>;
+  tags?: Maybe<StringListOperators>;
 };
 
 export type OrderItem = Node & {
@@ -3441,7 +3457,17 @@ export type OrderLine = Node & {
   taxLines: Array<TaxLine>;
   order: Order;
   fulfillments?: Maybe<Array<Fulfillment>>;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderLineCustomFields>;
+};
+
+export type OrderLineCustomFields = {
+  referrer?: Maybe<Customer>;
+  description?: Maybe<Scalars['String']>;
+};
+
+export type OrderLineCustomFieldsInput = {
+  referrerId?: Maybe<Scalars['ID']>;
+  description?: Maybe<Scalars['String']>;
 };
 
 export type OrderLineInput = {
@@ -5242,9 +5268,13 @@ export type UpdateOrderAddressInput = {
   phoneNumber?: Maybe<Scalars['String']>;
 };
 
+export type UpdateOrderCustomFieldsInput = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type UpdateOrderInput = {
   id: Scalars['ID'];
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type UpdateOrderItemsResult = Order | OrderModificationError | OrderLimitError | NegativeQuantityError | InsufficientStockError;

packages/payments-plugin/e2e/graphql/generated-shop-types.ts

@@ -1588,6 +1588,7 @@ export type Mutation = {
 export type MutationAddItemToOrderArgs = {
   productVariantId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 
@@ -1599,6 +1600,7 @@ export type MutationRemoveOrderLineArgs = {
 export type MutationAdjustOrderLineArgs = {
   orderLineId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 
@@ -1837,7 +1839,7 @@ export type Order = Node & {
   /** A summary of the taxes being applied to this Order */
   taxSummary: Array<OrderTaxSummary>;
   history: HistoryEntryList;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderCustomFields>;
 };
 
 
@@ -1859,6 +1861,10 @@ export type OrderAddress = {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type OrderCustomFields = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type OrderFilterParameter = {
   id?: Maybe<IdOperators>;
   createdAt?: Maybe<DateOperators>;
@@ -1875,6 +1881,7 @@ export type OrderFilterParameter = {
   shippingWithTax?: Maybe<NumberOperators>;
   total?: Maybe<NumberOperators>;
   totalWithTax?: Maybe<NumberOperators>;
+  tags?: Maybe<StringListOperators>;
 };
 
 export type OrderItem = Node & {
@@ -1978,7 +1985,17 @@ export type OrderLine = Node & {
   taxLines: Array<TaxLine>;
   order: Order;
   fulfillments?: Maybe<Array<Fulfillment>>;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderLineCustomFields>;
+};
+
+export type OrderLineCustomFields = {
+  referrer?: Maybe<Customer>;
+  description?: Maybe<Scalars['String']>;
+};
+
+export type OrderLineCustomFieldsInput = {
+  referrerId?: Maybe<Scalars['ID']>;
+  description?: Maybe<Scalars['String']>;
 };
 
 export type OrderList = PaginatedList & {
@@ -2995,8 +3012,12 @@ export type UpdateCustomerInput = {
 
 export type UpdateCustomerPasswordResult = Success | InvalidCredentialsError | PasswordValidationError | NativeAuthStrategyError;
 
+export type UpdateOrderCustomFieldsInput = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type UpdateOrderInput = {
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type UpdateOrderItemsResult = Order | OrderModificationError | OrderLimitError | NegativeQuantityError | InsufficientStockError;

packages/payments-plugin/src/mollie/graphql/generated-shop-types.ts

@@ -1689,6 +1689,7 @@ export type Mutation = {
 export type MutationAddItemToOrderArgs = {
   productVariantId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 
@@ -1700,6 +1701,7 @@ export type MutationAddPaymentToOrderArgs = {
 export type MutationAdjustOrderLineArgs = {
   orderLineId: Scalars['ID'];
   quantity: Scalars['Int'];
+  customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 
@@ -1948,7 +1950,7 @@ export type Order = Node & {
   /** A summary of the taxes being applied to this Order */
   taxSummary: Array<OrderTaxSummary>;
   history: HistoryEntryList;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderCustomFields>;
 };
 
 
@@ -1971,6 +1973,11 @@ export type OrderAddress = {
   customFields?: Maybe<Scalars['JSON']>;
 };
 
+export type OrderCustomFields = {
+  __typename?: 'OrderCustomFields';
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type OrderFilterParameter = {
   id?: Maybe<IdOperators>;
   createdAt?: Maybe<DateOperators>;
@@ -1987,6 +1994,7 @@ export type OrderFilterParameter = {
   shippingWithTax?: Maybe<NumberOperators>;
   total?: Maybe<NumberOperators>;
   totalWithTax?: Maybe<NumberOperators>;
+  tags?: Maybe<StringListOperators>;
 };
 
 export type OrderItem = Node & {
@@ -2093,7 +2101,18 @@ export type OrderLine = Node & {
   taxLines: Array<TaxLine>;
   order: Order;
   fulfillments?: Maybe<Array<Fulfillment>>;
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<OrderLineCustomFields>;
+};
+
+export type OrderLineCustomFields = {
+  __typename?: 'OrderLineCustomFields';
+  referrer?: Maybe<Customer>;
+  description?: Maybe<Scalars['String']>;
+};
+
+export type OrderLineCustomFieldsInput = {
+  referrerId?: Maybe<Scalars['ID']>;
+  description?: Maybe<Scalars['String']>;
 };
 
 export type OrderList = PaginatedList & {
@@ -3169,8 +3188,12 @@ export type UpdateCustomerInput = {
 
 export type UpdateCustomerPasswordResult = Success | InvalidCredentialsError | PasswordValidationError | NativeAuthStrategyError;
 
+export type UpdateOrderCustomFieldsInput = {
+  tags?: Maybe<Array<Scalars['String']>>;
+};
+
 export type UpdateOrderInput = {
-  customFields?: Maybe<Scalars['JSON']>;
+  customFields?: Maybe<UpdateOrderCustomFieldsInput>;
 };
 
 export type UpdateOrderItemsResult = Order | OrderModificationError | OrderLimitError | NegativeQuantityError | InsufficientStockError;