refactor(core): Remove OrderItem entity, refactor order structure

Relates to #1981. All core e2e tests are passing as of this commit. Still need to fix Admin UI and
any broken plugin tests

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

@@ -75,14 +75,10 @@ export type AdjustDraftOrderLineInput = {
     quantity: Scalars['Int'];
 };
 
-export type AdjustOrderLineInput = {
-    orderLineId: Scalars['ID'];
-    quantity: Scalars['Int'];
-};
-
 export type Adjustment = {
     adjustmentSource: Scalars['String'];
     amount: Scalars['Int'];
+    data?: Maybe<Scalars['JSON']>;
     description: Scalars['String'];
     type: AdjustmentType;
 };
@@ -844,10 +840,6 @@ export type CreateTaxRateInput = {
     zoneId: Scalars['ID'];
 };
 
-export type CreateVendorInput = {
-    name: Scalars['String'];
-};
-
 export type CreateZoneInput = {
     customFields?: InputMaybe<Scalars['JSON']>;
     memberIds?: InputMaybe<Array<Scalars['ID']>>;
@@ -1664,17 +1656,21 @@ export type Fulfillment = Node & {
     createdAt: Scalars['DateTime'];
     customFields?: Maybe<Scalars['JSON']>;
     id: Scalars['ID'];
+    lines: Array<FulfillmentLine>;
     method: Scalars['String'];
     nextStates: Array<Scalars['String']>;
-    orderItems: Array<OrderItem>;
     state: Scalars['String'];
-    summary: Array<FulfillmentLineSummary>;
+    /** @deprecated Use the `lines` field instead */
+    summary: Array<FulfillmentLine>;
     trackingCode?: Maybe<Scalars['String']>;
     updatedAt: Scalars['DateTime'];
 };
 
-export type FulfillmentLineSummary = {
+export type FulfillmentLine = {
+    fulfillment: Fulfillment;
+    fulfillmentId: Scalars['ID'];
     orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
 };
 
@@ -2327,7 +2323,7 @@ export type MissingConditionsError = ErrorResult & {
 
 export type ModifyOrderInput = {
     addItems?: InputMaybe<Array<AddItemInput>>;
-    adjustOrderLines?: InputMaybe<Array<AdjustOrderLineInput>>;
+    adjustOrderLines?: InputMaybe<Array<OrderLineInput>>;
     couponCodes?: InputMaybe<Array<Scalars['String']>>;
     dryRun: Scalars['Boolean'];
     note?: InputMaybe<Scalars['String']>;
@@ -2459,8 +2455,6 @@ export type Mutation = {
     createTaxCategory: TaxCategory;
     /** Create a new TaxRate */
     createTaxRate: TaxRate;
-    /** Create a new Vendor */
-    createVendor: Vendor;
     /** Create a new Zone */
     createZone: Zone;
     /** Delete an Administrator */
@@ -2518,8 +2512,6 @@ export type Mutation = {
     deleteTaxCategory: DeletionResponse;
     /** Delete a TaxRate */
     deleteTaxRate: DeletionResponse;
-    /** Delete a Vendor */
-    deleteVendor: DeletionResponse;
     /** Delete a Zone */
     deleteZone: DeletionResponse;
     flushBufferedJobs: Success;
@@ -2535,6 +2527,7 @@ export type Mutation = {
     /** Move a Collection to a different parent or index */
     moveCollection: Collection;
     refundOrder: RefundOrderResult;
+    registerNewSeller?: Maybe<Channel>;
     reindex: Job;
     /** Removes Collections from the specified Channel */
     removeCollectionsFromChannel: Array<Collection>;
@@ -2624,8 +2617,6 @@ export type Mutation = {
     updateTaxCategory: TaxCategory;
     /** Update an existing TaxRate */
     updateTaxRate: TaxRate;
-    /** Update an existing Vendor */
-    updateVendor: Vendor;
     /** Update an existing Zone */
     updateZone: Zone;
 };
@@ -2812,10 +2803,6 @@ export type MutationCreateTaxRateArgs = {
     input: CreateTaxRateInput;
 };
 
-export type MutationCreateVendorArgs = {
-    input: CreateVendorInput;
-};
-
 export type MutationCreateZoneArgs = {
     input: CreateZoneInput;
 };
@@ -2940,10 +2927,6 @@ export type MutationDeleteTaxRateArgs = {
     id: Scalars['ID'];
 };
 
-export type MutationDeleteVendorArgs = {
-    id: Scalars['ID'];
-};
-
 export type MutationDeleteZoneArgs = {
     id: Scalars['ID'];
 };
@@ -2974,6 +2957,10 @@ export type MutationRefundOrderArgs = {
     input: RefundOrderInput;
 };
 
+export type MutationRegisterNewSellerArgs = {
+    input: RegisterSellerInput;
+};
+
 export type MutationRemoveCollectionsFromChannelArgs = {
     input: RemoveCollectionsFromChannelInput;
 };
@@ -3185,10 +3172,6 @@ export type MutationUpdateTaxRateArgs = {
     input: UpdateTaxRateInput;
 };
 
-export type MutationUpdateVendorArgs = {
-    input: UpdateVendorInput;
-};
-
 export type MutationUpdateZoneArgs = {
     input: UpdateZoneInput;
 };
@@ -3424,9 +3407,8 @@ export type OrderLine = Node & {
     discountedUnitPriceWithTax: Scalars['Int'];
     discounts: Array<Discount>;
     featuredAsset?: Maybe<Asset>;
-    fulfillments?: Maybe<Array<Fulfillment>>;
+    fulfillmentLines?: Maybe<Array<FulfillmentLine>>;
     id: Scalars['ID'];
-    items: Array<OrderItem>;
     /** The total price of the line excluding tax and discounts. */
     linePrice: Scalars['Int'];
     /** The total price of the line including tax but excluding discounts. */
@@ -3434,6 +3416,8 @@ export type OrderLine = Node & {
     /** The total tax on this line */
     lineTax: Scalars['Int'];
     order: Order;
+    /** The quantity at the time the Order was placed */
+    orderPlacedQuantity: Scalars['Int'];
     productVariant: ProductVariant;
     /**
      * The actual line price, taking into account both item discounts _and_ prorated (proportionally-distributed)
@@ -3492,8 +3476,8 @@ export type OrderModification = Node & {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
     isSettled: Scalars['Boolean'];
+    lines: Array<OrderModificationLine>;
     note: Scalars['String'];
-    orderItems?: Maybe<Array<OrderItem>>;
     payment?: Maybe<Payment>;
     priceChange: Scalars['Int'];
     refund?: Maybe<Refund>;
@@ -3507,6 +3491,14 @@ export type OrderModificationError = ErrorResult & {
     message: Scalars['String'];
 };
 
+export type OrderModificationLine = {
+    modification: OrderModification;
+    modificationId: Scalars['ID'];
+    orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+};
+
 /** Returned when attempting to modify the contents of an Order that is not in the `Modifying` state. */
 export type OrderModificationStateError = ErrorResult & {
     errorCode: ErrorCode;
@@ -4286,8 +4278,6 @@ export type Query = {
     taxRates: TaxRateList;
     testEligibleShippingMethods: Array<ShippingMethodQuote>;
     testShippingMethod: TestShippingMethodResult;
-    vendor?: Maybe<Vendor>;
-    vendors: VendorList;
     zone?: Maybe<Zone>;
     zones: Array<Zone>;
 };
@@ -4488,14 +4478,6 @@ export type QueryTestShippingMethodArgs = {
     input: TestShippingMethodInput;
 };
 
-export type QueryVendorArgs = {
-    id: Scalars['ID'];
-};
-
-export type QueryVendorsArgs = {
-    options?: InputMaybe<VendorListOptions>;
-};
-
 export type QueryZoneArgs = {
     id: Scalars['ID'];
 };
@@ -4505,9 +4487,9 @@ export type Refund = Node & {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
     items: Scalars['Int'];
+    lines: Array<RefundLine>;
     metadata?: Maybe<Scalars['JSON']>;
     method?: Maybe<Scalars['String']>;
-    orderItems: Array<OrderItem>;
     paymentId: Scalars['ID'];
     reason?: Maybe<Scalars['String']>;
     shipping: Scalars['Int'];
@@ -4517,6 +4499,14 @@ export type Refund = Node & {
     updatedAt: Scalars['DateTime'];
 };
 
+export type RefundLine = {
+    orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+    refund: Refund;
+    refundId: Scalars['ID'];
+};
+
 export type RefundOrderInput = {
     adjustment: Scalars['Int'];
     lines: Array<OrderLineInput>;
@@ -4561,6 +4551,11 @@ export type RefundStateTransitionError = ErrorResult & {
     transitionError: Scalars['String'];
 };
 
+export type RegisterSellerInput = {
+    administrator: CreateAdministratorInput;
+    shopName: Scalars['String'];
+};
+
 export type RelationCustomFieldConfig = CustomField & {
     description?: Maybe<Array<LocalizedString>>;
     entity: Scalars['String'];
@@ -4940,6 +4935,24 @@ export type StockAdjustment = Node &
         updatedAt: Scalars['DateTime'];
     };
 
+export type StockLevel = Node & {
+    createdAt: Scalars['DateTime'];
+    id: Scalars['ID'];
+    stockAllocated: Scalars['Int'];
+    stockLocation: StockLocation;
+    stockLocationId: Scalars['ID'];
+    stockOnHand: Scalars['Int'];
+    updatedAt: Scalars['DateTime'];
+};
+
+export type StockLocation = Node & {
+    createdAt: Scalars['DateTime'];
+    description: Scalars['String'];
+    id: Scalars['ID'];
+    name: Scalars['String'];
+    updatedAt: Scalars['DateTime'];
+};
+
 export type StockMovement = {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
@@ -5462,11 +5475,6 @@ export type UpdateTaxRateInput = {
     zoneId?: InputMaybe<Scalars['ID']>;
 };
 
-export type UpdateVendorInput = {
-    id: Scalars['ID'];
-    name?: InputMaybe<Scalars['String']>;
-};
-
 export type UpdateZoneInput = {
     customFields?: InputMaybe<Scalars['JSON']>;
     id: Scalars['ID'];
@@ -5485,45 +5493,6 @@ export type User = Node & {
     verified: Scalars['Boolean'];
 };
 
-export type Vendor = Node & {
-    createdAt: Scalars['DateTime'];
-    id: Scalars['ID'];
-    name: Scalars['String'];
-    updatedAt: Scalars['DateTime'];
-};
-
-export type VendorFilterParameter = {
-    createdAt?: InputMaybe<DateOperators>;
-    id?: InputMaybe<IdOperators>;
-    name?: InputMaybe<StringOperators>;
-    updatedAt?: InputMaybe<DateOperators>;
-};
-
-export type VendorList = PaginatedList & {
-    items: Array<Vendor>;
-    totalItems: Scalars['Int'];
-};
-
-export type VendorListOptions = {
-    /** Allows the results to be filtered */
-    filter?: InputMaybe<VendorFilterParameter>;
-    /** Specifies whether multiple "filter" arguments should be combines with a logical AND or OR operation. Defaults to AND. */
-    filterOperator?: InputMaybe<LogicalOperator>;
-    /** Skips the first n results, for use in pagination */
-    skip?: InputMaybe<Scalars['Int']>;
-    /** Specifies which properties to sort the results by */
-    sort?: InputMaybe<VendorSortParameter>;
-    /** Takes n results, for use in pagination */
-    take?: InputMaybe<Scalars['Int']>;
-};
-
-export type VendorSortParameter = {
-    createdAt?: InputMaybe<SortOrder>;
-    id?: InputMaybe<SortOrder>;
-    name?: InputMaybe<SortOrder>;
-    updatedAt?: InputMaybe<SortOrder>;
-};
-
 export type Zone = Node & {
     createdAt: Scalars['DateTime'];
     customFields?: Maybe<Scalars['JSON']>;

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

@@ -53,6 +53,7 @@ export type Adjustment = {
     __typename?: 'Adjustment';
     adjustmentSource: Scalars['String'];
     amount: Scalars['Int'];
+    data?: Maybe<Scalars['JSON']>;
     description: Scalars['String'];
     type: AdjustmentType;
 };
@@ -1042,17 +1043,21 @@ export type Fulfillment = Node & {
     createdAt: Scalars['DateTime'];
     customFields?: Maybe<Scalars['JSON']>;
     id: Scalars['ID'];
+    lines: Array<FulfillmentLine>;
     method: Scalars['String'];
-    orderItems: Array<OrderItem>;
     state: Scalars['String'];
-    summary: Array<FulfillmentLineSummary>;
+    /** @deprecated Use the `lines` field instead */
+    summary: Array<FulfillmentLine>;
     trackingCode?: Maybe<Scalars['String']>;
     updatedAt: Scalars['DateTime'];
 };
 
-export type FulfillmentLineSummary = {
-    __typename?: 'FulfillmentLineSummary';
+export type FulfillmentLine = {
+    __typename?: 'FulfillmentLine';
+    fulfillment: Fulfillment;
+    fulfillmentId: Scalars['ID'];
     orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
 };
 
@@ -1635,7 +1640,12 @@ export type Mutation = {
     setOrderCustomFields: ActiveOrderResult;
     /** Sets the shipping address for this order */
     setOrderShippingAddress: ActiveOrderResult;
-    /** Sets the shipping method by id, which can be obtained with the `eligibleShippingMethods` query */
+    /**
+     * Sets the shipping method by id, which can be obtained with the `eligibleShippingMethods` query.
+     * An Order can have multiple shipping methods, in which case you can pass an array of ids. In this case,
+     * you should configure a custom ShippingLineAssignmentStrategy in order to know which OrderLines each
+     * shipping method will apply to.
+     */
     setOrderShippingMethod: SetOrderShippingMethodResult;
     /** Transitions an Order to a new state. Valid next states can be found by querying `nextOrderStates` */
     transitionOrderToState?: Maybe<TransitionOrderToStateResult>;
@@ -2004,9 +2014,8 @@ export type OrderLine = Node & {
     discountedUnitPriceWithTax: Scalars['Int'];
     discounts: Array<Discount>;
     featuredAsset?: Maybe<Asset>;
-    fulfillments?: Maybe<Array<Fulfillment>>;
+    fulfillmentLines?: Maybe<Array<FulfillmentLine>>;
     id: Scalars['ID'];
-    items: Array<OrderItem>;
     /** The total price of the line excluding tax and discounts. */
     linePrice: Scalars['Int'];
     /** The total price of the line including tax but excluding discounts. */
@@ -2014,6 +2023,8 @@ export type OrderLine = Node & {
     /** The total tax on this line */
     lineTax: Scalars['Int'];
     order: Order;
+    /** The quantity at the time the Order was placed */
+    orderPlacedQuantity: Scalars['Int'];
     productVariant: ProductVariant;
     /**
      * The actual line price, taking into account both item discounts _and_ prorated (proportionally-distributed)
@@ -2769,9 +2780,9 @@ export type Refund = Node & {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
     items: Scalars['Int'];
+    lines: Array<RefundLine>;
     metadata?: Maybe<Scalars['JSON']>;
     method?: Maybe<Scalars['String']>;
-    orderItems: Array<OrderItem>;
     paymentId: Scalars['ID'];
     reason?: Maybe<Scalars['String']>;
     shipping: Scalars['Int'];
@@ -2781,6 +2792,15 @@ export type Refund = Node & {
     updatedAt: Scalars['DateTime'];
 };
 
+export type RefundLine = {
+    __typename?: 'RefundLine';
+    orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+    refund: Refund;
+    refundId: Scalars['ID'];
+};
+
 export type RegisterCustomerAccountResult =
     | MissingPasswordError
     | NativeAuthStrategyError
@@ -3180,14 +3200,6 @@ export type User = Node & {
     verified: Scalars['Boolean'];
 };
 
-export type Vendor = Node & {
-    __typename?: 'Vendor';
-    createdAt: Scalars['DateTime'];
-    id: Scalars['ID'];
-    name: Scalars['String'];
-    updatedAt: Scalars['DateTime'];
-};
-
 /**
  * Returned if the verification token (used to verify a Customer's email address) is valid, but has
  * expired according to the `verificationTokenDuration` setting in the AuthOptions.

packages/common/src/generated-types.ts

@@ -69,15 +69,11 @@ export type AdjustDraftOrderLineInput = {
   quantity: Scalars['Int'];
 };
 
-export type AdjustOrderLineInput = {
-  orderLineId: Scalars['ID'];
-  quantity: Scalars['Int'];
-};
-
 export type Adjustment = {
   __typename?: 'Adjustment';
   adjustmentSource: Scalars['String'];
   amount: Scalars['Int'];
+  data?: Maybe<Scalars['JSON']>;
   description: Scalars['String'];
   type: AdjustmentType;
 };
@@ -858,10 +854,6 @@ export type CreateTaxRateInput = {
   zoneId: Scalars['ID'];
 };
 
-export type CreateVendorInput = {
-  name: Scalars['String'];
-};
-
 export type CreateZoneInput = {
   customFields?: InputMaybe<Scalars['JSON']>;
   memberIds?: InputMaybe<Array<Scalars['ID']>>;
@@ -1695,18 +1687,22 @@ export type Fulfillment = Node & {
   createdAt: Scalars['DateTime'];
   customFields?: Maybe<Scalars['JSON']>;
   id: Scalars['ID'];
+  lines: Array<FulfillmentLine>;
   method: Scalars['String'];
   nextStates: Array<Scalars['String']>;
-  orderItems: Array<OrderItem>;
   state: Scalars['String'];
-  summary: Array<FulfillmentLineSummary>;
+  /** @deprecated Use the `lines` field instead */
+  summary: Array<FulfillmentLine>;
   trackingCode?: Maybe<Scalars['String']>;
   updatedAt: Scalars['DateTime'];
 };
 
-export type FulfillmentLineSummary = {
-  __typename?: 'FulfillmentLineSummary';
+export type FulfillmentLine = {
+  __typename?: 'FulfillmentLine';
+  fulfillment: Fulfillment;
+  fulfillmentId: Scalars['ID'];
   orderLine: OrderLine;
+  orderLineId: Scalars['ID'];
   quantity: Scalars['Int'];
 };
 
@@ -2381,7 +2377,7 @@ export type MissingConditionsError = ErrorResult & {
 
 export type ModifyOrderInput = {
   addItems?: InputMaybe<Array<AddItemInput>>;
-  adjustOrderLines?: InputMaybe<Array<AdjustOrderLineInput>>;
+  adjustOrderLines?: InputMaybe<Array<OrderLineInput>>;
   couponCodes?: InputMaybe<Array<Scalars['String']>>;
   dryRun: Scalars['Boolean'];
   note?: InputMaybe<Scalars['String']>;
@@ -2504,8 +2500,6 @@ export type Mutation = {
   createTaxCategory: TaxCategory;
   /** Create a new TaxRate */
   createTaxRate: TaxRate;
-  /** Create a new Vendor */
-  createVendor: Vendor;
   /** Create a new Zone */
   createZone: Zone;
   /** Delete an Administrator */
@@ -2563,8 +2557,6 @@ export type Mutation = {
   deleteTaxCategory: DeletionResponse;
   /** Delete a TaxRate */
   deleteTaxRate: DeletionResponse;
-  /** Delete a Vendor */
-  deleteVendor: DeletionResponse;
   /** Delete a Zone */
   deleteZone: DeletionResponse;
   flushBufferedJobs: Success;
@@ -2580,6 +2572,7 @@ export type Mutation = {
   /** Move a Collection to a different parent or index */
   moveCollection: Collection;
   refundOrder: RefundOrderResult;
+  registerNewSeller?: Maybe<Channel>;
   reindex: Job;
   /** Removes Collections from the specified Channel */
   removeCollectionsFromChannel: Array<Collection>;
@@ -2669,8 +2662,6 @@ export type Mutation = {
   updateTaxCategory: TaxCategory;
   /** Update an existing TaxRate */
   updateTaxRate: TaxRate;
-  /** Update an existing Vendor */
-  updateVendor: Vendor;
   /** Update an existing Zone */
   updateZone: Zone;
 };
@@ -2901,11 +2892,6 @@ export type MutationCreateTaxRateArgs = {
 };
 
 
-export type MutationCreateVendorArgs = {
-  input: CreateVendorInput;
-};
-
-
 export type MutationCreateZoneArgs = {
   input: CreateZoneInput;
 };
@@ -3060,11 +3046,6 @@ export type MutationDeleteTaxRateArgs = {
 };
 
 
-export type MutationDeleteVendorArgs = {
-  id: Scalars['ID'];
-};
-
-
 export type MutationDeleteZoneArgs = {
   id: Scalars['ID'];
 };
@@ -3102,6 +3083,11 @@ export type MutationRefundOrderArgs = {
 };
 
 
+export type MutationRegisterNewSellerArgs = {
+  input: RegisterSellerInput;
+};
+
+
 export type MutationRemoveCollectionsFromChannelArgs = {
   input: RemoveCollectionsFromChannelInput;
 };
@@ -3362,11 +3348,6 @@ export type MutationUpdateTaxRateArgs = {
 };
 
 
-export type MutationUpdateVendorArgs = {
-  input: UpdateVendorInput;
-};
-
-
 export type MutationUpdateZoneArgs = {
   input: UpdateZoneInput;
 };
@@ -3613,9 +3594,8 @@ export type OrderLine = Node & {
   discountedUnitPriceWithTax: Scalars['Int'];
   discounts: Array<Discount>;
   featuredAsset?: Maybe<Asset>;
-  fulfillments?: Maybe<Array<Fulfillment>>;
+  fulfillmentLines?: Maybe<Array<FulfillmentLine>>;
   id: Scalars['ID'];
-  items: Array<OrderItem>;
   /** The total price of the line excluding tax and discounts. */
   linePrice: Scalars['Int'];
   /** The total price of the line including tax but excluding discounts. */
@@ -3623,6 +3603,8 @@ export type OrderLine = Node & {
   /** The total tax on this line */
   lineTax: Scalars['Int'];
   order: Order;
+  /** The quantity at the time the Order was placed */
+  orderPlacedQuantity: Scalars['Int'];
   productVariant: ProductVariant;
   /**
    * The actual line price, taking into account both item discounts _and_ prorated (proportionally-distributed)
@@ -3683,8 +3665,8 @@ export type OrderModification = Node & {
   createdAt: Scalars['DateTime'];
   id: Scalars['ID'];
   isSettled: Scalars['Boolean'];
+  lines: Array<OrderModificationLine>;
   note: Scalars['String'];
-  orderItems?: Maybe<Array<OrderItem>>;
   payment?: Maybe<Payment>;
   priceChange: Scalars['Int'];
   refund?: Maybe<Refund>;
@@ -3699,6 +3681,15 @@ export type OrderModificationError = ErrorResult & {
   message: Scalars['String'];
 };
 
+export type OrderModificationLine = {
+  __typename?: 'OrderModificationLine';
+  modification: OrderModification;
+  modificationId: Scalars['ID'];
+  orderLine: OrderLine;
+  orderLineId: Scalars['ID'];
+  quantity: Scalars['Int'];
+};
+
 /** Returned when attempting to modify the contents of an Order that is not in the `Modifying` state. */
 export type OrderModificationStateError = ErrorResult & {
   __typename?: 'OrderModificationStateError';
@@ -4508,8 +4499,6 @@ export type Query = {
   taxRates: TaxRateList;
   testEligibleShippingMethods: Array<ShippingMethodQuote>;
   testShippingMethod: TestShippingMethodResult;
-  vendor?: Maybe<Vendor>;
-  vendors: VendorList;
   zone?: Maybe<Zone>;
   zones: Array<Zone>;
 };
@@ -4759,16 +4748,6 @@ export type QueryTestShippingMethodArgs = {
 };
 
 
-export type QueryVendorArgs = {
-  id: Scalars['ID'];
-};
-
-
-export type QueryVendorsArgs = {
-  options?: InputMaybe<VendorListOptions>;
-};
-
-
 export type QueryZoneArgs = {
   id: Scalars['ID'];
 };
@@ -4779,9 +4758,9 @@ export type Refund = Node & {
   createdAt: Scalars['DateTime'];
   id: Scalars['ID'];
   items: Scalars['Int'];
+  lines: Array<RefundLine>;
   metadata?: Maybe<Scalars['JSON']>;
   method?: Maybe<Scalars['String']>;
-  orderItems: Array<OrderItem>;
   paymentId: Scalars['ID'];
   reason?: Maybe<Scalars['String']>;
   shipping: Scalars['Int'];
@@ -4791,6 +4770,15 @@ export type Refund = Node & {
   updatedAt: Scalars['DateTime'];
 };
 
+export type RefundLine = {
+  __typename?: 'RefundLine';
+  orderLine: OrderLine;
+  orderLineId: Scalars['ID'];
+  quantity: Scalars['Int'];
+  refund: Refund;
+  refundId: Scalars['ID'];
+};
+
 export type RefundOrderInput = {
   adjustment: Scalars['Int'];
   lines: Array<OrderLineInput>;
@@ -4829,6 +4817,11 @@ export type RefundStateTransitionError = ErrorResult & {
   transitionError: Scalars['String'];
 };
 
+export type RegisterSellerInput = {
+  administrator: CreateAdministratorInput;
+  shopName: Scalars['String'];
+};
+
 export type RelationCustomFieldConfig = CustomField & {
   __typename?: 'RelationCustomFieldConfig';
   description?: Maybe<Array<LocalizedString>>;
@@ -5218,6 +5211,26 @@ export type StockAdjustment = Node & StockMovement & {
   updatedAt: Scalars['DateTime'];
 };
 
+export type StockLevel = Node & {
+  __typename?: 'StockLevel';
+  createdAt: Scalars['DateTime'];
+  id: Scalars['ID'];
+  stockAllocated: Scalars['Int'];
+  stockLocation: StockLocation;
+  stockLocationId: Scalars['ID'];
+  stockOnHand: Scalars['Int'];
+  updatedAt: Scalars['DateTime'];
+};
+
+export type StockLocation = Node & {
+  __typename?: 'StockLocation';
+  createdAt: Scalars['DateTime'];
+  description: Scalars['String'];
+  id: Scalars['ID'];
+  name: Scalars['String'];
+  updatedAt: Scalars['DateTime'];
+};
+
 export type StockMovement = {
   createdAt: Scalars['DateTime'];
   id: Scalars['ID'];
@@ -5749,11 +5762,6 @@ export type UpdateTaxRateInput = {
   zoneId?: InputMaybe<Scalars['ID']>;
 };
 
-export type UpdateVendorInput = {
-  id: Scalars['ID'];
-  name?: InputMaybe<Scalars['String']>;
-};
-
 export type UpdateZoneInput = {
   customFields?: InputMaybe<Scalars['JSON']>;
   id: Scalars['ID'];
@@ -5773,47 +5781,6 @@ export type User = Node & {
   verified: Scalars['Boolean'];
 };
 
-export type Vendor = Node & {
-  __typename?: 'Vendor';
-  createdAt: Scalars['DateTime'];
-  id: Scalars['ID'];
-  name: Scalars['String'];
-  updatedAt: Scalars['DateTime'];
-};
-
-export type VendorFilterParameter = {
-  createdAt?: InputMaybe<DateOperators>;
-  id?: InputMaybe<IdOperators>;
-  name?: InputMaybe<StringOperators>;
-  updatedAt?: InputMaybe<DateOperators>;
-};
-
-export type VendorList = PaginatedList & {
-  __typename?: 'VendorList';
-  items: Array<Vendor>;
-  totalItems: Scalars['Int'];
-};
-
-export type VendorListOptions = {
-  /** Allows the results to be filtered */
-  filter?: InputMaybe<VendorFilterParameter>;
-  /** Specifies whether multiple "filter" arguments should be combines with a logical AND or OR operation. Defaults to AND. */
-  filterOperator?: InputMaybe<LogicalOperator>;
-  /** Skips the first n results, for use in pagination */
-  skip?: InputMaybe<Scalars['Int']>;
-  /** Specifies which properties to sort the results by */
-  sort?: InputMaybe<VendorSortParameter>;
-  /** Takes n results, for use in pagination */
-  take?: InputMaybe<Scalars['Int']>;
-};
-
-export type VendorSortParameter = {
-  createdAt?: InputMaybe<SortOrder>;
-  id?: InputMaybe<SortOrder>;
-  name?: InputMaybe<SortOrder>;
-  updatedAt?: InputMaybe<SortOrder>;
-};
-
 export type Zone = Node & {
   __typename?: 'Zone';
   createdAt: Scalars['DateTime'];

packages/common/src/shared-utils.ts

@@ -33,10 +33,20 @@ type NumericPropsOf<T> = {
     [K in keyof T]: T[K] extends number ? K : never;
 }[keyof T];
 
-type OnlyNumerics<T> = {
-    [K in NumericPropsOf<T>]: T[K];
+// homomorphic helper type
+// From https://stackoverflow.com/a/56140392/772859
+type NPO<T, KT extends keyof T> = {
+    [K in KT]: T[K] extends string | number | boolean
+        ? T[K]
+        : T[K] extends Array<infer A>
+        ? Array<OnlyNumerics<A>>
+        : OnlyNumerics<T[K]>;
 };
 
+// quick abort if T is a function or primitive
+// otherwise pass to a homomorphic helper type
+type OnlyNumerics<T> = NPO<T, NumericPropsOf<T>>;
+
 /**
  * Adds up all the values of a given numeric property of a list of objects.
  */
@@ -44,7 +54,7 @@ export function summate<T extends OnlyNumerics<T>>(
     items: T[] | undefined | null,
     prop: keyof OnlyNumerics<T>,
 ): number {
-    return (items || []).reduce((sum, i) => sum + i[prop], 0);
+    return (items || []).reduce((sum, i) => sum + (i[prop] as unknown as number), 0);
 }
 
 /**

packages/core/e2e/draft-order.e2e-spec.ts

@@ -26,6 +26,9 @@ describe('Draft Orders resolver', () => {
             paymentOptions: {
                 paymentMethodHandlers: [singleStageRefundablePaymentMethod],
             },
+            dbConnectionOptions: {
+                logging: true,
+            },
         }),
     );
     let customers: Codegen.GetCustomerListQuery['customers']['items'];
@@ -110,6 +113,7 @@ describe('Draft Orders resolver', () => {
         });
 
         orderGuard.assertSuccess(addItemToDraftOrder);
+
         expect(addItemToDraftOrder.lines.length).toBe(1);
         draftOrder = addItemToDraftOrder;
     });

packages/core/e2e/graphql/fragments.ts

@@ -334,19 +334,6 @@ export const ORDER_FRAGMENT = gql`
     }
 `;
 
-export const ORDER_ITEM_FRAGMENT = gql`
-    fragment OrderItem on OrderItem {
-        id
-        cancelled
-        unitPrice
-        unitPriceWithTax
-        taxRate
-        fulfillment {
-            id
-        }
-    }
-`;
-
 export const PAYMENT_FRAGMENT = gql`
     fragment Payment on Payment {
         id
@@ -387,12 +374,16 @@ export const ORDER_WITH_LINES_FRAGMENT = gql`
                 name
                 sku
             }
+            taxLines {
+                description
+                taxRate
+            }
             unitPrice
             unitPriceWithTax
             quantity
-            items {
-                ...OrderItem
-            }
+            unitPrice
+            unitPriceWithTax
+            taxRate
             linePriceWithTax
         }
         surcharges {
@@ -425,10 +416,19 @@ export const ORDER_WITH_LINES_FRAGMENT = gql`
         payments {
             ...Payment
         }
+        fulfillments {
+            id
+            state
+            method
+            trackingCode
+            lines {
+                orderLineId
+                quantity
+            }
+        }
         total
     }
     ${SHIPPING_ADDRESS_FRAGMENT}
-    ${ORDER_ITEM_FRAGMENT}
     ${PAYMENT_FRAGMENT}
 `;
 
@@ -521,8 +521,9 @@ export const FULFILLMENT_FRAGMENT = gql`
         nextStates
         method
         trackingCode
-        orderItems {
-            id
+        lines {
+            orderLineId
+            quantity
         }
     }
 `;

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

@@ -75,14 +75,10 @@ export type AdjustDraftOrderLineInput = {
     quantity: Scalars['Int'];
 };
 
-export type AdjustOrderLineInput = {
-    orderLineId: Scalars['ID'];
-    quantity: Scalars['Int'];
-};
-
 export type Adjustment = {
     adjustmentSource: Scalars['String'];
     amount: Scalars['Int'];
+    data?: Maybe<Scalars['JSON']>;
     description: Scalars['String'];
     type: AdjustmentType;
 };
@@ -844,10 +840,6 @@ export type CreateTaxRateInput = {
     zoneId: Scalars['ID'];
 };
 
-export type CreateVendorInput = {
-    name: Scalars['String'];
-};
-
 export type CreateZoneInput = {
     customFields?: InputMaybe<Scalars['JSON']>;
     memberIds?: InputMaybe<Array<Scalars['ID']>>;
@@ -1664,17 +1656,21 @@ export type Fulfillment = Node & {
     createdAt: Scalars['DateTime'];
     customFields?: Maybe<Scalars['JSON']>;
     id: Scalars['ID'];
+    lines: Array<FulfillmentLine>;
     method: Scalars['String'];
     nextStates: Array<Scalars['String']>;
-    orderItems: Array<OrderItem>;
     state: Scalars['String'];
-    summary: Array<FulfillmentLineSummary>;
+    /** @deprecated Use the `lines` field instead */
+    summary: Array<FulfillmentLine>;
     trackingCode?: Maybe<Scalars['String']>;
     updatedAt: Scalars['DateTime'];
 };
 
-export type FulfillmentLineSummary = {
+export type FulfillmentLine = {
+    fulfillment: Fulfillment;
+    fulfillmentId: Scalars['ID'];
     orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
 };
 
@@ -2327,7 +2323,7 @@ export type MissingConditionsError = ErrorResult & {
 
 export type ModifyOrderInput = {
     addItems?: InputMaybe<Array<AddItemInput>>;
-    adjustOrderLines?: InputMaybe<Array<AdjustOrderLineInput>>;
+    adjustOrderLines?: InputMaybe<Array<OrderLineInput>>;
     couponCodes?: InputMaybe<Array<Scalars['String']>>;
     dryRun: Scalars['Boolean'];
     note?: InputMaybe<Scalars['String']>;
@@ -2459,8 +2455,6 @@ export type Mutation = {
     createTaxCategory: TaxCategory;
     /** Create a new TaxRate */
     createTaxRate: TaxRate;
-    /** Create a new Vendor */
-    createVendor: Vendor;
     /** Create a new Zone */
     createZone: Zone;
     /** Delete an Administrator */
@@ -2518,8 +2512,6 @@ export type Mutation = {
     deleteTaxCategory: DeletionResponse;
     /** Delete a TaxRate */
     deleteTaxRate: DeletionResponse;
-    /** Delete a Vendor */
-    deleteVendor: DeletionResponse;
     /** Delete a Zone */
     deleteZone: DeletionResponse;
     flushBufferedJobs: Success;
@@ -2535,6 +2527,7 @@ export type Mutation = {
     /** Move a Collection to a different parent or index */
     moveCollection: Collection;
     refundOrder: RefundOrderResult;
+    registerNewSeller?: Maybe<Channel>;
     reindex: Job;
     /** Removes Collections from the specified Channel */
     removeCollectionsFromChannel: Array<Collection>;
@@ -2624,8 +2617,6 @@ export type Mutation = {
     updateTaxCategory: TaxCategory;
     /** Update an existing TaxRate */
     updateTaxRate: TaxRate;
-    /** Update an existing Vendor */
-    updateVendor: Vendor;
     /** Update an existing Zone */
     updateZone: Zone;
 };
@@ -2812,10 +2803,6 @@ export type MutationCreateTaxRateArgs = {
     input: CreateTaxRateInput;
 };
 
-export type MutationCreateVendorArgs = {
-    input: CreateVendorInput;
-};
-
 export type MutationCreateZoneArgs = {
     input: CreateZoneInput;
 };
@@ -2940,10 +2927,6 @@ export type MutationDeleteTaxRateArgs = {
     id: Scalars['ID'];
 };
 
-export type MutationDeleteVendorArgs = {
-    id: Scalars['ID'];
-};
-
 export type MutationDeleteZoneArgs = {
     id: Scalars['ID'];
 };
@@ -2974,6 +2957,10 @@ export type MutationRefundOrderArgs = {
     input: RefundOrderInput;
 };
 
+export type MutationRegisterNewSellerArgs = {
+    input: RegisterSellerInput;
+};
+
 export type MutationRemoveCollectionsFromChannelArgs = {
     input: RemoveCollectionsFromChannelInput;
 };
@@ -3185,10 +3172,6 @@ export type MutationUpdateTaxRateArgs = {
     input: UpdateTaxRateInput;
 };
 
-export type MutationUpdateVendorArgs = {
-    input: UpdateVendorInput;
-};
-
 export type MutationUpdateZoneArgs = {
     input: UpdateZoneInput;
 };
@@ -3424,9 +3407,8 @@ export type OrderLine = Node & {
     discountedUnitPriceWithTax: Scalars['Int'];
     discounts: Array<Discount>;
     featuredAsset?: Maybe<Asset>;
-    fulfillments?: Maybe<Array<Fulfillment>>;
+    fulfillmentLines?: Maybe<Array<FulfillmentLine>>;
     id: Scalars['ID'];
-    items: Array<OrderItem>;
     /** The total price of the line excluding tax and discounts. */
     linePrice: Scalars['Int'];
     /** The total price of the line including tax but excluding discounts. */
@@ -3434,6 +3416,8 @@ export type OrderLine = Node & {
     /** The total tax on this line */
     lineTax: Scalars['Int'];
     order: Order;
+    /** The quantity at the time the Order was placed */
+    orderPlacedQuantity: Scalars['Int'];
     productVariant: ProductVariant;
     /**
      * The actual line price, taking into account both item discounts _and_ prorated (proportionally-distributed)
@@ -3492,8 +3476,8 @@ export type OrderModification = Node & {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
     isSettled: Scalars['Boolean'];
+    lines: Array<OrderModificationLine>;
     note: Scalars['String'];
-    orderItems?: Maybe<Array<OrderItem>>;
     payment?: Maybe<Payment>;
     priceChange: Scalars['Int'];
     refund?: Maybe<Refund>;
@@ -3507,6 +3491,14 @@ export type OrderModificationError = ErrorResult & {
     message: Scalars['String'];
 };
 
+export type OrderModificationLine = {
+    modification: OrderModification;
+    modificationId: Scalars['ID'];
+    orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+};
+
 /** Returned when attempting to modify the contents of an Order that is not in the `Modifying` state. */
 export type OrderModificationStateError = ErrorResult & {
     errorCode: ErrorCode;
@@ -4286,8 +4278,6 @@ export type Query = {
     taxRates: TaxRateList;
     testEligibleShippingMethods: Array<ShippingMethodQuote>;
     testShippingMethod: TestShippingMethodResult;
-    vendor?: Maybe<Vendor>;
-    vendors: VendorList;
     zone?: Maybe<Zone>;
     zones: Array<Zone>;
 };
@@ -4488,14 +4478,6 @@ export type QueryTestShippingMethodArgs = {
     input: TestShippingMethodInput;
 };
 
-export type QueryVendorArgs = {
-    id: Scalars['ID'];
-};
-
-export type QueryVendorsArgs = {
-    options?: InputMaybe<VendorListOptions>;
-};
-
 export type QueryZoneArgs = {
     id: Scalars['ID'];
 };
@@ -4505,9 +4487,9 @@ export type Refund = Node & {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
     items: Scalars['Int'];
+    lines: Array<RefundLine>;
     metadata?: Maybe<Scalars['JSON']>;
     method?: Maybe<Scalars['String']>;
-    orderItems: Array<OrderItem>;
     paymentId: Scalars['ID'];
     reason?: Maybe<Scalars['String']>;
     shipping: Scalars['Int'];
@@ -4517,6 +4499,14 @@ export type Refund = Node & {
     updatedAt: Scalars['DateTime'];
 };
 
+export type RefundLine = {
+    orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+    refund: Refund;
+    refundId: Scalars['ID'];
+};
+
 export type RefundOrderInput = {
     adjustment: Scalars['Int'];
     lines: Array<OrderLineInput>;
@@ -4561,6 +4551,11 @@ export type RefundStateTransitionError = ErrorResult & {
     transitionError: Scalars['String'];
 };
 
+export type RegisterSellerInput = {
+    administrator: CreateAdministratorInput;
+    shopName: Scalars['String'];
+};
+
 export type RelationCustomFieldConfig = CustomField & {
     description?: Maybe<Array<LocalizedString>>;
     entity: Scalars['String'];
@@ -4940,6 +4935,24 @@ export type StockAdjustment = Node &
         updatedAt: Scalars['DateTime'];
     };
 
+export type StockLevel = Node & {
+    createdAt: Scalars['DateTime'];
+    id: Scalars['ID'];
+    stockAllocated: Scalars['Int'];
+    stockLocation: StockLocation;
+    stockLocationId: Scalars['ID'];
+    stockOnHand: Scalars['Int'];
+    updatedAt: Scalars['DateTime'];
+};
+
+export type StockLocation = Node & {
+    createdAt: Scalars['DateTime'];
+    description: Scalars['String'];
+    id: Scalars['ID'];
+    name: Scalars['String'];
+    updatedAt: Scalars['DateTime'];
+};
+
 export type StockMovement = {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
@@ -5462,11 +5475,6 @@ export type UpdateTaxRateInput = {
     zoneId?: InputMaybe<Scalars['ID']>;
 };
 
-export type UpdateVendorInput = {
-    id: Scalars['ID'];
-    name?: InputMaybe<Scalars['String']>;
-};
-
 export type UpdateZoneInput = {
     customFields?: InputMaybe<Scalars['JSON']>;
     id: Scalars['ID'];
@@ -5485,45 +5493,6 @@ export type User = Node & {
     verified: Scalars['Boolean'];
 };
 
-export type Vendor = Node & {
-    createdAt: Scalars['DateTime'];
-    id: Scalars['ID'];
-    name: Scalars['String'];
-    updatedAt: Scalars['DateTime'];
-};
-
-export type VendorFilterParameter = {
-    createdAt?: InputMaybe<DateOperators>;
-    id?: InputMaybe<IdOperators>;
-    name?: InputMaybe<StringOperators>;
-    updatedAt?: InputMaybe<DateOperators>;
-};
-
-export type VendorList = PaginatedList & {
-    items: Array<Vendor>;
-    totalItems: Scalars['Int'];
-};
-
-export type VendorListOptions = {
-    /** Allows the results to be filtered */
-    filter?: InputMaybe<VendorFilterParameter>;
-    /** Specifies whether multiple "filter" arguments should be combines with a logical AND or OR operation. Defaults to AND. */
-    filterOperator?: InputMaybe<LogicalOperator>;
-    /** Skips the first n results, for use in pagination */
-    skip?: InputMaybe<Scalars['Int']>;
-    /** Specifies which properties to sort the results by */
-    sort?: InputMaybe<VendorSortParameter>;
-    /** Takes n results, for use in pagination */
-    take?: InputMaybe<Scalars['Int']>;
-};
-
-export type VendorSortParameter = {
-    createdAt?: InputMaybe<SortOrder>;
-    id?: InputMaybe<SortOrder>;
-    name?: InputMaybe<SortOrder>;
-    updatedAt?: InputMaybe<SortOrder>;
-};
-
 export type Zone = Node & {
     createdAt: Scalars['DateTime'];
     customFields?: Maybe<Scalars['JSON']>;
@@ -6281,17 +6250,11 @@ export type CreateDraftOrderMutation = {
             unitPrice: number;
             unitPriceWithTax: number;
             quantity: number;
+            taxRate: number;
             linePriceWithTax: number;
             featuredAsset?: { preview: string } | null;
             productVariant: { id: string; name: string; sku: string };
-            items: Array<{
-                id: string;
-                cancelled: boolean;
-                unitPrice: number;
-                unitPriceWithTax: number;
-                taxRate: number;
-                fulfillment?: { id: string } | null;
-            }>;
+            taxLines: Array<{ description: string; taxRate: number }>;
         }>;
         surcharges: Array<{
             id: string;
@@ -6325,6 +6288,13 @@ export type CreateDraftOrderMutation = {
             metadata?: any | null;
             refunds: Array<{ id: string; total: number; reason?: string | null }>;
         }> | null;
+        fulfillments?: Array<{
+            id: string;
+            state: string;
+            method: string;
+            trackingCode?: string | null;
+            lines: Array<{ orderLineId: string; quantity: number }>;
+        }> | null;
     };
 };
 
@@ -6358,17 +6328,11 @@ export type AddItemToDraftOrderMutation = {
                   unitPrice: number;
                   unitPriceWithTax: number;
                   quantity: number;
+                  taxRate: number;
                   linePriceWithTax: number;
                   featuredAsset?: { preview: string } | null;
                   productVariant: { id: string; name: string; sku: string };
-                  items: Array<{
-                      id: string;
-                      cancelled: boolean;
-                      unitPrice: number;
-                      unitPriceWithTax: number;
-                      taxRate: number;
-                      fulfillment?: { id: string } | null;
-                  }>;
+                  taxLines: Array<{ description: string; taxRate: number }>;
               }>;
               surcharges: Array<{
                   id: string;
@@ -6402,6 +6366,13 @@ export type AddItemToDraftOrderMutation = {
                   metadata?: any | null;
                   refunds: Array<{ id: string; total: number; reason?: string | null }>;
               }> | null;
+              fulfillments?: Array<{
+                  id: string;
+                  state: string;
+                  method: string;
+                  trackingCode?: string | null;
+                  lines: Array<{ orderLineId: string; quantity: number }>;
+              }> | null;
           }
         | { errorCode: ErrorCode; message: string }
         | { errorCode: ErrorCode; message: string };
@@ -6437,17 +6408,11 @@ export type AdjustDraftOrderLineMutation = {
                   unitPrice: number;
                   unitPriceWithTax: number;
                   quantity: number;
+                  taxRate: number;
                   linePriceWithTax: number;
                   featuredAsset?: { preview: string } | null;
                   productVariant: { id: string; name: string; sku: string };
-                  items: Array<{
-                      id: string;
-                      cancelled: boolean;
-                      unitPrice: number;
-                      unitPriceWithTax: number;
-                      taxRate: number;
-                      fulfillment?: { id: string } | null;
-                  }>;
+                  taxLines: Array<{ description: string; taxRate: number }>;
               }>;
               surcharges: Array<{
                   id: string;
@@ -6481,6 +6446,13 @@ export type AdjustDraftOrderLineMutation = {
                   metadata?: any | null;
                   refunds: Array<{ id: string; total: number; reason?: string | null }>;
               }> | null;
+              fulfillments?: Array<{
+                  id: string;
+                  state: string;
+                  method: string;
+                  trackingCode?: string | null;
+                  lines: Array<{ orderLineId: string; quantity: number }>;
+              }> | null;
           }
         | { errorCode: ErrorCode; message: string }
         | { errorCode: ErrorCode; message: string };
@@ -6514,17 +6486,11 @@ export type RemoveDraftOrderLineMutation = {
                   unitPrice: number;
                   unitPriceWithTax: number;
                   quantity: number;
+                  taxRate: number;
                   linePriceWithTax: number;
                   featuredAsset?: { preview: string } | null;
                   productVariant: { id: string; name: string; sku: string };
-                  items: Array<{
-                      id: string;
-                      cancelled: boolean;
-                      unitPrice: number;
-                      unitPriceWithTax: number;
-                      taxRate: number;
-                      fulfillment?: { id: string } | null;
-                  }>;
+                  taxLines: Array<{ description: string; taxRate: number }>;
               }>;
               surcharges: Array<{
                   id: string;
@@ -6558,6 +6524,13 @@ export type RemoveDraftOrderLineMutation = {
                   metadata?: any | null;
                   refunds: Array<{ id: string; total: number; reason?: string | null }>;
               }> | null;
+              fulfillments?: Array<{
+                  id: string;
+                  state: string;
+                  method: string;
+                  trackingCode?: string | null;
+                  lines: Array<{ orderLineId: string; quantity: number }>;
+              }> | null;
           }
         | { errorCode: ErrorCode; message: string };
 };
@@ -6592,17 +6565,11 @@ export type SetCustomerForDraftOrderMutation = {
                   unitPrice: number;
                   unitPriceWithTax: number;
                   quantity: number;
+                  taxRate: number;
                   linePriceWithTax: number;
                   featuredAsset?: { preview: string } | null;
                   productVariant: { id: string; name: string; sku: string };
-                  items: Array<{
-                      id: string;
-                      cancelled: boolean;
-                      unitPrice: number;
-                      unitPriceWithTax: number;
-                      taxRate: number;
-                      fulfillment?: { id: string } | null;
-                  }>;
+                  taxLines: Array<{ description: string; taxRate: number }>;
               }>;
               surcharges: Array<{
                   id: string;
@@ -6636,6 +6603,13 @@ export type SetCustomerForDraftOrderMutation = {
                   metadata?: any | null;
                   refunds: Array<{ id: string; total: number; reason?: string | null }>;
               }> | null;
+              fulfillments?: Array<{
+                  id: string;
+                  state: string;
+                  method: string;
+                  trackingCode?: string | null;
+                  lines: Array<{ orderLineId: string; quantity: number }>;
+              }> | null;
           };
 };
 
@@ -6666,17 +6640,11 @@ export type SetDraftOrderShippingAddressMutation = {
             unitPrice: number;
             unitPriceWithTax: number;
             quantity: number;
+            taxRate: number;
             linePriceWithTax: number;
             featuredAsset?: { preview: string } | null;
             productVariant: { id: string; name: string; sku: string };
-            items: Array<{
-                id: string;
-                cancelled: boolean;
-                unitPrice: number;
-                unitPriceWithTax: number;
-                taxRate: number;
-                fulfillment?: { id: string } | null;
-            }>;
+            taxLines: Array<{ description: string; taxRate: number }>;
         }>;
         surcharges: Array<{
             id: string;
@@ -6710,6 +6678,13 @@ export type SetDraftOrderShippingAddressMutation = {
             metadata?: any | null;
             refunds: Array<{ id: string; total: number; reason?: string | null }>;
         }> | null;
+        fulfillments?: Array<{
+            id: string;
+            state: string;
+            method: string;
+            trackingCode?: string | null;
+            lines: Array<{ orderLineId: string; quantity: number }>;
+        }> | null;
     };
 };
 
@@ -6751,17 +6726,11 @@ export type SetDraftOrderBillingAddressMutation = {
             unitPrice: number;
             unitPriceWithTax: number;
             quantity: number;
+            taxRate: number;
             linePriceWithTax: number;
             featuredAsset?: { preview: string } | null;
             productVariant: { id: string; name: string; sku: string };
-            items: Array<{
-                id: string;
-                cancelled: boolean;
-                unitPrice: number;
-                unitPriceWithTax: number;
-                taxRate: number;
-                fulfillment?: { id: string } | null;
-            }>;
+            taxLines: Array<{ description: string; taxRate: number }>;
         }>;
         surcharges: Array<{
             id: string;
@@ -6795,6 +6764,13 @@ export type SetDraftOrderBillingAddressMutation = {
             metadata?: any | null;
             refunds: Array<{ id: string; total: number; reason?: string | null }>;
         }> | null;
+        fulfillments?: Array<{
+            id: string;
+            state: string;
+            method: string;
+            trackingCode?: string | null;
+            lines: Array<{ orderLineId: string; quantity: number }>;
+        }> | null;
     };
 };
 
@@ -6830,17 +6806,11 @@ export type ApplyCouponCodeToDraftOrderMutation = {
                   unitPrice: number;
                   unitPriceWithTax: number;
                   quantity: number;
+                  taxRate: number;
                   linePriceWithTax: number;
                   featuredAsset?: { preview: string } | null;
                   productVariant: { id: string; name: string; sku: string };
-                  items: Array<{
-                      id: string;
-                      cancelled: boolean;
-                      unitPrice: number;
-                      unitPriceWithTax: number;
-                      taxRate: number;
-                      fulfillment?: { id: string } | null;
-                  }>;
+                  taxLines: Array<{ description: string; taxRate: number }>;
               }>;
               surcharges: Array<{
                   id: string;
@@ -6874,6 +6844,13 @@ export type ApplyCouponCodeToDraftOrderMutation = {
                   metadata?: any | null;
                   refunds: Array<{ id: string; total: number; reason?: string | null }>;
               }> | null;
+              fulfillments?: Array<{
+                  id: string;
+                  state: string;
+                  method: string;
+                  trackingCode?: string | null;
+                  lines: Array<{ orderLineId: string; quantity: number }>;
+              }> | null;
           };
 };
 
@@ -6905,17 +6882,11 @@ export type RemoveCouponCodeFromDraftOrderMutation = {
             unitPrice: number;
             unitPriceWithTax: number;
             quantity: number;
+            taxRate: number;
             linePriceWithTax: number;
             featuredAsset?: { preview: string } | null;
             productVariant: { id: string; name: string; sku: string };
-            items: Array<{
-                id: string;
-                cancelled: boolean;
-                unitPrice: number;
-                unitPriceWithTax: number;
-                taxRate: number;
-                fulfillment?: { id: string } | null;
-            }>;
+            taxLines: Array<{ description: string; taxRate: number }>;
         }>;
         surcharges: Array<{
             id: string;
@@ -6949,6 +6920,13 @@ export type RemoveCouponCodeFromDraftOrderMutation = {
             metadata?: any | null;
             refunds: Array<{ id: string; total: number; reason?: string | null }>;
         }> | null;
+        fulfillments?: Array<{
+            id: string;
+            state: string;
+            method: string;
+            trackingCode?: string | null;
+            lines: Array<{ orderLineId: string; quantity: number }>;
+        }> | null;
     } | null;
 };
 
@@ -6998,17 +6976,11 @@ export type SetDraftOrderShippingMethodMutation = {
                   unitPrice: number;
                   unitPriceWithTax: number;
                   quantity: number;
+                  taxRate: number;
                   linePriceWithTax: number;
                   featuredAsset?: { preview: string } | null;
                   productVariant: { id: string; name: string; sku: string };
-                  items: Array<{
-                      id: string;
-                      cancelled: boolean;
-                      unitPrice: number;
-                      unitPriceWithTax: number;
-                      taxRate: number;
-                      fulfillment?: { id: string } | null;
-                  }>;
+                  taxLines: Array<{ description: string; taxRate: number }>;
               }>;
               surcharges: Array<{
                   id: string;
@@ -7042,6 +7014,13 @@ export type SetDraftOrderShippingMethodMutation = {
                   metadata?: any | null;
                   refunds: Array<{ id: string; total: number; reason?: string | null }>;
               }> | null;
+              fulfillments?: Array<{
+                  id: string;
+                  state: string;
+                  method: string;
+                  trackingCode?: string | null;
+                  lines: Array<{ orderLineId: string; quantity: number }>;
+              }> | null;
           }
         | { errorCode: ErrorCode; message: string };
 };
@@ -7540,15 +7519,6 @@ export type OrderFragment = {
     customer?: { id: string; firstName: string; lastName: string } | null;
 };
 
-export type OrderItemFragment = {
-    id: string;
-    cancelled: boolean;
-    unitPrice: number;
-    unitPriceWithTax: number;
-    taxRate: number;
-    fulfillment?: { id: string } | null;
-};
-
 export type PaymentFragment = {
     id: string;
     transactionId?: string | null;
@@ -7581,17 +7551,11 @@ export type OrderWithLinesFragment = {
         unitPrice: number;
         unitPriceWithTax: number;
         quantity: number;
+        taxRate: number;
         linePriceWithTax: number;
         featuredAsset?: { preview: string } | null;
         productVariant: { id: string; name: string; sku: string };
-        items: Array<{
-            id: string;
-            cancelled: boolean;
-            unitPrice: number;
-            unitPriceWithTax: number;
-            taxRate: number;
-            fulfillment?: { id: string } | null;
-        }>;
+        taxLines: Array<{ description: string; taxRate: number }>;
     }>;
     surcharges: Array<{
         id: string;
@@ -7625,6 +7589,13 @@ export type OrderWithLinesFragment = {
         metadata?: any | null;
         refunds: Array<{ id: string; total: number; reason?: string | null }>;
     }> | null;
+    fulfillments?: Array<{
+        id: string;
+        state: string;
+        method: string;
+        trackingCode?: string | null;
+        lines: Array<{ orderLineId: string; quantity: number }>;
+    }> | null;
 };
 
 export type PromotionFragment = {
@@ -7691,7 +7662,7 @@ export type FulfillmentFragment = {
     nextStates: Array<string>;
     method: string;
     trackingCode?: string | null;
-    orderItems: Array<{ id: string }>;
+    lines: Array<{ orderLineId: string; quantity: number }>;
 };
 
 export type ChannelFragment = {
@@ -8894,17 +8865,11 @@ export type GetOrderQuery = {
             unitPrice: number;
             unitPriceWithTax: number;
             quantity: number;
+            taxRate: number;
             linePriceWithTax: number;
             featuredAsset?: { preview: string } | null;
             productVariant: { id: string; name: string; sku: string };
-            items: Array<{
-                id: string;
-                cancelled: boolean;
-                unitPrice: number;
-                unitPriceWithTax: number;
-                taxRate: number;
-                fulfillment?: { id: string } | null;
-            }>;
+            taxLines: Array<{ description: string; taxRate: number }>;
         }>;
         surcharges: Array<{
             id: string;
@@ -8938,6 +8903,13 @@ export type GetOrderQuery = {
             metadata?: any | null;
             refunds: Array<{ id: string; total: number; reason?: string | null }>;
         }> | null;
+        fulfillments?: Array<{
+            id: string;
+            state: string;
+            method: string;
+            trackingCode?: string | null;
+            lines: Array<{ orderLineId: string; quantity: number }>;
+        }> | null;
     } | null;
 };
 
@@ -8980,7 +8952,7 @@ export type CreateFulfillmentMutation = {
               nextStates: Array<string>;
               method: string;
               trackingCode?: string | null;
-              orderItems: Array<{ id: string }>;
+              lines: Array<{ orderLineId: string; quantity: number }>;
           }
         | { errorCode: ErrorCode; message: string }
         | { errorCode: ErrorCode; message: string }
@@ -9001,7 +8973,7 @@ export type TransitFulfillmentMutation = {
               nextStates: Array<string>;
               method: string;
               trackingCode?: string | null;
-              orderItems: Array<{ id: string }>;
+              lines: Array<{ orderLineId: string; quantity: number }>;
           }
         | {
               errorCode: ErrorCode;
@@ -9274,11 +9246,7 @@ export type CancelOrderMutation = {
         | { errorCode: ErrorCode; message: string }
         | { errorCode: ErrorCode; message: string }
         | { errorCode: ErrorCode; message: string }
-        | {
-              id: string;
-              state: string;
-              lines: Array<{ quantity: number; items: Array<{ id: string; cancelled: boolean }> }>;
-          }
+        | { id: string; state: string; lines: Array<{ id: string; quantity: number }> }
         | { errorCode: ErrorCode; message: string }
         | { errorCode: ErrorCode; message: string };
 };
@@ -9286,7 +9254,7 @@ export type CancelOrderMutation = {
 export type CanceledOrderFragment = {
     id: string;
     state: string;
-    lines: Array<{ quantity: number; items: Array<{ id: string; cancelled: boolean }> }>;
+    lines: Array<{ id: string; quantity: number }>;
 };
 
 export type UpdateGlobalSettingsMutationVariables = Exact<{
@@ -9684,13 +9652,15 @@ export type OrderWithModificationsFragment = {
     lines: Array<{
         id: string;
         quantity: number;
+        orderPlacedQuantity: number;
         linePrice: number;
         linePriceWithTax: number;
+        unitPriceWithTax: number;
         discountedLinePriceWithTax: number;
         proratedLinePriceWithTax: number;
+        proratedUnitPriceWithTax: number;
         discounts: Array<{ description: string; amountWithTax: number }>;
         productVariant: { id: string; name: string };
-        items: Array<{ id: string; createdAt: any; updatedAt: any; cancelled: boolean; unitPrice: number }>;
     }>;
     surcharges: Array<{
         id: string;
@@ -9714,7 +9684,7 @@ export type OrderWithModificationsFragment = {
         note: string;
         priceChange: number;
         isSettled: boolean;
-        orderItems?: Array<{ id: string }> | null;
+        lines: Array<{ orderLineId: string; quantity: number }>;
         surcharges?: Array<{ id: string }> | null;
         payment?: { id: string; state: string; amount: number; method: string } | null;
         refund?: { id: string; state: string; total: number; paymentId: string } | null;
@@ -9761,19 +9731,15 @@ export type GetOrderWithModificationsQuery = {
         lines: Array<{
             id: string;
             quantity: number;
+            orderPlacedQuantity: number;
             linePrice: number;
             linePriceWithTax: number;
+            unitPriceWithTax: number;
             discountedLinePriceWithTax: number;
             proratedLinePriceWithTax: number;
+            proratedUnitPriceWithTax: number;
             discounts: Array<{ description: string; amountWithTax: number }>;
             productVariant: { id: string; name: string };
-            items: Array<{
-                id: string;
-                createdAt: any;
-                updatedAt: any;
-                cancelled: boolean;
-                unitPrice: number;
-            }>;
         }>;
         surcharges: Array<{
             id: string;
@@ -9797,7 +9763,7 @@ export type GetOrderWithModificationsQuery = {
             note: string;
             priceChange: number;
             isSettled: boolean;
-            orderItems?: Array<{ id: string }> | null;
+            lines: Array<{ orderLineId: string; quantity: number }>;
             surcharges?: Array<{ id: string }> | null;
             payment?: { id: string; state: string; amount: number; method: string } | null;
             refund?: { id: string; state: string; total: number; paymentId: string } | null;
@@ -9852,19 +9818,15 @@ export type ModifyOrderMutation = {
               lines: Array<{
                   id: string;
                   quantity: number;
+                  orderPlacedQuantity: number;
                   linePrice: number;
                   linePriceWithTax: number;
+                  unitPriceWithTax: number;
                   discountedLinePriceWithTax: number;
                   proratedLinePriceWithTax: number;
+                  proratedUnitPriceWithTax: number;
                   discounts: Array<{ description: string; amountWithTax: number }>;
                   productVariant: { id: string; name: string };
-                  items: Array<{
-                      id: string;
-                      createdAt: any;
-                      updatedAt: any;
-                      cancelled: boolean;
-                      unitPrice: number;
-                  }>;
               }>;
               surcharges: Array<{
                   id: string;
@@ -9888,7 +9850,7 @@ export type ModifyOrderMutation = {
                   note: string;
                   priceChange: number;
                   isSettled: boolean;
-                  orderItems?: Array<{ id: string }> | null;
+                  lines: Array<{ orderLineId: string; quantity: number }>;
                   surcharges?: Array<{ id: string }> | null;
                   payment?: { id: string; state: string; amount: number; method: string } | null;
                   refund?: { id: string; state: string; total: number; paymentId: string } | null;
@@ -9942,19 +9904,15 @@ export type AddManualPaymentMutation = {
               lines: Array<{
                   id: string;
                   quantity: number;
+                  orderPlacedQuantity: number;
                   linePrice: number;
                   linePriceWithTax: number;
+                  unitPriceWithTax: number;
                   discountedLinePriceWithTax: number;
                   proratedLinePriceWithTax: number;
+                  proratedUnitPriceWithTax: number;
                   discounts: Array<{ description: string; amountWithTax: number }>;
                   productVariant: { id: string; name: string };
-                  items: Array<{
-                      id: string;
-                      createdAt: any;
-                      updatedAt: any;
-                      cancelled: boolean;
-                      unitPrice: number;
-                  }>;
               }>;
               surcharges: Array<{
                   id: string;
@@ -9978,7 +9936,7 @@ export type AddManualPaymentMutation = {
                   note: string;
                   priceChange: number;
                   isSettled: boolean;
-                  orderItems?: Array<{ id: string }> | null;
+                  lines: Array<{ orderLineId: string; quantity: number }>;
                   surcharges?: Array<{ id: string }> | null;
                   payment?: { id: string; state: string; amount: number; method: string } | null;
                   refund?: { id: string; state: string; total: number; paymentId: string } | null;
@@ -10070,7 +10028,7 @@ export type GetOrderFulfillmentItemsQuery = {
             nextStates: Array<string>;
             method: string;
             trackingCode?: string | null;
-            orderItems: Array<{ id: string }>;
+            lines: Array<{ orderLineId: string; quantity: number }>;
         }> | null;
     } | null;
 };
@@ -10173,10 +10131,10 @@ export type GetOrderLineFulfillmentsQuery = {
         id: string;
         lines: Array<{
             id: string;
-            fulfillments?: Array<{
-                id: string;
-                state: string;
-                summary: Array<{ quantity: number; orderLine: { id: string } }>;
+            fulfillmentLines?: Array<{
+                orderLineId: string;
+                quantity: number;
+                fulfillment: { id: string; state: string };
             }> | null;
         }>;
     } | null;
@@ -10343,17 +10301,11 @@ export type AddManualPayment2Mutation = {
                   unitPrice: number;
                   unitPriceWithTax: number;
                   quantity: number;
+                  taxRate: number;
                   linePriceWithTax: number;
                   featuredAsset?: { preview: string } | null;
                   productVariant: { id: string; name: string; sku: string };
-                  items: Array<{
-                      id: string;
-                      cancelled: boolean;
-                      unitPrice: number;
-                      unitPriceWithTax: number;
-                      taxRate: number;
-                      fulfillment?: { id: string } | null;
-                  }>;
+                  taxLines: Array<{ description: string; taxRate: number }>;
               }>;
               surcharges: Array<{
                   id: string;
@@ -10387,6 +10339,13 @@ export type AddManualPayment2Mutation = {
                   metadata?: any | null;
                   refunds: Array<{ id: string; total: number; reason?: string | null }>;
               }> | null;
+              fulfillments?: Array<{
+                  id: string;
+                  state: string;
+                  method: string;
+                  trackingCode?: string | null;
+                  lines: Array<{ orderLineId: string; quantity: number }>;
+              }> | null;
           };
 };
 

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

@@ -51,6 +51,7 @@ export type Address = Node & {
 export type Adjustment = {
     adjustmentSource: Scalars['String'];
     amount: Scalars['Int'];
+    data?: Maybe<Scalars['JSON']>;
     description: Scalars['String'];
     type: AdjustmentType;
 };
@@ -1001,16 +1002,20 @@ export type Fulfillment = Node & {
     createdAt: Scalars['DateTime'];
     customFields?: Maybe<Scalars['JSON']>;
     id: Scalars['ID'];
+    lines: Array<FulfillmentLine>;
     method: Scalars['String'];
-    orderItems: Array<OrderItem>;
     state: Scalars['String'];
-    summary: Array<FulfillmentLineSummary>;
+    /** @deprecated Use the `lines` field instead */
+    summary: Array<FulfillmentLine>;
     trackingCode?: Maybe<Scalars['String']>;
     updatedAt: Scalars['DateTime'];
 };
 
-export type FulfillmentLineSummary = {
+export type FulfillmentLine = {
+    fulfillment: Fulfillment;
+    fulfillmentId: Scalars['ID'];
     orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
 };
 
@@ -1580,7 +1585,12 @@ export type Mutation = {
     setOrderCustomFields: ActiveOrderResult;
     /** Sets the shipping address for this order */
     setOrderShippingAddress: ActiveOrderResult;
-    /** Sets the shipping method by id, which can be obtained with the `eligibleShippingMethods` query */
+    /**
+     * Sets the shipping method by id, which can be obtained with the `eligibleShippingMethods` query.
+     * An Order can have multiple shipping methods, in which case you can pass an array of ids. In this case,
+     * you should configure a custom ShippingLineAssignmentStrategy in order to know which OrderLines each
+     * shipping method will apply to.
+     */
     setOrderShippingMethod: SetOrderShippingMethodResult;
     /** Transitions an Order to a new state. Valid next states can be found by querying `nextOrderStates` */
     transitionOrderToState?: Maybe<TransitionOrderToStateResult>;
@@ -1940,9 +1950,8 @@ export type OrderLine = Node & {
     discountedUnitPriceWithTax: Scalars['Int'];
     discounts: Array<Discount>;
     featuredAsset?: Maybe<Asset>;
-    fulfillments?: Maybe<Array<Fulfillment>>;
+    fulfillmentLines?: Maybe<Array<FulfillmentLine>>;
     id: Scalars['ID'];
-    items: Array<OrderItem>;
     /** The total price of the line excluding tax and discounts. */
     linePrice: Scalars['Int'];
     /** The total price of the line including tax but excluding discounts. */
@@ -1950,6 +1959,8 @@ export type OrderLine = Node & {
     /** The total tax on this line */
     lineTax: Scalars['Int'];
     order: Order;
+    /** The quantity at the time the Order was placed */
+    orderPlacedQuantity: Scalars['Int'];
     productVariant: ProductVariant;
     /**
      * The actual line price, taking into account both item discounts _and_ prorated (proportionally-distributed)
@@ -2676,9 +2687,9 @@ export type Refund = Node & {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
     items: Scalars['Int'];
+    lines: Array<RefundLine>;
     metadata?: Maybe<Scalars['JSON']>;
     method?: Maybe<Scalars['String']>;
-    orderItems: Array<OrderItem>;
     paymentId: Scalars['ID'];
     reason?: Maybe<Scalars['String']>;
     shipping: Scalars['Int'];
@@ -2688,6 +2699,14 @@ export type Refund = Node & {
     updatedAt: Scalars['DateTime'];
 };
 
+export type RefundLine = {
+    orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+    refund: Refund;
+    refundId: Scalars['ID'];
+};
+
 export type RegisterCustomerAccountResult =
     | MissingPasswordError
     | NativeAuthStrategyError
@@ -3061,13 +3080,6 @@ export type User = Node & {
     verified: Scalars['Boolean'];
 };
 
-export type Vendor = Node & {
-    createdAt: Scalars['DateTime'];
-    id: Scalars['ID'];
-    name: Scalars['String'];
-    updatedAt: Scalars['DateTime'];
-};
-
 /**
  * Returned if the verification token (used to verify a Customer's email address) is valid, but has
  * expired according to the `verificationTokenDuration` setting in the AuthOptions.
@@ -3132,6 +3144,7 @@ export type TestOrderFragmentFragment = {
         unitPriceWithTax: number;
         unitPriceChangeSinceAdded: number;
         unitPriceWithTaxChangeSinceAdded: number;
+        discountedUnitPriceWithTax: number;
         proratedUnitPriceWithTax: number;
         productVariant: { id: string };
         discounts: Array<{
@@ -3141,7 +3154,6 @@ export type TestOrderFragmentFragment = {
             description: string;
             type: AdjustmentType;
         }>;
-        items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
     }>;
     shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
     customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3440,6 +3452,7 @@ export type GetActiveOrderQuery = {
             unitPriceWithTax: number;
             unitPriceChangeSinceAdded: number;
             unitPriceWithTaxChangeSinceAdded: number;
+            discountedUnitPriceWithTax: number;
             proratedUnitPriceWithTax: number;
             productVariant: { id: string };
             discounts: Array<{
@@ -3449,7 +3462,6 @@ export type GetActiveOrderQuery = {
                 description: string;
                 type: AdjustmentType;
             }>;
-            items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
         }>;
         shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
         customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3474,7 +3486,6 @@ export type GetActiveOrderWithPriceDataQuery = {
             linePrice: number;
             lineTax: number;
             linePriceWithTax: number;
-            items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number; taxRate: number }>;
             taxLines: Array<{ taxRate: number; description: string }>;
         }>;
         taxSummary: Array<{ description: string; taxRate: number; taxBase: number; taxTotal: number }>;
@@ -3518,6 +3529,7 @@ export type AdjustItemQuantityMutation = {
                   unitPriceWithTax: number;
                   unitPriceChangeSinceAdded: number;
                   unitPriceWithTaxChangeSinceAdded: number;
+                  discountedUnitPriceWithTax: number;
                   proratedUnitPriceWithTax: number;
                   productVariant: { id: string };
                   discounts: Array<{
@@ -3527,7 +3539,6 @@ export type AdjustItemQuantityMutation = {
                       description: string;
                       type: AdjustmentType;
                   }>;
-                  items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
               }>;
               shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
               customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3571,6 +3582,7 @@ export type RemoveItemFromOrderMutation = {
                   unitPriceWithTax: number;
                   unitPriceChangeSinceAdded: number;
                   unitPriceWithTaxChangeSinceAdded: number;
+                  discountedUnitPriceWithTax: number;
                   proratedUnitPriceWithTax: number;
                   productVariant: { id: string };
                   discounts: Array<{
@@ -3580,7 +3592,6 @@ export type RemoveItemFromOrderMutation = {
                       description: string;
                       type: AdjustmentType;
                   }>;
-                  items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
               }>;
               shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
               customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3637,6 +3648,7 @@ export type SetShippingMethodMutation = {
                   unitPriceWithTax: number;
                   unitPriceChangeSinceAdded: number;
                   unitPriceWithTaxChangeSinceAdded: number;
+                  discountedUnitPriceWithTax: number;
                   proratedUnitPriceWithTax: number;
                   productVariant: { id: string };
                   discounts: Array<{
@@ -3646,7 +3658,6 @@ export type SetShippingMethodMutation = {
                       description: string;
                       type: AdjustmentType;
                   }>;
-                  items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
               }>;
               shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
               customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3710,6 +3721,7 @@ export type GetOrderByCodeQuery = {
             unitPriceWithTax: number;
             unitPriceChangeSinceAdded: number;
             unitPriceWithTaxChangeSinceAdded: number;
+            discountedUnitPriceWithTax: number;
             proratedUnitPriceWithTax: number;
             productVariant: { id: string };
             discounts: Array<{
@@ -3719,7 +3731,6 @@ export type GetOrderByCodeQuery = {
                 description: string;
                 type: AdjustmentType;
             }>;
-            items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
         }>;
         shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
         customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3760,6 +3771,7 @@ export type GetOrderShopQuery = {
             unitPriceWithTax: number;
             unitPriceChangeSinceAdded: number;
             unitPriceWithTaxChangeSinceAdded: number;
+            discountedUnitPriceWithTax: number;
             proratedUnitPriceWithTax: number;
             productVariant: { id: string };
             discounts: Array<{
@@ -3769,7 +3781,6 @@ export type GetOrderShopQuery = {
                 description: string;
                 type: AdjustmentType;
             }>;
-            items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
         }>;
         shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
         customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3811,6 +3822,7 @@ export type GetOrderPromotionsByCodeQuery = {
             unitPriceWithTax: number;
             unitPriceChangeSinceAdded: number;
             unitPriceWithTaxChangeSinceAdded: number;
+            discountedUnitPriceWithTax: number;
             proratedUnitPriceWithTax: number;
             productVariant: { id: string };
             discounts: Array<{
@@ -3820,7 +3832,6 @@ export type GetOrderPromotionsByCodeQuery = {
                 description: string;
                 type: AdjustmentType;
             }>;
-            items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
         }>;
         shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
         customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3866,6 +3877,7 @@ export type TransitionToStateMutation = {
                   unitPriceWithTax: number;
                   unitPriceChangeSinceAdded: number;
                   unitPriceWithTaxChangeSinceAdded: number;
+                  discountedUnitPriceWithTax: number;
                   proratedUnitPriceWithTax: number;
                   productVariant: { id: string };
                   discounts: Array<{
@@ -3875,7 +3887,6 @@ export type TransitionToStateMutation = {
                       description: string;
                       type: AdjustmentType;
                   }>;
-                  items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
               }>;
               shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
               customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3971,6 +3982,7 @@ export type TestOrderWithPaymentsFragment = {
         unitPriceWithTax: number;
         unitPriceChangeSinceAdded: number;
         unitPriceWithTaxChangeSinceAdded: number;
+        discountedUnitPriceWithTax: number;
         proratedUnitPriceWithTax: number;
         productVariant: { id: string };
         discounts: Array<{
@@ -3980,7 +3992,6 @@ export type TestOrderWithPaymentsFragment = {
             description: string;
             type: AdjustmentType;
         }>;
-        items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
     }>;
     shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
     customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -4026,6 +4037,7 @@ export type GetActiveOrderWithPaymentsQuery = {
             unitPriceWithTax: number;
             unitPriceChangeSinceAdded: number;
             unitPriceWithTaxChangeSinceAdded: number;
+            discountedUnitPriceWithTax: number;
             proratedUnitPriceWithTax: number;
             productVariant: { id: string };
             discounts: Array<{
@@ -4035,7 +4047,6 @@ export type GetActiveOrderWithPaymentsQuery = {
                 description: string;
                 type: AdjustmentType;
             }>;
-            items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
         }>;
         shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
         customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -4087,6 +4098,7 @@ export type AddPaymentToOrderMutation = {
                   unitPriceWithTax: number;
                   unitPriceChangeSinceAdded: number;
                   unitPriceWithTaxChangeSinceAdded: number;
+                  discountedUnitPriceWithTax: number;
                   proratedUnitPriceWithTax: number;
                   productVariant: { id: string };
                   discounts: Array<{
@@ -4096,7 +4108,6 @@ export type AddPaymentToOrderMutation = {
                       description: string;
                       type: AdjustmentType;
                   }>;
-                  items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
               }>;
               shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
               customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -4166,6 +4177,7 @@ export type GetOrderByCodeWithPaymentsQuery = {
             unitPriceWithTax: number;
             unitPriceChangeSinceAdded: number;
             unitPriceWithTaxChangeSinceAdded: number;
+            discountedUnitPriceWithTax: number;
             proratedUnitPriceWithTax: number;
             productVariant: { id: string };
             discounts: Array<{
@@ -4175,7 +4187,6 @@ export type GetOrderByCodeWithPaymentsQuery = {
                 description: string;
                 type: AdjustmentType;
             }>;
-            items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
         }>;
         shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
         customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -4193,18 +4204,13 @@ export type GetActiveCustomerOrderWithItemFulfillmentsQuery = {
                 id: string;
                 code: string;
                 state: string;
-                lines: Array<{
+                lines: Array<{ id: string }>;
+                fulfillments?: Array<{
                     id: string;
-                    items: Array<{
-                        id: string;
-                        fulfillment?: {
-                            id: string;
-                            state: string;
-                            method: string;
-                            trackingCode?: string | null;
-                        } | null;
-                    }>;
-                }>;
+                    state: string;
+                    method: string;
+                    trackingCode?: string | null;
+                }> | null;
             }>;
         };
     } | null;
@@ -4274,6 +4280,7 @@ export type ApplyCouponCodeMutation = {
                   unitPriceWithTax: number;
                   unitPriceChangeSinceAdded: number;
                   unitPriceWithTaxChangeSinceAdded: number;
+                  discountedUnitPriceWithTax: number;
                   proratedUnitPriceWithTax: number;
                   productVariant: { id: string };
                   discounts: Array<{
@@ -4283,7 +4290,6 @@ export type ApplyCouponCodeMutation = {
                       description: string;
                       type: AdjustmentType;
                   }>;
-                  items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
               }>;
               shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
               customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -4324,6 +4330,7 @@ export type RemoveCouponCodeMutation = {
             unitPriceWithTax: number;
             unitPriceChangeSinceAdded: number;
             unitPriceWithTaxChangeSinceAdded: number;
+            discountedUnitPriceWithTax: number;
             proratedUnitPriceWithTax: number;
             productVariant: { id: string };
             discounts: Array<{
@@ -4333,7 +4340,6 @@ export type RemoveCouponCodeMutation = {
                 description: string;
                 type: AdjustmentType;
             }>;
-            items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
         }>;
         shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
         customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -4373,6 +4379,7 @@ export type RemoveAllOrderLinesMutation = {
                   unitPriceWithTax: number;
                   unitPriceChangeSinceAdded: number;
                   unitPriceWithTaxChangeSinceAdded: number;
+                  discountedUnitPriceWithTax: number;
                   proratedUnitPriceWithTax: number;
                   productVariant: { id: string };
                   discounts: Array<{
@@ -4382,7 +4389,6 @@ export type RemoveAllOrderLinesMutation = {
                       description: string;
                       type: AdjustmentType;
                   }>;
-                  items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
               }>;
               shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
               customer?: { id: string; user?: { id: string; identifier: string } | null } | null;

packages/core/e2e/graphql/shared-definitions.ts

@@ -720,11 +720,8 @@ export const CANCEL_ORDER = gql`
         id
         state
         lines {
+            id
             quantity
-            items {
-                id
-                cancelled
-            }
         }
     }
 `;

packages/core/e2e/graphql/shop-definitions.ts

@@ -29,6 +29,7 @@ export const TEST_ORDER_FRAGMENT = gql`
             unitPriceWithTax
             unitPriceChangeSinceAdded
             unitPriceWithTaxChangeSinceAdded
+            discountedUnitPriceWithTax
             proratedUnitPriceWithTax
             productVariant {
                 id
@@ -40,11 +41,6 @@ export const TEST_ORDER_FRAGMENT = gql`
                 description
                 type
             }
-            items {
-                id
-                unitPrice
-                unitPriceWithTax
-            }
         }
         shippingLines {
             shippingMethod {
@@ -343,12 +339,6 @@ export const GET_ACTIVE_ORDER_WITH_PRICE_DATA = gql`
                 linePrice
                 lineTax
                 linePriceWithTax
-                items {
-                    id
-                    unitPrice
-                    unitPriceWithTax
-                    taxRate
-                }
                 taxLines {
                     taxRate
                     description
@@ -635,15 +625,12 @@ export const GET_ACTIVE_ORDER_CUSTOMER_WITH_ITEM_FULFILLMENTS = gql`
                     state
                     lines {
                         id
-                        items {
-                            id
-                            fulfillment {
-                                id
-                                state
-                                method
-                                trackingCode
-                            }
-                        }
+                    }
+                    fulfillments {
+                        id
+                        state
+                        method
+                        trackingCode
                     }
                 }
             }

packages/core/e2e/order-changed-price-handling.e2e-spec.ts

@@ -2,7 +2,7 @@
 import {
     ChangedPriceHandlingStrategy,
     mergeConfig,
-    OrderItem,
+    OrderLine,
     PriceCalculationResult,
     RequestContext,
 } from '@vendure/core';
@@ -24,15 +24,15 @@ class TestChangedPriceStrategy implements ChangedPriceHandlingStrategy {
     handlePriceChange(
         ctx: RequestContext,
         current: PriceCalculationResult,
-        existingItems: OrderItem[],
+        orderLine: OrderLine,
     ): PriceCalculationResult {
         TestChangedPriceStrategy.spy(current);
         if (TestChangedPriceStrategy.useLatestPrice) {
             return current;
         } else {
             return {
-                price: existingItems[0].listPrice,
-                priceIncludesTax: existingItems[0].listPriceIncludesTax,
+                price: orderLine.listPrice,
+                priceIncludesTax: orderLine.listPriceIncludesTax,
             };
         }
     }
@@ -111,7 +111,6 @@ describe('ChangedPriceHandlingStrategy', () => {
             const { activeOrder } = await shopClient.query<CodegenShop.GetActiveOrderQuery>(GET_ACTIVE_ORDER);
             expect(activeOrder?.lines[0].unitPriceChangeSinceAdded).toBe(626);
             expect(activeOrder?.lines[0].unitPrice).toBe(6000);
-            expect(activeOrder?.lines[0].items.every(i => i.unitPrice === 6000)).toBe(true);
             expect(TestChangedPriceStrategy.spy).toHaveBeenCalledTimes(1);
 
             firstOrderLineId = activeOrder!.lines[0].id;
@@ -143,7 +142,6 @@ describe('ChangedPriceHandlingStrategy', () => {
             const { activeOrder } = await shopClient.query<CodegenShop.GetActiveOrderQuery>(GET_ACTIVE_ORDER);
             expect(activeOrder?.lines[0].unitPriceChangeSinceAdded).toBe(-2374);
             expect(activeOrder?.lines[0].unitPrice).toBe(3000);
-            expect(activeOrder?.lines[0].items.every(i => i.unitPrice === 3000)).toBe(true);
             expect(TestChangedPriceStrategy.spy).toHaveBeenCalledTimes(1);
         });
     });
@@ -190,7 +188,6 @@ describe('ChangedPriceHandlingStrategy', () => {
             const { activeOrder } = await shopClient.query<CodegenShop.GetActiveOrderQuery>(GET_ACTIVE_ORDER);
             expect(activeOrder?.lines[1].unitPriceChangeSinceAdded).toBe(0);
             expect(activeOrder?.lines[1].unitPrice).toBe(ORIGINAL_PRICE);
-            expect(activeOrder?.lines[1].items.every(i => i.unitPrice === ORIGINAL_PRICE)).toBe(true);
             expect(TestChangedPriceStrategy.spy).toHaveBeenCalledTimes(1);
 
             secondOrderLineId = activeOrder!.lines[1].id;
@@ -222,7 +219,6 @@ describe('ChangedPriceHandlingStrategy', () => {
             const { activeOrder } = await shopClient.query<CodegenShop.GetActiveOrderQuery>(GET_ACTIVE_ORDER);
             expect(activeOrder?.lines[1].unitPriceChangeSinceAdded).toBe(0);
             expect(activeOrder?.lines[1].unitPrice).toBe(ORIGINAL_PRICE);
-            expect(activeOrder?.lines[1].items.every(i => i.unitPrice === ORIGINAL_PRICE)).toBe(true);
             expect(TestChangedPriceStrategy.spy).toHaveBeenCalledTimes(1);
         });
     });

packages/core/e2e/order-item-price-calculation-strategy.e2e-spec.ts

@@ -112,10 +112,6 @@ const ORDER_WITH_LINES_AND_ITEMS_FRAGMENT = gql`
             quantity
             unitPrice
             unitPriceWithTax
-            items {
-                unitPrice
-                unitPriceWithTax
-            }
         }
     }
 `;

packages/core/e2e/order-modification.e2e-spec.ts

@@ -522,7 +522,7 @@ describe('Order modification', () => {
             orderGuard.assertSuccess(modifyOrder);
 
             const expectedTotal = order!.totalWithTax + order!.lines[0].unitPriceWithTax * 2;
-            expect(modifyOrder.lines[0].items.length).toBe(3);
+            expect(modifyOrder.lines[0].quantity).toBe(3);
             expect(modifyOrder.totalWithTax).toBe(expectedTotal);
             await assertOrderIsUnchanged(order!);
         });
@@ -547,8 +547,7 @@ describe('Order modification', () => {
             orderGuard.assertSuccess(modifyOrder);
 
             const expectedTotal = order!.totalWithTax - order!.lines[1].unitPriceWithTax;
-            expect(modifyOrder.lines[1].items.filter(i => i.cancelled).length).toBe(1);
-            expect(modifyOrder.lines[1].items.filter(i => !i.cancelled).length).toBe(1);
+            expect(modifyOrder.lines[1].quantity).toBe(1);
             expect(modifyOrder.totalWithTax).toBe(expectedTotal);
             await assertOrderIsUnchanged(order!);
         });
@@ -572,9 +571,10 @@ describe('Order modification', () => {
             });
             orderGuard.assertSuccess(modifyOrder);
 
-            const expectedTotal = order!.totalWithTax - order!.lines[0].linePriceWithTax;
+            const expectedTotal =
+                order!.totalWithTax - order!.lines[0].unitPriceWithTax * order!.lines[0].quantity;
             expect(modifyOrder.totalWithTax).toBe(expectedTotal);
-            expect(modifyOrder.lines[0].items.every(i => i.cancelled)).toBe(true);
+            expect(modifyOrder.lines[0].quantity).toBe(0);
             await assertOrderIsUnchanged(order!);
         });
 
@@ -736,9 +736,9 @@ describe('Order modification', () => {
             expect(modifyOrder.lines.length).toBe(order!.lines.length + 1);
             expect(modifyOrder.modifications.length).toBe(1);
             expect(modifyOrder.modifications[0].priceChange).toBe(priceDelta);
-            expect(modifyOrder.modifications[0].orderItems?.length).toBe(1);
-            expect(modifyOrder.modifications[0].orderItems?.map(i => i.id)).toEqual([
-                modifyOrder.lines[1].items[0].id,
+            expect(modifyOrder.modifications[0].lines.length).toBe(1);
+            expect(modifyOrder.modifications[0].lines).toEqual([
+                { orderLineId: modifyOrder.lines[1].id, quantity: 1 },
             ]);
 
             await assertModifiedOrderIsPersisted(modifyOrder);
@@ -769,12 +769,8 @@ describe('Order modification', () => {
             expect(modifyOrder.lines[0].quantity).toBe(2);
             expect(modifyOrder.modifications.length).toBe(1);
             expect(modifyOrder.modifications[0].priceChange).toBe(priceDelta);
-            expect(modifyOrder.modifications[0].orderItems?.length).toBe(1);
-            expect(
-                modifyOrder.lines[0].items
-                    .map(i => i.id)
-                    .includes(modifyOrder.modifications?.[0].orderItems?.[0].id as string),
-            ).toBe(true);
+            expect(modifyOrder.modifications[0].lines.length).toBe(1);
+            expect(modifyOrder.lines[0].id).toEqual(modifyOrder.modifications[0].lines[0].orderLineId);
             await assertModifiedOrderIsPersisted(modifyOrder);
         });
 
@@ -813,12 +809,8 @@ describe('Order modification', () => {
             expect(modifyOrder.modifications.length).toBe(1);
             expect(modifyOrder.modifications[0].priceChange).toBe(priceDelta);
             expect(modifyOrder.modifications[0].surcharges).toEqual(modifyOrder.surcharges.map(pick(['id'])));
-            expect(modifyOrder.modifications[0].orderItems?.length).toBe(1);
-            expect(
-                modifyOrder.lines[0].items
-                    .map(i => i.id)
-                    .includes(modifyOrder.modifications?.[0].orderItems?.[0].id as string),
-            ).toBe(true);
+            expect(modifyOrder.modifications[0].lines.length).toBe(1);
+            expect(modifyOrder.lines[0].id).toEqual(modifyOrder.modifications[0].lines[0].orderLineId);
             await assertModifiedOrderIsPersisted(modifyOrder);
         });
 
@@ -1440,12 +1432,18 @@ describe('Order modification', () => {
                     total: 16649,
                 },
             ]);
+            // Note: During the big refactor of the OrderItem entity, the "total" value in the following
+            // assertion was changed from `300` to `600`. This is due to a change in the way we calculate
+            // refunds on pro-rated discounts. Previously, the pro-ration was not recalculated prior to
+            // the refund being calculated, so the individual OrderItem had only 1/2 the full order discount
+            // applied to it (300). Now, the pro-ration is applied to the single remaining item and therefore the
+            // entire discount of 600 gets moved over to the remaining item.
             expect(modifyOrder?.payments?.find(p => p.id !== additionalPaymentId)?.refunds).toEqual([
                 {
                     id: 'T_6',
                     paymentId: 'T_15',
                     state: 'Pending',
-                    total: 300,
+                    total: 600,
                 },
             ]);
             expect(modifyOrder.totalWithTax).toBe(getOrderPaymentsTotalWithRefunds(modifyOrder));
@@ -1678,7 +1676,7 @@ describe('Order modification', () => {
             expect(modifyOrder.totalWithTax).toBe(getOrderPaymentsTotalWithRefunds(modifyOrder));
         });
 
-        // github.com/vendure-ecommerce/vendure/issues/1865
+        // https://github.com/vendure-ecommerce/vendure/issues/1865
         describe('issue 1865', () => {
             const promoDiscount = 5000;
             let promoId: string;
@@ -2401,10 +2399,13 @@ export const ORDER_WITH_MODIFICATION_FRAGMENT = gql`
         lines {
             id
             quantity
+            orderPlacedQuantity
             linePrice
             linePriceWithTax
+            unitPriceWithTax
             discountedLinePriceWithTax
             proratedLinePriceWithTax
+            proratedUnitPriceWithTax
             discounts {
                 description
                 amountWithTax
@@ -2413,13 +2414,6 @@ export const ORDER_WITH_MODIFICATION_FRAGMENT = gql`
                 id
                 name
             }
-            items {
-                id
-                createdAt
-                updatedAt
-                cancelled
-                unitPrice
-            }
         }
         surcharges {
             id
@@ -2448,8 +2442,9 @@ export const ORDER_WITH_MODIFICATION_FRAGMENT = gql`
             note
             priceChange
             isSettled
-            orderItems {
-                id
+            lines {
+                orderLineId
+                quantity
             }
             surcharges {
                 id

packages/core/e2e/order-promotion.e2e-spec.ts

@@ -9,6 +9,7 @@ import {
     discountOnItemWithFacets,
     hasFacetValues,
     manualFulfillmentHandler,
+    mergeConfig,
     minimumOrderAmount,
     orderPercentageDiscount,
     productsPercentageDiscount,
@@ -58,12 +59,14 @@ import {
 import { addPaymentToOrder, proceedToArrangingPayment } from './utils/test-order-utils';
 
 describe('Promotions applied to Orders', () => {
-    const { server, adminClient, shopClient } = createTestEnvironment({
-        ...testConfig(),
-        paymentOptions: {
-            paymentMethodHandlers: [testSuccessfulPaymentMethod],
-        },
-    });
+    const { server, adminClient, shopClient } = createTestEnvironment(
+        mergeConfig(testConfig(), {
+            dbConnectionOptions: { logging: true },
+            paymentOptions: {
+                paymentMethodHandlers: [testSuccessfulPaymentMethod],
+            },
+        }),
+    );
 
     const freeOrderAction = {
         code: orderPercentageDiscount.code,

packages/core/e2e/order-taxes.e2e-spec.ts

@@ -150,9 +150,6 @@ describe('Order taxes', () => {
             expect(activeOrder?.lines[0].linePriceWithTax).toBe(240);
             expect(activeOrder?.lines[0].unitPrice).toBe(100);
             expect(activeOrder?.lines[0].unitPriceWithTax).toBe(120);
-            expect(activeOrder?.lines[0].items[0].unitPrice).toBe(100);
-            expect(activeOrder?.lines[0].items[0].unitPriceWithTax).toBe(120);
-            expect(activeOrder?.lines[0].items[0].taxRate).toBe(20);
             expect(activeOrder?.lines[0].taxLines).toEqual([
                 {
                     description: 'Standard Tax Europe',
@@ -197,9 +194,6 @@ describe('Order taxes', () => {
             expect(activeOrder?.lines[0].linePriceWithTax).toBe(200);
             expect(activeOrder?.lines[0].unitPrice).toBe(83);
             expect(activeOrder?.lines[0].unitPriceWithTax).toBe(100);
-            expect(activeOrder?.lines[0].items[0].unitPrice).toBe(83);
-            expect(activeOrder?.lines[0].items[0].unitPriceWithTax).toBe(100);
-            expect(activeOrder?.lines[0].items[0].taxRate).toBe(20);
             expect(activeOrder?.lines[0].taxLines).toEqual([
                 {
                     description: 'Standard Tax Europe',
@@ -249,9 +243,6 @@ describe('Order taxes', () => {
             expect(activeOrder?.lines[0].linePriceWithTax).toBe(166);
             expect(activeOrder?.lines[0].unitPrice).toBe(83);
             expect(activeOrder?.lines[0].unitPriceWithTax).toBe(83);
-            expect(activeOrder?.lines[0].items[0].unitPrice).toBe(83);
-            expect(activeOrder?.lines[0].items[0].unitPriceWithTax).toBe(83);
-            expect(activeOrder?.lines[0].items[0].taxRate).toBe(0);
             expect(activeOrder?.lines[0].taxLines).toEqual([
                 {
                     description: 'Standard Tax Asia',
@@ -286,9 +277,6 @@ describe('Order taxes', () => {
             expect(activeOrder?.lines[0].linePriceWithTax).toBe(200);
             expect(activeOrder?.lines[0].unitPrice).toBe(83);
             expect(activeOrder?.lines[0].unitPriceWithTax).toBe(100);
-            expect(activeOrder?.lines[0].items[0].unitPrice).toBe(83);
-            expect(activeOrder?.lines[0].items[0].unitPriceWithTax).toBe(100);
-            expect(activeOrder?.lines[0].items[0].taxRate).toBe(20);
             expect(activeOrder?.lines[0].taxLines).toEqual([
                 {
                     description: 'Standard Tax Americas',

packages/core/e2e/order.e2e-spec.ts

@@ -570,18 +570,18 @@ describe('Orders resolver', () => {
         });
 
         it('filter by transactionId', async () => {
-            const result = await adminClient.query<GetOrderList.Query, GetOrderList.Variables>(
-                GET_ORDERS_LIST,
-                {
-                    options: {
-                        filter: {
-                            transactionId: {
-                                eq: '12345-' + firstOrderCode,
-                            },
+            const result = await adminClient.query<
+                Codegen.GetOrderListQuery,
+                Codegen.GetOrderListQueryVariables
+            >(GET_ORDERS_LIST, {
+                options: {
+                    filter: {
+                        transactionId: {
+                            eq: '12345-' + firstOrderCode,
                         },
                     },
                 },
-            );
+            });
             expect(result.orders.totalItems).toEqual(1);
             expect(result.orders.items[0].code).toBe(firstOrderCode);
         });
@@ -676,7 +676,9 @@ describe('Orders resolver', () => {
             expect(addFulfillmentToOrder.method).toBe('Test1');
             expect(addFulfillmentToOrder.trackingCode).toBe('111');
             expect(addFulfillmentToOrder.state).toBe('Pending');
-            expect(addFulfillmentToOrder.orderItems).toEqual([{ id: lines[0].items[0].id }]);
+            expect(addFulfillmentToOrder.lines).toEqual([
+                { orderLineId: lines[0].id, quantity: lines[0].quantity },
+            ]);
             f1Id = addFulfillmentToOrder.id;
 
             const result = await adminClient.query<Codegen.GetOrderQuery, Codegen.GetOrderQueryVariables>(
@@ -686,13 +688,17 @@ describe('Orders resolver', () => {
                 },
             );
 
-            expect(result.order!.lines[0].items[0].fulfillment!.id).toBe(addFulfillmentToOrder!.id);
+            expect(result.order!.fulfillments?.length).toBe(1);
+            expect(result.order!.fulfillments![0]!.id).toBe(addFulfillmentToOrder!.id);
+            expect(result.order!.fulfillments![0]!.lines).toEqual([
+                {
+                    orderLineId: order?.lines[0].id,
+                    quantity: order?.lines[0].quantity,
+                },
+            ]);
             expect(
-                result.order!.lines[1].items.filter(
-                    i => i.fulfillment && i.fulfillment.id === addFulfillmentToOrder.id,
-                ).length,
+                result.order!.fulfillments![0]!.lines.filter(l => l.orderLineId === lines[1].id).length,
             ).toBe(0);
-            expect(result.order!.lines[1].items.filter(i => i.fulfillment == null).length).toBe(3);
         });
 
         it('creates the second fulfillment', async () => {
@@ -772,11 +778,11 @@ describe('Orders resolver', () => {
                 id: orderId,
             });
 
-            expect(order?.lines.find(l => l.id === 'T_3')!.fulfillments).toEqual([
-                { id: f1Id, state: 'Pending', summary: [{ orderLine: { id: 'T_3' }, quantity: 1 }] },
+            expect(order?.lines.find(l => l.id === 'T_3')!.fulfillmentLines).toEqual([
+                { fulfillment: { id: f1Id, state: 'Pending' }, orderLineId: 'T_3', quantity: 1 },
             ]);
             // Cancelled Fulfillments do not appear in the line field
-            expect(order?.lines.find(l => l.id === 'T_4')!.fulfillments).toEqual([]);
+            expect(order?.lines.find(l => l.id === 'T_4')!.fulfillmentLines).toEqual([]);
         });
 
         it('creates third fulfillment with same items from second fulfillment', async () => {
@@ -1079,33 +1085,33 @@ describe('Orders resolver', () => {
             ]);
         });
 
-        it('order.fulfillments.orderItems resolver', async () => {
-            const { order } = await adminClient.query<
-                Codegen.GetOrderFulfillmentItemsQuery,
-                Codegen.GetOrderFulfillmentItemsQueryVariables
-            >(GET_ORDER_FULFILLMENT_ITEMS, {
-                id: orderId,
-            });
-            const sortedFulfillments = order!.fulfillments!.sort(sortById);
-            expect(sortedFulfillments[0].orderItems).toEqual([{ id: 'T_3' }]);
-            expect(sortedFulfillments[1].orderItems).toEqual([{ id: 'T_4' }, { id: 'T_5' }, { id: 'T_6' }]);
-            expect(sortedFulfillments[2].orderItems).toEqual([{ id: 'T_4' }, { id: 'T_5' }, { id: 'T_6' }]);
-        });
-
-        it('order.line.items.fulfillment resolver', async () => {
-            const { order } = await adminClient.query<Codegen.GetOrderQuery, Codegen.GetOrderQueryVariables>(
-                GET_ORDER,
-                {
-                    id: orderId,
-                },
-            );
-            const { activeCustomer } = await shopClient.query<
-                CodegenShop.GetActiveCustomerOrderWithItemFulfillmentsQuery,
-                CodegenShop.GetActiveCustomerOrderWithItemFulfillmentsQueryVariables
-            >(GET_ACTIVE_ORDER_CUSTOMER_WITH_ITEM_FULFILLMENTS);
-            const firstCustomerOrder = activeCustomer!.orders.items[0]!;
-            expect(firstCustomerOrder.lines[0].items[0].fulfillment).not.toBeNull();
-        });
+        // it('order.fulfillments.orderItems resolver', async () => {
+        //     const { order } = await adminClient.query<
+        //         Codegen.GetOrderFulfillmentItemsQuery,
+        //         Codegen.GetOrderFulfillmentItemsQueryVariables
+        //     >(GET_ORDER_FULFILLMENT_ITEMS, {
+        //         id: orderId,
+        //     });
+        //     const sortedFulfillments = order!.fulfillments!.sort(sortById);
+        //     expect(sortedFulfillments[0].orderItems).toEqual([{ id: 'T_3' }]);
+        //     expect(sortedFulfillments[1].orderItems).toEqual([{ id: 'T_4' }, { id: 'T_5' }, { id: 'T_6' }]);
+        //     expect(sortedFulfillments[2].orderItems).toEqual([{ id: 'T_4' }, { id: 'T_5' }, { id: 'T_6' }]);
+        // });
+
+        // it('order.line.items.fulfillment resolver', async () => {
+        //     const { order } = await adminClient.query<Codegen.GetOrderQuery, Codegen.GetOrderQueryVariables>(
+        //         GET_ORDER,
+        //         {
+        //             id: orderId,
+        //         },
+        //     );
+        //     const { activeCustomer } = await shopClient.query<
+        //         CodegenShop.GetActiveCustomerOrderWithItemFulfillmentsQuery,
+        //         CodegenShop.GetActiveCustomerOrderWithItemFulfillmentsQueryVariables
+        //     >(GET_ACTIVE_ORDER_CUSTOMER_WITH_ITEM_FULFILLMENTS);
+        //     const firstCustomerOrder = activeCustomer!.orders.items[0]!;
+        //     expect(firstCustomerOrder.lines[0].items[0].fulfillment).not.toBeNull();
+        // });
     });
 
     describe('cancellation by orderId', () => {
@@ -1217,15 +1223,8 @@ describe('Orders resolver', () => {
             });
             orderGuard.assertSuccess(cancelOrder);
 
-            expect(
-                cancelOrder.lines.map(l =>
-                    l.items.map(pick(['id', 'cancelled'])).sort((a, b) => (a.id > b.id ? 1 : -1)),
-                ),
-            ).toEqual([
-                [
-                    { id: 'T_11', cancelled: true },
-                    { id: 'T_12', cancelled: true },
-                ],
+            expect(cancelOrder.lines.sort((a, b) => (a.id > b.id ? 1 : -1))).toEqual([
+                { id: 'T_7', quantity: 0 },
             ]);
             const { order: order2 } = await adminClient.query<
                 Codegen.GetOrderQuery,
@@ -1250,8 +1249,7 @@ describe('Orders resolver', () => {
             expect(variant1.stockMovements.items.map(pick(['type', 'quantity']))).toEqual([
                 { type: StockMovementType.ADJUSTMENT, quantity: 100 },
                 { type: StockMovementType.ALLOCATION, quantity: 2 },
-                { type: StockMovementType.RELEASE, quantity: 1 },
-                { type: StockMovementType.RELEASE, quantity: 1 },
+                { type: StockMovementType.RELEASE, quantity: 2 },
             ]);
         });
 
@@ -1395,8 +1393,7 @@ describe('Orders resolver', () => {
             expect(variant1.stockMovements.items.map(pick(['type', 'quantity']))).toEqual([
                 { type: StockMovementType.ADJUSTMENT, quantity: 100 },
                 { type: StockMovementType.ALLOCATION, quantity: 2 },
-                { type: StockMovementType.RELEASE, quantity: 1 },
-                { type: StockMovementType.RELEASE, quantity: 1 },
+                { type: StockMovementType.RELEASE, quantity: 2 },
                 { type: StockMovementType.ALLOCATION, quantity: 2 },
             ]);
 
@@ -1420,10 +1417,6 @@ describe('Orders resolver', () => {
             orderGuard.assertSuccess(cancelOrder);
 
             expect(cancelOrder.lines[0].quantity).toBe(1);
-            expect(cancelOrder.lines[0].items.sort((a, b) => (a.id < b.id ? -1 : 1))).toEqual([
-                { id: 'T_13', cancelled: true },
-                { id: 'T_14', cancelled: false },
-            ]);
 
             const { order: order2 } = await adminClient.query<
                 Codegen.GetOrderQuery,
@@ -1447,8 +1440,7 @@ describe('Orders resolver', () => {
             expect(variant2.stockMovements.items.map(pick(['type', 'quantity']))).toEqual([
                 { type: StockMovementType.ADJUSTMENT, quantity: 100 },
                 { type: StockMovementType.ALLOCATION, quantity: 2 },
-                { type: StockMovementType.RELEASE, quantity: 1 },
-                { type: StockMovementType.RELEASE, quantity: 1 },
+                { type: StockMovementType.RELEASE, quantity: 2 },
                 { type: StockMovementType.ALLOCATION, quantity: 2 },
                 { type: StockMovementType.RELEASE, quantity: 1 },
             ]);
@@ -1519,8 +1511,7 @@ describe('Orders resolver', () => {
             expect(variant2.stockMovements.items.map(pick(['type', 'quantity']))).toEqual([
                 { type: StockMovementType.ADJUSTMENT, quantity: 100 },
                 { type: StockMovementType.ALLOCATION, quantity: 2 },
-                { type: StockMovementType.RELEASE, quantity: 1 },
-                { type: StockMovementType.RELEASE, quantity: 1 },
+                { type: StockMovementType.RELEASE, quantity: 2 },
                 { type: StockMovementType.ALLOCATION, quantity: 2 },
                 { type: StockMovementType.RELEASE, quantity: 1 },
                 { type: StockMovementType.RELEASE, quantity: 1 },
@@ -1535,18 +1526,7 @@ describe('Orders resolver', () => {
                 },
             );
 
-            expect(order?.lines[0].unitPrice).toEqual(order?.lines[0].items[0].unitPrice);
-        });
-
-        it('cancelled OrderLine.unitPrice is not zero', async () => {
-            const { order } = await adminClient.query<Codegen.GetOrderQuery, Codegen.GetOrderQueryVariables>(
-                GET_ORDER,
-                {
-                    id: orderId,
-                },
-            );
-
-            expect(order?.lines[0].unitPrice).toEqual(order?.lines[0].items[0].unitPrice);
+            expect(order?.lines[0].unitPrice).not.toBe(0);
         });
 
         it('order history contains expected entries', async () => {
@@ -1592,7 +1572,7 @@ describe('Orders resolver', () => {
                 {
                     type: HistoryEntryType.ORDER_CANCELLATION,
                     data: {
-                        orderItemIds: ['T_13'],
+                        lines: [{ orderLineId: 'T_8', quantity: 1 }],
                         reason: 'cancel reason 1',
                         shippingCancelled: false,
                     },
@@ -1600,7 +1580,7 @@ describe('Orders resolver', () => {
                 {
                     type: HistoryEntryType.ORDER_CANCELLATION,
                     data: {
-                        orderItemIds: ['T_14'],
+                        lines: [{ orderLineId: 'T_8', quantity: 1 }],
                         reason: 'cancel reason 2',
                         shippingCancelled: true,
                     },
@@ -1660,7 +1640,7 @@ describe('Orders resolver', () => {
             expect(refundOrder.errorCode).toBe(ErrorCode.REFUND_ORDER_STATE_ERROR);
         });
 
-        it('returns error result if no lines and no shipping', async () => {
+        it('returns error result if no amount and no shipping', async () => {
             const { order } = await adminClient.query<Codegen.GetOrderQuery, Codegen.GetOrderQueryVariables>(
                 GET_ORDER,
                 {
@@ -1786,7 +1766,8 @@ describe('Orders resolver', () => {
             expect(settleRefund.transactionId).toBe('aaabbb');
         });
 
-        it('returns error result if attempting to refund the same item more than once', async () => {
+        // TODO: I think we should remove this restriction
+        xit('returns error result if attempting to refund the same item more than once', async () => {
             const { order } = await adminClient.query<Codegen.GetOrderQuery, Codegen.GetOrderQueryVariables>(
                 GET_ORDER,
                 {
@@ -2224,7 +2205,7 @@ describe('Orders resolver', () => {
                     lines: order!.lines.map(l => ({ orderLineId: l.id, quantity: 1 })),
                     shipping: 0,
                     adjustment: 0,
-                    reason: 'foo',
+                    reason: 'first refund',
                     paymentId: payment1Id,
                 },
             });
@@ -2262,7 +2243,7 @@ describe('Orders resolver', () => {
                     lines: order!.lines.map(l => ({ orderLineId: l.id, quantity: 1 })),
                     shipping: order!.shippingWithTax,
                     adjustment: 0,
-                    reason: 'foo',
+                    reason: 'second refund',
                     paymentId: payment1Id,
                 },
             });
@@ -2562,63 +2543,64 @@ describe('Orders resolver', () => {
             ).toBe(108720);
         });
 
+        // TODO: is this needed?
         // https://github.com/vendure-ecommerce/vendure/issues/1558
-        it('cancelling OrderItem avoids items that have been fulfilled', async () => {
-            await shopClient.asUserWithCredentials(customers[0].emailAddress, password);
-            const { addItemToOrder } = await shopClient.query<
-                AddItemToOrder.Mutation,
-                AddItemToOrder.Variables
-            >(ADD_ITEM_TO_ORDER, {
-                productVariantId: 'T_1',
-                quantity: 2,
-            });
-
-            await proceedToArrangingPayment(shopClient);
-            const order = await addPaymentToOrder(shopClient, singleStageRefundablePaymentMethod);
-            orderGuard.assertSuccess(order);
-
-            await adminClient.query<
-                Codegen.CreateFulfillmentMutation,
-                Codegen.CreateFulfillmentMutationVariables
-            >(CREATE_FULFILLMENT, {
-                input: {
-                    lines: [
-                        {
-                            orderLineId: order.lines[0].id,
-                            quantity: 1,
-                        },
-                    ],
-                    handler: {
-                        code: manualFulfillmentHandler.code,
-                        arguments: [{ name: 'method', value: 'Test' }],
-                    },
-                },
-            });
-
-            const { cancelOrder } = await adminClient.query<
-                Codegen.CancelOrderMutation,
-                Codegen.CancelOrderMutationVariables
-            >(CANCEL_ORDER, {
-                input: {
-                    orderId: order.id,
-                    lines: [{ orderLineId: order.lines[0].id, quantity: 1 }],
-                },
-            });
-            orderGuard.assertSuccess(cancelOrder);
-
-            const { order: order2 } = await adminClient.query<
-                Codegen.GetOrderQuery,
-                Codegen.GetOrderQueryVariables
-            >(GET_ORDER, {
-                id: order.id,
-            });
-
-            const items = order2!.lines[0].items;
-            const itemWhichIsCancelledAndFulfilled = items.find(
-                i => i.cancelled === true && i.fulfillment != null,
-            );
-            expect(itemWhichIsCancelledAndFulfilled).toBeUndefined();
-        });
+        // it('cancelling OrderItem avoids items that have been fulfilled', async () => {
+        //     await shopClient.asUserWithCredentials(customers[0].emailAddress, password);
+        //     const { addItemToOrder } = await shopClient.query<
+        //         CodegenShop.AddItemToOrderMutation,
+        //         CodegenShop.AddItemToOrderMutationVariables
+        //     >(ADD_ITEM_TO_ORDER, {
+        //         productVariantId: 'T_1',
+        //         quantity: 2,
+        //     });
+        //
+        //     await proceedToArrangingPayment(shopClient);
+        //     const order = await addPaymentToOrder(shopClient, singleStageRefundablePaymentMethod);
+        //     orderGuard.assertSuccess(order);
+        //
+        //     await adminClient.query<
+        //         Codegen.CreateFulfillmentMutation,
+        //         Codegen.CreateFulfillmentMutationVariables
+        //     >(CREATE_FULFILLMENT, {
+        //         input: {
+        //             lines: [
+        //                 {
+        //                     orderLineId: order.lines[0].id,
+        //                     quantity: 1,
+        //                 },
+        //             ],
+        //             handler: {
+        //                 code: manualFulfillmentHandler.code,
+        //                 arguments: [{ name: 'method', value: 'Test' }],
+        //             },
+        //         },
+        //     });
+        //
+        //     const { cancelOrder } = await adminClient.query<
+        //         Codegen.CancelOrderMutation,
+        //         Codegen.CancelOrderMutationVariables
+        //     >(CANCEL_ORDER, {
+        //         input: {
+        //             orderId: order.id,
+        //             lines: [{ orderLineId: order.lines[0].id, quantity: 1 }],
+        //         },
+        //     });
+        //     orderGuard.assertSuccess(cancelOrder);
+        //
+        //     const { order: order2 } = await adminClient.query<
+        //         Codegen.GetOrderQuery,
+        //         Codegen.GetOrderQueryVariables
+        //     >(GET_ORDER, {
+        //         id: order.id,
+        //     });
+        //
+        //     const items = order2!.lines[0].items;
+        //     const itemWhichIsCancelledAndFulfilled = items.find(
+        //         i => i.cancelled === true && i.fulfillment != null,
+        //     );
+        //     expect(itemWhichIsCancelledAndFulfilled).toBeUndefined();
+        // });
     });
 });
 
@@ -2674,16 +2656,24 @@ async function getUnfulfilledOrderLineInput(
     const { order } = await client.query<Codegen.GetOrderQuery, Codegen.GetOrderQueryVariables>(GET_ORDER, {
         id,
     });
+    const allFulfillmentLines =
+        order?.fulfillments
+            ?.filter(f => f.state !== 'Cancelled')
+            .reduce((all, f) => [...all, ...f.lines], [] as Codegen.FulfillmentFragment['lines']) || [];
 
     const unfulfilledItems =
-        order?.lines.filter(l => {
-            const items = l.items.filter(i => i.fulfillment === null);
-            return items.length > 0 ? true : false;
-        }) || [];
+        order?.lines
+            .map(l => {
+                const fulfilledQuantity = allFulfillmentLines
+                    .filter(fl => fl.orderLineId === l.id)
+                    .reduce((sum, fl) => sum + fl.quantity, 0);
+                return { orderLineId: l.id, unfulfilled: l.quantity - fulfilledQuantity };
+            })
+            .filter(l => 0 < l.unfulfilled) || [];
 
     return unfulfilledItems.map(l => ({
-        orderLineId: l.id,
-        quantity: l.items.length,
+        orderLineId: l.orderLineId,
+        quantity: l.unfulfilled,
     }));
 }
 
@@ -2805,15 +2795,13 @@ export const GET_ORDER_LINE_FULFILLMENTS = gql`
             id
             lines {
                 id
-                fulfillments {
-                    id
-                    state
-                    summary {
-                        orderLine {
-                            id
-                        }
-                        quantity
+                fulfillmentLines {
+                    fulfillment {
+                        id
+                        state
                     }
+                    orderLineId
+                    quantity
                 }
             }
         }

packages/core/e2e/relations-decorator.e2e-spec.ts

@@ -4,7 +4,7 @@ import gql from 'graphql-tag';
 import path from 'path';
 
 import { initialData } from '../../../e2e-common/e2e-initial-data';
-import { TEST_SETUP_TIMEOUT_MS, testConfig } from '../../../e2e-common/test-config';
+import { testConfig, TEST_SETUP_TIMEOUT_MS } from '../../../e2e-common/test-config';
 
 import {
     RelationDecoratorTestService,
@@ -107,7 +107,7 @@ describe('Relations decorator', () => {
                 }
             }
         `);
-        expect(testService.getRelations()).toEqual(['lines', 'lines.items']);
+        expect(testService.getRelations()).toEqual(['lines']);
     });
 
     it('defaults to a depth of 3', async () => {

packages/core/e2e/shipping-method.e2e-spec.ts

@@ -335,8 +335,8 @@ describe('ShippingMethod resolver', () => {
     describe('argument ordering', () => {
         it('createShippingMethod corrects order of arguments', async () => {
             const { createShippingMethod } = await adminClient.query<
-                CreateShippingMethod.Mutation,
-                CreateShippingMethod.Variables
+                Codegen.CreateShippingMethodMutation,
+                Codegen.CreateShippingMethodMutationVariables
             >(CREATE_SHIPPING_METHOD, {
                 input: {
                     code: 'new-method',
@@ -374,8 +374,8 @@ describe('ShippingMethod resolver', () => {
 
         it('updateShippingMethod corrects order of arguments', async () => {
             const { updateShippingMethod } = await adminClient.query<
-                UpdateShippingMethod.Mutation,
-                UpdateShippingMethod.Variables
+                Codegen.UpdateShippingMethodMutation,
+                Codegen.UpdateShippingMethodMutationVariables
             >(UPDATE_SHIPPING_METHOD, {
                 input: {
                     id: 'T_4',
@@ -403,8 +403,8 @@ describe('ShippingMethod resolver', () => {
 
         it('get shippingMethod preserves correct ordering', async () => {
             const { shippingMethod } = await adminClient.query<
-                GetShippingMethod.Query,
-                GetShippingMethod.Variables
+                Codegen.GetShippingMethodQuery,
+                Codegen.GetShippingMethodQueryVariables
             >(GET_SHIPPING_METHOD, {
                 id: 'T_4',
             });
@@ -418,8 +418,8 @@ describe('ShippingMethod resolver', () => {
 
         it('testShippingMethod corrects order of arguments', async () => {
             const { testShippingMethod } = await adminClient.query<
-                TestShippingMethod.Query,
-                TestShippingMethod.Variables
+                Codegen.TestShippingMethodQuery,
+                Codegen.TestShippingMethodQueryVariables
             >(TEST_SHIPPING_METHOD, {
                 input: {
                     calculator: {

packages/core/e2e/shop-order.e2e-spec.ts

@@ -2052,8 +2052,8 @@ describe('Shop orders', () => {
         // https://github.com/vendure-ecommerce/vendure/issues/1567
         it('allows transitioning to Cancelled with deleted variant', async () => {
             const { cancelOrder } = await adminClient.query<
-                CodegenShop.CancelOrderMutation,
-                CodegenShop.CancelOrderMutationVariables
+                Codegen.CancelOrderMutation,
+                Codegen.CancelOrderMutationVariables
             >(CANCEL_ORDER, {
                 input: {
                     orderId: orderWithDeletedProductVariantId,

packages/core/e2e/stock-control.e2e-spec.ts

@@ -1,4 +1,5 @@
 /* tslint:disable:no-non-null-assertion */
+import { pick } from '@vendure/common/lib/pick';
 import {
     DefaultOrderPlacedStrategy,
     manualFulfillmentHandler,
@@ -462,19 +463,17 @@ describe('Stock control', () => {
             const product = await getProductWithStockMovement('T_2');
             const [variant1, variant2, variant3] = product!.variants;
 
-            expect(variant1.stockMovements.totalItems).toBe(5);
+            expect(variant1.stockMovements.totalItems).toBe(4);
             expect(variant1.stockMovements.items[3].type).toBe(StockMovementType.CANCELLATION);
-            expect(variant1.stockMovements.items[4].type).toBe(StockMovementType.CANCELLATION);
+            expect(variant1.stockMovements.items[3].quantity).toBe(2);
 
-            expect(variant2.stockMovements.totalItems).toBe(6);
+            expect(variant2.stockMovements.totalItems).toBe(5);
             expect(variant2.stockMovements.items[4].type).toBe(StockMovementType.CANCELLATION);
-            expect(variant2.stockMovements.items[5].type).toBe(StockMovementType.CANCELLATION);
+            expect(variant2.stockMovements.items[4].quantity).toBe(2);
 
-            expect(variant3.stockMovements.totalItems).toBe(7);
+            expect(variant3.stockMovements.totalItems).toBe(4);
             expect(variant3.stockMovements.items[3].type).toBe(StockMovementType.CANCELLATION);
-            expect(variant3.stockMovements.items[4].type).toBe(StockMovementType.CANCELLATION);
-            expect(variant3.stockMovements.items[5].type).toBe(StockMovementType.CANCELLATION);
-            expect(variant3.stockMovements.items[6].type).toBe(StockMovementType.CANCELLATION);
+            expect(variant3.stockMovements.items[3].quantity).toBe(4);
         });
 
         // https://github.com/vendure-ecommerce/vendure/issues/1198
@@ -565,18 +564,17 @@ describe('Stock control', () => {
 
             expect(trackedVariant4.stockOnHand).toBe(5);
             expect(trackedVariant4.stockAllocated).toBe(1);
-            expect(trackedVariant4.stockMovements.items).toEqual([
-                { id: 'T_4', quantity: 5, type: 'ADJUSTMENT' },
-                { id: 'T_7', quantity: 3, type: 'ALLOCATION' },
-                { id: 'T_9', quantity: 1, type: 'RELEASE' },
-                { id: 'T_11', quantity: -2, type: 'SALE' },
-                { id: 'T_15', quantity: 1, type: 'CANCELLATION' },
-                { id: 'T_16', quantity: 1, type: 'CANCELLATION' },
-                { id: 'T_21', quantity: 1, type: 'ALLOCATION' },
-                { id: 'T_22', quantity: -1, type: 'SALE' },
+            expect(trackedVariant4.stockMovements.items.map(pick(['quantity', 'type']))).toEqual([
+                { quantity: 5, type: 'ADJUSTMENT' },
+                { quantity: 3, type: 'ALLOCATION' },
+                { quantity: 1, type: 'RELEASE' },
+                { quantity: -2, type: 'SALE' },
+                { quantity: 2, type: 'CANCELLATION' },
+                { quantity: 1, type: 'ALLOCATION' },
+                { quantity: -1, type: 'SALE' },
                 // This is the cancellation & allocation we are testing for
-                { id: 'T_23', quantity: 1, type: 'CANCELLATION' },
-                { id: 'T_24', quantity: 1, type: 'ALLOCATION' },
+                { quantity: 1, type: 'CANCELLATION' },
+                { quantity: 1, type: 'ALLOCATION' },
             ]);
 
             const { cancelOrder } = await adminClient.query<

packages/core/src/api/api-internal-modules.ts

@@ -53,6 +53,7 @@ import {
     FulfillmentAdminEntityResolver,
     FulfillmentEntityResolver,
 } from './resolvers/entity/fulfillment-entity.resolver';
+import { FulfillmentLineEntityResolver } from './resolvers/entity/fulfillment-line-entity.resolver';
 import { JobEntityResolver } from './resolvers/entity/job-entity.resolver';
 import { OrderAdminEntityResolver, OrderEntityResolver } from './resolvers/entity/order-entity.resolver';
 import { OrderItemEntityResolver } from './resolvers/entity/order-item-entity.resolver';
@@ -73,6 +74,7 @@ import {
     ProductVariantEntityResolver,
 } from './resolvers/entity/product-variant-entity.resolver';
 import { RefundEntityResolver } from './resolvers/entity/refund-entity.resolver';
+import { RefundLineEntityResolver } from './resolvers/entity/refund-line-entity.resolver';
 import { RoleEntityResolver } from './resolvers/entity/role-entity.resolver';
 import { ShippingLineEntityResolver } from './resolvers/entity/shipping-line-entity.resolver';
 import { ShippingMethodEntityResolver } from './resolvers/entity/shipping-method-entity.resolver';
@@ -131,6 +133,7 @@ export const entityResolvers = [
     FacetEntityResolver,
     FacetValueEntityResolver,
     FulfillmentEntityResolver,
+    FulfillmentLineEntityResolver,
     OrderEntityResolver,
     OrderItemEntityResolver,
     OrderLineEntityResolver,
@@ -140,6 +143,7 @@ export const entityResolvers = [
     ProductOptionGroupEntityResolver,
     ProductVariantEntityResolver,
     RefundEntityResolver,
+    RefundLineEntityResolver,
     RoleEntityResolver,
     ShippingLineEntityResolver,
     UserEntityResolver,

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

@@ -384,9 +384,9 @@ export function addOrderLineCustomFieldsInput(
 
         extendedSchema = extendSchema(extendedSchema, parse(customFieldTypeDefs));
     }
-    if (schema.getType('AdjustOrderLineInput')) {
+    if (schema.getType('OrderLineInput')) {
         const customFieldTypeDefs = `
-            extend input AdjustOrderLineInput {
+            extend input OrderLineInput {
                 customFields: OrderLineCustomFieldsInput
             }
         `;

packages/core/src/api/decorators/relations.decorator.ts

@@ -75,9 +75,9 @@ const cache = new TtlCache({ cacheSize: 500, ttl: 5 * 60 * 1000 });
  * then the value of `relations` will be
  *
  * ```
- * ['customer', 'lines', 'lines.items']
+ * ['customer', 'lines'']
  * ```
- * The `'customer'` comes from the fact that the query is nesting the "customer" object, and the `'lines'` & `'lines.items'` are taken
+ * The `'customer'` comes from the fact that the query is nesting the "customer" object, and the `'lines'` is taken
  * from the `Order` entity's `totalQuantity` property, which uses {@link Calculated} decorator and defines those relations as dependencies
  * for deriving the calculated value.
  *

packages/core/src/api/middleware/id-codec-plugin.ts

@@ -42,6 +42,7 @@ export class IdCodecPlugin implements ApolloServerPlugin {
                     'paymentId',
                     'fulfillmentId',
                     'orderItemIds',
+                    'orderLineId',
                     'promotionId',
                     'refundId',
                     'groupId',

packages/core/src/api/resolvers/entity/fulfillment-entity.resolver.ts

@@ -1,9 +1,7 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
-import { FulfillmentLineSummary } from '@vendure/payments-plugin/e2e/graphql/generated-admin-types';
 
 import { RequestContextCacheService } from '../../../cache/index';
 import { Fulfillment } from '../../../entity/fulfillment/fulfillment.entity';
-import { RequestContextService } from '../../../service/index';
 import { FulfillmentService } from '../../../service/services/fulfillment.service';
 import { RequestContext } from '../../common/request-context';
 import { Ctx } from '../../decorators/request-context.decorator';
@@ -16,18 +14,16 @@ export class FulfillmentEntityResolver {
     ) {}
 
     @ResolveField()
-    async orderItems(@Ctx() ctx: RequestContext, @Parent() fulfillment: Fulfillment) {
-        return this.requestContextCache.get(
-            ctx,
-            `FulfillmentEntityResolver.orderItems(${fulfillment.id})`,
-            () => this.fulfillmentService.getOrderItemsByFulfillmentId(ctx, fulfillment.id),
+    async lines(@Ctx() ctx: RequestContext, @Parent() fulfillment: Fulfillment) {
+        return this.requestContextCache.get(ctx, `FulfillmentEntityResolver.lines(${fulfillment.id})`, () =>
+            this.fulfillmentService.getFulfillmentLines(ctx, fulfillment.id),
         );
     }
 
     @ResolveField()
     async summary(@Ctx() ctx: RequestContext, @Parent() fulfillment: Fulfillment) {
-        return this.requestContextCache.get(ctx, `FulfillmentEntityResolver.summary(${fulfillment.id})`, () =>
-            this.fulfillmentService.getFulfillmentLineSummary(ctx, fulfillment.id),
+        return this.requestContextCache.get(ctx, `FulfillmentEntityResolver.lines(${fulfillment.id})`, () =>
+            this.fulfillmentService.getFulfillmentLines(ctx, fulfillment.id),
         );
     }
 }

packages/core/src/api/resolvers/entity/fulfillment-line-entity.resolver.ts

@@ -0,0 +1,22 @@
+import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
+
+import { TransactionalConnection } from '../../../connection/index';
+import { Fulfillment } from '../../../entity/fulfillment/fulfillment.entity';
+import { FulfillmentLine, OrderLine } from '../../../entity/index';
+import { RequestContext } from '../../common/request-context';
+import { Ctx } from '../../decorators/request-context.decorator';
+
+@Resolver('FulfillmentLine')
+export class FulfillmentLineEntityResolver {
+    constructor(private connection: TransactionalConnection) {}
+
+    @ResolveField()
+    async orderLine(@Ctx() ctx: RequestContext, @Parent() fulfillmentLine: FulfillmentLine) {
+        return this.connection.getRepository(ctx, OrderLine).findOne(fulfillmentLine.orderLineId);
+    }
+
+    @ResolveField()
+    async fulfillment(@Ctx() ctx: RequestContext, @Parent() fulfillmentLine: FulfillmentLine) {
+        return this.connection.getRepository(ctx, Fulfillment).findOne(fulfillmentLine.fulfillmentId);
+    }
+}

packages/core/src/api/resolvers/entity/order-entity.resolver.ts

@@ -30,6 +30,9 @@ export class OrderEntityResolver {
 
     @ResolveField()
     async fulfillments(@Ctx() ctx: RequestContext, @Parent() order: Order) {
+        if (order.fulfillments) {
+            return order.fulfillments;
+        }
         return this.orderService.getOrderFulfillments(ctx, order);
     }
 

packages/core/src/api/resolvers/entity/order-item-entity.resolver.ts

@@ -1,7 +1,7 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 
 import { RequestContextCacheService } from '../../../cache/index';
-import { Fulfillment, OrderItem } from '../../../entity';
+import { Fulfillment } from '../../../entity';
 import { FulfillmentService } from '../../../service';
 import { RequestContext } from '../../common/request-context';
 import { Ctx } from '../../decorators/request-context.decorator';
@@ -13,22 +13,22 @@ export class OrderItemEntityResolver {
         private requestContextCache: RequestContextCacheService,
     ) {}
 
-    @ResolveField()
-    async fulfillment(
-        @Ctx() ctx: RequestContext,
-        @Parent() orderItem: OrderItem,
-    ): Promise<Fulfillment | undefined> {
-        if (orderItem.fulfillment) {
-            return orderItem.fulfillment;
-        }
-        const lineFulfillments = await this.requestContextCache.get(
-            ctx,
-            `OrderItemEntityResolver.fulfillment(${orderItem.lineId})`,
-            () => this.fulfillmentService.getFulfillmentsByOrderLineId(ctx, orderItem.lineId),
-        );
-        const otherResult = lineFulfillments.find(({ orderItemIds }) =>
-            orderItemIds.has(orderItem.id),
-        )?.fulfillment;
-        return otherResult;
-    }
+    // @ResolveField()
+    // async fulfillment(
+    //     @Ctx() ctx: RequestContext,
+    //     @Parent() orderItem: OrderItem,
+    // ): Promise<Fulfillment | undefined> {
+    //     if (orderItem.fulfillment) {
+    //         return orderItem.fulfillment;
+    //     }
+    //     const lineFulfillments = await this.requestContextCache.get(
+    //         ctx,
+    //         `OrderItemEntityResolver.fulfillment(${orderItem.lineId})`,
+    //         () => this.fulfillmentService.getFulfillmentsByOrderLineId(ctx, orderItem.lineId),
+    //     );
+    //     const otherResult = lineFulfillments.find(({ orderItemIds }) =>
+    //         orderItemIds.has(orderItem.id),
+    //     )?.fulfillment;
+    //     return otherResult;
+    // }
 }

packages/core/src/api/resolvers/entity/order-line-entity.resolver.ts

@@ -1,6 +1,6 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 
-import { Asset, Fulfillment, Order, OrderLine, ProductVariant } from '../../../entity';
+import { Asset, FulfillmentLine, Order, OrderLine, ProductVariant } from '../../../entity';
 import { AssetService, FulfillmentService, OrderService, ProductVariantService } from '../../../service';
 import { RequestContext } from '../../common/request-context';
 import { RelationPaths, Relations } from '../../decorators/relations.decorator';
@@ -48,13 +48,11 @@ export class OrderLineEntityResolver {
     }
 
     @ResolveField()
-    async fulfillments(
+    async fulfillmentLines(
         @Ctx() ctx: RequestContext,
         @Parent() orderLine: OrderLine,
         @Relations(Order) relations: RelationPaths<Order>,
-    ): Promise<Fulfillment[]> {
-        return this.fulfillmentService
-            .getFulfillmentsByOrderLineId(ctx, orderLine.id)
-            .then(results => results.map(r => r.fulfillment));
+    ): Promise<FulfillmentLine[]> {
+        return this.fulfillmentService.getFulfillmentsLinesForOrderLine(ctx, orderLine.id);
     }
 }

packages/core/src/api/resolvers/entity/refund-entity.resolver.ts

@@ -1,6 +1,5 @@
 import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
 
-import { OrderItem } from '../../../entity/order-item/order-item.entity';
 import { Refund } from '../../../entity/refund/refund.entity';
 import { OrderService } from '../../../service/services/order.service';
 import { RequestContext } from '../../common/request-context';
@@ -10,12 +9,12 @@ import { Ctx } from '../../decorators/request-context.decorator';
 export class RefundEntityResolver {
     constructor(private orderService: OrderService) {}
 
-    @ResolveField()
-    async orderItems(@Ctx() ctx: RequestContext, @Parent() refund: Refund): Promise<OrderItem[]> {
-        if (refund.orderItems) {
-            return refund.orderItems;
-        } else {
-            return this.orderService.getRefundOrderItems(ctx, refund.id);
-        }
-    }
+    // @ResolveField()
+    // async orderItems(@Ctx() ctx: RequestContext, @Parent() refund: Refund): Promise<OrderItem[]> {
+    //     if (refund.orderItems) {
+    //         return refund.orderItems;
+    //     } else {
+    //         return this.orderService.getRefundOrderItems(ctx, refund.id);
+    //     }
+    // }
 }

packages/core/src/api/resolvers/entity/refund-line-entity.resolver.ts

@@ -0,0 +1,21 @@
+import { Parent, ResolveField, Resolver } from '@nestjs/graphql';
+
+import { TransactionalConnection } from '../../../connection/index';
+import { OrderLine, Refund, RefundLine } from '../../../entity/index';
+import { RequestContext } from '../../common/request-context';
+import { Ctx } from '../../decorators/request-context.decorator';
+
+@Resolver('RefundLine')
+export class RefundLineEntityResolver {
+    constructor(private connection: TransactionalConnection) {}
+
+    @ResolveField()
+    async orderLine(@Ctx() ctx: RequestContext, @Parent() refundLine: RefundLine): Promise<OrderLine> {
+        return await this.connection.getEntityOrThrow(ctx, OrderLine, refundLine.orderLineId);
+    }
+
+    @ResolveField()
+    async refund(@Ctx() ctx: RequestContext, @Parent() refundLine: RefundLine): Promise<Refund> {
+        return this.connection.getEntityOrThrow(ctx, Refund, refundLine.refundId);
+    }
+}

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

@@ -15,13 +15,21 @@ type Payment {
     nextStates: [String!]!
 }
 
+type OrderModificationLine {
+    orderLine: OrderLine!
+    orderLineId: ID!
+    quantity: Int!
+    modification: OrderModification!
+    modificationId: ID!
+}
+
 type OrderModification implements Node {
     id: ID!
     createdAt: DateTime!
     updatedAt: DateTime!
     priceChange: Int!
     note: String!
-    orderItems: [OrderItem!]
+    lines: [OrderModificationLine!]!
     surcharges: [Surcharge!]
     payment: Payment
     refund: Refund

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

@@ -161,7 +161,7 @@ input ModifyOrderInput {
     dryRun: Boolean!
     orderId: ID!
     addItems: [AddItemInput!]
-    adjustOrderLines: [AdjustOrderLineInput!]
+    adjustOrderLines: [OrderLineInput!]
     surcharges: [SurchargeInput!]
     updateShippingAddress: UpdateOrderAddressInput
     updateBillingAddress: UpdateOrderAddressInput
@@ -176,11 +176,6 @@ input AddItemInput {
     quantity: Int!
 }
 
-input AdjustOrderLineInput {
-    orderLineId: ID!
-    quantity: Int!
-}
-
 input OrderLineInput {
     orderLineId: ID!
     quantity: Int!

packages/core/src/api/schema/common/common-types.graphql

@@ -22,6 +22,7 @@ type Adjustment {
     type: AdjustmentType!
     description: String!
     amount: Int!
+    data: JSON
 }
 
 type TaxLine {

packages/core/src/api/schema/common/order.type.graphql

@@ -191,7 +191,8 @@ type OrderLine implements Node {
     "The proratedUnitPrice including tax"
     proratedUnitPriceWithTax: Int!
     quantity: Int!
-    items: [OrderItem!]!
+    "The quantity at the time the Order was placed"
+    orderPlacedQuantity: Int!
     taxRate: Float!
     """
     The total price of the line excluding tax and discounts.
@@ -218,7 +219,7 @@ type OrderLine implements Node {
     discounts: [Discount!]!
     taxLines: [TaxLine!]!
     order: Order!
-    fulfillments: [Fulfillment!]
+    fulfillmentLines: [FulfillmentLine!]
 }
 
 type Payment implements Node {
@@ -234,6 +235,14 @@ type Payment implements Node {
     metadata: JSON
 }
 
+type RefundLine {
+    orderLine: OrderLine!
+    orderLineId: ID!
+    quantity: Int!
+    refund: Refund!
+    refundId: ID!
+}
+
 type Refund implements Node {
     id: ID!
     createdAt: DateTime!
@@ -246,22 +255,25 @@ type Refund implements Node {
     state: String!
     transactionId: String
     reason: String
-    orderItems: [OrderItem!]!
+    lines: [RefundLine!]!
     paymentId: ID!
     metadata: JSON
 }
 
-type FulfillmentLineSummary {
+type FulfillmentLine {
     orderLine: OrderLine!
+    orderLineId: ID!
     quantity: Int!
+    fulfillment: Fulfillment!
+    fulfillmentId: ID!
 }
 
 type Fulfillment implements Node {
     id: ID!
     createdAt: DateTime!
     updatedAt: DateTime!
-    orderItems: [OrderItem!]!
-    summary: [FulfillmentLineSummary!]!
+    lines: [FulfillmentLine!]!
+    summary: [FulfillmentLine!]! @deprecated(reason: "Use the `lines` field instead")
     state: String!
     method: String!
     trackingCode: String

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

@@ -2,10 +2,8 @@ import { HistoryEntryType } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
 
 import { RequestContext } from '../../api/common/request-context';
-import { awaitPromiseOrObservable } from '../../common/index';
+import { awaitPromiseOrObservable, InternalServerError, isGraphQlErrorResult } from '../../common/index';
 import { Fulfillment } from '../../entity/index';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
-import { OrderLine } from '../../entity/order-line/order-line.entity';
 import { Order } from '../../entity/order/order.entity';
 import { orderItemsAreDelivered, orderItemsAreShipped } from '../../service/helpers/utils/order-utils';
 import { FulfillmentState, OrderState } from '../../service/index';
@@ -79,9 +77,10 @@ export const defaultFulfillmentProcess: FulfillmentProcess<FulfillmentState> = {
     },
     async onTransitionEnd(fromState, toState, { ctx, fulfillment, orders }) {
         if (toState === 'Cancelled') {
-            await stockMovementService.createCancellationsForOrderItems(ctx, fulfillment.orderItems);
-            const lines = await groupOrderItemsIntoLines(ctx, fulfillment.orderItems);
-            await stockMovementService.createAllocationsForOrderLines(ctx, lines);
+            const orderLineInput = fulfillment.lines.map(l => ({ orderLineId: l.id, quantity: l.quantity }));
+            await stockMovementService.createCancellationsForOrderLines(ctx, orderLineInput);
+            // const lines = await groupOrderItemsIntoLines(ctx, orderLineInput);
+            await stockMovementService.createAllocationsForOrderLines(ctx, orderLineInput);
         }
         const historyEntryPromises = orders.map(order =>
             historyService.createHistoryEntryForOrder({
@@ -106,31 +105,6 @@ export const defaultFulfillmentProcess: FulfillmentProcess<FulfillmentState> = {
     },
 };
 
-async function groupOrderItemsIntoLines(
-    ctx: RequestContext,
-    orderItems: OrderItem[],
-): Promise<Array<{ orderLine: OrderLine; quantity: number }>> {
-    const orderLineIdQuantityMap = new Map<ID, number>();
-    for (const item of orderItems) {
-        const quantity = orderLineIdQuantityMap.get(item.lineId);
-        if (quantity == null) {
-            orderLineIdQuantityMap.set(item.lineId, 1);
-        } else {
-            orderLineIdQuantityMap.set(item.lineId, quantity + 1);
-        }
-    }
-    const orderLines = await connection
-        .getRepository(ctx, OrderLine)
-        .findByIds([...orderLineIdQuantityMap.keys()], {
-            relations: ['productVariant'],
-        });
-    return orderLines.map(orderLine => ({
-        orderLine,
-        // tslint:disable-next-line:no-non-null-assertion
-        quantity: orderLineIdQuantityMap.get(orderLine.id)!,
-    }));
-}
-
 async function handleFulfillmentStateTransitByOrder(
     ctx: RequestContext,
     order: Order,
@@ -140,8 +114,14 @@ async function handleFulfillmentStateTransitByOrder(
 ): Promise<void> {
     const nextOrderStates = orderService.getNextOrderStates(order);
 
-    const transitionOrderIfStateAvailable = (state: OrderState) =>
-        nextOrderStates.includes(state) && orderService.transitionToState(ctx, order.id, state);
+    const transitionOrderIfStateAvailable = async (state: OrderState) => {
+        if (nextOrderStates.includes(state)) {
+            const result = await orderService.transitionToState(ctx, order.id, state);
+            if (isGraphQlErrorResult(result)) {
+                throw new InternalServerError(result.message);
+            }
+        }
+    };
 
     if (toState === 'Shipped') {
         const orderWithFulfillment = await getOrderWithFulfillments(ctx, order.id);
@@ -163,6 +143,6 @@ async function handleFulfillmentStateTransitByOrder(
 
 async function getOrderWithFulfillments(ctx: RequestContext, orderId: ID) {
     return await connection.getEntityOrThrow(ctx, Order, orderId, {
-        relations: ['lines', 'lines.items', 'lines.items.fulfillments'],
+        relations: ['lines', 'fulfillments', 'fulfillments.lines', 'fulfillments.lines.fulfillment'],
     });
 }

packages/core/src/config/fulfillment/fulfillment-handler.ts

@@ -1,4 +1,4 @@
-import { ConfigArg } from '@vendure/common/lib/generated-types';
+import { ConfigArg, FulfillOrderInput, OrderLineInput } from '@vendure/common/lib/generated-types';
 
 import { RequestContext } from '../../api/common/request-context';
 import {
@@ -9,7 +9,6 @@ import {
 } from '../../common/configurable-operation';
 import { OnTransitionStartFn } from '../../common/finite-state-machine/types';
 import { Fulfillment } from '../../entity/fulfillment/fulfillment.entity';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
 import { Order } from '../../entity/order/order.entity';
 import {
     FulfillmentState,
@@ -35,7 +34,7 @@ export type CreateFulfillmentResult = Partial<Pick<Fulfillment, 'trackingCode' |
 export type CreateFulfillmentFn<T extends ConfigArgs> = (
     ctx: RequestContext,
     orders: Order[],
-    orderItems: OrderItem[],
+    lines: OrderLineInput[],
     args: ConfigArgValues<T>,
 ) => CreateFulfillmentResult | Promise<CreateFulfillmentResult>;
 
@@ -168,10 +167,10 @@ export class FulfillmentHandler<T extends ConfigArgs = ConfigArgs> extends Confi
     createFulfillment(
         ctx: RequestContext,
         orders: Order[],
-        orderItems: OrderItem[],
+        lines: OrderLineInput[],
         args: ConfigArg[],
     ): Partial<Fulfillment> | Promise<Partial<Fulfillment>> {
-        return this.createFulfillmentFn(ctx, orders, orderItems, this.argsArrayToHash(args));
+        return this.createFulfillmentFn(ctx, orders, lines, this.argsArrayToHash(args));
     }
 
     /**

packages/core/src/config/order/changed-price-handling-strategy.ts

@@ -1,13 +1,13 @@
 import { RequestContext } from '../../api/common/request-context';
 import { PriceCalculationResult } from '../../common/types/common-types';
 import { InjectableStrategy } from '../../common/types/injectable-strategy';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
+import { OrderLine } from '../../entity/index';
 import { Order } from '../../entity/order/order.entity';
 
 /**
  * @description
  * This strategy defines how we handle the situation where an OrderItem exists in an Order, and
- * then later on another is added but in the mean time the price of the ProductVariant has changed.
+ * then later on another is added but in the meantime the price of the ProductVariant has changed.
  *
  * By default, the latest price will be used. Any price changes resulting from using a newer price
  * will be reflected in the GraphQL `OrderLine.unitPrice[WithTax]ChangeSinceAdded` field.
@@ -25,7 +25,7 @@ export interface ChangedPriceHandlingStrategy extends InjectableStrategy {
     handlePriceChange(
         ctx: RequestContext,
         current: PriceCalculationResult,
-        existingItems: OrderItem[],
+        orderLine: OrderLine,
         order: Order,
     ): PriceCalculationResult | Promise<PriceCalculationResult>;
 }

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

@@ -4,16 +4,16 @@ import { unique } from '@vendure/common/lib/unique';
 
 import { RequestContext } from '../../api/index';
 import { TransactionalConnection } from '../../connection/transactional-connection';
-import { Order, Payment, ProductVariant } from '../../entity/index';
+import { Order, OrderLine, Payment, ProductVariant } from '../../entity/index';
 import { OrderModification } from '../../entity/order-modification/order-modification.entity';
 import { OrderPlacedEvent } from '../../event-bus/events/order-placed-event';
 import { OrderState } from '../../service/helpers/order-state-machine/order-state';
 import {
-    orderItemsAreAllCancelled,
     orderItemsAreDelivered,
     orderItemsArePartiallyDelivered,
     orderItemsArePartiallyShipped,
     orderItemsAreShipped,
+    orderLinesAreAllCancelled,
     orderTotalIsCovered,
     totalCoveredByPayments,
 } from '../../service/helpers/utils/order-utils';
@@ -357,7 +357,7 @@ export function configureDefaultOrderProcess(options: DefaultOrderProcessOptions
                     fromState !== 'AddingItems' &&
                     fromState !== 'ArrangingPayment'
                 ) {
-                    if (!orderItemsAreAllCancelled(order)) {
+                    if (!orderLinesAreAllCancelled(order)) {
                         return `message.cannot-transition-unless-all-cancelled`;
                     }
                 }
@@ -402,6 +402,13 @@ export function configureDefaultOrderProcess(options: DefaultOrderProcessOptions
                 if (shouldSetAsPlaced) {
                     order.active = false;
                     order.orderPlacedAt = new Date();
+                    await Promise.all(
+                        order.lines.map(line =>
+                            connection
+                                .getRepository(ctx, OrderLine)
+                                .update(line.id, { orderPlacedQuantity: line.quantity }),
+                        ),
+                    );
                     eventBus.publish(new OrderPlacedEvent(fromState, toState, ctx, order));
                     await orderSplitter.createSellerOrders(ctx, order);
                 }
@@ -432,7 +439,7 @@ export function configureDefaultOrderProcess(options: DefaultOrderProcessOptions
 
     async function findOrderWithFulfillments(ctx: RequestContext, id: ID): Promise<Order> {
         return await connection.getEntityOrThrow(ctx, Order, id, {
-            relations: ['lines', 'lines.items', 'lines.items.fulfillments'],
+            relations: ['lines', 'fulfillments', 'fulfillments.lines', 'fulfillments.lines.fulfillment'],
         });
     }
 

packages/core/src/config/promotion/actions/buy-x-get-y-free-action.ts

@@ -2,7 +2,6 @@ import { LanguageCode } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
 
 import { idsAreEqual } from '../../../common/utils';
-import { OrderItem } from '../../../entity';
 import { buyXGetYFreeCondition } from '../conditions/buy-x-get-y-free-condition';
 import { PromotionItemAction } from '../promotion-action';
 
@@ -11,22 +10,18 @@ export const buyXGetYFreeAction = new PromotionItemAction({
     description: [
         {
             languageCode: LanguageCode.en,
-            value:
-                'Buy { amountX } of { variantIdsX } products, get { amountY } of { variantIdsY } products free',
+            value: 'Buy { amountX } of { variantIdsX } products, get { amountY } of { variantIdsY } products free',
         },
     ],
     args: {},
     conditions: [buyXGetYFreeCondition],
-    execute(ctx, orderItem, orderLine, args, state) {
+    execute(ctx, orderLine, args, state) {
         const freeItemIds = state.buy_x_get_y_free.freeItemIds;
-        if (idsContainsItem(freeItemIds, orderItem)) {
-            const unitPrice = ctx.channel.pricesIncludeTax ? orderLine.unitPriceWithTax : orderLine.unitPrice;
-            return -unitPrice;
-        }
+        // TODO: fix me
+        // if (idsContainsItem(freeItemIds, orderItem)) {
+        //     const unitPrice = ctx.channel.pricesIncludeTax ? orderLine.unitPriceWithTax : orderLine.unitPrice;
+        //     return -unitPrice;
+        // }
         return 0;
     },
 });
-
-function idsContainsItem(ids: ID[], item: OrderItem): boolean {
-    return !!ids.find(id => idsAreEqual(id, item.id));
-}

packages/core/src/config/promotion/actions/facet-values-percentage-discount-action.ts

@@ -25,7 +25,7 @@ export const discountOnItemWithFacets = new PromotionItemAction({
     init(injector) {
         facetValueChecker = new FacetValueChecker(injector.get(TransactionalConnection));
     },
-    async execute(ctx, orderItem, orderLine, args) {
+    async execute(ctx, orderLine, args) {
         if (await facetValueChecker.hasFacetValues(orderLine, args.facets, ctx)) {
             const unitPrice = ctx.channel.pricesIncludeTax ? orderLine.unitPriceWithTax : orderLine.unitPrice;
             return -unitPrice * (args.discount / 100);

packages/core/src/config/promotion/actions/product-percentage-discount-action.ts

@@ -24,7 +24,7 @@ export const productsPercentageDiscount = new PromotionItemAction({
         },
     },
 
-    execute(ctx, orderItem, orderLine, args) {
+    execute(ctx, orderLine, args) {
         if (lineContainsIds(args.productVariantIds, orderLine)) {
             const unitPrice = ctx.channel.pricesIncludeTax ? orderLine.unitPriceWithTax : orderLine.unitPrice;
             return -unitPrice * (args.discount / 100);

packages/core/src/config/promotion/conditions/buy-x-get-y-free-condition.ts

@@ -8,8 +8,7 @@ export const buyXGetYFreeCondition = new PromotionCondition({
     description: [
         {
             languageCode: LanguageCode.en,
-            value:
-                'Buy { amountX } of { variantIdsX } products, get { amountY } of { variantIdsY } products free',
+            value: 'Buy { amountX } of { variantIdsX } products, get { amountY } of { variantIdsY } products free',
         },
     ],
     args: {
@@ -38,15 +37,16 @@ export const buyXGetYFreeCondition = new PromotionCondition({
         const xIds = createIdentityMap(args.variantIdsX);
         const yIds = createIdentityMap(args.variantIdsY);
         let matches = 0;
-        const freeItemCandidates = [];
+        // TODO: fix me
+        const freeItemCandidates: any[] = [];
         for (const line of order.lines) {
             const variantId = line.productVariant.id;
             if (variantId in xIds) {
                 matches += line.quantity;
             }
-            if (variantId in yIds) {
-                freeItemCandidates.push(...line.items);
-            }
+            // if (variantId in yIds) {
+            //     freeItemCandidates.push(...line.items);
+            // }
         }
         const quantity = Math.floor(matches / args.amountX);
         if (!quantity || !freeItemCandidates.length) return false;

packages/core/src/config/promotion/index.ts

@@ -31,12 +31,12 @@ export const defaultPromotionActions = [
     discountOnItemWithFacets,
     productsPercentageDiscount,
     freeShipping,
-    buyXGetYFreeAction,
+    // buyXGetYFreeAction,
 ];
 export const defaultPromotionConditions = [
     minimumOrderAmount,
     hasFacetValues,
     containsProducts,
     customerGroup,
-    buyXGetYFreeCondition,
+    // buyXGetYFreeCondition,
 ];

packages/core/src/config/promotion/promotion-action.ts

@@ -9,7 +9,6 @@ import {
     ConfigurableOperationDefOptions,
 } from '../../common/configurable-operation';
 import { Promotion, PromotionState } from '../../entity';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
 import { Order } from '../../entity/order/order.entity';
 import { ShippingLine } from '../../entity/shipping-line/shipping-line.entity';
@@ -72,7 +71,6 @@ export type ConditionState<
  */
 export type ExecutePromotionItemActionFn<T extends ConfigArgs, U extends Array<PromotionCondition<any>>> = (
     ctx: RequestContext,
-    orderItem: OrderItem,
     orderLine: OrderLine,
     args: ConfigArgValues<T>,
     state: ConditionState<U>,
@@ -332,7 +330,6 @@ export class PromotionItemAction<
     /** @internal */
     execute(
         ctx: RequestContext,
-        orderItem: OrderItem,
         orderLine: OrderLine,
         args: ConfigArg[],
         state: PromotionState,
@@ -346,7 +343,6 @@ export class PromotionItemAction<
             : {};
         return this.executeFn(
             ctx,
-            orderItem,
             orderLine,
             this.argsArrayToHash(args),
             actionState as ConditionState<U>,

packages/core/src/config/tax/default-tax-line-calculation-strategy.ts

@@ -11,7 +11,7 @@ import { CalculateTaxLinesArgs, TaxLineCalculationStrategy } from './tax-line-ca
  */
 export class DefaultTaxLineCalculationStrategy implements TaxLineCalculationStrategy {
     calculate(args: CalculateTaxLinesArgs): TaxLine[] {
-        const { orderItem, applicableTaxRate } = args;
-        return [applicableTaxRate.apply(orderItem.proratedUnitPrice)];
+        const { orderLine, applicableTaxRate } = args;
+        return [applicableTaxRate.apply(orderLine.proratedUnitPrice)];
     }
 }

packages/core/src/config/tax/tax-line-calculation-strategy.ts

@@ -2,7 +2,6 @@ import { TaxLine } from '@vendure/common/lib/generated-types';
 
 import { RequestContext } from '../../api/common/request-context';
 import { InjectableStrategy } from '../../common/types/injectable-strategy';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
 import { Order } from '../../entity/order/order.entity';
 import { TaxRate } from '../../entity/tax-rate/tax-rate.entity';
@@ -42,6 +41,5 @@ export interface CalculateTaxLinesArgs {
     ctx: RequestContext;
     order: Order;
     orderLine: OrderLine;
-    orderItem: OrderItem;
     applicableTaxRate: TaxRate;
 }

packages/core/src/entity/entities.ts

@@ -21,7 +21,10 @@ import { GlobalSettings } from './global-settings/global-settings.entity';
 import { CustomerHistoryEntry } from './history-entry/customer-history-entry.entity';
 import { HistoryEntry } from './history-entry/history-entry.entity';
 import { OrderHistoryEntry } from './history-entry/order-history-entry.entity';
-import { OrderItem } from './order-item/order-item.entity';
+import { FulfillmentLine } from './order-line-reference/fulfillment-line.entity';
+import { OrderLineReference } from './order-line-reference/order-line-reference.entity';
+import { OrderModificationLine } from './order-line-reference/order-modification-line.entity';
+import { RefundLine } from './order-line-reference/refund-line.entity';
 import { OrderLine } from './order-line/order-line.entity';
 import { OrderModification } from './order-modification/order-modification.entity';
 import { Order } from './order/order.entity';
@@ -88,13 +91,15 @@ export const coreEntitiesMap = {
     FacetValue,
     FacetValueTranslation,
     Fulfillment,
+    FulfillmentLine,
     GlobalSettings,
     HistoryEntry,
+    OrderModificationLine,
     NativeAuthenticationMethod,
     Order,
     OrderHistoryEntry,
-    OrderItem,
     OrderLine,
+    OrderLineReference,
     OrderModification,
     Payment,
     PaymentMethod,
@@ -111,6 +116,7 @@ export const coreEntitiesMap = {
     ProductVariantTranslation,
     Promotion,
     Refund,
+    RefundLine,
     Release,
     Role,
     Sale,

packages/core/src/entity/fulfillment/fulfillment.entity.ts

@@ -1,11 +1,11 @@
 import { DeepPartial } from '@vendure/common/lib/shared-types';
-import { Column, Entity, ManyToMany, OneToMany } from 'typeorm';
+import { Column, Entity, OneToMany } from 'typeorm';
 
 import { HasCustomFields } from '../../config/custom-field/custom-field-types';
 import { FulfillmentState } from '../../service/helpers/fulfillment-state-machine/fulfillment-state';
 import { VendureEntity } from '../base/base.entity';
 import { CustomFulfillmentFields } from '../custom-entity-fields';
-import { OrderItem } from '../order-item/order-item.entity';
+import { FulfillmentLine } from '../order-line-reference/fulfillment-line.entity';
 
 /**
  * @description
@@ -31,8 +31,8 @@ export class Fulfillment extends VendureEntity implements HasCustomFields {
     @Column()
     handlerCode: string;
 
-    @ManyToMany(type => OrderItem, orderItem => orderItem.fulfillments)
-    orderItems: OrderItem[];
+    @OneToMany(type => FulfillmentLine, fulfillmentLine => fulfillmentLine.fulfillment)
+    lines: FulfillmentLine[];
 
     @Column(type => CustomFulfillmentFields)
     customFields: CustomFulfillmentFields;

packages/core/src/entity/index.ts

@@ -21,8 +21,11 @@ export * from './facet-value/facet-value-translation.entity';
 export * from './fulfillment/fulfillment.entity';
 export * from './global-settings/global-settings.entity';
 export * from './order/order.entity';
-export * from './order-item/order-item.entity';
 export * from './order-line/order-line.entity';
+export * from './order-line-reference/fulfillment-line.entity';
+export * from './order-line-reference/order-modification-line.entity';
+export * from './order-line-reference/order-line-reference.entity';
+export * from './order-line-reference/refund-line.entity';
 export * from './payment/payment.entity';
 export * from './payment-method/payment-method.entity';
 export * from './product/product.entity';

packages/core/src/entity/order-item/order-item.entity.ts

@@ -1,195 +1,195 @@
-import { Adjustment, AdjustmentType, TaxLine } from '@vendure/common/lib/generated-types';
-import { DeepPartial, ID } from '@vendure/common/lib/shared-types';
-import { summate } from '@vendure/common/lib/shared-utils';
-import { Column, Entity, Index, JoinTable, ManyToMany, ManyToOne, OneToOne } from 'typeorm';
-
-import { Calculated } from '../../common/calculated-decorator';
-import { grossPriceOf, netPriceOf } from '../../common/tax-utils';
-import { VendureEntity } from '../base/base.entity';
-import { EntityId } from '../entity-id.decorator';
-import { Fulfillment } from '../fulfillment/fulfillment.entity';
-import { OrderLine } from '../order-line/order-line.entity';
-import { Refund } from '../refund/refund.entity';
-import { Cancellation } from '../stock-movement/cancellation.entity';
-
-/**
- * @description
- * An individual item of an {@link OrderLine}.
- *
- * @docsCategory entities
- */
-@Entity()
-export class OrderItem extends VendureEntity {
-    constructor(input?: DeepPartial<OrderItem>) {
-        super(input);
-    }
-
-    @Index()
-    @ManyToOne(type => OrderLine, line => line.items, { onDelete: 'CASCADE' })
-    line: OrderLine;
-
-    @EntityId()
-    lineId: ID; // TypeORM requires this ID field on the entity explicitly in order to save the foreign key via `.insert`
-
-    /**
-     * @description
-     * The price as calculated when the OrderItem was first added to the Order. Usually will be identical to the
-     * `listPrice`, except when the ProductVariant price has changed in the mean time and a re-calculation of
-     * the Order has been performed.
-     */
-    @Column({ nullable: true })
-    initialListPrice: number;
-
-    /**
-     * @description
-     * This is the price as listed by the ProductVariant (and possibly modified by the {@link OrderItemPriceCalculationStrategy}),
-     * which, depending on the current Channel, may or may not include tax.
-     */
-    @Column()
-    listPrice: number;
-
-    /**
-     * @description
-     * Whether or not the listPrice includes tax, which depends on the settings
-     * of the current Channel.
-     */
-    @Column()
-    listPriceIncludesTax: boolean;
-
-    @Column('simple-json')
-    adjustments: Adjustment[];
-
-    @Column('simple-json')
-    taxLines: TaxLine[];
-
-    @ManyToMany(type => Fulfillment, fulfillment => fulfillment.orderItems)
-    @JoinTable()
-    fulfillments: Fulfillment[];
-
-    @Index()
-    @ManyToOne(type => Refund)
-    refund: Refund;
-
-    @EntityId({ nullable: true })
-    refundId: ID | null;
-
-    @OneToOne(type => Cancellation, cancellation => cancellation.orderItem)
-    cancellation: Cancellation;
-
-    @Column({ default: false })
-    cancelled: boolean;
-
-    get fulfillment(): Fulfillment | undefined {
-        return this.fulfillments?.find(f => f.state !== 'Cancelled');
-    }
-
-    /**
-     * @description
-     * The price of a single unit, excluding tax and discounts.
-     */
-    @Calculated()
-    get unitPrice(): number {
-        return this.listPriceIncludesTax ? netPriceOf(this.listPrice, this.taxRate) : this.listPrice;
-    }
-
-    /**
-     * @description
-     * The price of a single unit, including tax but excluding discounts.
-     */
-    @Calculated()
-    get unitPriceWithTax(): number {
-        return this.listPriceIncludesTax ? this.listPrice : grossPriceOf(this.listPrice, this.taxRate);
-    }
-
-    /**
-     * @description
-     * The total applicable tax rate, which is the sum of all taxLines on this
-     * OrderItem.
-     */
-    @Calculated()
-    get taxRate(): number {
-        return summate(this.taxLines, 'taxRate');
-    }
-
-    @Calculated()
-    get unitTax(): number {
-        return this.unitPriceWithTax - this.unitPrice;
-    }
-
-    /**
-     * @description
-     * The price of a single unit including discounts, excluding tax.
-     *
-     * If Order-level discounts have been applied, this will not be the
-     * actual taxable unit price (see `proratedUnitPrice`), but is generally the
-     * correct price to display to customers to avoid confusion
-     * about the internal handling of distributed Order-level discounts.
-     */
-    @Calculated()
-    get discountedUnitPrice(): number {
-        const result = this.listPrice + this.getAdjustmentsTotal(AdjustmentType.PROMOTION);
-        return this.listPriceIncludesTax ? netPriceOf(result, this.taxRate) : result;
-    }
-
-    /**
-     * @description
-     * The price of a single unit including discounts and tax.
-     */
-    @Calculated()
-    get discountedUnitPriceWithTax(): number {
-        const result = this.listPrice + this.getAdjustmentsTotal(AdjustmentType.PROMOTION);
-        return this.listPriceIncludesTax ? result : grossPriceOf(result, this.taxRate);
-    }
-
-    /**
-     * @description
-     * The actual unit price, taking into account both item discounts _and_ prorated (proportionally-distributed)
-     * Order-level discounts. This value is the true economic value of the OrderItem, and is used in tax
-     * and refund calculations.
-     */
-    @Calculated()
-    get proratedUnitPrice(): number {
-        const result = this.listPrice + this.getAdjustmentsTotal();
-        return this.listPriceIncludesTax ? netPriceOf(result, this.taxRate) : result;
-    }
-
-    /**
-     * @description
-     * The `proratedUnitPrice` including tax.
-     */
-    @Calculated()
-    get proratedUnitPriceWithTax(): number {
-        const result = this.listPrice + this.getAdjustmentsTotal();
-        return this.listPriceIncludesTax ? result : grossPriceOf(result, this.taxRate);
-    }
-
-    @Calculated()
-    get proratedUnitTax(): number {
-        return this.proratedUnitPriceWithTax - this.proratedUnitPrice;
-    }
-
-    /**
-     * @description
-     * The total of all price adjustments. Will typically be a negative number due to discounts.
-     */
-    private getAdjustmentsTotal(type?: AdjustmentType): number {
-        if (!this.adjustments) {
-            return 0;
-        }
-        return this.adjustments
-            .filter(adjustment => (type ? adjustment.type === type : true))
-            .reduce((total, a) => total + a.amount, 0);
-    }
-
-    addAdjustment(adjustment: Adjustment) {
-        this.adjustments = this.adjustments.concat(adjustment);
-    }
-
-    clearAdjustments(type?: AdjustmentType) {
-        if (!type) {
-            this.adjustments = [];
-        } else {
-            this.adjustments = this.adjustments ? this.adjustments.filter(a => a.type !== type) : [];
-        }
-    }
-}
+// import { Adjustment, AdjustmentType, TaxLine } from '@vendure/common/lib/generated-types';
+// import { DeepPartial, ID } from '@vendure/common/lib/shared-types';
+// import { summate } from '@vendure/common/lib/shared-utils';
+// import { Column, Entity, Index, JoinTable, ManyToMany, ManyToOne, OneToOne } from 'typeorm';
+//
+// import { Calculated } from '../../common/calculated-decorator';
+// import { grossPriceOf, netPriceOf } from '../../common/tax-utils';
+// import { VendureEntity } from '../base/base.entity';
+// import { EntityId } from '../entity-id.decorator';
+// import { Fulfillment } from '../fulfillment/fulfillment.entity';
+// import { OrderLine } from '../order-line/order-line.entity';
+// import { Refund } from '../refund/refund.entity';
+// import { Cancellation } from '../stock-movement/cancellation.entity';
+//
+// /**
+//  * @description
+//  * An individual item of an {@link OrderLine}.
+//  *
+//  * @docsCategory entities
+//  */
+// @Entity()
+// export class OrderItem extends VendureEntity {
+//     constructor(input?: DeepPartial<OrderItem>) {
+//         super(input);
+//     }
+//
+//     @Index()
+//     @ManyToOne(type => OrderLine)
+//     line: OrderLine;
+//
+//     @EntityId()
+//     lineId: ID; // TypeORM requires this ID field on the entity explicitly in order to save the foreign key via `.insert`
+//
+//     /**
+//      * @description
+//      * The price as calculated when the OrderItem was first added to the Order. Usually will be identical to the
+//      * `listPrice`, except when the ProductVariant price has changed in the mean time and a re-calculation of
+//      * the Order has been performed.
+//      */
+//     @Column({ nullable: true })
+//     initialListPrice: number;
+//
+//     /**
+//      * @description
+//      * This is the price as listed by the ProductVariant (and possibly modified by the {@link OrderItemPriceCalculationStrategy}),
+//      * which, depending on the current Channel, may or may not include tax.
+//      */
+//     @Column()
+//     listPrice: number;
+//
+//     /**
+//      * @description
+//      * Whether or not the listPrice includes tax, which depends on the settings
+//      * of the current Channel.
+//      */
+//     @Column()
+//     listPriceIncludesTax: boolean;
+//
+//     @Column('simple-json')
+//     adjustments: Adjustment[];
+//
+//     @Column('simple-json')
+//     taxLines: TaxLine[];
+//
+//     @ManyToMany(type => Fulfillment, fulfillment => fulfillment.orderItems)
+//     @JoinTable()
+//     fulfillments: Fulfillment[];
+//
+//     @Index()
+//     @ManyToOne(type => Refund)
+//     refund: Refund;
+//
+//     @EntityId({ nullable: true })
+//     refundId: ID | null;
+//
+//     @OneToOne(type => Cancellation, cancellation => cancellation.orderItem)
+//     cancellation: Cancellation;
+//
+//     @Column({ default: false })
+//     cancelled: boolean;
+//
+//     get fulfillment(): Fulfillment | undefined {
+//         return this.fulfillments?.find(f => f.state !== 'Cancelled');
+//     }
+//
+//     /**
+//      * @description
+//      * The price of a single unit, excluding tax and discounts.
+//      */
+//     @Calculated()
+//     get unitPrice(): number {
+//         return this.listPriceIncludesTax ? netPriceOf(this.listPrice, this.taxRate) : this.listPrice;
+//     }
+//
+//     /**
+//      * @description
+//      * The price of a single unit, including tax but excluding discounts.
+//      */
+//     @Calculated()
+//     get unitPriceWithTax(): number {
+//         return this.listPriceIncludesTax ? this.listPrice : grossPriceOf(this.listPrice, this.taxRate);
+//     }
+//
+//     /**
+//      * @description
+//      * The total applicable tax rate, which is the sum of all taxLines on this
+//      * OrderItem.
+//      */
+//     @Calculated()
+//     get taxRate(): number {
+//         return summate(this.taxLines, 'taxRate');
+//     }
+//
+//     @Calculated()
+//     get unitTax(): number {
+//         return this.unitPriceWithTax - this.unitPrice;
+//     }
+//
+//     /**
+//      * @description
+//      * The price of a single unit including discounts, excluding tax.
+//      *
+//      * If Order-level discounts have been applied, this will not be the
+//      * actual taxable unit price (see `proratedUnitPrice`), but is generally the
+//      * correct price to display to customers to avoid confusion
+//      * about the internal handling of distributed Order-level discounts.
+//      */
+//     @Calculated()
+//     get discountedUnitPrice(): number {
+//         const result = this.listPrice + this.getAdjustmentsTotal(AdjustmentType.PROMOTION);
+//         return this.listPriceIncludesTax ? netPriceOf(result, this.taxRate) : result;
+//     }
+//
+//     /**
+//      * @description
+//      * The price of a single unit including discounts and tax.
+//      */
+//     @Calculated()
+//     get discountedUnitPriceWithTax(): number {
+//         const result = this.listPrice + this.getAdjustmentsTotal(AdjustmentType.PROMOTION);
+//         return this.listPriceIncludesTax ? result : grossPriceOf(result, this.taxRate);
+//     }
+//
+//     /**
+//      * @description
+//      * The actual unit price, taking into account both item discounts _and_ prorated (proportionally-distributed)
+//      * Order-level discounts. This value is the true economic value of the OrderItem, and is used in tax
+//      * and refund calculations.
+//      */
+//     @Calculated()
+//     get proratedUnitPrice(): number {
+//         const result = this.listPrice + this.getAdjustmentsTotal();
+//         return this.listPriceIncludesTax ? netPriceOf(result, this.taxRate) : result;
+//     }
+//
+//     /**
+//      * @description
+//      * The `proratedUnitPrice` including tax.
+//      */
+//     @Calculated()
+//     get proratedUnitPriceWithTax(): number {
+//         const result = this.listPrice + this.getAdjustmentsTotal();
+//         return this.listPriceIncludesTax ? result : grossPriceOf(result, this.taxRate);
+//     }
+//
+//     @Calculated()
+//     get proratedUnitTax(): number {
+//         return this.proratedUnitPriceWithTax - this.proratedUnitPrice;
+//     }
+//
+//     /**
+//      * @description
+//      * The total of all price adjustments. Will typically be a negative number due to discounts.
+//      */
+//     private getAdjustmentsTotal(type?: AdjustmentType): number {
+//         if (!this.adjustments) {
+//             return 0;
+//         }
+//         return this.adjustments
+//             .filter(adjustment => (type ? adjustment.type === type : true))
+//             .reduce((total, a) => total + a.amount, 0);
+//     }
+//
+//     addAdjustment(adjustment: Adjustment) {
+//         this.adjustments = this.adjustments.concat(adjustment);
+//     }
+//
+//     clearAdjustments(type?: AdjustmentType) {
+//         if (!type) {
+//             this.adjustments = [];
+//         } else {
+//             this.adjustments = this.adjustments ? this.adjustments.filter(a => a.type !== type) : [];
+//         }
+//     }
+// }

packages/core/src/entity/order-line-reference/fulfillment-line.entity.ts

@@ -0,0 +1,28 @@
+import { DeepPartial, ID } from '@vendure/common/lib/shared-types';
+import { ChildEntity, Index, ManyToOne } from 'typeorm';
+
+import { EntityId } from '../entity-id.decorator';
+import { Fulfillment } from '../fulfillment/fulfillment.entity';
+
+import { OrderLineReference } from './order-line-reference.entity';
+
+/**
+ * @description
+ * This entity represents a fulfillment of an Order or part of it, i.e. the {@link OrderItem}s have been
+ * delivered to the Customer after successful payment.
+ *
+ * @docsCategory entities
+ */
+@ChildEntity()
+export class FulfillmentLine extends OrderLineReference {
+    constructor(input?: DeepPartial<FulfillmentLine>) {
+        super(input);
+    }
+
+    @Index()
+    @ManyToOne(type => Fulfillment, fulfillment => fulfillment.lines)
+    fulfillment: Fulfillment;
+
+    @EntityId()
+    fulfillmentId: ID;
+}

packages/core/src/entity/order-line-reference/order-line-reference.entity.ts

@@ -0,0 +1,27 @@
+import { ID } from '@vendure/common/lib/shared-types';
+import { Column, Entity, Index, ManyToOne, TableInheritance } from 'typeorm';
+
+import { VendureEntity } from '../base/base.entity';
+import { EntityId } from '../entity-id.decorator';
+import { OrderLine } from '../order-line/order-line.entity';
+
+/**
+ * @description
+ * This entity represents a fulfillment of an Order or part of it, i.e. the {@link OrderItem}s have been
+ * delivered to the Customer after successful payment.
+ *
+ * @docsCategory entities
+ */
+@Entity()
+@TableInheritance({ column: { type: 'varchar', name: 'discriminator' } })
+export abstract class OrderLineReference extends VendureEntity {
+    @Column()
+    quantity: number;
+
+    @Index()
+    @ManyToOne(type => OrderLine, { onDelete: 'CASCADE' })
+    orderLine: OrderLine;
+
+    @EntityId()
+    orderLineId: ID;
+}

packages/core/src/entity/order-line-reference/order-modification-line.entity.ts

@@ -0,0 +1,28 @@
+import { DeepPartial, ID } from '@vendure/common/lib/shared-types';
+import { ChildEntity, Index, ManyToOne } from 'typeorm';
+
+import { EntityId } from '../entity-id.decorator';
+import { OrderModification } from '../order-modification/order-modification.entity';
+
+import { OrderLineReference } from './order-line-reference.entity';
+
+/**
+ * @description
+ * This entity represents a fulfillment of an Order or part of it, i.e. the {@link OrderItem}s have been
+ * delivered to the Customer after successful payment.
+ *
+ * @docsCategory entities
+ */
+@ChildEntity()
+export class OrderModificationLine extends OrderLineReference {
+    constructor(input?: DeepPartial<OrderModificationLine>) {
+        super(input);
+    }
+
+    @Index()
+    @ManyToOne(type => OrderModification, modification => modification.lines)
+    modification: OrderModification;
+
+    @EntityId()
+    modificationId: ID;
+}

packages/core/src/entity/order-line-reference/refund-line.entity.ts

@@ -0,0 +1,28 @@
+import { DeepPartial, ID } from '@vendure/common/lib/shared-types';
+import { ChildEntity, Index, ManyToOne } from 'typeorm';
+
+import { EntityId } from '../entity-id.decorator';
+import { Refund } from '../refund/refund.entity';
+
+import { OrderLineReference } from './order-line-reference.entity';
+
+/**
+ * @description
+ * This entity represents a fulfillment of an Order or part of it, i.e. the {@link OrderItem}s have been
+ * delivered to the Customer after successful payment.
+ *
+ * @docsCategory entities
+ */
+@ChildEntity()
+export class RefundLine extends OrderLineReference {
+    constructor(input?: DeepPartial<RefundLine>) {
+        super(input);
+    }
+
+    @Index()
+    @ManyToOne(type => Refund, refund => refund.lines)
+    refund: Refund;
+
+    @EntityId()
+    refundId: ID;
+}

packages/core/src/entity/order-line/order-line.entity.ts

@@ -1,21 +1,20 @@
 import { Adjustment, AdjustmentType, Discount, TaxLine } from '@vendure/common/lib/generated-types';
 import { DeepPartial, ID } from '@vendure/common/lib/shared-types';
 import { summate } from '@vendure/common/lib/shared-utils';
-import { Column, Entity, Index, ManyToOne, OneToMany } from 'typeorm';
+import { Column, Entity, Index, ManyToOne, OneToOne } from 'typeorm';
 
 import { Calculated } from '../../common/calculated-decorator';
 import { grossPriceOf, netPriceOf } from '../../common/tax-utils';
 import { HasCustomFields } from '../../config/custom-field/custom-field-types';
-import { Logger } from '../../config/index';
 import { Asset } from '../asset/asset.entity';
 import { VendureEntity } from '../base/base.entity';
 import { Channel } from '../channel/channel.entity';
 import { CustomOrderLineFields } from '../custom-entity-fields';
 import { EntityId } from '../entity-id.decorator';
-import { OrderItem } from '../order-item/order-item.entity';
 import { Order } from '../order/order.entity';
 import { ProductVariant } from '../product-variant/product-variant.entity';
 import { ShippingLine } from '../shipping-line/shipping-line.entity';
+import { Cancellation } from '../stock-movement/cancellation.entity';
 import { TaxCategory } from '../tax-category/tax-category.entity';
 
 /**
@@ -47,6 +46,9 @@ export class OrderLine extends VendureEntity implements HasCustomFields {
     @ManyToOne(type => ProductVariant)
     productVariant: ProductVariant;
 
+    @EntityId()
+    productVariantId: ID;
+
     @Index()
     @ManyToOne(type => TaxCategory)
     taxCategory: TaxCategory;
@@ -55,13 +57,57 @@ export class OrderLine extends VendureEntity implements HasCustomFields {
     @ManyToOne(type => Asset)
     featuredAsset: Asset;
 
-    @OneToMany(type => OrderItem, item => item.line, { eager: true })
-    items: OrderItem[];
+    // @OneToMany(type => OrderItem, item => item.line, { eager: true })
+    // items: OrderItem[];
 
     @Index()
     @ManyToOne(type => Order, order => order.lines, { onDelete: 'CASCADE' })
     order: Order;
 
+    @Column()
+    quantity: number;
+
+    /**
+     * @description
+     * The quantity of this OrderLine at the time the order was placed (as per the {@link OrderPlacedStrategy}).
+     */
+    @Column({ default: 0 })
+    orderPlacedQuantity: number;
+
+    /**
+     * @description
+     * The price as calculated when the OrderItem was first added to the Order. Usually will be identical to the
+     * `listPrice`, except when the ProductVariant price has changed in the mean time and a re-calculation of
+     * the Order has been performed.
+     */
+    @Column({ nullable: true })
+    initialListPrice: number;
+
+    /**
+     * @description
+     * This is the price as listed by the ProductVariant (and possibly modified by the {@link OrderItemPriceCalculationStrategy}),
+     * which, depending on the current Channel, may or may not include tax.
+     */
+    @Column()
+    listPrice: number;
+
+    /**
+     * @description
+     * Whether or not the listPrice includes tax, which depends on the settings
+     * of the current Channel.
+     */
+    @Column()
+    listPriceIncludesTax: boolean;
+
+    @Column('simple-json')
+    adjustments: Adjustment[];
+
+    @Column('simple-json')
+    taxLines: TaxLine[];
+
+    @OneToOne(type => Cancellation, cancellation => cancellation.orderLine)
+    cancellation: Cancellation;
+
     @Column(type => CustomOrderLineFields)
     customFields: CustomOrderLineFields;
 
@@ -69,31 +115,27 @@ export class OrderLine extends VendureEntity implements HasCustomFields {
      * @description
      * The price of a single unit, excluding tax and discounts.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get unitPrice(): number {
-        return this.firstActiveItemPropOr('unitPrice', 0);
+        return this.listPriceIncludesTax ? netPriceOf(this.listPrice, this.taxRate) : this.listPrice;
     }
 
     /**
      * @description
      * The price of a single unit, including tax but excluding discounts.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get unitPriceWithTax(): number {
-        return this.firstActiveItemPropOr('unitPriceWithTax', 0);
+        return this.listPriceIncludesTax ? this.listPrice : grossPriceOf(this.listPrice, this.taxRate);
     }
 
     /**
      * @description
      * Non-zero if the `unitPrice` has changed since it was initially added to Order.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get unitPriceChangeSinceAdded(): number {
-        const firstItem = this.activeItems[0];
-        if (!firstItem) {
-            return 0;
-        }
-        const { initialListPrice, listPriceIncludesTax } = firstItem;
+        const { initialListPrice, listPriceIncludesTax } = this;
         const initialPrice = listPriceIncludesTax
             ? netPriceOf(initialListPrice, this.taxRate)
             : initialListPrice;
@@ -104,13 +146,9 @@ export class OrderLine extends VendureEntity implements HasCustomFields {
      * @description
      * Non-zero if the `unitPriceWithTax` has changed since it was initially added to Order.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get unitPriceWithTaxChangeSinceAdded(): number {
-        const firstItem = this.activeItems[0];
-        if (!firstItem) {
-            return 0;
-        }
-        const { initialListPrice, listPriceIncludesTax } = firstItem;
+        const { initialListPrice, listPriceIncludesTax } = this;
         const initialPriceWithTax = listPriceIncludesTax
             ? initialListPrice
             : grossPriceOf(initialListPrice, this.taxRate);
@@ -126,18 +164,20 @@ export class OrderLine extends VendureEntity implements HasCustomFields {
      * correct price to display to customers to avoid confusion
      * about the internal handling of distributed Order-level discounts.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get discountedUnitPrice(): number {
-        return this.firstActiveItemPropOr('discountedUnitPrice', 0);
+        const result = this.listPrice + this.getAdjustmentsTotal(AdjustmentType.PROMOTION);
+        return this.listPriceIncludesTax ? netPriceOf(result, this.taxRate) : result;
     }
 
     /**
      * @description
      * The price of a single unit including discounts and tax
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get discountedUnitPriceWithTax(): number {
-        return this.firstActiveItemPropOr('discountedUnitPriceWithTax', 0);
+        const result = this.listPrice + this.getAdjustmentsTotal(AdjustmentType.PROMOTION);
+        return this.listPriceIncludesTax ? result : grossPriceOf(result, this.taxRate);
     }
 
     /**
@@ -146,91 +186,123 @@ export class OrderLine extends VendureEntity implements HasCustomFields {
      * Order-level discounts. This value is the true economic value of the OrderItem, and is used in tax
      * and refund calculations.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get proratedUnitPrice(): number {
-        return this.firstActiveItemPropOr('proratedUnitPrice', 0);
+        const result = this.listPrice + this.getAdjustmentsTotal();
+        return this.listPriceIncludesTax ? netPriceOf(result, this.taxRate) : result;
     }
 
     /**
      * @description
      * The `proratedUnitPrice` including tax.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get proratedUnitPriceWithTax(): number {
-        return this.firstActiveItemPropOr('proratedUnitPriceWithTax', 0);
+        const result = this.listPrice + this.getAdjustmentsTotal();
+        return this.listPriceIncludesTax ? result : grossPriceOf(result, this.taxRate);
     }
 
-    @Calculated({ relations: ['items'] })
-    get quantity(): number {
-        return this.activeItems.length;
+    @Calculated()
+    get unitTax(): number {
+        return this.unitPriceWithTax - this.unitPrice;
     }
 
-    @Calculated({ relations: ['items'] })
-    get adjustments(): Adjustment[] {
-        return this.activeItems.reduce(
-            (adjustments, item) => [...adjustments, ...(item.adjustments || [])],
-            [] as Adjustment[],
-        );
+    @Calculated()
+    get proratedUnitTax(): number {
+        return this.proratedUnitPriceWithTax - this.proratedUnitPrice;
     }
 
-    @Calculated({ relations: ['items'] })
-    get taxLines(): TaxLine[] {
-        return this.firstActiveItemPropOr('taxLines', []);
+    /**
+     * @description
+     * The total of all price adjustments. Will typically be a negative number due to discounts.
+     */
+    private getAdjustmentsTotal(type?: AdjustmentType): number {
+        if (!this.adjustments || this.quantity === 0) {
+            return 0;
+        }
+        return Math.round(
+            this.adjustments
+                .filter(adjustment => (type ? adjustment.type === type : true))
+                .map(adjustment => adjustment.amount / Math.max(this.orderPlacedQuantity, this.quantity))
+                .reduce((total, a) => total + a, 0),
+        );
     }
 
-    @Calculated({ relations: ['items'] })
+    /*@Calculated()
+    get quantity(): number {
+        return this.activeItems.length;
+    }*/
+
+    // @Calculated({relations: ['items']})
+    // get adjustments(): Adjustment[] {
+    //     return this.activeItems.reduce(
+    //         (adjustments, item) => [...adjustments, ...(item.adjustments || [])],
+    //         [] as Adjustment[],
+    //     );
+    // }
+
+    // @Calculated({relations: ['items']})
+    // get taxLines(): TaxLine[] {
+    //     return this.firstActiveItemPropOr('taxLines', []);
+    // }
+
+    @Calculated()
     get taxRate(): number {
-        return this.firstActiveItemPropOr('taxRate', 0);
+        return summate(this.taxLines, 'taxRate');
     }
 
     /**
      * @description
      * The total price of the line excluding tax and discounts.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get linePrice(): number {
-        return summate(this.activeItems, 'unitPrice');
+        return this.unitPrice * this.quantity;
     }
 
     /**
      * @description
      * The total price of the line including tax but excluding discounts.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get linePriceWithTax(): number {
-        return summate(this.activeItems, 'unitPriceWithTax');
+        return this.unitPriceWithTax * this.quantity;
     }
 
     /**
      * @description
      * The price of the line including discounts, excluding tax.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get discountedLinePrice(): number {
-        return summate(this.activeItems, 'discountedUnitPrice');
+        return this.discountedUnitPrice * this.quantity;
     }
 
     /**
      * @description
      * The price of the line including discounts and tax.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get discountedLinePriceWithTax(): number {
-        return summate(this.activeItems, 'discountedUnitPriceWithTax');
+        return this.discountedUnitPriceWithTax * this.quantity;
     }
 
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get discounts(): Discount[] {
-        const priceIncludesTax = this.items?.[0]?.listPriceIncludesTax ?? false;
+        const priceIncludesTax = this.listPriceIncludesTax;
         // Group discounts together, so that it does not list a new
         // discount row for each OrderItem in the line
         const groupedDiscounts = new Map<string, Discount>();
         for (const adjustment of this.adjustments) {
             const discountGroup = groupedDiscounts.get(adjustment.adjustmentSource);
-            const amount = priceIncludesTax ? netPriceOf(adjustment.amount, this.taxRate) : adjustment.amount;
+            const unitAdjustmentAmount =
+                (adjustment.amount / Math.max(this.orderPlacedQuantity, this.quantity)) * this.quantity;
+            const amount = priceIncludesTax
+                ? netPriceOf(unitAdjustmentAmount, this.taxRate)
+                : unitAdjustmentAmount;
             const amountWithTax = priceIncludesTax
-                ? adjustment.amount
-                : grossPriceOf(adjustment.amount, this.taxRate);
+                ? unitAdjustmentAmount
+                : grossPriceOf(unitAdjustmentAmount, this.taxRate);
             if (discountGroup) {
                 discountGroup.amount += amount;
                 discountGroup.amountWithTax += amountWithTax;
@@ -249,9 +321,9 @@ export class OrderLine extends VendureEntity implements HasCustomFields {
      * @description
      * The total tax on this line.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get lineTax(): number {
-        return summate(this.activeItems, 'unitTax');
+        return this.unitTax * this.quantity;
     }
 
     /**
@@ -260,43 +332,39 @@ export class OrderLine extends VendureEntity implements HasCustomFields {
      * Order-level discounts. This value is the true economic value of the OrderLine, and is used in tax
      * and refund calculations.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get proratedLinePrice(): number {
-        return summate(this.activeItems, 'proratedUnitPrice');
+        return this.proratedUnitPrice * this.quantity;
     }
 
     /**
      * @description
      * The `proratedLinePrice` including tax.
      */
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get proratedLinePriceWithTax(): number {
-        return summate(this.activeItems, 'proratedUnitPriceWithTax');
+        return this.proratedUnitPriceWithTax * this.quantity;
     }
 
-    @Calculated({ relations: ['items'] })
+    @Calculated()
     get proratedLineTax(): number {
-        return summate(this.activeItems, 'proratedUnitTax');
+        return this.proratedUnitTax * this.quantity;
     }
 
     /**
      * Returns all non-cancelled OrderItems on this line.
      */
-    get activeItems(): OrderItem[] {
-        if (this.items == null) {
-            Logger.warn(
-                `Attempted to access OrderLine.items without first joining the relation: { relations: ['items'] }`,
-            );
-        }
-        return (this.items || []).filter(i => !i.cancelled);
-    }
-
-    /**
-     * Returns the first OrderItems of the line (i.e. the one with the earliest
-     * `createdAt` property).
-     */
-    get firstItem(): OrderItem | undefined {
-        return (this.items ?? []).sort((a, b) => +a.createdAt - +b.createdAt)[0];
+    // get activeItems(): OrderItem[] {
+    //     if (this.items == null) {
+    //         Logger.warn(
+    //             `Attempted to access OrderLine.items without first joining the relation: `,
+    //         );
+    //     }
+    //     return (this.items || []).filter(i => !i.cancelled);
+    // }
+
+    addAdjustment(adjustment: Adjustment) {
+        this.adjustments = this.adjustments.concat(adjustment);
     }
 
     /**
@@ -304,20 +372,10 @@ export class OrderLine extends VendureEntity implements HasCustomFields {
      * is specified, then all adjustments are removed.
      */
     clearAdjustments(type?: AdjustmentType) {
-        this.items.forEach(item => item.clearAdjustments(type));
-    }
-
-    /**
-     * @description
-     * Fetches the specified property of the first active (non-cancelled) OrderItem.
-     * If all OrderItems are cancelled (e.g. in a full cancelled Order), then fetches from
-     * the first OrderItem.
-     */
-    private firstActiveItemPropOr<K extends keyof OrderItem>(
-        prop: K,
-        defaultVal: OrderItem[K],
-    ): OrderItem[K] {
-        const items = this.activeItems.length ? this.activeItems : this.items ?? [];
-        return items.length ? items[0][prop] : defaultVal;
+        if (!type) {
+            this.adjustments = [];
+        } else {
+            this.adjustments = this.adjustments ? this.adjustments.filter(a => a.type !== type) : [];
+        }
     }
 }

packages/core/src/entity/order-modification/order-modification.entity.ts

@@ -1,24 +1,13 @@
-import { Adjustment, OrderAddress } from '@vendure/common/lib/generated-types';
+import { OrderAddress } from '@vendure/common/lib/generated-types';
 import { DeepPartial } from '@vendure/common/lib/shared-types';
-import {
-    Column,
-    Entity,
-    Index,
-    JoinColumn,
-    JoinTable,
-    ManyToMany,
-    ManyToOne,
-    OneToMany,
-    OneToOne,
-} from 'typeorm';
+import { Column, Entity, Index, JoinColumn, ManyToOne, OneToMany, OneToOne } from 'typeorm';
 
 import { Calculated } from '../../common/calculated-decorator';
 import { VendureEntity } from '../base/base.entity';
-import { OrderItem } from '../order-item/order-item.entity';
+import { OrderModificationLine } from '../order-line-reference/order-modification-line.entity';
 import { Order } from '../order/order.entity';
 import { Payment } from '../payment/payment.entity';
 import { Refund } from '../refund/refund.entity';
-import { Cancellation } from '../stock-movement/cancellation.entity';
 import { Surcharge } from '../surcharge/surcharge.entity';
 
 /**
@@ -41,9 +30,8 @@ export class OrderModification extends VendureEntity {
     @ManyToOne(type => Order, order => order.modifications, { onDelete: 'CASCADE' })
     order: Order;
 
-    @ManyToMany(type => OrderItem)
-    @JoinTable()
-    orderItems: OrderItem[];
+    @OneToMany(type => OrderModificationLine, line => line.modification)
+    lines: OrderModificationLine[];
 
     @OneToMany(type => Surcharge, surcharge => surcharge.orderModification)
     surcharges: Surcharge[];

packages/core/src/entity/order/order.entity.ts

@@ -20,7 +20,7 @@ import { Channel } from '../channel/channel.entity';
 import { CustomOrderFields } from '../custom-entity-fields';
 import { Customer } from '../customer/customer.entity';
 import { EntityId } from '../entity-id.decorator';
-import { OrderItem } from '../order-item/order-item.entity';
+import { Fulfillment } from '../fulfillment/fulfillment.entity';
 import { OrderLine } from '../order-line/order-line.entity';
 import { OrderModification } from '../order-modification/order-modification.entity';
 import { Payment } from '../payment/payment.entity';
@@ -128,6 +128,10 @@ export class Order extends VendureEntity implements ChannelAware, HasCustomField
     @OneToMany(type => Payment, payment => payment.order)
     payments: Payment[];
 
+    @ManyToMany(type => Fulfillment)
+    @JoinTable()
+    fulfillments: Fulfillment[];
+
     @Column('varchar')
     currencyCode: CurrencyCode;
 
@@ -178,7 +182,7 @@ export class Order extends VendureEntity implements ChannelAware, HasCustomField
     @Column({ default: 0 })
     shippingWithTax: number;
 
-    @Calculated({ relations: ['lines', 'lines.items', 'shippingLines'] })
+    @Calculated({ relations: ['lines', 'shippingLines'] })
     get discounts(): Discount[] {
         this.throwIfLinesNotJoined('discounts');
         const groupedAdjustments = new Map<string, Discount>();
@@ -256,16 +260,15 @@ export class Order extends VendureEntity implements ChannelAware, HasCustomField
     }
 
     @Calculated({
-        relations: ['lines', 'lines.items'],
+        relations: ['lines'],
         query: qb => {
             qb.leftJoin(
                 qb1 => {
                     return qb1
                         .from(Order, 'order')
-                        .select('COUNT(DISTINCT items.id)', 'qty')
+                        .select('SUM(lines.quantity)', 'qty')
                         .addSelect('order.id', 'oid')
                         .leftJoin('order.lines', 'lines')
-                        .leftJoin('lines.items', 'items')
                         .groupBy('order.id');
                 },
                 't1',
@@ -283,7 +286,7 @@ export class Order extends VendureEntity implements ChannelAware, HasCustomField
      * @description
      * A summary of the taxes being applied to this Order.
      */
-    @Calculated({ relations: ['lines', 'lines.items'] })
+    @Calculated({ relations: ['lines'] })
     get taxSummary(): OrderTaxSummary[] {
         this.throwIfLinesNotJoined('taxSummary');
         const taxRateMap = new Map<
@@ -324,13 +327,6 @@ export class Order extends VendureEntity implements ChannelAware, HasCustomField
         }));
     }
 
-    getOrderItems(): OrderItem[] {
-        this.throwIfLinesNotJoined('getOrderItems');
-        return this.lines.reduce((items, line) => {
-            return [...items, ...line.items];
-        }, [] as OrderItem[]);
-    }
-
     private throwIfLinesNotJoined(propertyName: keyof Order) {
         if (this.lines == null) {
             const errorMessage = [

packages/core/src/entity/promotion/promotion.entity.ts

@@ -16,13 +16,11 @@ import {
 import { PromotionCondition, PromotionConditionState } from '../../config/promotion/promotion-condition';
 import { Channel } from '../channel/channel.entity';
 import { CustomPromotionFields } from '../custom-entity-fields';
-import { OrderItem } from '../order-item/order-item.entity';
 import { OrderLine } from '../order-line/order-line.entity';
 import { Order } from '../order/order.entity';
 import { ShippingLine } from '../shipping-line/shipping-line.entity';
 
 export interface ApplyOrderItemActionArgs {
-    orderItem: OrderItem;
     orderLine: OrderLine;
 }
 
@@ -133,9 +131,9 @@ export class Promotion extends AdjustmentSource implements ChannelAware, SoftDel
             const promotionAction = this.allActions[action.code];
             if (promotionAction instanceof PromotionItemAction) {
                 if (this.isOrderItemArg(args)) {
-                    const { orderItem, orderLine } = args;
+                    const { orderLine } = args;
                     amount += Math.round(
-                        await promotionAction.execute(ctx, orderItem, orderLine, action.args, state, this),
+                        await promotionAction.execute(ctx, orderLine, action.args, state, this),
                     );
                 }
             } else if (promotionAction instanceof PromotionOrderAction) {
@@ -158,6 +156,7 @@ export class Promotion extends AdjustmentSource implements ChannelAware, SoftDel
                 type: this.type,
                 description: this.name,
                 adjustmentSource: this.getSourceId(),
+                data: {},
             };
         }
     }
@@ -223,7 +222,7 @@ export class Promotion extends AdjustmentSource implements ChannelAware, SoftDel
     private isOrderItemArg(
         value: ApplyOrderItemActionArgs | ApplyOrderActionArgs | ApplyShippingActionArgs,
     ): value is ApplyOrderItemActionArgs {
-        return value.hasOwnProperty('orderItem');
+        return value.hasOwnProperty('orderLine');
     }
 
     private isShippingArg(

packages/core/src/entity/refund/refund.entity.ts

@@ -5,7 +5,7 @@ import { PaymentMetadata } from '../../common/types/common-types';
 import { RefundState } from '../../service/helpers/refund-state-machine/refund-state';
 import { VendureEntity } from '../base/base.entity';
 import { EntityId } from '../entity-id.decorator';
-import { OrderItem } from '../order-item/order-item.entity';
+import { RefundLine } from '../order-line-reference/refund-line.entity';
 import { Payment } from '../payment/payment.entity';
 
 @Entity()
@@ -30,9 +30,9 @@ export class Refund extends VendureEntity {
 
     @Column({ nullable: true }) transactionId: string;
 
-    @OneToMany(type => OrderItem, orderItem => orderItem.refund)
+    @OneToMany(type => RefundLine, line => line.refund)
     @JoinTable()
-    orderItems: OrderItem[];
+    lines: RefundLine[];
 
     @Index()
     @ManyToOne(type => Payment)

packages/core/src/entity/stock-movement/cancellation.entity.ts

@@ -1,8 +1,8 @@
 import { StockMovementType } from '@vendure/common/lib/generated-types';
 import { DeepPartial } from '@vendure/common/lib/shared-types';
-import { ChildEntity, Index, ManyToOne } from 'typeorm';
+import { ChildEntity, ManyToOne } from 'typeorm';
 
-import { OrderItem } from '../order-item/order-item.entity';
+import { OrderLine } from '../order-line/order-line.entity';
 
 import { StockMovement } from './stock-movement.entity';
 
@@ -21,7 +21,6 @@ export class Cancellation extends StockMovement {
         super(input);
     }
 
-    // @Index() omitted as it would conflict with the orderItemId index from the Release entity
-    @ManyToOne(type => OrderItem, orderItem => orderItem.cancellation)
-    orderItem: OrderItem;
+    @ManyToOne(type => OrderLine)
+    orderLine: OrderLine;
 }

packages/core/src/entity/stock-movement/release.entity.ts

@@ -1,8 +1,8 @@
 import { StockMovementType } from '@vendure/common/lib/generated-types';
 import { DeepPartial } from '@vendure/common/lib/shared-types';
-import { ChildEntity, Index, ManyToOne } from 'typeorm';
+import { ChildEntity, ManyToOne } from 'typeorm';
 
-import { OrderItem } from '../order-item/order-item.entity';
+import { OrderLine } from '../order-line/order-line.entity';
 
 import { StockMovement } from './stock-movement.entity';
 
@@ -22,7 +22,6 @@ export class Release extends StockMovement {
         super(input);
     }
 
-    @Index()
-    @ManyToOne(type => OrderItem)
-    orderItem: OrderItem;
+    @ManyToOne(type => OrderLine)
+    orderLine: OrderLine;
 }

packages/core/src/event-bus/events/fulfillment-event.ts

@@ -1,7 +1,7 @@
-import { ConfigurableOperationInput } from '@vendure/common/lib/generated-types';
+import { ConfigurableOperationInput, OrderLineInput } from '@vendure/common/lib/generated-types';
 
 import { RequestContext } from '../../api';
-import { Order, OrderItem } from '../../entity';
+import { Order } from '../../entity';
 import { Fulfillment } from '../../entity/fulfillment/fulfillment.entity';
 import { VendureEntityEvent } from '../vendure-entity-event';
 
@@ -12,7 +12,7 @@ import { VendureEntityEvent } from '../vendure-entity-event';
  */
 type CreateFulfillmentInput = {
     orders: Order[];
-    items: OrderItem[];
+    lines: OrderLineInput[];
     handler: ConfigurableOperationInput;
 };
 

packages/core/src/service/helpers/order-calculator/order-calculator.spec.ts

@@ -15,7 +15,6 @@ import {
     TaxLineCalculationStrategy,
 } from '../../../config/tax/tax-line-calculation-strategy';
 import { Promotion } from '../../../entity';
-import { OrderItem } from '../../../entity/order-item/order-item.entity';
 import { Order } from '../../../entity/order/order.entity';
 import { ShippingLine } from '../../../entity/shipping-line/shipping-line.entity';
 import { Surcharge } from '../../../entity/surcharge/surcharge.entity';

packages/core/src/service/helpers/order-calculator/order-calculator.ts

@@ -8,7 +8,7 @@ import { InternalServerError } from '../../../common/error/errors';
 import { netPriceOf } from '../../../common/tax-utils';
 import { idsAreEqual } from '../../../common/utils';
 import { ConfigService } from '../../../config/config.service';
-import { OrderItem, OrderLine, TaxCategory, TaxRate } from '../../../entity';
+import { OrderLine, TaxCategory, TaxRate } from '../../../entity';
 import { Order } from '../../../entity/order/order.entity';
 import { Promotion } from '../../../entity/promotion/promotion.entity';
 import { ShippingLine } from '../../../entity/shipping-line/shipping-line.entity';
@@ -54,7 +54,7 @@ export class OrderCalculator {
         promotions: Promotion[],
         updatedOrderLines: OrderLine[] = [],
         options?: { recalculateShipping?: boolean },
-    ): Promise<OrderItem[]> {
+    ): Promise<Order> {
         const { taxZoneStrategy } = this.configService.taxOptions;
         // We reset the promotions array as all promotions
         // must be revalidated on any changes to an Order.
@@ -72,7 +72,6 @@ export class OrderCalculator {
             order.taxZoneId = activeTaxZone.id;
             taxZoneChanged = true;
         }
-        const updatedOrderItems = new Set<OrderItem>();
         for (const updatedOrderLine of updatedOrderLines) {
             await this.applyTaxesToOrderLine(
                 ctx,
@@ -81,7 +80,6 @@ export class OrderCalculator {
                 activeTaxZone,
                 this.createTaxRateGetter(ctx, activeTaxZone),
             );
-            updatedOrderLine.activeItems.forEach(item => updatedOrderItems.add(item));
         }
         this.calculateOrderTotals(order);
         if (order.lines.length) {
@@ -92,10 +90,10 @@ export class OrderCalculator {
 
             // Then test and apply promotions
             const totalBeforePromotions = order.subTotal;
-            const itemsModifiedByPromotions = await this.applyPromotions(ctx, order, promotions);
-            itemsModifiedByPromotions.forEach(item => updatedOrderItems.add(item));
+            await this.applyPromotions(ctx, order, promotions);
+            // itemsModifiedByPromotions.forEach(item => updatedOrderItems.add(item));
 
-            if (order.subTotal !== totalBeforePromotions || itemsModifiedByPromotions.length) {
+            if (order.subTotal !== totalBeforePromotions) {
                 // Finally, re-calculate taxes because the promotions may have
                 // altered the unit prices, which in turn will alter the tax payable.
                 await this.applyTaxes(ctx, order, activeTaxZone);
@@ -106,7 +104,7 @@ export class OrderCalculator {
             await this.applyShippingPromotions(ctx, order, promotions);
         }
         this.calculateOrderTotals(order);
-        return taxZoneChanged ? order.getOrderItems() : Array.from(updatedOrderItems);
+        return order;
     }
 
     /**
@@ -134,15 +132,12 @@ export class OrderCalculator {
     ) {
         const applicableTaxRate = await getTaxRate(line.taxCategory);
         const { taxLineCalculationStrategy } = this.configService.taxOptions;
-        for (const item of line.activeItems) {
-            item.taxLines = await taxLineCalculationStrategy.calculate({
-                ctx,
-                applicableTaxRate,
-                order,
-                orderItem: item,
-                orderLine: line,
-            });
-        }
+        line.taxLines = await taxLineCalculationStrategy.calculate({
+            ctx,
+            applicableTaxRate,
+            order,
+            orderLine: line,
+        });
     }
 
     /**
@@ -172,18 +167,10 @@ export class OrderCalculator {
      * Applies any eligible promotions to each OrderItem in the order. Returns an array of
      * any OrderItems which had their Adjustments modified.
      */
-    private async applyPromotions(
-        ctx: RequestContext,
-        order: Order,
-        promotions: Promotion[],
-    ): Promise<OrderItem[]> {
-        const updatedItems = await this.applyOrderItemPromotions(ctx, order, promotions);
-        const orderUpdatedItems = await this.applyOrderPromotions(ctx, order, promotions);
-        if (orderUpdatedItems.length) {
-            return orderUpdatedItems;
-        } else {
-            return updatedItems;
-        }
+    private async applyPromotions(ctx: RequestContext, order: Order, promotions: Promotion[]): Promise<void> {
+        await this.applyOrderItemPromotions(ctx, order, promotions);
+        await this.applyOrderPromotions(ctx, order, promotions);
+        return;
     }
 
     /**
@@ -196,34 +183,26 @@ export class OrderCalculator {
         ctx: RequestContext,
         order: Order,
         promotions: Promotion[],
-    ): Promise<OrderItem[]> {
-        // The naive implementation updates *every* OrderItem after this function is run.
-        // However, on a very large order with hundreds or thousands of OrderItems, this results in
-        // very poor performance. E.g. updating a single quantity of an OrderLine results in saving
-        // all 1000 (for example) OrderItems to the DB.
-        // The solution is to try to be smart about tracking exactly which OrderItems have changed,
-        // so that we only update those.
-        const updatedOrderItems = new Set<OrderItem>();
-
+    ): Promise<void> {
         for (const line of order.lines) {
             // Must be re-calculated for each line, since the previous lines may have triggered promotions
             // which affected the order price.
             const applicablePromotions = await filterAsync(promotions, p => p.test(ctx, order).then(Boolean));
 
-            const lineHasExistingPromotions = !!line.firstItem?.adjustments?.find(
-                a => a.type === AdjustmentType.PROMOTION,
-            );
-            const forceUpdateItems = this.orderLineHasInapplicablePromotions(applicablePromotions, line);
-
-            if (forceUpdateItems || lineHasExistingPromotions) {
-                line.clearAdjustments();
-            }
-            if (forceUpdateItems) {
-                // This OrderLine contains Promotion adjustments for Promotions that are no longer
-                // applicable. So we know for sure we will need to update these OrderItems in the
-                // DB. Therefore add them to the `updatedOrderItems` set.
-                line.items.forEach(i => updatedOrderItems.add(i));
-            }
+            // const lineHasExistingPromotions = !!line.adjustments?.find(
+            //     a => a.type === AdjustmentType.PROMOTION,
+            // );
+            // const forceUpdateItems = this.orderLineHasInapplicablePromotions(applicablePromotions, line);
+            //
+            // if (forceUpdateItems || lineHasExistingPromotions) {
+            line.clearAdjustments();
+            // }
+            // if (forceUpdateItems) {
+            //     // This OrderLine contains Promotion adjustments for Promotions that are no longer
+            //     // applicable. So we know for sure we will need to update these OrderItems in the
+            //     // DB. Therefore add them to the `updatedOrderItems` set.
+            //     line.items.forEach(i => updatedOrderItems.add(i));
+            // }
 
             for (const promotion of applicablePromotions) {
                 let priceAdjusted = false;
@@ -233,20 +212,12 @@ export class OrderCalculator {
                 const applicableOrState = await promotion.test(ctx, order);
                 if (applicableOrState) {
                     const state = typeof applicableOrState === 'object' ? applicableOrState : undefined;
-                    for (const item of line.items) {
-                        const adjustment = await promotion.apply(
-                            ctx,
-                            {
-                                orderItem: item,
-                                orderLine: line,
-                            },
-                            state,
-                        );
-                        if (adjustment) {
-                            item.addAdjustment(adjustment);
-                            priceAdjusted = true;
-                            updatedOrderItems.add(item);
-                        }
+                    // for (const item of line.items) {
+                    const adjustment = await promotion.apply(ctx, { orderLine: line }, state);
+                    if (adjustment) {
+                        adjustment.amount = adjustment.amount * line.quantity;
+                        line.addAdjustment(adjustment);
+                        priceAdjusted = true;
                     }
                     if (priceAdjusted) {
                         this.calculateOrderTotals(order);
@@ -255,22 +226,22 @@ export class OrderCalculator {
                     this.addPromotion(order, promotion);
                 }
             }
-            const lineNoLongerHasPromotions = !line.firstItem?.adjustments?.find(
-                a => a.type === AdjustmentType.PROMOTION,
-            );
-            if (lineHasExistingPromotions && lineNoLongerHasPromotions) {
-                line.items.forEach(i => updatedOrderItems.add(i));
-            }
+            // const lineNoLongerHasPromotions = !line?.adjustments?.find(
+            //     a => a.type === AdjustmentType.PROMOTION,
+            // );
+            // if (lineHasExistingPromotions && lineNoLongerHasPromotions) {
+            //     line.items.forEach(i => updatedOrderItems.add(i));
+            // }
 
-            if (forceUpdateItems) {
-                // If we are forcing an update, we need to ensure that totals get
-                // re-calculated *even if* there are no applicable promotions (i.e.
-                // the other call to `this.calculateOrderTotals()` inside the `for...of`
-                // loop was never invoked).
-                this.calculateOrderTotals(order);
-            }
+            // if (forceUpdateItems) {
+            // If we are forcing an update, we need to ensure that totals get
+            // re-calculated *even if* there are no applicable promotions (i.e.
+            // the other call to `this.calculateOrderTotals()` inside the `for...of`
+            // loop was never invoked).
+            this.calculateOrderTotals(order);
+            // }
         }
-        return Array.from(updatedOrderItems.values());
+        return;
     }
 
     /**
@@ -283,24 +254,24 @@ export class OrderCalculator {
      * We need to know about this because it means that all OrderItems in the OrderLine must be
      * updated.
      */
-    private orderLineHasInapplicablePromotions(applicablePromotions: Promotion[], line: OrderLine) {
-        const applicablePromotionIds = applicablePromotions.map(p => p.getSourceId());
-
-        const linePromotionIds = line.adjustments
-            .filter(a => a.type === AdjustmentType.PROMOTION)
-            .map(a => a.adjustmentSource);
-        const hasPromotionsThatAreNoLongerApplicable = !linePromotionIds.every(id =>
-            applicablePromotionIds.includes(id),
-        );
-        return hasPromotionsThatAreNoLongerApplicable;
-    }
+    // private orderLineHasInapplicablePromotions(applicablePromotions: Promotion[], line: OrderLine) {
+    //     const applicablePromotionIds = applicablePromotions.map(p => p.getSourceId());
+    //
+    //     const linePromotionIds = line.adjustments
+    //         .filter(a => a.type === AdjustmentType.PROMOTION)
+    //         .map(a => a.adjustmentSource);
+    //     const hasPromotionsThatAreNoLongerApplicable = !linePromotionIds.every(id =>
+    //         applicablePromotionIds.includes(id),
+    //     );
+    //     return hasPromotionsThatAreNoLongerApplicable;
+    // }
 
     private async applyOrderPromotions(
         ctx: RequestContext,
         order: Order,
         promotions: Promotion[],
-    ): Promise<OrderItem[]> {
-        const updatedItems = new Set<OrderItem>();
+    ): Promise<void> {
+        // const updatedItems = new Set<OrderItem>();
         const orderHasDistributedPromotions = !!order.discounts.find(
             adjustment => adjustment.type === AdjustmentType.DISTRIBUTED_ORDER_PROMOTION,
         );
@@ -311,7 +282,7 @@ export class OrderCalculator {
             // to be saved.
             order.lines.forEach(line => {
                 line.clearAdjustments(AdjustmentType.DISTRIBUTED_ORDER_PROMOTION);
-                line.items.forEach(item => updatedItems.add(item));
+                // line.items.forEach(item => updatedItems.add(item));
             });
         }
 
@@ -329,32 +300,22 @@ export class OrderCalculator {
                     const adjustment = await promotion.apply(ctx, { order }, state);
                     if (adjustment && adjustment.amount !== 0) {
                         const amount = adjustment.amount;
-                        const weights = order.lines.map(l => l.proratedLinePriceWithTax);
+                        const weights = order.lines
+                            .filter(l => l.quantity !== 0)
+                            .map(l => l.proratedLinePriceWithTax);
                         const distribution = prorate(weights, amount);
                         order.lines.forEach((line, i) => {
                             const shareOfAmount = distribution[i];
-                            const itemWeights = line.items.map(item => item.unitPrice);
+                            const itemWeights = Array.from({
+                                length: line.quantity,
+                            }).map(() => line.unitPrice);
                             const itemDistribution = prorate(itemWeights, shareOfAmount);
-                            line.items.forEach((item, j) => {
-                                const discount = itemDistribution[j];
-                                const adjustedDiscount = item.listPriceIncludesTax
-                                    ? netPriceOf(amount, item.taxRate)
-                                    : amount;
-                                // Note: At this point, any time we have an Order-level discount being applied,
-                                // we are effectively nuking all the performance optimizations we have for updating
-                                // as few OrderItems as possible (see notes in the `applyOrderItemPromotions()` method).
-                                // This is because we are prorating any Order-level discounts over _all_ OrderItems.
-                                // (see https://github.com/vendure-ecommerce/vendure/issues/573 for a detailed discussion
-                                // as to why). The are ways to optimize this, but for now I am leaving the implementation
-                                // as-is, and we can deal with performance issues later. Correctness is more important
-                                // when is comes to price & tax calculations.
-                                updatedItems.add(item);
-                                item.addAdjustment({
-                                    amount: discount,
-                                    adjustmentSource: adjustment.adjustmentSource,
-                                    description: adjustment.description,
-                                    type: AdjustmentType.DISTRIBUTED_ORDER_PROMOTION,
-                                });
+                            line.addAdjustment({
+                                amount: shareOfAmount,
+                                adjustmentSource: adjustment.adjustmentSource,
+                                description: adjustment.description,
+                                type: AdjustmentType.DISTRIBUTED_ORDER_PROMOTION,
+                                data: { itemDistribution },
                             });
                         });
                         this.calculateOrderTotals(order);
@@ -364,7 +325,7 @@ export class OrderCalculator {
             }
             this.calculateOrderTotals(order);
         }
-        return Array.from(updatedItems.values());
+        return;
     }
 
     private async applyShippingPromotions(ctx: RequestContext, order: Order, promotions: Promotion[]) {

packages/core/src/service/helpers/order-modifier/order-modifier.ts

@@ -1,8 +1,11 @@
 import { Injectable } from '@nestjs/common';
 import {
+    AdjustmentType,
+    CancelOrderInput,
     HistoryEntryType,
     ModifyOrderInput,
     ModifyOrderResult,
+    OrderLineInput,
     RefundOrderInput,
 } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
@@ -12,11 +15,15 @@ import { RequestContext } from '../../../api/common/request-context';
 import { isGraphQlErrorResult, JustErrorResults } from '../../../common/error/error-result';
 import { EntityNotFoundError, InternalServerError, UserInputError } from '../../../common/error/errors';
 import {
+    CancelActiveOrderError,
     CouponCodeExpiredError,
     CouponCodeInvalidError,
     CouponCodeLimitError,
+    EmptyOrderLineSelectionError,
+    MultipleOrderError,
     NoChangesSpecifiedError,
     OrderModificationStateError,
+    QuantityTooGreatError,
     RefundPaymentIdMissingError,
 } from '../../../common/error/generated-graphql-admin-errors';
 import {
@@ -24,18 +31,23 @@ import {
     NegativeQuantityError,
     OrderLimitError,
 } from '../../../common/error/generated-graphql-shop-errors';
-import { idsAreEqual } from '../../../common/utils';
+import { assertFound, idsAreEqual } from '../../../common/utils';
 import { ConfigService } from '../../../config/config.service';
 import { CustomFieldConfig } from '../../../config/custom-field/custom-field-types';
 import { TransactionalConnection } from '../../../connection/transactional-connection';
 import { VendureEntity } from '../../../entity/base/base.entity';
-import { OrderItem } from '../../../entity/order-item/order-item.entity';
+import { FulfillmentLine } from '../../../entity/index';
+import { OrderModificationLine } from '../../../entity/order-line-reference/order-modification-line.entity';
 import { OrderLine } from '../../../entity/order-line/order-line.entity';
 import { OrderModification } from '../../../entity/order-modification/order-modification.entity';
 import { Order } from '../../../entity/order/order.entity';
 import { Payment } from '../../../entity/payment/payment.entity';
 import { ProductVariant } from '../../../entity/product-variant/product-variant.entity';
 import { ShippingLine } from '../../../entity/shipping-line/shipping-line.entity';
+import { Allocation } from '../../../entity/stock-movement/allocation.entity';
+import { Cancellation } from '../../../entity/stock-movement/cancellation.entity';
+import { Release } from '../../../entity/stock-movement/release.entity';
+import { Sale } from '../../../entity/stock-movement/sale.entity';
 import { Surcharge } from '../../../entity/surcharge/surcharge.entity';
 import { EventBus } from '../../../event-bus/event-bus';
 import { OrderLineEvent } from '../../../event-bus/index';
@@ -49,6 +61,7 @@ import { CustomFieldRelationService } from '../custom-field-relation/custom-fiel
 import { EntityHydrator } from '../entity-hydrator/entity-hydrator.service';
 import { OrderCalculator } from '../order-calculator/order-calculator';
 import { TranslatorService } from '../translator/translator.service';
+import { getOrdersFromLines, orderLinesAreAllCancelled } from '../utils/order-utils';
 import { patchEntity } from '../utils/patch-entity';
 
 /**
@@ -144,7 +157,12 @@ export class OrderModifier {
                 productVariant,
                 taxCategory: productVariant.taxCategory,
                 featuredAsset: productVariant.featuredAsset ?? productVariant.product.featuredAsset,
+                listPrice: productVariant.listPrice,
+                listPriceIncludesTax: productVariant.listPriceIncludesTax,
+                adjustments: [],
+                taxLines: [],
                 customFields,
+                quantity: 0,
             }),
         );
         const { orderSellerStrategy } = this.configService.orderOptions;
@@ -160,7 +178,6 @@ export class OrderModifier {
         await this.customFieldRelationService.updateRelations(ctx, OrderLine, { customFields }, orderLine);
         const lineWithRelations = await this.connection.getEntityOrThrow(ctx, OrderLine, orderLine.id, {
             relations: [
-                'items',
                 'taxCategory',
                 'productVariant',
                 'productVariant.productVariantPrices',
@@ -194,65 +211,29 @@ export class OrderModifier {
         order: Order,
     ): Promise<OrderLine> {
         const currentQuantity = orderLine.quantity;
-
+        orderLine.quantity = quantity;
         if (currentQuantity < quantity) {
-            if (!orderLine.items) {
-                orderLine.items = [];
-            }
-            const newOrderItems = [];
-            for (let i = currentQuantity; i < quantity; i++) {
-                newOrderItems.push(
-                    new OrderItem({
-                        listPrice: orderLine.productVariant.listPrice,
-                        listPriceIncludesTax: orderLine.productVariant.listPriceIncludesTax,
-                        adjustments: [],
-                        taxLines: [],
-                        lineId: orderLine.id,
-                    }),
-                );
-            }
-            const { identifiers } = await this.connection
-                .getRepository(ctx, OrderItem)
-                .createQueryBuilder()
-                .insert()
-                .into(OrderItem)
-                .values(newOrderItems)
-                .execute();
-            newOrderItems.forEach((item, i) => (item.id = identifiers[i].id));
-            orderLine.items = await this.connection
-                .getRepository(ctx, OrderItem)
-                .find({ where: { line: orderLine }, order: { createdAt: 'ASC' } });
             if (!order.active && order.state !== 'Draft') {
                 await this.stockMovementService.createAllocationsForOrderLines(ctx, [
                     {
-                        orderLine,
+                        orderLineId: orderLine.id,
                         quantity: quantity - currentQuantity,
                     },
                 ]);
             }
         } else if (quantity < currentQuantity) {
-            if (order.active || order.state === 'Draft') {
-                // When an Order is still active, it is fine to just delete
-                // any OrderItems that are no longer needed
-                const keepItems = orderLine.items.slice(0, quantity);
-                const removeItems = orderLine.items.slice(quantity);
-                orderLine.items = keepItems;
-                await this.connection
-                    .getRepository(ctx, OrderItem)
-                    .createQueryBuilder()
-                    .delete()
-                    .whereInIds(removeItems.map(i => i.id))
-                    .execute();
-            } else {
+            if (!order.active && order.state !== 'Draft') {
                 // When an Order is not active (i.e. Customer checked out), then we don't want to just
                 // delete the OrderItems - instead we will cancel them
-                const toSetAsCancelled = orderLine.items.filter(i => !i.cancelled).slice(quantity);
-                const fulfilledItems = toSetAsCancelled.filter(i => !!i.fulfillment);
-                const allocatedItems = toSetAsCancelled.filter(i => !i.fulfillment);
-                await this.stockMovementService.createCancellationsForOrderItems(ctx, fulfilledItems);
-                await this.stockMovementService.createReleasesForOrderItems(ctx, allocatedItems);
-                toSetAsCancelled.forEach(i => (i.cancelled = true));
-                await this.connection.getRepository(ctx, OrderItem).save(toSetAsCancelled, { reload: false });
+                // const toSetAsCancelled = orderLine.items.filter(i => !i.cancelled).slice(quantity);
+                // const fulfilledItems = toSetAsCancelled.filter(i => !!i.fulfillment);
+                // const allocatedItems = toSetAsCancelled.filter(i => !i.fulfillment);
+                await this.stockMovementService.createCancellationsForOrderLines(ctx, [
+                    { orderLineId: orderLine.id, quantity },
+                ]);
+                await this.stockMovementService.createReleasesForOrderLines(ctx, [
+                    { orderLineId: orderLine.id, quantity },
+                ]);
             }
         }
         await this.connection.getRepository(ctx, OrderLine).save(orderLine);
@@ -260,6 +241,129 @@ export class OrderModifier {
         return orderLine;
     }
 
+    async cancelOrderByOrderLines(
+        ctx: RequestContext,
+        input: CancelOrderInput,
+        lineInputs: OrderLineInput[],
+    ) {
+        if (lineInputs.length === 0 || summate(lineInputs, 'quantity') === 0) {
+            return new EmptyOrderLineSelectionError();
+        }
+        const orders = await getOrdersFromLines(ctx, this.connection, lineInputs);
+        if (1 < orders.length) {
+            return new MultipleOrderError();
+        }
+        const order = orders[0];
+        if (!idsAreEqual(order.id, input.orderId)) {
+            return new MultipleOrderError();
+        }
+        if (order.active) {
+            return new CancelActiveOrderError({ orderState: order.state });
+        }
+        const fullOrder = await this.connection.getEntityOrThrow(ctx, Order, order.id, {
+            relations: ['lines'],
+        });
+
+        const allocatedLines: OrderLineInput[] = [];
+        const fulfilledLines: OrderLineInput[] = [];
+        for (const lineInput of lineInputs) {
+            const orderLine = fullOrder.lines.find(l => idsAreEqual(l.id, lineInput.orderLineId));
+            if (orderLine && orderLine.quantity < lineInput.quantity) {
+                return new QuantityTooGreatError();
+            }
+            const allocationsForLine = await this.connection
+                .getRepository(ctx, Allocation)
+                .createQueryBuilder('allocation')
+                .leftJoinAndSelect('allocation.orderLine', 'orderLine')
+                .where('orderLine.id = :orderLineId', { orderLineId: lineInput.orderLineId })
+                .getMany();
+            const salesForLine = await this.connection
+                .getRepository(ctx, Sale)
+                .createQueryBuilder('sale')
+                .leftJoinAndSelect('sale.orderLine', 'orderLine')
+                .where('orderLine.id = :orderLineId', { orderLineId: lineInput.orderLineId })
+                .getMany();
+            const releasesForLine = await this.connection
+                .getRepository(ctx, Release)
+                .createQueryBuilder('release')
+                .leftJoinAndSelect('release.orderLine', 'orderLine')
+                .where('orderLine.id = :orderLineId', { orderLineId: lineInput.orderLineId })
+                .getMany();
+            const totalAllocated =
+                summate(allocationsForLine, 'quantity') +
+                summate(salesForLine, 'quantity') -
+                summate(releasesForLine, 'quantity');
+            if (0 < totalAllocated) {
+                allocatedLines.push({
+                    orderLineId: lineInput.orderLineId,
+                    quantity: Math.min(totalAllocated, lineInput.quantity),
+                });
+            }
+            const fulfillmentsForLine = await this.connection
+                .getRepository(ctx, FulfillmentLine)
+                .createQueryBuilder('fulfillmentLine')
+                .leftJoinAndSelect('fulfillmentLine.orderLine', 'orderLine')
+                .where('orderLine.id = :orderLineId', { orderLineId: lineInput.orderLineId })
+                .getMany();
+            const cancellationsForLine = await this.connection
+                .getRepository(ctx, Cancellation)
+                .createQueryBuilder('cancellation')
+                .leftJoinAndSelect('cancellation.orderLine', 'orderLine')
+                .where('orderLine.id = :orderLineId', { orderLineId: lineInput.orderLineId })
+                .getMany();
+            const totalFulfilled =
+                summate(fulfillmentsForLine, 'quantity') - summate(cancellationsForLine, 'quantity');
+            if (0 < totalFulfilled) {
+                fulfilledLines.push({
+                    orderLineId: lineInput.orderLineId,
+                    quantity: Math.min(totalFulfilled, lineInput.quantity),
+                });
+            }
+        }
+        await this.stockMovementService.createCancellationsForOrderLines(ctx, fulfilledLines);
+        await this.stockMovementService.createReleasesForOrderLines(ctx, allocatedLines);
+        for (const line of lineInputs) {
+            const orderLine = fullOrder.lines.find(l => idsAreEqual(l.id, line.orderLineId));
+            if (orderLine) {
+                await this.connection.getRepository(ctx, OrderLine).update(line.orderLineId, {
+                    quantity: orderLine.quantity - line.quantity,
+                });
+            }
+        }
+
+        const orderWithLines = await this.connection.getEntityOrThrow(ctx, Order, order.id, {
+            relations: ['lines', 'surcharges', 'shippingLines'],
+        });
+        if (input.cancelShipping === true) {
+            for (const shippingLine of orderWithLines.shippingLines) {
+                shippingLine.adjustments.push({
+                    adjustmentSource: 'CANCEL_ORDER',
+                    type: AdjustmentType.OTHER,
+                    description: 'shipping cancellation',
+                    amount: -shippingLine.discountedPriceWithTax,
+                    data: {},
+                });
+                await this.connection.getRepository(ctx, ShippingLine).save(shippingLine, { reload: false });
+            }
+        }
+        // Update totals after cancellation
+        this.orderCalculator.calculateOrderTotals(orderWithLines);
+        await this.connection.getRepository(ctx, Order).save(orderWithLines, { reload: false });
+
+        await this.historyService.createHistoryEntryForOrder({
+            ctx,
+            orderId: order.id,
+            type: HistoryEntryType.ORDER_CANCELLATION,
+            data: {
+                lines: lineInputs,
+                reason: input.reason || undefined,
+                shippingCancelled: !!input.cancelShipping,
+            },
+        });
+
+        return orderLinesAreAllCancelled(orderWithLines);
+    }
+
     async modifyOrder(
         ctx: RequestContext,
         input: ModifyOrderInput,
@@ -269,7 +373,7 @@ export class OrderModifier {
         const modification = new OrderModification({
             order,
             note: input.note || '',
-            orderItems: [],
+            lines: [],
             surcharges: [],
         });
         const initialTotalWithTax = order.totalWithTax;
@@ -283,13 +387,12 @@ export class OrderModifier {
         const { orderItemsLimit } = this.configService.orderOptions;
         let currentItemsCount = summate(order.lines, 'quantity');
         const updatedOrderLineIds: ID[] = [];
-        const refundInput: RefundOrderInput & { orderItems: OrderItem[] } = {
+        const refundInput: RefundOrderInput = {
             lines: [],
             adjustment: 0,
             shipping: 0,
             paymentId: input.refund?.paymentId || '',
             reason: input.refund?.reason || input.note,
-            orderItems: [],
         };
 
         for (const row of input.addItems ?? []) {
@@ -316,7 +419,11 @@ export class OrderModifier {
             updatedOrderLineIds.push(orderLine.id);
             const initialQuantity = orderLine.quantity;
             await this.updateOrderLineQuantity(ctx, orderLine, initialQuantity + correctedQuantity, order);
-            modification.orderItems.push(...orderLine.items.slice(initialQuantity));
+
+            const orderModificationLine = await this.connection
+                .getRepository(ctx, OrderModificationLine)
+                .save(new OrderModificationLine({ orderLine, quantity: quantity - initialQuantity }));
+            modification.lines.push(orderModificationLine);
         }
 
         for (const row of input.adjustOrderLines ?? []) {
@@ -351,21 +458,37 @@ export class OrderModifier {
                 if (customFields) {
                     patchEntity(orderLine, { customFields });
                 }
-                await this.updateOrderLineQuantity(ctx, orderLine, quantity, order);
+                if (quantity < initialLineQuantity) {
+                    const cancelLinesInput = [
+                        {
+                            orderLineId,
+                            quantity: initialLineQuantity - quantity,
+                        },
+                    ];
+                    await this.cancelOrderByOrderLines(ctx, { orderId: order.id }, cancelLinesInput);
+                    orderLine.quantity = quantity;
+                } else {
+                    await this.updateOrderLineQuantity(ctx, orderLine, quantity, order);
+                }
+                const orderModificationLine = await this.connection
+                    .getRepository(ctx, OrderModificationLine)
+                    .save(new OrderModificationLine({ orderLine, quantity: quantity - initialLineQuantity }));
+                modification.lines.push(orderModificationLine);
+
                 if (correctedQuantity < initialLineQuantity) {
                     const qtyDelta = initialLineQuantity - correctedQuantity;
-                    refundInput.lines.push({
+                    refundInput.lines?.push({
                         orderLineId: orderLine.id,
-                        quantity,
+                        quantity: qtyDelta,
                     });
-                    const cancelledOrderItems = orderLine.items.filter(i => i.cancelled).slice(0, qtyDelta);
-                    refundInput.orderItems.push(...cancelledOrderItems);
-                    modification.orderItems.push(...cancelledOrderItems);
+                    // const cancelledOrderItems = orderLine.items.filter(i => i.cancelled).slice(0, qtyDelta);
+                    // refundInput.orderItems.push(...cancelledOrderItems);
+                    // modification.orderItems.push(...cancelledOrderItems);
                 } else {
-                    const addedOrderItems = orderLine.items
-                        .filter(i => !i.cancelled)
-                        .slice(initialLineQuantity);
-                    modification.orderItems.push(...addedOrderItems);
+                    // const addedOrderItems = orderLine.items
+                    //     .filter(i => !i.cancelled)
+                    //     .slice(initialLineQuantity);
+                    // modification.orderItems.push(...addedOrderItems);
                 }
             }
             updatedOrderLineIds.push(orderLine.id);
@@ -473,16 +596,10 @@ export class OrderModifier {
         const updatedOrderLines = order.lines.filter(l => updatedOrderLineIds.includes(l.id));
         const promotions = await this.promotionService.getActivePromotionsInChannel(ctx);
         const activePromotionsPre = await this.promotionService.getActivePromotionsOnOrder(ctx, order.id);
-        const updatedOrderItems = await this.orderCalculator.applyPriceAdjustments(
-            ctx,
-            order,
-            promotions,
-            updatedOrderLines,
-            {
-                recalculateShipping: input.options?.recalculateShipping,
-            },
-        );
-
+        await this.orderCalculator.applyPriceAdjustments(ctx, order, promotions, updatedOrderLines, {
+            recalculateShipping: input.options?.recalculateShipping,
+        });
+        await this.connection.getRepository(ctx, OrderLine).save(order.lines, { reload: false });
         const orderCustomFields = (input as any).customFields;
         if (orderCustomFields) {
             patchEntity(order, { customFields: orderCustomFields });
@@ -505,17 +622,11 @@ export class OrderModifier {
             if (shippingDelta < 0) {
                 refundInput.shipping = shippingDelta * -1;
             }
-            refundInput.adjustment += this.calculateRefundAdjustment(delta, refundInput);
+            refundInput.adjustment += await this.calculateRefundAdjustment(ctx, delta, refundInput);
             const existingPayments = await this.getOrderPayments(ctx, order.id);
             const payment = existingPayments.find(p => idsAreEqual(p.id, input.refund?.paymentId));
             if (payment) {
-                const refund = await this.paymentService.createRefund(
-                    ctx,
-                    refundInput,
-                    order,
-                    refundInput.orderItems,
-                    payment,
-                );
+                const refund = await this.paymentService.createRefund(ctx, refundInput, order, payment);
                 if (!isGraphQlErrorResult(refund)) {
                     modification.refund = refund;
                 } else {
@@ -529,18 +640,18 @@ export class OrderModifier {
             .getRepository(ctx, OrderModification)
             .save(modification);
         await this.connection.getRepository(ctx, Order).save(order);
-        if (input.couponCodes) {
-            // When coupon codes have changed, this will likely affect the adjustments applied to
-            // OrderItems. So in this case we need to save all of them.
-            const orderItems = order.lines.reduce((all, line) => all.concat(line.items), [] as OrderItem[]);
-            await this.connection.getRepository(ctx, OrderItem).save(orderItems, { reload: false });
-        } else {
-            // Otherwise, just save those OrderItems that were specifically added/removed
-            // or updated when applying `OrderCalculator.applyPriceAdjustments()`
-            await this.connection
-                .getRepository(ctx, OrderItem)
-                .save([...modification.orderItems, ...updatedOrderItems], { reload: false });
-        }
+        // if (input.couponCodes) {
+        //     // When coupon codes have changed, this will likely affect the adjustments applied to
+        //     // OrderItems. So in this case we need to save all of them.
+        //     const orderItems = order.lines.reduce((all, line) => all.concat(line.items), [] as OrderItem[]);
+        //     await this.connection.getRepository(ctx, OrderItem).save(orderItems, { reload: false });
+        // } else {
+        //     // Otherwise, just save those OrderItems that were specifically added/removed
+        //     // or updated when applying `OrderCalculator.applyPriceAdjustments()`
+        //     await this.connection
+        //         .getRepository(ctx, OrderItem)
+        //         .save([...modification.orderItems, ...updatedOrderItems], { reload: false });
+        // }
         await this.connection.getRepository(ctx, ShippingLine).save(order.shippingLines, { reload: false });
         return { order, modification: createdModification };
     }
@@ -563,12 +674,18 @@ export class OrderModifier {
      * we need to make sure the amount gets adjusted to match any changes caused by other factors,
      * i.e. promotions that were previously active but are no longer.
      */
-    private calculateRefundAdjustment(
+    private async calculateRefundAdjustment(
+        ctx: RequestContext,
         delta: number,
-        refundInput: RefundOrderInput & { orderItems: OrderItem[] },
-    ): number {
+        refundInput: RefundOrderInput,
+    ): Promise<number> {
         const existingAdjustment = refundInput.adjustment;
-        const itemAmount = summate(refundInput.orderItems, 'proratedUnitPriceWithTax');
+
+        let itemAmount = 0; // TODO: figure out what this should be
+        for (const lineInput of refundInput.lines) {
+            const orderLine = await this.connection.getEntityOrThrow(ctx, OrderLine, lineInput.orderLineId);
+            itemAmount += orderLine.proratedUnitPriceWithTax * lineInput.quantity;
+        }
         const calculatedDelta = itemAmount + refundInput.shipping + existingAdjustment;
         const absDelta = Math.abs(delta);
         return absDelta !== calculatedDelta ? absDelta - calculatedDelta : 0;

packages/core/src/service/helpers/order-splitter/order-splitter.ts

@@ -5,7 +5,7 @@ import { pick } from '@vendure/common/lib/pick';
 import { RequestContext } from '../../../api/index';
 import { ConfigService } from '../../../config/index';
 import { TransactionalConnection } from '../../../connection/index';
-import { Channel, Order, OrderItem, OrderLine, ShippingLine, Surcharge } from '../../../entity/index';
+import { Channel, Order, OrderLine, ShippingLine } from '../../../entity/index';
 import { ChannelService } from '../../services/channel.service';
 import { OrderService } from '../../services/order.service';
 
@@ -78,6 +78,7 @@ export class OrderSplitter {
         const newLine = await this.connection.getRepository(ctx, OrderLine).save(
             new OrderLine({
                 ...pick(line, [
+                    'quantity',
                     'productVariant',
                     'taxCategory',
                     'featuredAsset',
@@ -86,25 +87,15 @@ export class OrderSplitter {
                     'customFields',
                     'sellerChannel',
                     'sellerChannelId',
+                    'initialListPrice',
+                    'listPrice',
+                    'listPriceIncludesTax',
+                    'adjustments',
+                    'taxLines',
+                    'orderPlacedQuantity',
                 ]),
-                items: [],
             }),
         );
-        newLine.items = line.items.map(
-            item =>
-                new OrderItem({
-                    ...pick(item, [
-                        'initialListPrice',
-                        'listPrice',
-                        'listPriceIncludesTax',
-                        'adjustments',
-                        'taxLines',
-                        'cancelled',
-                    ]),
-                    lineId: newLine.id,
-                }),
-        );
-        await this.connection.getRepository(ctx, OrderItem).save(newLine.items);
         return newLine;
     }
 

packages/core/src/service/helpers/utils/order-utils.ts

@@ -1,7 +1,14 @@
+import { OrderLineInput } from '@vendure/common/lib/generated-types';
+import { ID } from '@vendure/common/lib/shared-types';
 import { summate } from '@vendure/common/lib/shared-utils';
+import { unique } from '@vendure/common/lib/unique';
 
-import { OrderItem } from '../../../entity/order-item/order-item.entity';
+import { RequestContext } from '../../../api/index';
+import { EntityNotFoundError, idsAreEqual } from '../../../common/index';
+import { TransactionalConnection } from '../../../connection/index';
+import { FulfillmentLine, OrderLine } from '../../../entity/index';
 import { Order } from '../../../entity/order/order.entity';
+import { FulfillmentState } from '../fulfillment-state-machine/fulfillment-state';
 import { PaymentState } from '../payment-state-machine/payment-state';
 
 /**
@@ -35,53 +42,94 @@ export function totalCoveredByPayments(order: Order, state?: PaymentState | Paym
  * Returns true if all (non-cancelled) OrderItems are delivered.
  */
 export function orderItemsAreDelivered(order: Order) {
-    return getOrderItems(order)
-        .filter(orderItem => !orderItem.cancelled)
-        .every(isDelivered);
+    return getOrderLinesFulfillmentStates(order).every(state => state === 'Delivered');
 }
 
 /**
  * Returns true if at least one, but not all (non-cancelled) OrderItems are delivered.
  */
 export function orderItemsArePartiallyDelivered(order: Order) {
-    const nonCancelledItems = getNonCancelledItems(order);
-    return nonCancelledItems.some(isDelivered) && !nonCancelledItems.every(isDelivered);
+    const states = getOrderLinesFulfillmentStates(order);
+    return states.some(state => state === 'Delivered') && !states.every(state => state === 'Delivered');
+}
+
+function getOrderLinesFulfillmentStates(order: Order): Array<FulfillmentState | undefined> {
+    const fulfillmentLines = getOrderFulfillmentLines(order);
+    const states = unique(
+        order.lines
+            .filter(line => line.quantity !== 0)
+            .map(line => {
+                const matchingFulfillmentLines = fulfillmentLines.filter(fl =>
+                    idsAreEqual(fl.orderLineId, line.id),
+                );
+                const totalFulfilled = summate(matchingFulfillmentLines, 'quantity');
+                if (totalFulfilled === line.quantity) {
+                    return matchingFulfillmentLines.map(l => l.fulfillment.state);
+                } else {
+                    return undefined;
+                }
+            })
+            .flat(),
+    );
+    return states;
 }
 
 /**
  * Returns true if at least one, but not all (non-cancelled) OrderItems are shipped.
  */
 export function orderItemsArePartiallyShipped(order: Order) {
-    const nonCancelledItems = getNonCancelledItems(order);
-    return nonCancelledItems.some(isShipped) && !nonCancelledItems.every(isShipped);
+    const states = getOrderLinesFulfillmentStates(order);
+    return states.some(state => state === 'Shipped') && !states.every(state => state === 'Shipped');
 }
 
 /**
  * Returns true if all (non-cancelled) OrderItems are shipped.
  */
 export function orderItemsAreShipped(order: Order) {
-    return getOrderItems(order)
-        .filter(orderItem => !orderItem.cancelled)
-        .every(isShipped);
+    return getOrderLinesFulfillmentStates(order).every(state => state === 'Shipped');
 }
 
 /**
  * Returns true if all OrderItems in the order are cancelled
  */
-export function orderItemsAreAllCancelled(order: Order) {
-    return getOrderItems(order).every(orderItem => orderItem.cancelled);
+export function orderLinesAreAllCancelled(order: Order) {
+    return order.lines.every(line => line.quantity === 0);
 }
 
-function getOrderItems(order: Order): OrderItem[] {
-    return order.lines.reduce((orderItems, line) => [...orderItems, ...line.items], [] as OrderItem[]);
-}
-function getNonCancelledItems(order: Order): OrderItem[] {
-    return getOrderItems(order).filter(orderItem => !orderItem.cancelled);
+function getOrderFulfillmentLines(order: Order): FulfillmentLine[] {
+    return order.fulfillments
+        .filter(f => f.state !== 'Cancelled')
+        .reduce(
+            (fulfillmentLines, fulfillment) => [...fulfillmentLines, ...fulfillment.lines],
+            [] as FulfillmentLine[],
+        );
 }
 
-function isDelivered(orderItem: OrderItem) {
-    return orderItem.fulfillment?.state === 'Delivered';
-}
-function isShipped(orderItem: OrderItem) {
-    return orderItem.fulfillment?.state === 'Shipped';
+export async function getOrdersFromLines(
+    ctx: RequestContext,
+    connection: TransactionalConnection,
+    orderLinesInput: OrderLineInput[],
+): Promise<Order[]> {
+    const orders = new Map<ID, Order>();
+    const lines = await connection.getRepository(ctx, OrderLine).findByIds(
+        orderLinesInput.map(l => l.orderLineId),
+        {
+            relations: ['order', 'order.channels'],
+            order: { id: 'ASC' },
+        },
+    );
+    for (const line of lines) {
+        const inputLine = orderLinesInput.find(l => idsAreEqual(l.orderLineId, line.id));
+        if (!inputLine) {
+            continue;
+        }
+        const order = line.order;
+        if (!order.channels.some(channel => channel.id === ctx.channelId)) {
+            throw new EntityNotFoundError('Order', order.id);
+        }
+        if (!orders.has(order.id)) {
+            orders.set(order.id, order);
+        }
+    }
+    return Array.from(orders.values());
 }

packages/core/src/service/services/fulfillment.service.ts

@@ -1,9 +1,8 @@
 import { Injectable } from '@nestjs/common';
-import { ConfigurableOperationInput } from '@vendure/common/lib/generated-types';
+import { ConfigurableOperationInput, OrderLineInput } from '@vendure/common/lib/generated-types';
 import { ID } from '@vendure/common/lib/shared-types';
 import { isObject } from '@vendure/common/lib/shared-utils';
 import { unique } from '@vendure/common/lib/unique';
-import { FulfillmentLineSummary } from '@vendure/payments-plugin/e2e/graphql/generated-admin-types';
 
 import { RequestContext } from '../../api/common/request-context';
 import {
@@ -14,8 +13,7 @@ import {
 import { ConfigService } from '../../config/config.service';
 import { TransactionalConnection } from '../../connection/transactional-connection';
 import { Fulfillment } from '../../entity/fulfillment/fulfillment.entity';
-import { OrderLine } from '../../entity/index';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
+import { FulfillmentLine, OrderLine } from '../../entity/index';
 import { Order } from '../../entity/order/order.entity';
 import { EventBus } from '../../event-bus/event-bus';
 import { FulfillmentEvent } from '../../event-bus/events/fulfillment-event';
@@ -48,7 +46,7 @@ export class FulfillmentService {
     async create(
         ctx: RequestContext,
         orders: Order[],
-        items: OrderItem[],
+        lines: OrderLineInput[],
         handler: ConfigurableOperationInput,
     ): Promise<Fulfillment | InvalidFulfillmentHandlerError | CreateFulfillmentError> {
         const fulfillmentHandler = this.configService.shippingOptions.fulfillmentHandlers.find(
@@ -62,7 +60,7 @@ export class FulfillmentService {
             fulfillmentPartial = await fulfillmentHandler.createFulfillment(
                 ctx,
                 orders,
-                items,
+                lines,
                 handler.arguments,
             );
         } catch (e: unknown) {
@@ -73,16 +71,36 @@ export class FulfillmentService {
             return new CreateFulfillmentError({ fulfillmentHandlerError: message });
         }
 
+        const orderLines = await this.connection
+            .getRepository(ctx, OrderLine)
+            .findByIds(lines.map(l => l.orderLineId));
+
         const newFulfillment = await this.connection.getRepository(ctx, Fulfillment).save(
             new Fulfillment({
                 method: '',
                 trackingCode: '',
                 ...fulfillmentPartial,
-                orderItems: items,
+                lines: [],
                 state: this.fulfillmentStateMachine.getInitialState(),
                 handlerCode: fulfillmentHandler.code,
             }),
         );
+        const fulfillmentLines: FulfillmentLine[] = [];
+        for (const { orderLineId, quantity } of lines) {
+            const fulfillmentLine = await this.connection.getRepository(ctx, FulfillmentLine).save(
+                new FulfillmentLine({
+                    orderLineId,
+                    quantity,
+                }),
+            );
+            fulfillmentLines.push(fulfillmentLine);
+        }
+        await this.connection
+            .getRepository(ctx, Fulfillment)
+            .createQueryBuilder()
+            .relation('lines')
+            .of(newFulfillment)
+            .add(fulfillmentLines);
         const fulfillmentWithRelations = await this.customFieldRelationService.updateRelations(
             ctx,
             Fulfillment,
@@ -92,94 +110,35 @@ export class FulfillmentService {
         this.eventBus.publish(
             new FulfillmentEvent(ctx, fulfillmentWithRelations, {
                 orders,
-                items,
+                lines,
                 handler,
             }),
         );
         return newFulfillment;
     }
 
-    private async findOneOrThrow(
-        ctx: RequestContext,
-        id: ID,
-        relations: string[] = ['orderItems'],
-    ): Promise<Fulfillment> {
-        return await this.connection.getEntityOrThrow(ctx, Fulfillment, id, {
-            relations,
-        });
+    async getFulfillmentLines(ctx: RequestContext, id: ID): Promise<FulfillmentLine[]> {
+        return this.connection
+            .getEntityOrThrow(ctx, Fulfillment, id, {
+                relations: ['lines'],
+            })
+            .then(fulfillment => fulfillment.lines);
     }
 
-    /**
-     * @description
-     * Returns all OrderItems associated with the specified Fulfillment.
-     */
-    async getOrderItemsByFulfillmentId(ctx: RequestContext, id: ID): Promise<OrderItem[]> {
-        const fulfillment = await this.findOneOrThrow(ctx, id);
-        return fulfillment.orderItems;
+    getFulfillmentLikeOrderLine(ctx: RequestContext, fullfillmentLineId: ID) {
+        return this.connection.getRepository(ctx, OrderLine).findOne();
     }
 
-    async getFulfillmentLineSummary(
-        ctx: RequestContext,
-        id: ID,
-    ): Promise<Array<{ orderLine: OrderLine; quantity: number }>> {
-        const result = await this.connection
-            .getRepository(ctx, OrderLine)
-            .createQueryBuilder('line')
-            .leftJoinAndSelect('line.items', 'item')
-            .leftJoin('item.fulfillments', 'fulfillment')
-            .select('line.id', 'lineId')
-            .addSelect('COUNT(item.id)', 'itemCount')
-            .groupBy('line.id')
-            .where('fulfillment.id = :id', { id })
-            .getRawMany();
-
-        return Promise.all(
-            result.map(async ({ lineId, itemCount }: { lineId: ID; itemCount: string }) => {
-                return {
-                    orderLine: await this.connection.getEntityOrThrow(ctx, OrderLine, lineId),
-                    quantity: +itemCount,
-                };
-            }),
-        );
-    }
-
-    async getFulfillmentsByOrderLineId(
-        ctx: RequestContext,
-        orderLineId: ID,
-    ): Promise<Array<{ fulfillment: Fulfillment; orderItemIds: Set<ID> }>> {
-        const itemIdsQb = await this.connection
-            .getRepository(ctx, OrderItem)
-            .createQueryBuilder('item')
-            .select('item.id', 'id')
-            .where('item.lineId = :orderLineId', { orderLineId });
-
-        const fulfillments = await this.connection
-            .getRepository(ctx, Fulfillment)
-            .createQueryBuilder('fulfillment')
-            .leftJoinAndSelect('fulfillment.orderItems', 'item')
-            .where(`item.id IN (${itemIdsQb.getQuery()})`)
+    async getFulfillmentsLinesForOrderLine(ctx: RequestContext, orderLineId: ID): Promise<FulfillmentLine[]> {
+        const fulfillmentLines = await this.connection
+            .getRepository(ctx, FulfillmentLine)
+            .createQueryBuilder('fulfillmentLine')
+            .leftJoin('fulfillmentLine.fulfillment', 'fulfillment')
+            .where(`fulfillmentLine.orderLineId = :orderLineId`, { orderLineId })
             .andWhere('fulfillment.state != :cancelledState', { cancelledState: 'Cancelled' })
-            .setParameters(itemIdsQb.getParameters())
             .getMany();
 
-        return fulfillments.map(fulfillment => ({
-            fulfillment,
-            orderItemIds: new Set(fulfillment.orderItems.map(i => i.id)),
-        }));
-    }
-
-    /**
-     * @description
-     * Returns the Fulfillment for the given OrderItem (if one exists).
-     */
-    async getFulfillmentByOrderItemId(
-        ctx: RequestContext,
-        orderItemId: ID,
-    ): Promise<Fulfillment | undefined> {
-        const orderItem = await this.connection
-            .getRepository(ctx, OrderItem)
-            .findOne(orderItemId, { relations: ['fulfillments'] });
-        return orderItem?.fulfillment;
+        return fulfillmentLines;
     }
 
     /**
@@ -200,13 +159,15 @@ export class FulfillmentService {
           }
         | FulfillmentStateTransitionError
     > {
-        const fulfillment = await this.findOneOrThrow(ctx, fulfillmentId, ['orderItems']);
-        const lineIds = unique(fulfillment.orderItems.map(item => item.lineId));
+        const fulfillment = await this.connection.getEntityOrThrow(ctx, Fulfillment, fulfillmentId, {
+            relations: ['lines'],
+        });
+        const orderLinesIds = unique(fulfillment.lines.map(lines => lines.orderLineId));
         const orders = await this.connection
             .getRepository(ctx, Order)
             .createQueryBuilder('order')
             .leftJoinAndSelect('order.lines', 'line')
-            .where('line.id IN (:...lineIds)', { lineIds })
+            .where('line.id IN (:...lineIds)', { lineIds: orderLinesIds })
             .getMany();
         const fromState = fulfillment.state;
         let finalize: () => Promise<any>;

packages/core/src/service/services/history.service.ts

@@ -3,6 +3,7 @@ import { UpdateCustomerInput as UpdateCustomerShopInput } from '@vendure/common/
 import {
     HistoryEntryListOptions,
     HistoryEntryType,
+    OrderLineInput,
     UpdateAddressInput,
     UpdateCustomerInput,
 } from '@vendure/common/lib/generated-types';
@@ -85,7 +86,7 @@ export interface OrderHistoryEntryData {
         fulfillmentId: ID;
     };
     [HistoryEntryType.ORDER_CANCELLATION]: {
-        orderItemIds: ID[];
+        lines: OrderLineInput[];
         shippingCancelled: boolean;
         reason?: string;
     };

packages/core/src/service/services/order-testing.service.ts

@@ -13,7 +13,6 @@ import { RequestContext } from '../../api/common/request-context';
 import { grossPriceOf, netPriceOf } from '../../common/tax-utils';
 import { ConfigService } from '../../config/config.service';
 import { TransactionalConnection } from '../../connection/transactional-connection';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
 import { Order } from '../../entity/order/order.entity';
 import { ProductVariant } from '../../entity/product-variant/product-variant.entity';
@@ -127,7 +126,9 @@ export class OrderTestingService {
             await this.productPriceApplicator.applyChannelPriceAndTax(productVariant, ctx, mockOrder);
             const orderLine = new OrderLine({
                 productVariant,
-                items: [],
+                adjustments: [],
+                taxLines: [],
+                quantity: line.quantity,
                 taxCategory: productVariant.taxCategory,
             });
             mockOrder.lines.push(orderLine);
@@ -136,20 +137,11 @@ export class OrderTestingService {
                 ctx,
                 productVariant,
                 orderLine.customFields || {},
-                mockOrder
+                mockOrder,
             );
             const taxRate = productVariant.taxRateApplied;
-            const unitPrice = priceIncludesTax ? taxRate.netPriceOf(price) : price;
-
-            for (let i = 0; i < line.quantity; i++) {
-                const orderItem = new OrderItem({
-                    listPrice: price,
-                    listPriceIncludesTax: priceIncludesTax,
-                    adjustments: [],
-                    taxLines: [],
-                });
-                orderLine.items.push(orderItem);
-            }
+            orderLine.listPrice = price;
+            orderLine.listPriceIncludesTax = priceIncludesTax;
         }
         mockOrder.shippingLines = [
             new ShippingLine({

packages/core/src/service/services/order.service.ts

@@ -38,6 +38,7 @@ import {
 } from '@vendure/common/lib/generated-types';
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 import { summate } from '@vendure/common/lib/shared-utils';
+import { In } from 'typeorm';
 import { FindOptionsUtils } from 'typeorm/find-options/FindOptionsUtils';
 
 import { RequestContext } from '../../api/common/request-context';
@@ -81,8 +82,7 @@ import { TransactionalConnection } from '../../connection/transactional-connecti
 import { Customer } from '../../entity/customer/customer.entity';
 import { Fulfillment } from '../../entity/fulfillment/fulfillment.entity';
 import { HistoryEntry } from '../../entity/history-entry/history-entry.entity';
-import { Channel, Session } from '../../entity/index';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
+import { Channel, FulfillmentLine, RefundLine, Session } from '../../entity/index';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
 import { OrderModification } from '../../entity/order-modification/order-modification.entity';
 import { Order } from '../../entity/order/order.entity';
@@ -115,7 +115,11 @@ import { PaymentStateMachine } from '../helpers/payment-state-machine/payment-st
 import { RefundStateMachine } from '../helpers/refund-state-machine/refund-state-machine';
 import { ShippingCalculator } from '../helpers/shipping-calculator/shipping-calculator';
 import { TranslatorService } from '../helpers/translator/translator.service';
-import { orderItemsAreAllCancelled, totalCoveredByPayments } from '../helpers/utils/order-utils';
+import {
+    getOrdersFromLines,
+    orderLinesAreAllCancelled,
+    totalCoveredByPayments,
+} from '../helpers/utils/order-utils';
 import { patchEntity } from '../helpers/utils/patch-entity';
 
 import { ChannelService } from './channel.service';
@@ -189,7 +193,6 @@ export class OrderService {
                     'lines',
                     'customer',
                     'lines.productVariant',
-                    'lines.items',
                     'channels',
                     'shippingLines',
                     'payments',
@@ -220,8 +223,6 @@ export class OrderService {
             'customer',
             'customer.user',
             'lines',
-            'lines.items',
-            'lines.items.fulfillments',
             'lines.productVariant',
             'lines.productVariant.taxCategory',
             'lines.productVariant.productVariantPrices',
@@ -245,10 +246,8 @@ export class OrderService {
         qb.leftJoin('order.channels', 'channel')
             .where('order.id = :orderId', { orderId })
             .andWhere('channel.id = :channelId', { channelId: ctx.channelId });
-        if (effectiveRelations.includes('lines') && effectiveRelations.includes('lines.items')) {
-            qb.addOrderBy('order__lines.createdAt', 'ASC')
-                .addOrderBy('order__lines__items.createdAt', 'ASC')
-                .addOrderBy('order__lines.productVariantId', 'ASC');
+        if (effectiveRelations.includes('lines')) {
+            qb.addOrderBy('order__lines.createdAt', 'ASC').addOrderBy('order__lines.productVariantId', 'ASC');
         }
 
         // tslint:disable-next-line:no-non-null-assertion
@@ -306,9 +305,7 @@ export class OrderService {
         options?: ListQueryOptions<Order>,
         relations?: RelationPaths<Order>,
     ): Promise<PaginatedList<Order>> {
-        const effectiveRelations = (
-            relations ?? ['lines', 'lines.items', 'customer', 'channels', 'shippingLines']
-        ).filter(
+        const effectiveRelations = (relations ?? ['lines', 'customer', 'channels', 'shippingLines']).filter(
             r =>
                 // Don't join productVariant because it messes with the
                 // price calculation in certain edge-case field resolver scenarios
@@ -316,7 +313,7 @@ export class OrderService {
         );
         return this.listQueryBuilder
             .build(Order, options, {
-                relations: relations ?? ['lines', 'lines.items', 'customer', 'channels', 'shippingLines'],
+                relations: relations ?? ['lines', 'customer', 'channels', 'shippingLines'],
                 channelId: ctx.channelId,
                 ctx,
             })
@@ -344,17 +341,6 @@ export class OrderService {
         });
     }
 
-    /**
-     * @description
-     * Returns all OrderItems associated with the given {@link Refund}.
-     */
-    async getRefundOrderItems(ctx: RequestContext, refundId: ID): Promise<OrderItem[]> {
-        const refund = await this.connection.getEntityOrThrow(ctx, Refund, refundId, {
-            relations: ['orderItems'],
-        });
-        return refund.orderItems;
-    }
-
     /**
      * @description
      * Returns an array of any {@link OrderModification} entities associated with the Order.
@@ -364,7 +350,7 @@ export class OrderService {
             where: {
                 order: orderId,
             },
-            relations: ['orderItems', 'payment', 'refund', 'surcharges'],
+            relations: ['lines', 'payment', 'refund', 'surcharges'],
         });
     }
 
@@ -744,14 +730,12 @@ export class OrderService {
         if (order.couponCodes.includes(couponCode)) {
             // When removing a couponCode which has triggered an Order-level discount
             // we need to make sure we persist the changes to the adjustments array of
-            // any affected OrderItems.
-            const affectedOrderItems = order.lines
-                .reduce((items, l) => [...items, ...l.items], [] as OrderItem[])
-                .filter(
-                    i =>
-                        i.adjustments.filter(a => a.type === AdjustmentType.DISTRIBUTED_ORDER_PROMOTION)
-                            .length,
-                );
+            // any affected OrderLines.
+            const affectedOrderLines = order.lines.filter(
+                line =>
+                    line.adjustments.filter(a => a.type === AdjustmentType.DISTRIBUTED_ORDER_PROMOTION)
+                        .length,
+            );
             order.couponCodes = order.couponCodes.filter(cc => cc !== couponCode);
             await this.historyService.createHistoryEntryForOrder({
                 ctx,
@@ -761,7 +745,7 @@ export class OrderService {
             });
             this.eventBus.publish(new CouponCodeEvent(ctx, couponCode, orderId, 'removed'));
             const result = await this.applyPriceAdjustments(ctx, order);
-            await this.connection.getRepository(ctx, OrderItem).save(affectedOrderItems);
+            await this.connection.getRepository(ctx, OrderLine).save(affectedOrderLines);
             return result;
         } else {
             return order;
@@ -1199,32 +1183,31 @@ export class OrderService {
         if (!input.lines || input.lines.length === 0 || summate(input.lines, 'quantity') === 0) {
             return new EmptyOrderLineSelectionError();
         }
-        const ordersAndItems = await this.getOrdersAndItemsFromLines(
-            ctx,
-            input.lines,
-            i => !i.fulfillment && !i.cancelled,
-        );
-        if (!ordersAndItems) {
+        const orders = await getOrdersFromLines(ctx, this.connection, input.lines);
+
+        if (await this.requestedFulfillmentQuantityExceedsLineQuantity(ctx, input)) {
             return new ItemsAlreadyFulfilledError();
         }
+
         const stockCheckResult = await this.ensureSufficientStockForFulfillment(ctx, input);
         if (isGraphQlErrorResult(stockCheckResult)) {
             return stockCheckResult;
         }
 
-        const fulfillment = await this.fulfillmentService.create(
-            ctx,
-            ordersAndItems.orders,
-            ordersAndItems.items,
-            input.handler,
-        );
+        const fulfillment = await this.fulfillmentService.create(ctx, orders, input.lines, input.handler);
         if (isGraphQlErrorResult(fulfillment)) {
             return fulfillment;
         }
 
-        await this.stockMovementService.createSalesForOrder(ctx, ordersAndItems.items);
+        await this.connection
+            .getRepository(ctx, Order)
+            .createQueryBuilder()
+            .relation('fulfillments')
+            .of(orders)
+            .add(fulfillment);
+        await this.stockMovementService.createSalesForOrder(ctx, input.lines);
 
-        for (const order of ordersAndItems.orders) {
+        for (const order of orders) {
             await this.historyService.createHistoryEntryForOrder({
                 ctx,
                 orderId: order.id,
@@ -1241,6 +1224,33 @@ export class OrderService {
         return result.fulfillment;
     }
 
+    private async requestedFulfillmentQuantityExceedsLineQuantity(
+        ctx: RequestContext,
+        input: FulfillOrderInput,
+    ) {
+        const linesToBeFulfilled = await this.connection
+            .getRepository(ctx, FulfillmentLine)
+            .createQueryBuilder('fulfillmentLine')
+            .leftJoinAndSelect('fulfillmentLine.orderLine', 'orderLine')
+            .leftJoinAndSelect('fulfillmentLine.fulfillment', 'fulfillment')
+            .where('fulfillmentLine.orderLineId IN (:...orderLineIds)', {
+                orderLineIds: input.lines.map(l => l.orderLineId),
+            })
+            .andWhere('fulfillment.state != :state', { state: 'Cancelled' })
+            .getMany();
+
+        for (const lineToBeFulfilled of linesToBeFulfilled) {
+            const unfulfilledQuantity = lineToBeFulfilled.orderLine.quantity - lineToBeFulfilled.quantity;
+            const lineInput = input.lines.find(l =>
+                idsAreEqual(l.orderLineId, lineToBeFulfilled.orderLine.id),
+            );
+            if (unfulfilledQuantity < (lineInput?.quantity ?? 0)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private async ensureSufficientStockForFulfillment(
         ctx: RequestContext,
         input: FulfillOrderInput,
@@ -1273,21 +1283,9 @@ export class OrderService {
      * Returns an array of all Fulfillments associated with the Order.
      */
     async getOrderFulfillments(ctx: RequestContext, order: Order): Promise<Fulfillment[]> {
-        const itemIdsQb = await this.connection
-            .getRepository(ctx, OrderItem)
-            .createQueryBuilder('item')
-            .select('item.id', 'id')
-            .leftJoin('item.line', 'line')
-            .leftJoin('line.order', 'order')
-            .where('order.id = :orderId', { orderId: order.id });
-
-        const fulfillments = await this.connection
-            .getRepository(ctx, Fulfillment)
-            .createQueryBuilder('fulfillment')
-            .leftJoinAndSelect('fulfillment.orderItems', 'item')
-            .where(`item.id IN (${itemIdsQb.getQuery()})`)
-            .setParameters(itemIdsQb.getParameters())
-            .getMany();
+        const { fulfillments } = await this.connection.getEntityOrThrow(ctx, Order, order.id, {
+            relations: ['fulfillments'],
+        });
 
         return fulfillments;
     }
@@ -1316,7 +1314,7 @@ export class OrderService {
         let allOrderItemsCancelled = false;
         const cancelResult =
             input.lines != null
-                ? await this.cancelOrderByOrderLines(ctx, input, input.lines)
+                ? await this.orderModifier.cancelOrderByOrderLines(ctx, input, input.lines)
                 : await this.cancelOrderById(ctx, input);
 
         if (isGraphQlErrorResult(cancelResult)) {
@@ -1343,93 +1341,29 @@ export class OrderService {
                 orderLineId: l.id,
                 quantity: l.quantity,
             }));
-            return this.cancelOrderByOrderLines(ctx, input, lines);
-        }
-    }
-
-    private async cancelOrderByOrderLines(
-        ctx: RequestContext,
-        input: CancelOrderInput,
-        lines: OrderLineInput[],
-    ) {
-        if (lines.length === 0 || summate(lines, 'quantity') === 0) {
-            return new EmptyOrderLineSelectionError();
-        }
-        const ordersAndItems = await this.getOrdersAndItemsFromLines(ctx, lines, i => !i.cancelled);
-        if (!ordersAndItems) {
-            return new QuantityTooGreatError();
-        }
-        if (1 < ordersAndItems.orders.length) {
-            return new MultipleOrderError();
-        }
-        const { orders, items } = ordersAndItems;
-        const order = orders[0];
-        if (!idsAreEqual(order.id, input.orderId)) {
-            return new MultipleOrderError();
-        }
-        if (order.active) {
-            return new CancelActiveOrderError({ orderState: order.state });
-        }
-        const fullOrder = await this.findOne(ctx, order.id);
-
-        const soldItems = items.filter(i => !!i.fulfillment);
-        const allocatedItems = await this.getAllocatedItems(ctx, items);
-        await this.stockMovementService.createCancellationsForOrderItems(ctx, soldItems);
-        await this.stockMovementService.createReleasesForOrderItems(ctx, allocatedItems);
-        items.forEach(i => (i.cancelled = true));
-        await this.connection.getRepository(ctx, OrderItem).save(items, { reload: false });
-
-        const orderWithItems = await this.connection.getEntityOrThrow(ctx, Order, order.id, {
-            relations: ['lines', 'lines.items', 'surcharges', 'shippingLines'],
-        });
-        if (input.cancelShipping === true) {
-            for (const shippingLine of orderWithItems.shippingLines) {
-                shippingLine.adjustments.push({
-                    adjustmentSource: 'CANCEL_ORDER',
-                    type: AdjustmentType.OTHER,
-                    description: 'shipping cancellation',
-                    amount: -shippingLine.discountedPriceWithTax,
-                });
-                this.connection.getRepository(ctx, ShippingLine).save(shippingLine, { reload: false });
-            }
-        }
-        // Update totals after cancellation
-        this.orderCalculator.calculateOrderTotals(orderWithItems);
-        await this.connection.getRepository(ctx, Order).save(orderWithItems, { reload: false });
-
-        await this.historyService.createHistoryEntryForOrder({
-            ctx,
-            orderId: order.id,
-            type: HistoryEntryType.ORDER_CANCELLATION,
-            data: {
-                orderItemIds: items.map(i => i.id),
-                reason: input.reason || undefined,
-                shippingCancelled: !!input.cancelShipping,
-            },
-        });
-
-        return orderItemsAreAllCancelled(orderWithItems);
-    }
-
-    private async getAllocatedItems(ctx: RequestContext, items: OrderItem[]): Promise<OrderItem[]> {
-        const allocatedItems: OrderItem[] = [];
-        const allocationMap = new Map<ID, Allocation | false>();
-        for (const item of items) {
-            let allocation = allocationMap.get(item.lineId);
-            if (!allocation) {
-                allocation = await this.connection
-                    .getRepository(ctx, Allocation)
-                    .createQueryBuilder('allocation')
-                    .where('allocation.orderLine = :lineId', { lineId: item.lineId })
-                    .getOne();
-                allocationMap.set(item.lineId, allocation || false);
-            }
-            if (allocation && !item.fulfillment) {
-                allocatedItems.push(item);
-            }
-        }
-        return allocatedItems;
-    }
+            return this.orderModifier.cancelOrderByOrderLines(ctx, input, lines);
+        }
+    }
+
+    // private async getAllocatedItems(ctx: RequestContext, items: OrderItem[]): Promise<OrderItem[]> {
+    //     const allocatedItems: OrderItem[] = [];
+    //     const allocationMap = new Map<ID, Allocation | false>();
+    //     for (const item of items) {
+    //         let allocation = allocationMap.get(item.lineId);
+    //         if (!allocation) {
+    //             allocation = await this.connection
+    //                 .getRepository(ctx, Allocation)
+    //                 .createQueryBuilder('allocation')
+    //                 .where('allocation.orderLine = :lineId', { lineId: item.lineId })
+    //                 .getOne();
+    //             allocationMap.set(item.lineId, allocation || false);
+    //         }
+    //         if (allocation && !item.fulfillment) {
+    //             allocatedItems.push(item);
+    //         }
+    //     }
+    //     return allocatedItems;
+    // }
 
     /**
      * @description
@@ -1446,18 +1380,34 @@ export class OrderService {
         ) {
             return new NothingToRefundError();
         }
-        const ordersAndItems = await this.getOrdersAndItemsFromLines(
-            ctx,
-            input.lines,
-            i => i.refund?.state !== 'Settled',
-        );
-        if (!ordersAndItems) {
-            return new QuantityTooGreatError();
-        }
-        const { orders, items } = ordersAndItems;
+        const orders = await getOrdersFromLines(ctx, this.connection, input.lines ?? []);
         if (1 < orders.length) {
             return new MultipleOrderError();
         }
+        // const refundLines = await this.connection
+        //     .getRepository(ctx, RefundLine)
+        //     .createQueryBuilder('refundLine')
+        //     .leftJoinAndSelect('refundLine.refund', 'refund')
+        //     .where('refundLine.orderLineId IN (:...orderLineIds)', {
+        //         orderLineIds: input.lines?.map(l => l.orderLineId) ?? [],
+        //     })
+        //     .andWhere('refund.state != :state', { state: 'Failed' })
+        //     .getMany();
+        // const orderLines = await this.connection
+        //     .getRepository(ctx, OrderLine)
+        //     .findByIds(input.lines?.map(l => l.orderLineId) ?? []);
+        // for (const lineInput of input.lines) {
+        //     const refundLinesForOrderLine = refundLines.filter(l =>
+        //         idsAreEqual(l.orderLineId, lineInput.orderLineId),
+        //     );
+        //     const orderLine = orderLines.find(l => idsAreEqual(l.id, lineInput.orderLineId));
+        //     const orderLineQuantity = orderLine ? orderLine.quantity - orderLine.cancelledCount : 0;
+        //     const quantityRefunded = summate(refundLinesForOrderLine, 'quantity');
+        //
+        //     if (orderLineQuantity - quantityRefunded < lineInput.quantity) {
+        //         return new QuantityTooGreatError();
+        //     }
+        // }
         const payment = await this.connection.getEntityOrThrow(ctx, Payment, input.paymentId, {
             relations: ['order'],
         });
@@ -1472,14 +1422,8 @@ export class OrderService {
         ) {
             return new RefundOrderStateError({ orderState: order.state });
         }
-        const alreadyRefunded = items.find(
-            i => i.refund?.state === 'Pending' || i.refund?.state === 'Settled',
-        );
-        if (alreadyRefunded) {
-            return new AlreadyRefundedError({ refundId: alreadyRefunded.refundId as string });
-        }
 
-        return await this.paymentService.createRefund(ctx, input, order, items, payment);
+        return await this.paymentService.createRefund(ctx, input, order, payment);
     }
 
     /**
@@ -1769,116 +1713,35 @@ export class OrderService {
                     updatedOrderLine.customFields || {},
                     order,
                 );
-                const initialListPrice =
-                    updatedOrderLine.items.find(i => i.initialListPrice != null)?.initialListPrice ??
-                    priceResult.price;
+                const initialListPrice = updatedOrderLine.initialListPrice ?? priceResult.price;
                 if (initialListPrice !== priceResult.price) {
                     priceResult = await changedPriceHandlingStrategy.handlePriceChange(
                         ctx,
                         priceResult,
-                        updatedOrderLine.items,
+                        updatedOrderLine,
                         order,
                     );
                 }
-                for (const item of updatedOrderLine.items) {
-                    if (item.initialListPrice == null) {
-                        item.initialListPrice = initialListPrice;
-                    }
-                    item.listPrice = priceResult.price;
-                    item.listPriceIncludesTax = priceResult.priceIncludesTax;
+
+                if (updatedOrderLine.initialListPrice == null) {
+                    updatedOrderLine.initialListPrice = initialListPrice;
                 }
+                updatedOrderLine.listPrice = priceResult.price;
+                updatedOrderLine.listPriceIncludesTax = priceResult.priceIncludesTax;
             }
         }
 
-        const updatedItems = await this.orderCalculator.applyPriceAdjustments(
+        const updatedOrder = await this.orderCalculator.applyPriceAdjustments(
             ctx,
             order,
             promotions,
             updatedOrderLines ?? [],
         );
-        const updateFields: Array<keyof OrderItem> = [
-            'initialListPrice',
-            'listPrice',
-            'listPriceIncludesTax',
-            'adjustments',
-            'taxLines',
-        ];
-        await this.connection
-            .getRepository(ctx, OrderItem)
-            .createQueryBuilder()
-            .insert()
-            .into(OrderItem, [...updateFields, 'id', 'lineId'])
-            .values(updatedItems)
-            .orUpdate({
-                conflict_target: ['id'],
-                overwrite: updateFields,
-            })
-            .updateEntity(false)
-            .execute();
-        await this.connection.getRepository(ctx, Order).save(order, { reload: false });
+        await this.connection.getRepository(ctx, Order).save(updatedOrder, { reload: false });
+        await this.connection.getRepository(ctx, OrderLine).save(updatedOrder.lines, { reload: false });
         await this.connection.getRepository(ctx, ShippingLine).save(order.shippingLines, { reload: false });
         await this.promotionService.runPromotionSideEffects(ctx, order, activePromotionsPre);
 
         return assertFound(this.findOne(ctx, order.id));
     }
-
-    private async getOrdersAndItemsFromLines(
-        ctx: RequestContext,
-        orderLinesInput: OrderLineInput[],
-        itemMatcher: (i: OrderItem) => boolean,
-    ): Promise<{ orders: Order[]; items: OrderItem[] } | false> {
-        const orders = new Map<ID, Order>();
-        const items = new Map<ID, OrderItem>();
-
-        const lines = await this.connection.getRepository(ctx, OrderLine).findByIds(
-            orderLinesInput.map(l => l.orderLineId),
-            {
-                relations: ['order', 'items', 'items.fulfillments', 'order.channels', 'items.refund'],
-                order: { id: 'ASC' },
-            },
-        );
-        for (const line of lines) {
-            const inputLine = orderLinesInput.find(l => idsAreEqual(l.orderLineId, line.id));
-            if (!inputLine) {
-                continue;
-            }
-            const order = line.order;
-            if (!order.channels.some(channel => channel.id === ctx.channelId)) {
-                throw new EntityNotFoundError('Order', order.id);
-            }
-            if (!orders.has(order.id)) {
-                orders.set(order.id, order);
-            }
-            const matchingItems = line.items.sort((a, b) => (a.id < b.id ? -1 : 1)).filter(itemMatcher);
-            if (matchingItems.length < inputLine.quantity) {
-                return false;
-            }
-            matchingItems
-                .slice(0)
-                .sort((a, b) =>
-                    // sort the OrderItems so that those without Fulfillments come first, as
-                    // it makes sense to cancel these prior to cancelling fulfilled items.
-                    !a.fulfillment && b.fulfillment ? -1 : a.fulfillment && !b.fulfillment ? 1 : 0,
-                )
-                .slice(0, inputLine.quantity)
-                .forEach(item => {
-                    items.set(item.id, item);
-                });
-        }
-        return {
-            orders: Array.from(orders.values()),
-            items: Array.from(items.values()),
-        };
-    }
-
-    private mergePaymentMetadata(m1: PaymentMetadata, m2?: PaymentMetadata): PaymentMetadata {
-        if (!m2) {
-            return m1;
-        }
-        const merged = { ...m1, ...m2 };
-        if (m1.public && m1.public) {
-            merged.public = { ...m1.public, ...m2.public };
-        }
-        return merged;
-    }
 }

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

@@ -14,8 +14,7 @@ import { PaymentMetadata } from '../../common/types/common-types';
 import { idsAreEqual } from '../../common/utils';
 import { Logger, PaymentMethodHandler } from '../../config/index';
 import { TransactionalConnection } from '../../connection/transactional-connection';
-import { PaymentMethod } from '../../entity/index';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
+import { Fulfillment, FulfillmentLine, OrderLine, PaymentMethod, RefundLine } from '../../entity/index';
 import { Order } from '../../entity/order/order.entity';
 import { Payment } from '../../entity/payment/payment.entity';
 import { Refund } from '../../entity/refund/refund.entity';
@@ -277,7 +276,6 @@ export class PaymentService {
         ctx: RequestContext,
         input: RefundOrderInput,
         order: Order,
-        items: OrderItem[],
         selectedPayment: Payment,
     ): Promise<Refund | RefundStateTransitionError> {
         const orderWithRefunds = await this.connection.getEntityOrThrow(ctx, Order, order.id, {
@@ -293,10 +291,19 @@ export class PaymentService {
         const refundablePayments = orderWithRefunds.payments.filter(p => {
             return paymentRefundTotal(p) < p.amount;
         });
-        const itemAmount = summate(items, 'proratedUnitPriceWithTax');
+        let refundOrderLinesTotal = 0;
+        const orderLines = await this.connection
+            .getRepository(ctx, OrderLine)
+            .findByIds(input.lines.map(l => l.orderLineId));
+        for (const line of input.lines) {
+            const orderLine = orderLines.find(l => idsAreEqual(l.id, line.orderLineId));
+            if (orderLine && 0 < orderLine.quantity) {
+                refundOrderLinesTotal += line.quantity * orderLine.proratedUnitPriceWithTax;
+            }
+        }
         let primaryRefund: Refund | undefined;
         const refundedPaymentIds: ID[] = [];
-        const refundTotal = itemAmount + input.shipping + input.adjustment;
+        const refundTotal = refundOrderLinesTotal + input.shipping + input.adjustment;
         const refundMax =
             orderWithRefunds.payments
                 ?.map(p => p.amount - paymentRefundTotal(p))
@@ -316,8 +323,7 @@ export class PaymentService {
             let refund = new Refund({
                 payment: paymentToRefund,
                 total,
-                orderItems: items,
-                items: itemAmount,
+                items: refundOrderLinesTotal,
                 reason: input.reason,
                 adjustment: input.adjustment,
                 shipping: input.shipping,
@@ -356,6 +362,23 @@ export class PaymentService {
                 refund.metadata = createRefundResult.metadata || {};
             }
             refund = await this.connection.getRepository(ctx, Refund).save(refund);
+            const refundLines: RefundLine[] = [];
+            for (const { orderLineId, quantity } of input.lines) {
+                const refundLine = await this.connection.getRepository(ctx, RefundLine).save(
+                    new RefundLine({
+                        refund,
+                        orderLineId,
+                        quantity,
+                    }),
+                );
+                refundLines.push(refundLine);
+            }
+            await this.connection
+                .getRepository(ctx, Fulfillment)
+                .createQueryBuilder()
+                .relation('lines')
+                .of(refund)
+                .add(refundLines);
             if (createRefundResult) {
                 let finalize: () => Promise<any>;
                 const fromState = refund.state;

packages/core/src/service/services/stock-movement.service.ts

@@ -1,13 +1,13 @@
 import { Injectable } from '@nestjs/common';
-import { GlobalFlag, StockMovementListOptions } from '@vendure/common/lib/generated-types';
+import { GlobalFlag, OrderLineInput, StockMovementListOptions } from '@vendure/common/lib/generated-types';
 import { ID, PaginatedList } from '@vendure/common/lib/shared-types';
 
 import { RequestContext } from '../../api/common/request-context';
 import { InternalServerError } from '../../common/error/errors';
+import { idsAreEqual } from '../../common/index';
 import { ShippingCalculator } from '../../config/shipping-method/shipping-calculator';
 import { ShippingEligibilityChecker } from '../../config/shipping-method/shipping-eligibility-checker';
 import { TransactionalConnection } from '../../connection/transactional-connection';
-import { OrderItem } from '../../entity/order-item/order-item.entity';
 import { OrderLine } from '../../entity/order-line/order-line.entity';
 import { Order } from '../../entity/order/order.entity';
 import { ProductVariant } from '../../entity/product-variant/product-variant.entity';
@@ -101,7 +101,10 @@ export class StockMovementService {
         if (order.active !== false) {
             throw new InternalServerError('error.cannot-create-allocations-for-active-order');
         }
-        const lines = order.lines.map(orderLine => ({ orderLine, quantity: orderLine.quantity }));
+        const lines = order.lines.map(orderLine => ({
+            orderLineId: orderLine.id,
+            quantity: orderLine.quantity,
+        }));
         return this.createAllocationsForOrderLines(ctx, lines);
     }
 
@@ -113,15 +116,16 @@ export class StockMovementService {
      */
     async createAllocationsForOrderLines(
         ctx: RequestContext,
-        lines: Array<{ orderLine: OrderLine; quantity: number }>,
+        lines: OrderLineInput[],
     ): Promise<Allocation[]> {
         const allocations: Allocation[] = [];
         const globalTrackInventory = (await this.globalSettingsService.getSettings(ctx)).trackInventory;
-        for (const { orderLine, quantity } of lines) {
+        for (const { orderLineId, quantity } of lines) {
+            const orderLine = await this.connection.getEntityOrThrow(ctx, OrderLine, orderLineId);
             const productVariant = await this.connection.getEntityOrThrow(
                 ctx,
                 ProductVariant,
-                orderLine.productVariant.id,
+                orderLine.productVariantId,
             );
             const allocation = new Allocation({
                 productVariant,
@@ -148,41 +152,48 @@ export class StockMovementService {
      * @description
      * Creates {@link Sale}s for each OrderLine in the Order. For ProductVariants
      * which are configured to track stock levels, the `ProductVariant.stockAllocated` value is
-     * reduced and the `stockOnHand` value is also reduced the the OrderLine quantity, indicating
+     * reduced and the `stockOnHand` value is also reduced by the OrderLine quantity, indicating
      * that the stock is no longer allocated, but is actually sold and no longer available.
      */
-    async createSalesForOrder(ctx: RequestContext, orderItems: OrderItem[]): Promise<Sale[]> {
+    async createSalesForOrder(ctx: RequestContext, lines: OrderLineInput[]): Promise<Sale[]> {
         const sales: Sale[] = [];
         const globalTrackInventory = (await this.globalSettingsService.getSettings(ctx)).trackInventory;
-        const orderLinesMap = new Map<ID, { line: OrderLine; items: OrderItem[] }>();
+        // const orderLinesMap = new Map<ID, { line: OrderLine; items: OrderItem[] }>();
 
-        for (const orderItem of orderItems) {
-            let value = orderLinesMap.get(orderItem.lineId);
-            if (!value) {
-                const line = await this.connection.getEntityOrThrow(ctx, OrderLine, orderItem.lineId, {
-                    relations: ['productVariant'],
-                });
-                value = { line, items: [] };
-                orderLinesMap.set(orderItem.lineId, value);
+        // for (const orderItem of orderItems) {
+        //     let value = orderLinesMap.get(orderItem.lineId);
+        //     if (!value) {
+        //         const line = await this.connection.getEntityOrThrow(ctx, OrderLine, orderItem.lineId, {
+        //             relations: ['productVariant'],
+        //         });
+        //         value = { line, items: [] };
+        //         orderLinesMap.set(orderItem.lineId, value);
+        //     }
+        //     value.items.push(orderItem);
+        // }
+        const orderLines = await this.connection
+            .getRepository(ctx, OrderLine)
+            .findByIds(lines.map(line => line.orderLineId));
+        for (const lineRow of lines) {
+            const orderLine = orderLines.find(line => idsAreEqual(line.id, lineRow.orderLineId));
+            if (!orderLine) {
+                continue;
             }
-            value.items.push(orderItem);
-        }
-        for (const lineRow of orderLinesMap.values()) {
             const productVariant = await this.connection.getEntityOrThrow(
                 ctx,
                 ProductVariant,
-                lineRow.line.productVariant.id,
+                orderLine.productVariantId,
             );
             const sale = new Sale({
                 productVariant,
-                quantity: lineRow.items.length * -1,
-                orderLine: lineRow.line,
+                quantity: lineRow.quantity * -1,
+                orderLine,
             });
             sales.push(sale);
 
             if (this.trackInventoryForVariant(productVariant, globalTrackInventory)) {
-                productVariant.stockOnHand -= lineRow.items.length;
-                productVariant.stockAllocated -= lineRow.items.length;
+                productVariant.stockOnHand -= lineRow.quantity;
+                productVariant.stockAllocated -= lineRow.quantity;
                 await this.connection
                     .getRepository(ctx, ProductVariant)
                     .save(productVariant, { reload: false });
@@ -201,38 +212,36 @@ export class StockMovementService {
      * which are configured to track stock levels, the `ProductVariant.stockOnHand` value is
      * increased for each Cancellation, allowing that stock to be sold again.
      */
-    async createCancellationsForOrderItems(ctx: RequestContext, items: OrderItem[]): Promise<Cancellation[]> {
-        const orderItems = await this.connection.getRepository(ctx, OrderItem).findByIds(
-            items.map(i => i.id),
+    async createCancellationsForOrderLines(
+        ctx: RequestContext,
+        lineInputs: OrderLineInput[],
+    ): Promise<Cancellation[]> {
+        const orderLines = await this.connection.getRepository(ctx, OrderLine).findByIds(
+            lineInputs.map(line => line.orderLineId),
             {
-                relations: ['line', 'line.productVariant'],
+                relations: ['productVariant'],
             },
         );
+
         const cancellations: Cancellation[] = [];
         const globalTrackInventory = (await this.globalSettingsService.getSettings(ctx)).trackInventory;
-        const variantsMap = new Map<ID, ProductVariant>();
-        for (const item of orderItems) {
-            let productVariant: ProductVariant;
-            const productVariantId = item.line.productVariant.id;
-            if (variantsMap.has(productVariantId)) {
-                // tslint:disable-next-line:no-non-null-assertion
-                productVariant = variantsMap.get(productVariantId)!;
-            } else {
-                productVariant = item.line.productVariant;
-                variantsMap.set(productVariantId, productVariant);
+        for (const line of orderLines) {
+            const lineInput = lineInputs.find(l => idsAreEqual(l.orderLineId, line.id));
+            if (!lineInput) {
+                continue;
             }
             const cancellation = new Cancellation({
-                productVariant,
-                quantity: 1,
-                orderItem: item,
+                productVariant: line.productVariant,
+                quantity: lineInput.quantity,
+                orderLine: line,
             });
             cancellations.push(cancellation);
 
-            if (this.trackInventoryForVariant(productVariant, globalTrackInventory)) {
-                productVariant.stockOnHand += 1;
+            if (this.trackInventoryForVariant(line.productVariant, globalTrackInventory)) {
+                line.productVariant.stockOnHand += lineInput.quantity;
                 await this.connection
                     .getRepository(ctx, ProductVariant)
-                    .save(productVariant, { reload: false });
+                    .save(line.productVariant, { reload: false });
             }
         }
         const savedCancellations = await this.connection.getRepository(ctx, Cancellation).save(cancellations);
@@ -248,38 +257,39 @@ export class StockMovementService {
      * which are configured to track stock levels, the `ProductVariant.stockAllocated` value is
      * reduced, indicating that this stock is once again available to buy.
      */
-    async createReleasesForOrderItems(ctx: RequestContext, items: OrderItem[]): Promise<Release[]> {
-        const orderItems = await this.connection.getRepository(ctx, OrderItem).findByIds(
-            items.map(i => i.id),
+    async createReleasesForOrderLines(ctx: RequestContext, lineInputs: OrderLineInput[]): Promise<Release[]> {
+        // const orderItems = await this.connection.getRepository(ctx, OrderItem).findByIds(
+        //     items.map(i => i.id),
+        //     {
+        //         relations: ['line', 'line.productVariant'],
+        //     },
+        // );
+        const releases: Release[] = [];
+        const orderLines = await this.connection.getRepository(ctx, OrderLine).findByIds(
+            lineInputs.map(line => line.orderLineId),
             {
-                relations: ['line', 'line.productVariant'],
+                relations: ['productVariant'],
             },
         );
-        const releases: Release[] = [];
         const globalTrackInventory = (await this.globalSettingsService.getSettings(ctx)).trackInventory;
         const variantsMap = new Map<ID, ProductVariant>();
-        for (const item of orderItems) {
-            let productVariant: ProductVariant;
-            const productVariantId = item.line.productVariant.id;
-            if (variantsMap.has(productVariantId)) {
-                // tslint:disable-next-line:no-non-null-assertion
-                productVariant = variantsMap.get(productVariantId)!;
-            } else {
-                productVariant = item.line.productVariant;
-                variantsMap.set(productVariantId, productVariant);
+        for (const line of orderLines) {
+            const lineInput = lineInputs.find(l => idsAreEqual(l.orderLineId, line.id));
+            if (!lineInput) {
+                continue;
             }
             const release = new Release({
-                productVariant,
-                quantity: 1,
-                orderItem: item,
+                productVariant: line.productVariant,
+                quantity: lineInput.quantity,
+                orderLine: line,
             });
             releases.push(release);
 
-            if (this.trackInventoryForVariant(productVariant, globalTrackInventory)) {
-                productVariant.stockAllocated -= 1;
+            if (this.trackInventoryForVariant(line.productVariant, globalTrackInventory)) {
+                line.productVariant.stockAllocated -= lineInput.quantity;
                 await this.connection
                     .getRepository(ctx, ProductVariant)
-                    .save(productVariant, { reload: false });
+                    .save(line.productVariant, { reload: false });
             }
         }
         const savedReleases = await this.connection.getRepository(ctx, Release).save(releases);

packages/core/src/testing/order-test-utils.ts

@@ -4,7 +4,6 @@ import { ID } from '@vendure/common/lib/shared-types';
 
 import { RequestContext } from '../api/common/request-context';
 import { Channel } from '../entity/channel/channel.entity';
-import { OrderItem } from '../entity/order-item/order-item.entity';
 import { OrderLine } from '../entity/order-line/order-line.entity';
 import { Order } from '../entity/order/order.entity';
 import { ProductVariant } from '../entity/product-variant/product-variant.entity';
@@ -20,7 +19,7 @@ export function createOrderFromLines(simpleLines: SimpleLine[]): Order {
             new OrderLine({
                 id: lineId,
                 productVariant: new ProductVariant({ id: productVariantId }),
-                items: Array.from({ length: quantity }).map(() => new OrderItem({})),
+                quantity,
                 ...(customFields ? { customFields } : {}),
             }),
     );
@@ -144,15 +143,11 @@ export function createOrder(
         ({ listPrice, taxCategory, quantity }) =>
             new OrderLine({
                 taxCategory,
-                items: Array.from({ length: quantity }).map(
-                    () =>
-                        new OrderItem({
-                            listPrice,
-                            listPriceIncludesTax: orderConfig.ctx.channel.pricesIncludeTax,
-                            taxLines: [],
-                            adjustments: [],
-                        }),
-                ),
+                quantity,
+                listPrice,
+                listPriceIncludesTax: orderConfig.ctx.channel.pricesIncludeTax,
+                taxLines: [],
+                adjustments: [],
             }),
     );
 

packages/dev-server/test-plugins/multivendor-plugin/config/mv-order-process.ts

@@ -68,7 +68,7 @@ export const multivendorOrderProcess: CustomOrderProcess<any> = {
             const aggregateOrder = await orderService.getAggregateOrder(ctx, order);
             if (aggregateOrder) {
                 // This part is responsible for automatically updating the state of the aggregate Order
-                // based on the fulfillment state of all the the associated seller Orders.
+                // based on the fulfillment state of all the associated seller Orders.
                 const otherSellerOrders = (await orderService.getSellerOrders(ctx, aggregateOrder)).filter(
                     so => !idsAreEqual(so.id, order.id),
                 );
@@ -89,6 +89,6 @@ export const multivendorOrderProcess: CustomOrderProcess<any> = {
 
 async function findOrderWithFulfillments(ctx: RequestContext, id: ID): Promise<Order> {
     return await connection.getEntityOrThrow(ctx, Order, id, {
-        relations: ['lines', 'lines.items', 'lines.items.fulfillments'],
+        relations: ['lines', 'fulfillments', 'fulfillments.lines'],
     });
 }

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

@@ -75,14 +75,10 @@ export type AdjustDraftOrderLineInput = {
     quantity: Scalars['Int'];
 };
 
-export type AdjustOrderLineInput = {
-    orderLineId: Scalars['ID'];
-    quantity: Scalars['Int'];
-};
-
 export type Adjustment = {
     adjustmentSource: Scalars['String'];
     amount: Scalars['Int'];
+    data?: Maybe<Scalars['JSON']>;
     description: Scalars['String'];
     type: AdjustmentType;
 };
@@ -844,10 +840,6 @@ export type CreateTaxRateInput = {
     zoneId: Scalars['ID'];
 };
 
-export type CreateVendorInput = {
-    name: Scalars['String'];
-};
-
 export type CreateZoneInput = {
     customFields?: InputMaybe<Scalars['JSON']>;
     memberIds?: InputMaybe<Array<Scalars['ID']>>;
@@ -1664,17 +1656,21 @@ export type Fulfillment = Node & {
     createdAt: Scalars['DateTime'];
     customFields?: Maybe<Scalars['JSON']>;
     id: Scalars['ID'];
+    lines: Array<FulfillmentLine>;
     method: Scalars['String'];
     nextStates: Array<Scalars['String']>;
-    orderItems: Array<OrderItem>;
     state: Scalars['String'];
-    summary: Array<FulfillmentLineSummary>;
+    /** @deprecated Use the `lines` field instead */
+    summary: Array<FulfillmentLine>;
     trackingCode?: Maybe<Scalars['String']>;
     updatedAt: Scalars['DateTime'];
 };
 
-export type FulfillmentLineSummary = {
+export type FulfillmentLine = {
+    fulfillment: Fulfillment;
+    fulfillmentId: Scalars['ID'];
     orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
 };
 
@@ -2327,7 +2323,7 @@ export type MissingConditionsError = ErrorResult & {
 
 export type ModifyOrderInput = {
     addItems?: InputMaybe<Array<AddItemInput>>;
-    adjustOrderLines?: InputMaybe<Array<AdjustOrderLineInput>>;
+    adjustOrderLines?: InputMaybe<Array<OrderLineInput>>;
     couponCodes?: InputMaybe<Array<Scalars['String']>>;
     dryRun: Scalars['Boolean'];
     note?: InputMaybe<Scalars['String']>;
@@ -2459,8 +2455,6 @@ export type Mutation = {
     createTaxCategory: TaxCategory;
     /** Create a new TaxRate */
     createTaxRate: TaxRate;
-    /** Create a new Vendor */
-    createVendor: Vendor;
     /** Create a new Zone */
     createZone: Zone;
     /** Delete an Administrator */
@@ -2518,8 +2512,6 @@ export type Mutation = {
     deleteTaxCategory: DeletionResponse;
     /** Delete a TaxRate */
     deleteTaxRate: DeletionResponse;
-    /** Delete a Vendor */
-    deleteVendor: DeletionResponse;
     /** Delete a Zone */
     deleteZone: DeletionResponse;
     flushBufferedJobs: Success;
@@ -2535,6 +2527,7 @@ export type Mutation = {
     /** Move a Collection to a different parent or index */
     moveCollection: Collection;
     refundOrder: RefundOrderResult;
+    registerNewSeller?: Maybe<Channel>;
     reindex: Job;
     /** Removes Collections from the specified Channel */
     removeCollectionsFromChannel: Array<Collection>;
@@ -2624,8 +2617,6 @@ export type Mutation = {
     updateTaxCategory: TaxCategory;
     /** Update an existing TaxRate */
     updateTaxRate: TaxRate;
-    /** Update an existing Vendor */
-    updateVendor: Vendor;
     /** Update an existing Zone */
     updateZone: Zone;
 };
@@ -2812,10 +2803,6 @@ export type MutationCreateTaxRateArgs = {
     input: CreateTaxRateInput;
 };
 
-export type MutationCreateVendorArgs = {
-    input: CreateVendorInput;
-};
-
 export type MutationCreateZoneArgs = {
     input: CreateZoneInput;
 };
@@ -2940,10 +2927,6 @@ export type MutationDeleteTaxRateArgs = {
     id: Scalars['ID'];
 };
 
-export type MutationDeleteVendorArgs = {
-    id: Scalars['ID'];
-};
-
 export type MutationDeleteZoneArgs = {
     id: Scalars['ID'];
 };
@@ -2974,6 +2957,10 @@ export type MutationRefundOrderArgs = {
     input: RefundOrderInput;
 };
 
+export type MutationRegisterNewSellerArgs = {
+    input: RegisterSellerInput;
+};
+
 export type MutationRemoveCollectionsFromChannelArgs = {
     input: RemoveCollectionsFromChannelInput;
 };
@@ -3185,10 +3172,6 @@ export type MutationUpdateTaxRateArgs = {
     input: UpdateTaxRateInput;
 };
 
-export type MutationUpdateVendorArgs = {
-    input: UpdateVendorInput;
-};
-
 export type MutationUpdateZoneArgs = {
     input: UpdateZoneInput;
 };
@@ -3424,9 +3407,8 @@ export type OrderLine = Node & {
     discountedUnitPriceWithTax: Scalars['Int'];
     discounts: Array<Discount>;
     featuredAsset?: Maybe<Asset>;
-    fulfillments?: Maybe<Array<Fulfillment>>;
+    fulfillmentLines?: Maybe<Array<FulfillmentLine>>;
     id: Scalars['ID'];
-    items: Array<OrderItem>;
     /** The total price of the line excluding tax and discounts. */
     linePrice: Scalars['Int'];
     /** The total price of the line including tax but excluding discounts. */
@@ -3434,6 +3416,8 @@ export type OrderLine = Node & {
     /** The total tax on this line */
     lineTax: Scalars['Int'];
     order: Order;
+    /** The quantity at the time the Order was placed */
+    orderPlacedQuantity: Scalars['Int'];
     productVariant: ProductVariant;
     /**
      * The actual line price, taking into account both item discounts _and_ prorated (proportionally-distributed)
@@ -3492,8 +3476,8 @@ export type OrderModification = Node & {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
     isSettled: Scalars['Boolean'];
+    lines: Array<OrderModificationLine>;
     note: Scalars['String'];
-    orderItems?: Maybe<Array<OrderItem>>;
     payment?: Maybe<Payment>;
     priceChange: Scalars['Int'];
     refund?: Maybe<Refund>;
@@ -3507,6 +3491,14 @@ export type OrderModificationError = ErrorResult & {
     message: Scalars['String'];
 };
 
+export type OrderModificationLine = {
+    modification: OrderModification;
+    modificationId: Scalars['ID'];
+    orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+};
+
 /** Returned when attempting to modify the contents of an Order that is not in the `Modifying` state. */
 export type OrderModificationStateError = ErrorResult & {
     errorCode: ErrorCode;
@@ -4286,8 +4278,6 @@ export type Query = {
     taxRates: TaxRateList;
     testEligibleShippingMethods: Array<ShippingMethodQuote>;
     testShippingMethod: TestShippingMethodResult;
-    vendor?: Maybe<Vendor>;
-    vendors: VendorList;
     zone?: Maybe<Zone>;
     zones: Array<Zone>;
 };
@@ -4488,14 +4478,6 @@ export type QueryTestShippingMethodArgs = {
     input: TestShippingMethodInput;
 };
 
-export type QueryVendorArgs = {
-    id: Scalars['ID'];
-};
-
-export type QueryVendorsArgs = {
-    options?: InputMaybe<VendorListOptions>;
-};
-
 export type QueryZoneArgs = {
     id: Scalars['ID'];
 };
@@ -4505,9 +4487,9 @@ export type Refund = Node & {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
     items: Scalars['Int'];
+    lines: Array<RefundLine>;
     metadata?: Maybe<Scalars['JSON']>;
     method?: Maybe<Scalars['String']>;
-    orderItems: Array<OrderItem>;
     paymentId: Scalars['ID'];
     reason?: Maybe<Scalars['String']>;
     shipping: Scalars['Int'];
@@ -4517,6 +4499,14 @@ export type Refund = Node & {
     updatedAt: Scalars['DateTime'];
 };
 
+export type RefundLine = {
+    orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+    refund: Refund;
+    refundId: Scalars['ID'];
+};
+
 export type RefundOrderInput = {
     adjustment: Scalars['Int'];
     lines: Array<OrderLineInput>;
@@ -4561,6 +4551,11 @@ export type RefundStateTransitionError = ErrorResult & {
     transitionError: Scalars['String'];
 };
 
+export type RegisterSellerInput = {
+    administrator: CreateAdministratorInput;
+    shopName: Scalars['String'];
+};
+
 export type RelationCustomFieldConfig = CustomField & {
     description?: Maybe<Array<LocalizedString>>;
     entity: Scalars['String'];
@@ -4940,6 +4935,24 @@ export type StockAdjustment = Node &
         updatedAt: Scalars['DateTime'];
     };
 
+export type StockLevel = Node & {
+    createdAt: Scalars['DateTime'];
+    id: Scalars['ID'];
+    stockAllocated: Scalars['Int'];
+    stockLocation: StockLocation;
+    stockLocationId: Scalars['ID'];
+    stockOnHand: Scalars['Int'];
+    updatedAt: Scalars['DateTime'];
+};
+
+export type StockLocation = Node & {
+    createdAt: Scalars['DateTime'];
+    description: Scalars['String'];
+    id: Scalars['ID'];
+    name: Scalars['String'];
+    updatedAt: Scalars['DateTime'];
+};
+
 export type StockMovement = {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
@@ -5462,11 +5475,6 @@ export type UpdateTaxRateInput = {
     zoneId?: InputMaybe<Scalars['ID']>;
 };
 
-export type UpdateVendorInput = {
-    id: Scalars['ID'];
-    name?: InputMaybe<Scalars['String']>;
-};
-
 export type UpdateZoneInput = {
     customFields?: InputMaybe<Scalars['JSON']>;
     id: Scalars['ID'];
@@ -5485,45 +5493,6 @@ export type User = Node & {
     verified: Scalars['Boolean'];
 };
 
-export type Vendor = Node & {
-    createdAt: Scalars['DateTime'];
-    id: Scalars['ID'];
-    name: Scalars['String'];
-    updatedAt: Scalars['DateTime'];
-};
-
-export type VendorFilterParameter = {
-    createdAt?: InputMaybe<DateOperators>;
-    id?: InputMaybe<IdOperators>;
-    name?: InputMaybe<StringOperators>;
-    updatedAt?: InputMaybe<DateOperators>;
-};
-
-export type VendorList = PaginatedList & {
-    items: Array<Vendor>;
-    totalItems: Scalars['Int'];
-};
-
-export type VendorListOptions = {
-    /** Allows the results to be filtered */
-    filter?: InputMaybe<VendorFilterParameter>;
-    /** Specifies whether multiple "filter" arguments should be combines with a logical AND or OR operation. Defaults to AND. */
-    filterOperator?: InputMaybe<LogicalOperator>;
-    /** Skips the first n results, for use in pagination */
-    skip?: InputMaybe<Scalars['Int']>;
-    /** Specifies which properties to sort the results by */
-    sort?: InputMaybe<VendorSortParameter>;
-    /** Takes n results, for use in pagination */
-    take?: InputMaybe<Scalars['Int']>;
-};
-
-export type VendorSortParameter = {
-    createdAt?: InputMaybe<SortOrder>;
-    id?: InputMaybe<SortOrder>;
-    name?: InputMaybe<SortOrder>;
-    updatedAt?: InputMaybe<SortOrder>;
-};
-
 export type Zone = Node & {
     createdAt: Scalars['DateTime'];
     customFields?: Maybe<Scalars['JSON']>;

packages/email-plugin/src/mock-events.ts

@@ -6,7 +6,6 @@ import {
     IdentifierChangeRequestEvent,
     NativeAuthenticationMethod,
     Order,
-    OrderItem,
     OrderLine,
     OrderStateTransitionEvent,
     PasswordResetEvent,
@@ -45,22 +44,18 @@ export const mockOrderStateTransitionEvent = new OrderStateTransitionEvent(
                     name: 'Curvy Monitor 24 inch',
                     sku: 'C24F390',
                 }),
-                items: [
-                    new OrderItem({
-                        id: '6',
-                        listPrice: 14374,
-                        listPriceIncludesTax: true,
-                        adjustments: [
-                            {
-                                adjustmentSource: 'Promotion:1',
-                                type: AdjustmentType.PROMOTION,
-                                amount: -1000,
-                                description: '$10 off computer equipment',
-                            },
-                        ],
-                        taxLines: [],
-                    }),
+                quantity: 1,
+                listPrice: 14374,
+                listPriceIncludesTax: true,
+                adjustments: [
+                    {
+                        adjustmentSource: 'Promotion:1',
+                        type: AdjustmentType.PROMOTION,
+                        amount: -1000,
+                        description: '$10 off computer equipment',
+                    },
                 ],
+                taxLines: [],
             }),
             new OrderLine({
                 id: '6',
@@ -72,15 +67,11 @@ export const mockOrderStateTransitionEvent = new OrderStateTransitionEvent(
                     name: 'Hard Drive 1TB',
                     sku: 'IHD455T1',
                 }),
-                items: [
-                    new OrderItem({
-                        id: '7',
-                        listPrice: 3799,
-                        listPriceIncludesTax: true,
-                        adjustments: [],
-                        taxLines: [],
-                    }),
-                ],
+                quantity: 1,
+                listPrice: 3799,
+                listPriceIncludesTax: true,
+                adjustments: [],
+                taxLines: [],
             }),
         ],
         subTotal: 15144,

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

@@ -75,14 +75,10 @@ export type AdjustDraftOrderLineInput = {
     quantity: Scalars['Int'];
 };
 
-export type AdjustOrderLineInput = {
-    orderLineId: Scalars['ID'];
-    quantity: Scalars['Int'];
-};
-
 export type Adjustment = {
     adjustmentSource: Scalars['String'];
     amount: Scalars['Int'];
+    data?: Maybe<Scalars['JSON']>;
     description: Scalars['String'];
     type: AdjustmentType;
 };
@@ -844,10 +840,6 @@ export type CreateTaxRateInput = {
     zoneId: Scalars['ID'];
 };
 
-export type CreateVendorInput = {
-    name: Scalars['String'];
-};
-
 export type CreateZoneInput = {
     customFields?: InputMaybe<Scalars['JSON']>;
     memberIds?: InputMaybe<Array<Scalars['ID']>>;
@@ -1664,17 +1656,21 @@ export type Fulfillment = Node & {
     createdAt: Scalars['DateTime'];
     customFields?: Maybe<Scalars['JSON']>;
     id: Scalars['ID'];
+    lines: Array<FulfillmentLine>;
     method: Scalars['String'];
     nextStates: Array<Scalars['String']>;
-    orderItems: Array<OrderItem>;
     state: Scalars['String'];
-    summary: Array<FulfillmentLineSummary>;
+    /** @deprecated Use the `lines` field instead */
+    summary: Array<FulfillmentLine>;
     trackingCode?: Maybe<Scalars['String']>;
     updatedAt: Scalars['DateTime'];
 };
 
-export type FulfillmentLineSummary = {
+export type FulfillmentLine = {
+    fulfillment: Fulfillment;
+    fulfillmentId: Scalars['ID'];
     orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
 };
 
@@ -2327,7 +2323,7 @@ export type MissingConditionsError = ErrorResult & {
 
 export type ModifyOrderInput = {
     addItems?: InputMaybe<Array<AddItemInput>>;
-    adjustOrderLines?: InputMaybe<Array<AdjustOrderLineInput>>;
+    adjustOrderLines?: InputMaybe<Array<OrderLineInput>>;
     couponCodes?: InputMaybe<Array<Scalars['String']>>;
     dryRun: Scalars['Boolean'];
     note?: InputMaybe<Scalars['String']>;
@@ -2459,8 +2455,6 @@ export type Mutation = {
     createTaxCategory: TaxCategory;
     /** Create a new TaxRate */
     createTaxRate: TaxRate;
-    /** Create a new Vendor */
-    createVendor: Vendor;
     /** Create a new Zone */
     createZone: Zone;
     /** Delete an Administrator */
@@ -2518,8 +2512,6 @@ export type Mutation = {
     deleteTaxCategory: DeletionResponse;
     /** Delete a TaxRate */
     deleteTaxRate: DeletionResponse;
-    /** Delete a Vendor */
-    deleteVendor: DeletionResponse;
     /** Delete a Zone */
     deleteZone: DeletionResponse;
     flushBufferedJobs: Success;
@@ -2535,6 +2527,7 @@ export type Mutation = {
     /** Move a Collection to a different parent or index */
     moveCollection: Collection;
     refundOrder: RefundOrderResult;
+    registerNewSeller?: Maybe<Channel>;
     reindex: Job;
     /** Removes Collections from the specified Channel */
     removeCollectionsFromChannel: Array<Collection>;
@@ -2624,8 +2617,6 @@ export type Mutation = {
     updateTaxCategory: TaxCategory;
     /** Update an existing TaxRate */
     updateTaxRate: TaxRate;
-    /** Update an existing Vendor */
-    updateVendor: Vendor;
     /** Update an existing Zone */
     updateZone: Zone;
 };
@@ -2812,10 +2803,6 @@ export type MutationCreateTaxRateArgs = {
     input: CreateTaxRateInput;
 };
 
-export type MutationCreateVendorArgs = {
-    input: CreateVendorInput;
-};
-
 export type MutationCreateZoneArgs = {
     input: CreateZoneInput;
 };
@@ -2940,10 +2927,6 @@ export type MutationDeleteTaxRateArgs = {
     id: Scalars['ID'];
 };
 
-export type MutationDeleteVendorArgs = {
-    id: Scalars['ID'];
-};
-
 export type MutationDeleteZoneArgs = {
     id: Scalars['ID'];
 };
@@ -2974,6 +2957,10 @@ export type MutationRefundOrderArgs = {
     input: RefundOrderInput;
 };
 
+export type MutationRegisterNewSellerArgs = {
+    input: RegisterSellerInput;
+};
+
 export type MutationRemoveCollectionsFromChannelArgs = {
     input: RemoveCollectionsFromChannelInput;
 };
@@ -3185,10 +3172,6 @@ export type MutationUpdateTaxRateArgs = {
     input: UpdateTaxRateInput;
 };
 
-export type MutationUpdateVendorArgs = {
-    input: UpdateVendorInput;
-};
-
 export type MutationUpdateZoneArgs = {
     input: UpdateZoneInput;
 };
@@ -3424,9 +3407,8 @@ export type OrderLine = Node & {
     discountedUnitPriceWithTax: Scalars['Int'];
     discounts: Array<Discount>;
     featuredAsset?: Maybe<Asset>;
-    fulfillments?: Maybe<Array<Fulfillment>>;
+    fulfillmentLines?: Maybe<Array<FulfillmentLine>>;
     id: Scalars['ID'];
-    items: Array<OrderItem>;
     /** The total price of the line excluding tax and discounts. */
     linePrice: Scalars['Int'];
     /** The total price of the line including tax but excluding discounts. */
@@ -3434,6 +3416,8 @@ export type OrderLine = Node & {
     /** The total tax on this line */
     lineTax: Scalars['Int'];
     order: Order;
+    /** The quantity at the time the Order was placed */
+    orderPlacedQuantity: Scalars['Int'];
     productVariant: ProductVariant;
     /**
      * The actual line price, taking into account both item discounts _and_ prorated (proportionally-distributed)
@@ -3492,8 +3476,8 @@ export type OrderModification = Node & {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
     isSettled: Scalars['Boolean'];
+    lines: Array<OrderModificationLine>;
     note: Scalars['String'];
-    orderItems?: Maybe<Array<OrderItem>>;
     payment?: Maybe<Payment>;
     priceChange: Scalars['Int'];
     refund?: Maybe<Refund>;
@@ -3507,6 +3491,14 @@ export type OrderModificationError = ErrorResult & {
     message: Scalars['String'];
 };
 
+export type OrderModificationLine = {
+    modification: OrderModification;
+    modificationId: Scalars['ID'];
+    orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+};
+
 /** Returned when attempting to modify the contents of an Order that is not in the `Modifying` state. */
 export type OrderModificationStateError = ErrorResult & {
     errorCode: ErrorCode;
@@ -4286,8 +4278,6 @@ export type Query = {
     taxRates: TaxRateList;
     testEligibleShippingMethods: Array<ShippingMethodQuote>;
     testShippingMethod: TestShippingMethodResult;
-    vendor?: Maybe<Vendor>;
-    vendors: VendorList;
     zone?: Maybe<Zone>;
     zones: Array<Zone>;
 };
@@ -4488,14 +4478,6 @@ export type QueryTestShippingMethodArgs = {
     input: TestShippingMethodInput;
 };
 
-export type QueryVendorArgs = {
-    id: Scalars['ID'];
-};
-
-export type QueryVendorsArgs = {
-    options?: InputMaybe<VendorListOptions>;
-};
-
 export type QueryZoneArgs = {
     id: Scalars['ID'];
 };
@@ -4505,9 +4487,9 @@ export type Refund = Node & {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
     items: Scalars['Int'];
+    lines: Array<RefundLine>;
     metadata?: Maybe<Scalars['JSON']>;
     method?: Maybe<Scalars['String']>;
-    orderItems: Array<OrderItem>;
     paymentId: Scalars['ID'];
     reason?: Maybe<Scalars['String']>;
     shipping: Scalars['Int'];
@@ -4517,6 +4499,14 @@ export type Refund = Node & {
     updatedAt: Scalars['DateTime'];
 };
 
+export type RefundLine = {
+    orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+    refund: Refund;
+    refundId: Scalars['ID'];
+};
+
 export type RefundOrderInput = {
     adjustment: Scalars['Int'];
     lines: Array<OrderLineInput>;
@@ -4561,6 +4551,11 @@ export type RefundStateTransitionError = ErrorResult & {
     transitionError: Scalars['String'];
 };
 
+export type RegisterSellerInput = {
+    administrator: CreateAdministratorInput;
+    shopName: Scalars['String'];
+};
+
 export type RelationCustomFieldConfig = CustomField & {
     description?: Maybe<Array<LocalizedString>>;
     entity: Scalars['String'];
@@ -4940,6 +4935,24 @@ export type StockAdjustment = Node &
         updatedAt: Scalars['DateTime'];
     };
 
+export type StockLevel = Node & {
+    createdAt: Scalars['DateTime'];
+    id: Scalars['ID'];
+    stockAllocated: Scalars['Int'];
+    stockLocation: StockLocation;
+    stockLocationId: Scalars['ID'];
+    stockOnHand: Scalars['Int'];
+    updatedAt: Scalars['DateTime'];
+};
+
+export type StockLocation = Node & {
+    createdAt: Scalars['DateTime'];
+    description: Scalars['String'];
+    id: Scalars['ID'];
+    name: Scalars['String'];
+    updatedAt: Scalars['DateTime'];
+};
+
 export type StockMovement = {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
@@ -5462,11 +5475,6 @@ export type UpdateTaxRateInput = {
     zoneId?: InputMaybe<Scalars['ID']>;
 };
 
-export type UpdateVendorInput = {
-    id: Scalars['ID'];
-    name?: InputMaybe<Scalars['String']>;
-};
-
 export type UpdateZoneInput = {
     customFields?: InputMaybe<Scalars['JSON']>;
     id: Scalars['ID'];
@@ -5485,45 +5493,6 @@ export type User = Node & {
     verified: Scalars['Boolean'];
 };
 
-export type Vendor = Node & {
-    createdAt: Scalars['DateTime'];
-    id: Scalars['ID'];
-    name: Scalars['String'];
-    updatedAt: Scalars['DateTime'];
-};
-
-export type VendorFilterParameter = {
-    createdAt?: InputMaybe<DateOperators>;
-    id?: InputMaybe<IdOperators>;
-    name?: InputMaybe<StringOperators>;
-    updatedAt?: InputMaybe<DateOperators>;
-};
-
-export type VendorList = PaginatedList & {
-    items: Array<Vendor>;
-    totalItems: Scalars['Int'];
-};
-
-export type VendorListOptions = {
-    /** Allows the results to be filtered */
-    filter?: InputMaybe<VendorFilterParameter>;
-    /** Specifies whether multiple "filter" arguments should be combines with a logical AND or OR operation. Defaults to AND. */
-    filterOperator?: InputMaybe<LogicalOperator>;
-    /** Skips the first n results, for use in pagination */
-    skip?: InputMaybe<Scalars['Int']>;
-    /** Specifies which properties to sort the results by */
-    sort?: InputMaybe<VendorSortParameter>;
-    /** Takes n results, for use in pagination */
-    take?: InputMaybe<Scalars['Int']>;
-};
-
-export type VendorSortParameter = {
-    createdAt?: InputMaybe<SortOrder>;
-    id?: InputMaybe<SortOrder>;
-    name?: InputMaybe<SortOrder>;
-    updatedAt?: InputMaybe<SortOrder>;
-};
-
 export type Zone = Node & {
     createdAt: Scalars['DateTime'];
     customFields?: Maybe<Scalars['JSON']>;

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

@@ -51,6 +51,7 @@ export type Address = Node & {
 export type Adjustment = {
     adjustmentSource: Scalars['String'];
     amount: Scalars['Int'];
+    data?: Maybe<Scalars['JSON']>;
     description: Scalars['String'];
     type: AdjustmentType;
 };
@@ -1001,16 +1002,20 @@ export type Fulfillment = Node & {
     createdAt: Scalars['DateTime'];
     customFields?: Maybe<Scalars['JSON']>;
     id: Scalars['ID'];
+    lines: Array<FulfillmentLine>;
     method: Scalars['String'];
-    orderItems: Array<OrderItem>;
     state: Scalars['String'];
-    summary: Array<FulfillmentLineSummary>;
+    /** @deprecated Use the `lines` field instead */
+    summary: Array<FulfillmentLine>;
     trackingCode?: Maybe<Scalars['String']>;
     updatedAt: Scalars['DateTime'];
 };
 
-export type FulfillmentLineSummary = {
+export type FulfillmentLine = {
+    fulfillment: Fulfillment;
+    fulfillmentId: Scalars['ID'];
     orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
 };
 
@@ -1580,7 +1585,12 @@ export type Mutation = {
     setOrderCustomFields: ActiveOrderResult;
     /** Sets the shipping address for this order */
     setOrderShippingAddress: ActiveOrderResult;
-    /** Sets the shipping method by id, which can be obtained with the `eligibleShippingMethods` query */
+    /**
+     * Sets the shipping method by id, which can be obtained with the `eligibleShippingMethods` query.
+     * An Order can have multiple shipping methods, in which case you can pass an array of ids. In this case,
+     * you should configure a custom ShippingLineAssignmentStrategy in order to know which OrderLines each
+     * shipping method will apply to.
+     */
     setOrderShippingMethod: SetOrderShippingMethodResult;
     /** Transitions an Order to a new state. Valid next states can be found by querying `nextOrderStates` */
     transitionOrderToState?: Maybe<TransitionOrderToStateResult>;
@@ -1940,9 +1950,8 @@ export type OrderLine = Node & {
     discountedUnitPriceWithTax: Scalars['Int'];
     discounts: Array<Discount>;
     featuredAsset?: Maybe<Asset>;
-    fulfillments?: Maybe<Array<Fulfillment>>;
+    fulfillmentLines?: Maybe<Array<FulfillmentLine>>;
     id: Scalars['ID'];
-    items: Array<OrderItem>;
     /** The total price of the line excluding tax and discounts. */
     linePrice: Scalars['Int'];
     /** The total price of the line including tax but excluding discounts. */
@@ -1950,6 +1959,8 @@ export type OrderLine = Node & {
     /** The total tax on this line */
     lineTax: Scalars['Int'];
     order: Order;
+    /** The quantity at the time the Order was placed */
+    orderPlacedQuantity: Scalars['Int'];
     productVariant: ProductVariant;
     /**
      * The actual line price, taking into account both item discounts _and_ prorated (proportionally-distributed)
@@ -2676,9 +2687,9 @@ export type Refund = Node & {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
     items: Scalars['Int'];
+    lines: Array<RefundLine>;
     metadata?: Maybe<Scalars['JSON']>;
     method?: Maybe<Scalars['String']>;
-    orderItems: Array<OrderItem>;
     paymentId: Scalars['ID'];
     reason?: Maybe<Scalars['String']>;
     shipping: Scalars['Int'];
@@ -2688,6 +2699,14 @@ export type Refund = Node & {
     updatedAt: Scalars['DateTime'];
 };
 
+export type RefundLine = {
+    orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+    refund: Refund;
+    refundId: Scalars['ID'];
+};
+
 export type RegisterCustomerAccountResult =
     | MissingPasswordError
     | NativeAuthStrategyError
@@ -3061,13 +3080,6 @@ export type User = Node & {
     verified: Scalars['Boolean'];
 };
 
-export type Vendor = Node & {
-    createdAt: Scalars['DateTime'];
-    id: Scalars['ID'];
-    name: Scalars['String'];
-    updatedAt: Scalars['DateTime'];
-};
-
 /**
  * Returned if the verification token (used to verify a Customer's email address) is valid, but has
  * expired according to the `verificationTokenDuration` setting in the AuthOptions.
@@ -3150,7 +3162,6 @@ export type TestOrderFragmentFragment = {
             description: string;
             type: AdjustmentType;
         }>;
-        items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
     }>;
     shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
     customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3211,7 +3222,6 @@ export type AddPaymentToOrderMutation = {
                       description: string;
                       type: AdjustmentType;
                   }>;
-                  items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
               }>;
               shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
               customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3328,7 +3338,6 @@ export type SetShippingMethodMutation = {
                       description: string;
                       type: AdjustmentType;
                   }>;
-                  items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
               }>;
               shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
               customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3394,7 +3403,6 @@ export type AddItemToOrderMutation = {
                           description: string;
                           type: AdjustmentType;
                       }>;
-                      items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
                   }>;
                   shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
                   customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3448,7 +3456,6 @@ export type AddItemToOrderMutation = {
                       description: string;
                       type: AdjustmentType;
                   }>;
-                  items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
               }>;
               shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
               customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3509,7 +3516,6 @@ export type GetOrderByCodeQuery = {
                 description: string;
                 type: AdjustmentType;
             }>;
-            items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
         }>;
         shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
         customer?: { id: string; user?: { id: string; identifier: string } | null } | null;
@@ -3566,7 +3572,6 @@ export type GetActiveOrderQuery = {
                 description: string;
                 type: AdjustmentType;
             }>;
-            items: Array<{ id: string; unitPrice: number; unitPriceWithTax: number }>;
         }>;
         shippingLines: Array<{ shippingMethod: { id: string; code: string; description: string } }>;
         customer?: { id: string; user?: { id: string; identifier: string } | null } | null;

packages/payments-plugin/e2e/graphql/shop-queries.ts

@@ -49,11 +49,6 @@ export const TEST_ORDER_FRAGMENT = gql`
                 description
                 type
             }
-            items {
-                id
-                unitPrice
-                unitPriceWithTax
-            }
         }
         shippingLines {
             shippingMethod {

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

@@ -53,6 +53,7 @@ export type Adjustment = {
     __typename?: 'Adjustment';
     adjustmentSource: Scalars['String'];
     amount: Scalars['Int'];
+    data?: Maybe<Scalars['JSON']>;
     description: Scalars['String'];
     type: AdjustmentType;
 };
@@ -1042,17 +1043,21 @@ export type Fulfillment = Node & {
     createdAt: Scalars['DateTime'];
     customFields?: Maybe<Scalars['JSON']>;
     id: Scalars['ID'];
+    lines: Array<FulfillmentLine>;
     method: Scalars['String'];
-    orderItems: Array<OrderItem>;
     state: Scalars['String'];
-    summary: Array<FulfillmentLineSummary>;
+    /** @deprecated Use the `lines` field instead */
+    summary: Array<FulfillmentLine>;
     trackingCode?: Maybe<Scalars['String']>;
     updatedAt: Scalars['DateTime'];
 };
 
-export type FulfillmentLineSummary = {
-    __typename?: 'FulfillmentLineSummary';
+export type FulfillmentLine = {
+    __typename?: 'FulfillmentLine';
+    fulfillment: Fulfillment;
+    fulfillmentId: Scalars['ID'];
     orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
     quantity: Scalars['Int'];
 };
 
@@ -1681,7 +1686,12 @@ export type Mutation = {
     setOrderCustomFields: ActiveOrderResult;
     /** Sets the shipping address for this order */
     setOrderShippingAddress: ActiveOrderResult;
-    /** Sets the shipping method by id, which can be obtained with the `eligibleShippingMethods` query */
+    /**
+     * Sets the shipping method by id, which can be obtained with the `eligibleShippingMethods` query.
+     * An Order can have multiple shipping methods, in which case you can pass an array of ids. In this case,
+     * you should configure a custom ShippingLineAssignmentStrategy in order to know which OrderLines each
+     * shipping method will apply to.
+     */
     setOrderShippingMethod: SetOrderShippingMethodResult;
     /** Transitions an Order to a new state. Valid next states can be found by querying `nextOrderStates` */
     transitionOrderToState?: Maybe<TransitionOrderToStateResult>;
@@ -2054,9 +2064,8 @@ export type OrderLine = Node & {
     discountedUnitPriceWithTax: Scalars['Int'];
     discounts: Array<Discount>;
     featuredAsset?: Maybe<Asset>;
-    fulfillments?: Maybe<Array<Fulfillment>>;
+    fulfillmentLines?: Maybe<Array<FulfillmentLine>>;
     id: Scalars['ID'];
-    items: Array<OrderItem>;
     /** The total price of the line excluding tax and discounts. */
     linePrice: Scalars['Int'];
     /** The total price of the line including tax but excluding discounts. */
@@ -2064,6 +2073,8 @@ export type OrderLine = Node & {
     /** The total tax on this line */
     lineTax: Scalars['Int'];
     order: Order;
+    /** The quantity at the time the Order was placed */
+    orderPlacedQuantity: Scalars['Int'];
     productVariant: ProductVariant;
     /**
      * The actual line price, taking into account both item discounts _and_ prorated (proportionally-distributed)
@@ -2824,9 +2835,9 @@ export type Refund = Node & {
     createdAt: Scalars['DateTime'];
     id: Scalars['ID'];
     items: Scalars['Int'];
+    lines: Array<RefundLine>;
     metadata?: Maybe<Scalars['JSON']>;
     method?: Maybe<Scalars['String']>;
-    orderItems: Array<OrderItem>;
     paymentId: Scalars['ID'];
     reason?: Maybe<Scalars['String']>;
     shipping: Scalars['Int'];
@@ -2836,6 +2847,15 @@ export type Refund = Node & {
     updatedAt: Scalars['DateTime'];
 };
 
+export type RefundLine = {
+    __typename?: 'RefundLine';
+    orderLine: OrderLine;
+    orderLineId: Scalars['ID'];
+    quantity: Scalars['Int'];
+    refund: Refund;
+    refundId: Scalars['ID'];
+};
+
 export type RegisterCustomerAccountResult =
     | MissingPasswordError
     | NativeAuthStrategyError
@@ -3235,14 +3255,6 @@ export type User = Node & {
     verified: Scalars['Boolean'];
 };
 
-export type Vendor = Node & {
-    __typename?: 'Vendor';
-    createdAt: Scalars['DateTime'];
-    id: Scalars['ID'];
-    name: Scalars['String'];
-    updatedAt: Scalars['DateTime'];
-};
-
 /**
  * Returned if the verification token (used to verify a Customer's email address) is valid, but has
  * expired according to the `verificationTokenDuration` setting in the AuthOptions.

scripts/codegen/generate-graphql-types.ts

@@ -123,25 +123,25 @@ Promise.all([
                     plugins: clientPlugins,
                     config: e2eConfig,
                 },
-                [path.join(__dirname, '../../packages/admin-ui/src/lib/core/src/common/generated-types.ts')]:
-                    {
-                        schema: [ADMIN_SCHEMA_OUTPUT_FILE, path.join(__dirname, 'client-schema.ts')],
-                        documents: CLIENT_QUERY_FILES,
-                        plugins: clientPlugins,
-                        config: {
-                            ...config,
-                            skipTypeNameForRoot: true,
-                        },
-                    },
-                [path.join(
-                    __dirname,
-                    '../../packages/admin-ui/src/lib/core/src/common/introspection-result.ts',
-                )]: {
-                    schema: [ADMIN_SCHEMA_OUTPUT_FILE, path.join(__dirname, 'client-schema.ts')],
-                    documents: CLIENT_QUERY_FILES,
-                    plugins: [disableTsLintPlugin, 'fragment-matcher'],
-                    config: { ...config, apolloClientVersion: 3 },
-                },
+                // [path.join(__dirname, '../../packages/admin-ui/src/lib/core/src/common/generated-types.ts')]:
+                //     {
+                //         schema: [ADMIN_SCHEMA_OUTPUT_FILE, path.join(__dirname, 'client-schema.ts')],
+                //         documents: CLIENT_QUERY_FILES,
+                //         plugins: clientPlugins,
+                //         config: {
+                //             ...config,
+                //             skipTypeNameForRoot: true,
+                //         },
+                //     },
+                // [path.join(
+                //     __dirname,
+                //     '../../packages/admin-ui/src/lib/core/src/common/introspection-result.ts',
+                // )]: {
+                //     schema: [ADMIN_SCHEMA_OUTPUT_FILE, path.join(__dirname, 'client-schema.ts')],
+                //     documents: CLIENT_QUERY_FILES,
+                //     plugins: [disableTsLintPlugin, 'fragment-matcher'],
+                //     config: { ...config, apolloClientVersion: 3 },
+                // },
                 [path.join(__dirname, '../../packages/common/src/generated-types.ts')]: {
                     schema: [ADMIN_SCHEMA_OUTPUT_FILE],
                     plugins: commonPlugins,