refactor(admin-ui): Rename OrderWithLines to OrderDetail

admin-ui/src/app/catalog/catalog.routes.ts

@@ -4,7 +4,7 @@ import { map } from 'rxjs/operators';
 
 import { createResolveData } from '../common/base-entity-resolver';
 import { detailBreadcrumb } from '../common/detail-breadcrumb';
-import { FacetWithValues, OrderWithLines, ProductWithVariants } from '../common/generated-types';
+import { FacetWithValues, OrderDetail, ProductWithVariants } from '../common/generated-types';
 import { BreadcrumbValue } from '../core/components/breadcrumb/breadcrumb.component';
 import { _ } from '../core/providers/i18n/mark-for-extraction';
 import { CanDeactivateDetailGuard } from '../shared/providers/routing/can-deactivate-detail-guard';

admin-ui/src/app/common/generated-types.ts

@@ -19,6 +19,11 @@ export type Scalars = {
 };
 
 
+export type AddNoteToOrderInput = {
+  id: Scalars['ID'],
+  note: Scalars['String'],
+};
+
 export type Address = Node & {
   __typename?: 'Address',
   id: Scalars['ID'],
@@ -1066,6 +1071,50 @@ export type GlobalSettings = {
   customFields?: Maybe<Scalars['JSON']>,
 };
 
+export type HistoryEntry = Node & {
+  __typename?: 'HistoryEntry',
+  id: Scalars['ID'],
+  createdAt: Scalars['DateTime'],
+  updatedAt: Scalars['DateTime'],
+  type: HistoryEntryType,
+  administrator?: Maybe<Administrator>,
+  data: Scalars['JSON'],
+};
+
+export type HistoryEntryFilterParameter = {
+  createdAt?: Maybe<DateOperators>,
+  updatedAt?: Maybe<DateOperators>,
+  type?: Maybe<StringOperators>,
+};
+
+export type HistoryEntryList = PaginatedList & {
+  __typename?: 'HistoryEntryList',
+  items: Array<HistoryEntry>,
+  totalItems: Scalars['Int'],
+};
+
+export type HistoryEntryListOptions = {
+  skip?: Maybe<Scalars['Int']>,
+  take?: Maybe<Scalars['Int']>,
+  sort?: Maybe<HistoryEntrySortParameter>,
+  filter?: Maybe<HistoryEntryFilterParameter>,
+};
+
+export type HistoryEntrySortParameter = {
+  id?: Maybe<SortOrder>,
+  createdAt?: Maybe<SortOrder>,
+  updatedAt?: Maybe<SortOrder>,
+};
+
+export enum HistoryEntryType {
+  ORDER_STATE_TRANSITION = 'ORDER_STATE_TRANSITION',
+  ORDER_PAYMENT_TRANSITION = 'ORDER_PAYMENT_TRANSITION',
+  ORDER_FULLFILLMENT = 'ORDER_FULLFILLMENT',
+  ORDER_CANCELLATION = 'ORDER_CANCELLATION',
+  ORDER_REFUND_TRANSITION = 'ORDER_REFUND_TRANSITION',
+  ORDER_NOTE = 'ORDER_NOTE'
+}
+
 export type ImportInfo = {
   __typename?: 'ImportInfo',
   errors?: Maybe<Array<Scalars['String']>>,
@@ -1503,12 +1552,6 @@ export type Mutation = {
   updateCollection: Collection,
   /** Move a Collection to a different parent or index */
   moveCollection: Collection,
-  /** Create a new Country */
-  createCountry: Country,
-  /** Update an existing Country */
-  updateCountry: Country,
-  /** Delete a Country */
-  deleteCountry: DeletionResponse,
   /** Create a new CustomerGroup */
   createCustomerGroup: CustomerGroup,
   /** Update an existing CustomerGroup */
@@ -1517,6 +1560,12 @@ export type Mutation = {
   addCustomersToGroup: CustomerGroup,
   /** Remove Customers from a CustomerGroup */
   removeCustomersFromGroup: CustomerGroup,
+  /** Create a new Country */
+  createCountry: Country,
+  /** Update an existing Country */
+  updateCountry: Country,
+  /** Delete a Country */
+  deleteCountry: DeletionResponse,
   /** Create a new Customer. If a password is provided, a new User will also be created an linked to the Customer. */
   createCustomer: Customer,
   /** Update an existing Customer */
@@ -1541,19 +1590,21 @@ export type Mutation = {
   updateFacetValues: Array<FacetValue>,
   /** Delete one or more FacetValues */
   deleteFacetValues: Array<DeletionResponse>,
-  importProducts?: Maybe<ImportInfo>,
   updateGlobalSettings: GlobalSettings,
+  importProducts?: Maybe<ImportInfo>,
   settlePayment: Payment,
   fulfillOrder: Fulfillment,
   cancelOrder: Order,
   refundOrder: Refund,
   settleRefund: Refund,
+  addNoteToOrder: Order,
   /** Update an existing PaymentMethod */
   updatePaymentMethod: PaymentMethod,
   /** Create a new ProductOptionGroup */
   createProductOptionGroup: ProductOptionGroup,
   /** Update an existing ProductOptionGroup */
   updateProductOptionGroup: ProductOptionGroup,
+  reindex: JobInfo,
   /** Create a new Product */
   createProduct: Product,
   /** Update an existing Product */
@@ -1568,7 +1619,6 @@ export type Mutation = {
   generateVariantsForProduct: Product,
   /** Update existing ProductVariants */
   updateProductVariants: Array<Maybe<ProductVariant>>,
-  reindex: JobInfo,
   createPromotion: Promotion,
   updatePromotion: Promotion,
   deletePromotion: DeletionResponse,
@@ -1659,21 +1709,6 @@ export type MutationMoveCollectionArgs = {
 };
 
 
-export type MutationCreateCountryArgs = {
-  input: CreateCountryInput
-};
-
-
-export type MutationUpdateCountryArgs = {
-  input: UpdateCountryInput
-};
-
-
-export type MutationDeleteCountryArgs = {
-  id: Scalars['ID']
-};
-
-
 export type MutationCreateCustomerGroupArgs = {
   input: CreateCustomerGroupInput
 };
@@ -1696,6 +1731,21 @@ export type MutationRemoveCustomersFromGroupArgs = {
 };
 
 
+export type MutationCreateCountryArgs = {
+  input: CreateCountryInput
+};
+
+
+export type MutationUpdateCountryArgs = {
+  input: UpdateCountryInput
+};
+
+
+export type MutationDeleteCountryArgs = {
+  id: Scalars['ID']
+};
+
+
 export type MutationCreateCustomerArgs = {
   input: CreateCustomerInput,
   password?: Maybe<Scalars['String']>
@@ -1760,13 +1810,13 @@ export type MutationDeleteFacetValuesArgs = {
 };
 
 
-export type MutationImportProductsArgs = {
-  csvFile: Scalars['Upload']
+export type MutationUpdateGlobalSettingsArgs = {
+  input: UpdateGlobalSettingsInput
 };
 
 
-export type MutationUpdateGlobalSettingsArgs = {
-  input: UpdateGlobalSettingsInput
+export type MutationImportProductsArgs = {
+  csvFile: Scalars['Upload']
 };
 
 
@@ -1795,6 +1845,11 @@ export type MutationSettleRefundArgs = {
 };
 
 
+export type MutationAddNoteToOrderArgs = {
+  input: AddNoteToOrderInput
+};
+
+
 export type MutationUpdatePaymentMethodArgs = {
   input: UpdatePaymentMethodInput
 };
@@ -1989,6 +2044,12 @@ export type Order = Node & {
   shippingMethod?: Maybe<ShippingMethod>,
   totalBeforeTax: Scalars['Int'],
   total: Scalars['Int'],
+  history: HistoryEntryList,
+};
+
+
+export type OrderHistoryArgs = {
+  options?: Maybe<HistoryEntryListOptions>
 };
 
 export type OrderAddress = {
@@ -2447,10 +2508,10 @@ export type Query = {
   collections: CollectionList,
   collection?: Maybe<Collection>,
   collectionFilters: Array<ConfigurableOperation>,
-  countries: CountryList,
-  country?: Maybe<Country>,
   customerGroups: Array<CustomerGroup>,
   customerGroup?: Maybe<CustomerGroup>,
+  countries: CountryList,
+  country?: Maybe<Country>,
   customers: CustomerList,
   customer?: Maybe<Customer>,
   facets: FacetList,
@@ -2464,10 +2525,10 @@ export type Query = {
   paymentMethod?: Maybe<PaymentMethod>,
   productOptionGroups: Array<ProductOptionGroup>,
   productOptionGroup?: Maybe<ProductOptionGroup>,
+  search: SearchResponse,
   products: ProductList,
   /** Get a Product either by id or slug. If neither id nor slug is speicified, an error will result. */
   product?: Maybe<Product>,
-  search: SearchResponse,
   promotion?: Maybe<Promotion>,
   promotions: PromotionList,
   adjustmentOperations: AdjustmentOperations,
@@ -2526,17 +2587,17 @@ export type QueryCollectionArgs = {
 };
 
 
-export type QueryCountriesArgs = {
-  options?: Maybe<CountryListOptions>
+export type QueryCustomerGroupArgs = {
+  id: Scalars['ID']
 };
 
 
-export type QueryCountryArgs = {
-  id: Scalars['ID']
+export type QueryCountriesArgs = {
+  options?: Maybe<CountryListOptions>
 };
 
 
-export type QueryCustomerGroupArgs = {
+export type QueryCountryArgs = {
   id: Scalars['ID']
 };
 
@@ -2605,6 +2666,11 @@ export type QueryProductOptionGroupArgs = {
 };
 
 
+export type QuerySearchArgs = {
+  input: SearchInput
+};
+
+
 export type QueryProductsArgs = {
   languageCode?: Maybe<LanguageCode>,
   options?: Maybe<ProductListOptions>
@@ -2618,11 +2684,6 @@ export type QueryProductArgs = {
 };
 
 
-export type QuerySearchArgs = {
-  input: SearchInput
-};
-
-
 export type QueryPromotionArgs = {
   id: Scalars['ID']
 };
@@ -3491,7 +3552,7 @@ export type OrderFragment = ({ __typename?: 'Order' } & Pick<Order, 'id' | 'crea
 
 export type FulfillmentFragment = ({ __typename?: 'Fulfillment' } & Pick<Fulfillment, 'id' | 'createdAt' | 'updatedAt' | 'method' | 'trackingCode'>);
 
-export type OrderWithLinesFragment = ({ __typename?: 'Order' } & Pick<Order, 'id' | 'createdAt' | 'updatedAt' | 'code' | 'state' | 'active' | 'subTotal' | 'subTotalBeforeTax' | 'totalBeforeTax' | 'currencyCode' | 'shipping' | 'total'> & { customer: Maybe<({ __typename?: 'Customer' } & Pick<Customer, 'id' | 'firstName' | 'lastName'>)>, lines: Array<({ __typename?: 'OrderLine' } & Pick<OrderLine, 'id' | 'unitPrice' | 'unitPriceWithTax' | 'quantity' | 'totalPrice'> & { featuredAsset: Maybe<({ __typename?: 'Asset' } & Pick<Asset, 'preview'>)>, productVariant: ({ __typename?: 'ProductVariant' } & Pick<ProductVariant, 'id' | 'name' | 'sku'>), items: Array<({ __typename?: 'OrderItem' } & Pick<OrderItem, 'id' | 'unitPrice' | 'unitPriceIncludesTax' | 'unitPriceWithTax' | 'taxRate' | 'refundId' | 'cancelled'> & { fulfillment: Maybe<({ __typename?: 'Fulfillment' } & FulfillmentFragment)> })> })>, adjustments: Array<({ __typename?: 'Adjustment' } & AdjustmentFragment)>, shippingMethod: Maybe<({ __typename?: 'ShippingMethod' } & Pick<ShippingMethod, 'id' | 'code' | 'description'>)>, shippingAddress: Maybe<({ __typename?: 'OrderAddress' } & ShippingAddressFragment)>, payments: Maybe<Array<({ __typename?: 'Payment' } & Pick<Payment, 'id' | 'createdAt' | 'transactionId' | 'amount' | 'method' | 'state' | 'metadata'> & { refunds: Array<({ __typename?: 'Refund' } & Pick<Refund, 'id' | 'createdAt' | 'state' | 'items' | 'adjustment' | 'total' | 'paymentId' | 'transactionId' | 'method'> & { orderItems: Array<({ __typename?: 'OrderItem' } & Pick<OrderItem, 'id'>)> })> })>>, fulfillments: Maybe<Array<({ __typename?: 'Fulfillment' } & FulfillmentFragment)>> });
+export type OrderDetailFragment = ({ __typename?: 'Order' } & Pick<Order, 'id' | 'createdAt' | 'updatedAt' | 'code' | 'state' | 'active' | 'subTotal' | 'subTotalBeforeTax' | 'totalBeforeTax' | 'currencyCode' | 'shipping' | 'total'> & { customer: Maybe<({ __typename?: 'Customer' } & Pick<Customer, 'id' | 'firstName' | 'lastName'>)>, lines: Array<({ __typename?: 'OrderLine' } & Pick<OrderLine, 'id' | 'unitPrice' | 'unitPriceWithTax' | 'quantity' | 'totalPrice'> & { featuredAsset: Maybe<({ __typename?: 'Asset' } & Pick<Asset, 'preview'>)>, productVariant: ({ __typename?: 'ProductVariant' } & Pick<ProductVariant, 'id' | 'name' | 'sku'>), items: Array<({ __typename?: 'OrderItem' } & Pick<OrderItem, 'id' | 'unitPrice' | 'unitPriceIncludesTax' | 'unitPriceWithTax' | 'taxRate' | 'refundId' | 'cancelled'> & { fulfillment: Maybe<({ __typename?: 'Fulfillment' } & FulfillmentFragment)> })> })>, adjustments: Array<({ __typename?: 'Adjustment' } & AdjustmentFragment)>, shippingMethod: Maybe<({ __typename?: 'ShippingMethod' } & Pick<ShippingMethod, 'id' | 'code' | 'description'>)>, shippingAddress: Maybe<({ __typename?: 'OrderAddress' } & ShippingAddressFragment)>, payments: Maybe<Array<({ __typename?: 'Payment' } & Pick<Payment, 'id' | 'createdAt' | 'transactionId' | 'amount' | 'method' | 'state' | 'metadata'> & { refunds: Array<({ __typename?: 'Refund' } & Pick<Refund, 'id' | 'createdAt' | 'state' | 'items' | 'adjustment' | 'total' | 'paymentId' | 'transactionId' | 'method'> & { orderItems: Array<({ __typename?: 'OrderItem' } & Pick<OrderItem, 'id'>)> })> })>>, fulfillments: Maybe<Array<({ __typename?: 'Fulfillment' } & FulfillmentFragment)>> });
 
 export type GetOrderListQueryVariables = {
   options?: Maybe<OrderListOptions>
@@ -3505,7 +3566,7 @@ export type GetOrderQueryVariables = {
 };
 
 
-export type GetOrderQuery = ({ __typename?: 'Query' } & { order: Maybe<({ __typename?: 'Order' } & OrderWithLinesFragment)> });
+export type GetOrderQuery = ({ __typename?: 'Query' } & { order: Maybe<({ __typename?: 'Order' } & OrderDetailFragment)> });
 
 export type SettlePaymentMutationVariables = {
   id: Scalars['ID']
@@ -3526,7 +3587,7 @@ export type CancelOrderMutationVariables = {
 };
 
 
-export type CancelOrderMutation = ({ __typename?: 'Mutation' } & { cancelOrder: ({ __typename?: 'Order' } & OrderWithLinesFragment) });
+export type CancelOrderMutation = ({ __typename?: 'Mutation' } & { cancelOrder: ({ __typename?: 'Order' } & OrderDetailFragment) });
 
 export type RefundOrderMutationVariables = {
   input: RefundOrderInput
@@ -4291,20 +4352,20 @@ export namespace Fulfillment {
   export type Fragment = FulfillmentFragment;
 }
 
-export namespace OrderWithLines {
-  export type Fragment = OrderWithLinesFragment;
-  export type Customer = (NonNullable<OrderWithLinesFragment['customer']>);
-  export type Lines = (NonNullable<OrderWithLinesFragment['lines'][0]>);
-  export type FeaturedAsset = (NonNullable<(NonNullable<OrderWithLinesFragment['lines'][0]>)['featuredAsset']>);
-  export type ProductVariant = (NonNullable<OrderWithLinesFragment['lines'][0]>)['productVariant'];
-  export type Items = (NonNullable<(NonNullable<OrderWithLinesFragment['lines'][0]>)['items'][0]>);
+export namespace OrderDetail {
+  export type Fragment = OrderDetailFragment;
+  export type Customer = (NonNullable<OrderDetailFragment['customer']>);
+  export type Lines = (NonNullable<OrderDetailFragment['lines'][0]>);
+  export type FeaturedAsset = (NonNullable<(NonNullable<OrderDetailFragment['lines'][0]>)['featuredAsset']>);
+  export type ProductVariant = (NonNullable<OrderDetailFragment['lines'][0]>)['productVariant'];
+  export type Items = (NonNullable<(NonNullable<OrderDetailFragment['lines'][0]>)['items'][0]>);
   export type Fulfillment = FulfillmentFragment;
   export type Adjustments = AdjustmentFragment;
-  export type ShippingMethod = (NonNullable<OrderWithLinesFragment['shippingMethod']>);
+  export type ShippingMethod = (NonNullable<OrderDetailFragment['shippingMethod']>);
   export type ShippingAddress = ShippingAddressFragment;
-  export type Payments = (NonNullable<(NonNullable<OrderWithLinesFragment['payments']>)[0]>);
-  export type Refunds = (NonNullable<(NonNullable<(NonNullable<OrderWithLinesFragment['payments']>)[0]>)['refunds'][0]>);
-  export type OrderItems = (NonNullable<(NonNullable<(NonNullable<(NonNullable<OrderWithLinesFragment['payments']>)[0]>)['refunds'][0]>)['orderItems'][0]>);
+  export type Payments = (NonNullable<(NonNullable<OrderDetailFragment['payments']>)[0]>);
+  export type Refunds = (NonNullable<(NonNullable<(NonNullable<OrderDetailFragment['payments']>)[0]>)['refunds'][0]>);
+  export type OrderItems = (NonNullable<(NonNullable<(NonNullable<(NonNullable<OrderDetailFragment['payments']>)[0]>)['refunds'][0]>)['orderItems'][0]>);
   export type Fulfillments = FulfillmentFragment;
 }
 
@@ -4318,7 +4379,7 @@ export namespace GetOrderList {
 export namespace GetOrder {
   export type Variables = GetOrderQueryVariables;
   export type Query = GetOrderQuery;
-  export type Order = OrderWithLinesFragment;
+  export type Order = OrderDetailFragment;
 }
 
 export namespace SettlePayment {
@@ -4336,7 +4397,7 @@ export namespace CreateFulfillment {
 export namespace CancelOrder {
   export type Variables = CancelOrderMutationVariables;
   export type Mutation = CancelOrderMutation;
-  export type CancelOrder = OrderWithLinesFragment;
+  export type CancelOrder = OrderDetailFragment;
 }
 
 export namespace RefundOrder {

admin-ui/src/app/data/definitions/order-definitions.ts

@@ -62,8 +62,8 @@ export const FULFILLMENT_FRAGMENT = gql`
     }
 `;
 
-export const ORDER_WITH_LINES_FRAGMENT = gql`
-    fragment OrderWithLines on Order {
+export const ORDER_DETAIL_FRAGMENT = gql`
+    fragment OrderDetail on Order {
         id
         createdAt
         updatedAt
@@ -166,10 +166,10 @@ export const GET_ORDERS_LIST = gql`
 export const GET_ORDER = gql`
     query GetOrder($id: ID!) {
         order(id: $id) {
-            ...OrderWithLines
+            ...OrderDetail
         }
     }
-    ${ORDER_WITH_LINES_FRAGMENT}
+    ${ORDER_DETAIL_FRAGMENT}
 `;
 
 export const SETTLE_PAYMENT = gql`
@@ -197,10 +197,10 @@ export const CREATE_FULFILLMENT = gql`
 export const CANCEL_ORDER = gql`
     mutation CancelOrder($input: CancelOrderInput!) {
         cancelOrder(input: $input) {
-            ...OrderWithLines
+            ...OrderDetail
         }
     }
-    ${ORDER_WITH_LINES_FRAGMENT}
+    ${ORDER_DETAIL_FRAGMENT}
 `;
 
 export const REFUND_ORDER = gql`

admin-ui/src/app/order/components/cancel-order-dialog/cancel-order-dialog.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { _ } from 'src/app/core/providers/i18n/mark-for-extraction';
 
-import { CancelOrderInput, OrderWithLinesFragment } from '../../../common/generated-types';
+import { CancelOrderInput, OrderDetailFragment } from '../../../common/generated-types';
 import { I18nService } from '../../../core/providers/i18n/i18n.service';
 import { Dialog } from '../../../shared/providers/modal/modal.service';
 
@@ -12,7 +12,7 @@ import { Dialog } from '../../../shared/providers/modal/modal.service';
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class CancelOrderDialogComponent implements OnInit, Dialog<CancelOrderInput> {
-    order: OrderWithLinesFragment;
+    order: OrderDetailFragment;
     resolveWith: (result?: CancelOrderInput) => void;
     reason: string;
     lineQuantities: { [lineId: string]: number } = {};

admin-ui/src/app/order/components/fulfill-order-dialog/fulfill-order-dialog.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 
-import { FulfillOrderInput, OrderWithLines, OrderWithLinesFragment } from '../../../common/generated-types';
+import { FulfillOrderInput, OrderDetail, OrderDetailFragment } from '../../../common/generated-types';
 import { Dialog } from '../../../shared/providers/modal/modal.service';
 
 @Component({
@@ -10,7 +10,7 @@ import { Dialog } from '../../../shared/providers/modal/modal.service';
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class FulfillOrderDialogComponent implements Dialog<FulfillOrderInput>, OnInit {
-    order: OrderWithLinesFragment;
+    order: OrderDetailFragment;
     resolveWith: (result?: FulfillOrderInput) => void;
     method = '';
     trackingCode = '';
@@ -28,7 +28,7 @@ export class FulfillOrderDialogComponent implements Dialog<FulfillOrderInput>, O
         }
     }
 
-    getUnfulfilledCount(line: OrderWithLines.Lines): number {
+    getUnfulfilledCount(line: OrderDetail.Lines): number {
         const fulfilled = line.items.reduce((sum, item) => sum + (item.fulfillment ? 1 : 0), 0);
         return line.quantity - fulfilled;
     }

admin-ui/src/app/order/components/line-fulfillment/line-fulfillment.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, Input, OnChanges, SimpleChanges } from '@angular/core';
 import { unique } from 'shared/unique';
 
-import { OrderWithLines } from '../../../common/generated-types';
+import { OrderDetail } from '../../../common/generated-types';
 
 export type FulfillmentStatus = 'full' | 'partial' | 'none';
 
@@ -12,11 +12,11 @@ export type FulfillmentStatus = 'full' | 'partial' | 'none';
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class LineFulfillmentComponent implements OnChanges {
-    @Input() line: OrderWithLines.Lines;
+    @Input() line: OrderDetail.Lines;
     @Input() orderState: string;
     fulfilledCount = 0;
     fulfillmentStatus: FulfillmentStatus;
-    fulfillments: Array<{ count: number; fulfillment: OrderWithLines.Fulfillment }> = [];
+    fulfillments: Array<{ count: number; fulfillment: OrderDetail.Fulfillment }> = [];
 
     ngOnChanges(changes: SimpleChanges): void {
         if (this.line) {
@@ -29,7 +29,7 @@ export class LineFulfillmentComponent implements OnChanges {
     /**
      * Returns the number of items in an OrderLine which are fulfilled.
      */
-    private getFulfilledCount(line: OrderWithLines.Lines): number {
+    private getFulfilledCount(line: OrderDetail.Lines): number {
         return line.items.reduce((sum, item) => sum + (item.fulfillment ? 1 : 0), 0);
     }
 
@@ -44,8 +44,8 @@ export class LineFulfillmentComponent implements OnChanges {
     }
 
     private getFulfillments(
-        line: OrderWithLines.Lines,
-    ): Array<{ count: number; fulfillment: OrderWithLines.Fulfillment }> {
+        line: OrderDetail.Lines,
+    ): Array<{ count: number; fulfillment: OrderDetail.Fulfillment }> {
         const counts: { [fulfillmentId: string]: number } = {};
 
         for (const item of line.items) {
@@ -61,7 +61,7 @@ export class LineFulfillmentComponent implements OnChanges {
             (fulfillments, item) => {
                 return item.fulfillment ? [...fulfillments, item.fulfillment] : fulfillments;
             },
-            [] as OrderWithLines.Fulfillment[],
+            [] as OrderDetail.Fulfillment[],
         );
 
         return Object.entries(counts).map(([id, count]) => {

admin-ui/src/app/order/components/line-refunds/line-refunds.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
 
-import { OrderWithLines } from '../../../common/generated-types';
+import { OrderDetail } from '../../../common/generated-types';
 
 @Component({
     selector: 'vdr-line-refunds',
@@ -9,7 +9,7 @@ import { OrderWithLines } from '../../../common/generated-types';
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class LineRefundsComponent {
-    @Input() line: OrderWithLines.Lines;
+    @Input() line: OrderDetail.Lines;
 
     getRefundedCount(): number {
         return this.line.items.filter(i => i.refundId != null && !i.cancelled).length;

admin-ui/src/app/order/components/order-detail/order-detail.component.ts

@@ -7,7 +7,7 @@ import { omit } from 'shared/omit';
 import { _ } from 'src/app/core/providers/i18n/mark-for-extraction';
 
 import { BaseDetailComponent } from '../../../common/base-detail.component';
-import { Order, OrderWithLines } from '../../../common/generated-types';
+import { Order, OrderDetail } from '../../../common/generated-types';
 import { NotificationService } from '../../../core/providers/notification/notification.service';
 import { DataService } from '../../../data/providers/data.service';
 import { ServerConfigService } from '../../../data/server-config';
@@ -23,7 +23,7 @@ import { SettleRefundDialogComponent } from '../settle-refund-dialog/settle-refu
     styleUrls: ['./order-detail.component.scss'],
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class OrderDetailComponent extends BaseDetailComponent<OrderWithLines.Fragment>
+export class OrderDetailComponent extends BaseDetailComponent<OrderDetail.Fragment>
     implements OnInit, OnDestroy {
     detailForm = new FormGroup({});
     constructor(
@@ -55,7 +55,7 @@ export class OrderDetailComponent extends BaseDetailComponent<OrderWithLines.Fra
             .filter(line => !!line);
     }
 
-    settlePayment(payment: OrderWithLines.Payments) {
+    settlePayment(payment: OrderDetail.Payments) {
         this.dataService.order.settlePayment(payment.id).subscribe(({ settlePayment }) => {
             if (settlePayment) {
                 if (settlePayment.state === 'Settled') {
@@ -96,7 +96,7 @@ export class OrderDetailComponent extends BaseDetailComponent<OrderWithLines.Fra
             });
     }
 
-    cancelOrRefund(order: OrderWithLines.Fragment) {
+    cancelOrRefund(order: OrderDetail.Fragment) {
         if (order.state === 'PaymentAuthorized') {
             this.cancelOrder(order);
         } else {
@@ -104,7 +104,7 @@ export class OrderDetailComponent extends BaseDetailComponent<OrderWithLines.Fra
         }
     }
 
-    settleRefund(refund: OrderWithLines.Refunds) {
+    settleRefund(refund: OrderDetail.Refunds) {
         this.modalService
             .fromComponent(SettleRefundDialogComponent, {
                 size: 'md',
@@ -135,7 +135,7 @@ export class OrderDetailComponent extends BaseDetailComponent<OrderWithLines.Fra
             });
     }
 
-    private cancelOrder(order: OrderWithLines.Fragment) {
+    private cancelOrder(order: OrderDetail.Fragment) {
         this.modalService
             .fromComponent(CancelOrderDialogComponent, {
                 size: 'xl',
@@ -160,7 +160,7 @@ export class OrderDetailComponent extends BaseDetailComponent<OrderWithLines.Fra
             });
     }
 
-    private refundOrder(order: OrderWithLines.Fragment) {
+    private refundOrder(order: OrderDetail.Fragment) {
         this.modalService
             .fromComponent(RefundOrderDialogComponent, {
                 size: 'xl',

admin-ui/src/app/order/components/order-payment-detail/order-payment-detail.component.ts

@@ -1,7 +1,7 @@
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core';
 import { CurrencyCode } from 'shared/generated-types';
 
-import { OrderWithLines } from '../../../common/generated-types';
+import { OrderDetail } from '../../../common/generated-types';
 
 @Component({
     selector: 'vdr-order-payment-detail',
@@ -10,12 +10,12 @@ import { OrderWithLines } from '../../../common/generated-types';
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class OrderPaymentDetailComponent {
-    @Input() payment: OrderWithLines.Payments;
+    @Input() payment: OrderDetail.Payments;
     @Input() currencyCode: CurrencyCode;
-    @Output() settlePayment = new EventEmitter<OrderWithLines.Payments>();
-    @Output() settleRefund = new EventEmitter<OrderWithLines.Refunds>();
+    @Output() settlePayment = new EventEmitter<OrderDetail.Payments>();
+    @Output() settleRefund = new EventEmitter<OrderDetail.Refunds>();
 
-    getPaymentMetadata(payment: OrderWithLines.Payments) {
+    getPaymentMetadata(payment: OrderDetail.Payments) {
         return Object.entries(payment.metadata);
     }
 }

admin-ui/src/app/order/components/refund-order-dialog/refund-order-dialog.component.ts

@@ -2,9 +2,9 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { _ } from 'src/app/core/providers/i18n/mark-for-extraction';
 
 import {
+    OrderDetail,
+    OrderDetailFragment,
     OrderLineInput,
-    OrderWithLines,
-    OrderWithLinesFragment,
     RefundOrderInput,
 } from '../../../common/generated-types';
 import { I18nService } from '../../../core/providers/i18n/i18n.service';
@@ -18,7 +18,7 @@ import { Dialog } from '../../../shared/providers/modal/modal.service';
 })
 export class RefundOrderDialogComponent
     implements OnInit, Dialog<RefundOrderInput & { cancel: OrderLineInput[] }> {
-    order: OrderWithLinesFragment;
+    order: OrderDetailFragment;
     resolveWith: (result?: RefundOrderInput & { cancel: OrderLineInput[] }) => void;
     reason: string;
     lineQuantities: { [lineId: string]: { quantity: number; cancel: boolean } } = {};
@@ -37,7 +37,7 @@ export class RefundOrderDialogComponent
         return itemTotal + (this.refundShipping ? this.order.shipping : 0) + this.adjustment;
     }
 
-    lineCanBeRefunded(line: OrderWithLines.Lines): boolean {
+    lineCanBeRefunded(line: OrderDetail.Lines): boolean {
         return 0 < line.items.filter(i => i.refundId == null && !i.cancelled).length;
     }
 

admin-ui/src/app/order/components/settle-refund-dialog/settle-refund-dialog.component.ts

@@ -1,6 +1,6 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 
-import { OrderWithLines } from '../../../common/generated-types';
+import { OrderDetail } from '../../../common/generated-types';
 import { Dialog } from '../../../shared/providers/modal/modal.service';
 
 @Component({
@@ -12,7 +12,7 @@ import { Dialog } from '../../../shared/providers/modal/modal.service';
 export class SettleRefundDialogComponent implements Dialog<string> {
     resolveWith: (result?: string) => void;
     transactionId = '';
-    refund: OrderWithLines.Refunds;
+    refund: OrderDetail.Refunds;
 
     submit() {
         this.resolveWith(this.transactionId);

admin-ui/src/app/order/order.routes.ts

@@ -2,7 +2,7 @@ import { Route } from '@angular/router';
 
 import { createResolveData } from '../common/base-entity-resolver';
 import { detailBreadcrumb } from '../common/detail-breadcrumb';
-import { OrderWithLines } from '../common/generated-types';
+import { OrderDetail } from '../common/generated-types';
 import { _ } from '../core/providers/i18n/mark-for-extraction';
 import { CanDeactivateDetailGuard } from '../shared/providers/routing/can-deactivate-detail-guard';
 
@@ -30,7 +30,7 @@ export const orderRoutes: Route[] = [
 ];
 
 export function orderBreadcrumb(data: any, params: any) {
-    return detailBreadcrumb<OrderWithLines.Fragment>({
+    return detailBreadcrumb<OrderDetail.Fragment>({
         entity: data.entity,
         id: params.id,
         breadcrumbKey: 'breadcrumb.orders',

admin-ui/src/app/order/providers/routing/order-resolver.ts

@@ -1,14 +1,14 @@
 import { Injectable } from '@angular/core';
 
 import { BaseEntityResolver } from '../../../common/base-entity-resolver';
-import { OrderWithLines } from '../../../common/generated-types';
+import { OrderDetail } from '../../../common/generated-types';
 import { DataService } from '../../../data/providers/data.service';
 
 /**
  * Resolves the id from the path into a Customer entity.
  */
 @Injectable()
-export class OrderResolver extends BaseEntityResolver<OrderWithLines.Fragment> {
+export class OrderResolver extends BaseEntityResolver<OrderDetail.Fragment> {
     constructor(private dataService: DataService) {
         super(
             {