feat(core): Allow Order/OrderLine customFields to be modified

Relates to #314
vendure-ecommerce · Dec 22, 2020 · ce656c4 · ce656c4
1 parent d3e3a88
commit ce656c4
Show file tree

Hide file tree

Showing 13 changed files with 345 additions and 114 deletions.
diff --git a/packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts b/packages/asset-server-plugin/e2e/graphql/generated-e2e-asset-server-plugin-types.ts
@@ -1406,7 +1406,7 @@ export type ModifyOrderInput = {
     dryRun: Scalars['Boolean'];
     orderId: Scalars['ID'];
     addItems?: Maybe<Array<AddItemInput>>;
-    adjustOrderLines?: Maybe<Array<OrderLineInput>>;
+    adjustOrderLines?: Maybe<Array<AdjustOrderLineInput>>;
     surcharges?: Maybe<Array<SurchargeInput>>;
     updateShippingAddress?: Maybe<UpdateOrderAddressInput>;
     updateBillingAddress?: Maybe<UpdateOrderAddressInput>;
@@ -1420,6 +1420,11 @@ export type AddItemInput = {
     quantity: Scalars['Int'];
 };
 
+export type AdjustOrderLineInput = {
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+};
+
 export type SurchargeInput = {
     description: Scalars['String'];
     sku?: Maybe<Scalars['String']>;
@@ -3594,7 +3599,7 @@ export type OrderLine = Node & {
     discounts: Array<Adjustment>;
     taxLines: Array<TaxLine>;
     order: Order;
-    customFields?: Maybe<OrderLineCustomFields>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type Payment = Node & {
@@ -4310,11 +4315,6 @@ export type HistoryEntrySortParameter = {
     updatedAt?: Maybe<SortOrder>;
 };
 
-export type OrderLineCustomFields = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
 export type AuthenticationInput = {
     native?: Maybe<NativeAuthInput>;
 };

diff --git a/packages/common/src/generated-shop-types.ts b/packages/common/src/generated-shop-types.ts
@@ -181,7 +181,6 @@ export type Mutation = {
 export type MutationAddItemToOrderArgs = {
     productVariantId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type MutationRemoveOrderLineArgs = {
@@ -191,7 +190,6 @@ export type MutationRemoveOrderLineArgs = {
 export type MutationAdjustOrderLineArgs = {
     orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type MutationApplyCouponCodeArgs = {
@@ -1925,7 +1923,7 @@ export type OrderLine = Node & {
     discounts: Array<Adjustment>;
     taxLines: Array<TaxLine>;
     order: Order;
-    customFields?: Maybe<OrderLineCustomFields>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type Payment = Node & {
@@ -2722,17 +2720,6 @@ export type UpdateOrderInput = {
     customFields?: Maybe<Scalars['JSON']>;
 };
 
-export type OrderLineCustomFields = {
-    __typename?: 'OrderLineCustomFields';
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
-export type OrderLineCustomFieldsInput = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
 export type AuthenticationInput = {
     native?: Maybe<NativeAuthInput>;
 };

diff --git a/packages/common/src/generated-types.ts b/packages/common/src/generated-types.ts
@@ -1567,7 +1567,7 @@ export type ModifyOrderInput = {
   dryRun: Scalars['Boolean'];
   orderId: Scalars['ID'];
   addItems?: Maybe<Array<AddItemInput>>;
-  adjustOrderLines?: Maybe<Array<OrderLineInput>>;
+  adjustOrderLines?: Maybe<Array<AdjustOrderLineInput>>;
   surcharges?: Maybe<Array<SurchargeInput>>;
   updateShippingAddress?: Maybe<UpdateOrderAddressInput>;
   updateBillingAddress?: Maybe<UpdateOrderAddressInput>;
@@ -1581,6 +1581,11 @@ export type AddItemInput = {
   quantity: Scalars['Int'];
 };
 
+export type AdjustOrderLineInput = {
+  orderLineId: Scalars['ID'];
+  quantity: Scalars['Int'];
+};
+
 export type SurchargeInput = {
   description: Scalars['String'];
   sku?: Maybe<Scalars['String']>;
@@ -3802,7 +3807,7 @@ export type OrderLine = Node & {
   discounts: Array<Adjustment>;
   taxLines: Array<TaxLine>;
   order: Order;
-  customFields?: Maybe<OrderLineCustomFields>;
+  customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type Payment = Node & {
@@ -4547,12 +4552,6 @@ export type HistoryEntrySortParameter = {
   updatedAt?: Maybe<SortOrder>;
 };
 
-export type OrderLineCustomFields = {
-  __typename?: 'OrderLineCustomFields';
-  test?: Maybe<Scalars['String']>;
-  test2?: Maybe<Scalars['String']>;
-};
-
 export type AuthenticationInput = {
   native?: Maybe<NativeAuthInput>;
 };

diff --git a/packages/core/e2e/graphql/generated-e2e-admin-types.ts b/packages/core/e2e/graphql/generated-e2e-admin-types.ts
@@ -1406,7 +1406,7 @@ export type ModifyOrderInput = {
     dryRun: Scalars['Boolean'];
     orderId: Scalars['ID'];
     addItems?: Maybe<Array<AddItemInput>>;
-    adjustOrderLines?: Maybe<Array<OrderLineInput>>;
+    adjustOrderLines?: Maybe<Array<AdjustOrderLineInput>>;
     surcharges?: Maybe<Array<SurchargeInput>>;
     updateShippingAddress?: Maybe<UpdateOrderAddressInput>;
     updateBillingAddress?: Maybe<UpdateOrderAddressInput>;
@@ -1420,6 +1420,11 @@ export type AddItemInput = {
     quantity: Scalars['Int'];
 };
 
+export type AdjustOrderLineInput = {
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+};
+
 export type SurchargeInput = {
     description: Scalars['String'];
     sku?: Maybe<Scalars['String']>;
@@ -3594,7 +3599,7 @@ export type OrderLine = Node & {
     discounts: Array<Adjustment>;
     taxLines: Array<TaxLine>;
     order: Order;
-    customFields?: Maybe<OrderLineCustomFields>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type Payment = Node & {
@@ -4310,11 +4315,6 @@ export type HistoryEntrySortParameter = {
     updatedAt?: Maybe<SortOrder>;
 };
 
-export type OrderLineCustomFields = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
 export type AuthenticationInput = {
     native?: Maybe<NativeAuthInput>;
 };

diff --git a/packages/core/e2e/graphql/generated-e2e-shop-types.ts b/packages/core/e2e/graphql/generated-e2e-shop-types.ts
@@ -179,7 +179,6 @@ export type Mutation = {
 export type MutationAddItemToOrderArgs = {
     productVariantId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type MutationRemoveOrderLineArgs = {
@@ -189,7 +188,6 @@ export type MutationRemoveOrderLineArgs = {
 export type MutationAdjustOrderLineArgs = {
     orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
-    customFields?: Maybe<OrderLineCustomFieldsInput>;
 };
 
 export type MutationApplyCouponCodeArgs = {
@@ -1867,7 +1865,7 @@ export type OrderLine = Node & {
     discounts: Array<Adjustment>;
     taxLines: Array<TaxLine>;
     order: Order;
-    customFields?: Maybe<OrderLineCustomFields>;
+    customFields?: Maybe<Scalars['JSON']>;
 };
 
 export type Payment = Node & {
@@ -2613,16 +2611,6 @@ export type UpdateOrderInput = {
     customFields?: Maybe<Scalars['JSON']>;
 };
 
-export type OrderLineCustomFields = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
-export type OrderLineCustomFieldsInput = {
-    test?: Maybe<Scalars['String']>;
-    test2?: Maybe<Scalars['String']>;
-};
-
 export type AuthenticationInput = {
     native?: Maybe<NativeAuthInput>;
 };