From b0de18797ef9652faff701bd3180144a59c9dbad Mon Sep 17 00:00:00 2001 From: Tomasz Szymanski Date: Wed, 27 Jan 2021 10:49:35 +0100 Subject: [PATCH 01/22] Refactor mutations of draftOrderLines[CRUD] to orderLines[CRUD] --- schema.graphql | 72 +++---- src/customers/types/CustomerDetails.ts | 4 +- src/fragments/types/FulfillmentFragment.ts | 2 +- src/fragments/types/MetadataFragment.ts | 2 +- src/fragments/types/OrderDetailsFragment.ts | 18 +- src/fragments/types/OrderLineFragment.ts | 2 +- .../types/RefundOrderLineFragment.ts | 2 +- .../components/OrderHistory/OrderHistory.tsx | 4 +- src/orders/mutations.ts | 6 +- src/orders/types/FulfillOrder.ts | 18 +- src/orders/types/OrderCancel.ts | 18 +- src/orders/types/OrderCapture.ts | 18 +- src/orders/types/OrderConfirm.ts | 18 +- src/orders/types/OrderDetails.ts | 18 +- src/orders/types/OrderDraftCancel.ts | 18 +- src/orders/types/OrderDraftFinalize.ts | 18 +- src/orders/types/OrderDraftList.ts | 4 +- src/orders/types/OrderDraftUpdate.ts | 18 +- src/orders/types/OrderFulfillmentCancel.ts | 18 +- .../types/OrderFulfillmentRefundProducts.ts | 20 +- .../types/OrderFulfillmentUpdateTracking.ts | 18 +- src/orders/types/OrderLineDelete.ts | 186 +++++++++--------- src/orders/types/OrderLineUpdate.ts | 186 +++++++++--------- src/orders/types/OrderLinesAdd.ts | 186 +++++++++--------- src/orders/types/OrderList.ts | 4 +- src/orders/types/OrderMarkAsPaid.ts | 18 +- src/orders/types/OrderRefund.ts | 18 +- src/orders/types/OrderRefundData.ts | 10 +- src/orders/types/OrderShippingMethodUpdate.ts | 2 +- src/orders/types/OrderUpdate.ts | 18 +- src/orders/types/OrderVoid.ts | 18 +- .../OrderDetails/OrderDetailsMessages.tsx | 6 +- src/orders/views/OrderDetails/index.tsx | 4 +- src/types/globalTypes.ts | 7 +- src/utils/metadata/types/UpdateMetadata.ts | 2 +- .../metadata/types/UpdatePrivateMetadata.ts | 2 +- 36 files changed, 491 insertions(+), 492 deletions(-) diff --git a/schema.graphql b/schema.graphql index 0ed146de4..e61f4fb3e 100644 --- a/schema.graphql +++ b/schema.graphql @@ -677,7 +677,7 @@ type Category implements Node & ObjectWithMetadata { level: Int! privateMetadata: [MetadataItem]! metadata: [MetadataItem]! - descriptionJson: String @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") + descriptionJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") ancestors(before: String, after: String, first: Int, last: Int): CategoryCountableConnection products(channel: String, before: String, after: String, first: Int, last: Int): ProductCountableConnection url: String @deprecated(reason: "This field will be removed after 2020-07-31.") @@ -747,7 +747,7 @@ type CategoryTranslatableContent implements Node { id: ID! name: String! description: JSONString! - descriptionJson: String @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") + descriptionJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") translation(languageCode: LanguageCodeEnum!): CategoryTranslation category: Category } @@ -765,7 +765,7 @@ type CategoryTranslation implements Node { name: String! description: JSONString! language: LanguageDisplay! - descriptionJson: String @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") + descriptionJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") } type CategoryUpdate { @@ -1054,7 +1054,7 @@ type Collection implements Node & ObjectWithMetadata { slug: String! privateMetadata: [MetadataItem]! metadata: [MetadataItem]! - descriptionJson: String @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") + descriptionJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") products(filter: ProductFilterInput, sortBy: ProductOrder, before: String, after: String, first: Int, last: Int): ProductCountableConnection backgroundImage(size: Int): Image translation(languageCode: LanguageCodeEnum!): CollectionTranslation @@ -1206,7 +1206,7 @@ type CollectionTranslatableContent implements Node { id: ID! name: String! description: JSONString! - descriptionJson: String @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") + descriptionJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") translation(languageCode: LanguageCodeEnum!): CollectionTranslation collection: Collection } @@ -1224,7 +1224,7 @@ type CollectionTranslation implements Node { name: String! description: JSONString! language: LanguageDisplay! - descriptionJson: String @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") + descriptionJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") } type CollectionUpdate { @@ -1806,33 +1806,12 @@ input DraftOrderInput { redirectUrl: String } -type DraftOrderLineDelete { - errors: [Error!]! @deprecated(reason: "Use typed errors with error codes. This field will be removed after 2020-07-31.") - order: Order - orderLine: OrderLine - orderErrors: [OrderError!]! -} - -type DraftOrderLineUpdate { - errors: [Error!]! @deprecated(reason: "Use typed errors with error codes. This field will be removed after 2020-07-31.") - order: Order - orderErrors: [OrderError!]! - orderLine: OrderLine -} - type DraftOrderLinesBulkDelete { errors: [Error!]! @deprecated(reason: "Use typed errors with error codes. This field will be removed after 2020-07-31.") count: Int! orderErrors: [OrderError!]! } -type DraftOrderLinesCreate { - errors: [Error!]! @deprecated(reason: "Use typed errors with error codes. This field will be removed after 2020-07-31.") - order: Order - orderLines: [OrderLine!] - orderErrors: [OrderError!]! -} - type DraftOrderUpdate { errors: [Error!]! @deprecated(reason: "Use typed errors with error codes. This field will be removed after 2020-07-31.") orderErrors: [OrderError!]! @@ -2656,9 +2635,6 @@ type Mutation { draftOrderDelete(id: ID!): DraftOrderDelete draftOrderBulkDelete(ids: [ID]!): DraftOrderBulkDelete draftOrderLinesBulkDelete(ids: [ID]!): DraftOrderLinesBulkDelete - draftOrderLinesCreate(id: ID!, input: [OrderLineCreateInput]!): DraftOrderLinesCreate - draftOrderLineDelete(id: ID!): DraftOrderLineDelete - draftOrderLineUpdate(id: ID!, input: OrderLineInput!): DraftOrderLineUpdate draftOrderUpdate(id: ID!, input: DraftOrderInput!): DraftOrderUpdate orderAddNote(order: ID!, input: OrderAddNoteInput!): OrderAddNote orderCancel(id: ID!): OrderCancel @@ -2669,6 +2645,9 @@ type Mutation { orderFulfillmentUpdateTracking(id: ID!, input: FulfillmentUpdateTrackingInput!): FulfillmentUpdateTracking orderFulfillmentRefundProducts(input: OrderRefundProductsInput!, order: ID!): FulfillmentRefundProducts orderFulfillmentReturnProducts(input: OrderReturnProductsInput!, order: ID!): FulfillmentReturnProducts + orderLinesCreate(id: ID!, input: [OrderLineCreateInput]!): OrderLinesCreate + orderLineDelete(id: ID!): OrderLineDelete + orderLineUpdate(id: ID!, input: OrderLineInput!): OrderLineUpdate orderMarkAsPaid(id: ID!, transactionReference: String): OrderMarkAsPaid orderRefund(amount: PositiveDecimal!, id: ID!): OrderRefund orderUpdate(id: ID!, input: OrderUpdateInput!): OrderUpdate @@ -3031,8 +3010,8 @@ enum OrderEventsEmailsEnum { enum OrderEventsEnum { DRAFT_CREATED DRAFT_CREATED_FROM_REPLACE - DRAFT_ADDED_PRODUCTS - DRAFT_REMOVED_PRODUCTS + ADDED_PRODUCTS + REMOVED_PRODUCTS PLACED PLACED_FROM_DRAFT OVERSOLD_ITEMS @@ -3119,10 +3098,31 @@ input OrderLineCreateInput { variantId: ID! } +type OrderLineDelete { + errors: [Error!]! @deprecated(reason: "Use typed errors with error codes. This field will be removed after 2020-07-31.") + order: Order + orderLine: OrderLine + orderErrors: [OrderError!]! +} + input OrderLineInput { quantity: Int! } +type OrderLineUpdate { + errors: [Error!]! @deprecated(reason: "Use typed errors with error codes. This field will be removed after 2020-07-31.") + order: Order + orderErrors: [OrderError!]! + orderLine: OrderLine +} + +type OrderLinesCreate { + errors: [Error!]! @deprecated(reason: "Use typed errors with error codes. This field will be removed after 2020-07-31.") + order: Order + orderLines: [OrderLine!] + orderErrors: [OrderError!]! +} + type OrderMarkAsPaid { errors: [Error!]! @deprecated(reason: "Use typed errors with error codes. This field will be removed after 2020-07-31.") order: Order @@ -3802,7 +3802,7 @@ type Product implements Node & ObjectWithMetadata { rating: Float privateMetadata: [MetadataItem]! metadata: [MetadataItem]! - descriptionJson: String @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") + descriptionJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") url: String! @deprecated(reason: "This field will be removed after 2020-07-31.") thumbnail(size: Int): Image pricing: ProductPricingInfo @@ -4097,7 +4097,7 @@ type ProductTranslatableContent implements Node { seoDescription: String name: String! description: JSONString! - descriptionJson: String @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") + descriptionJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") translation(languageCode: LanguageCodeEnum!): ProductTranslation product: Product } @@ -4115,7 +4115,7 @@ type ProductTranslation implements Node { name: String! description: JSONString! language: LanguageDisplay! - descriptionJson: String @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") + descriptionJson: JSONString @deprecated(reason: "Will be removed in Saleor 4.0. Use the `description` field instead.") } type ProductType implements Node & ObjectWithMetadata { @@ -5846,4 +5846,4 @@ union _Entity = Address | User | Group | App | ProductVariant | Product | Produc type _Service { sdl: String -} \ No newline at end of file +} diff --git a/src/customers/types/CustomerDetails.ts b/src/customers/types/CustomerDetails.ts index 840e0a996..89532aa61 100644 --- a/src/customers/types/CustomerDetails.ts +++ b/src/customers/types/CustomerDetails.ts @@ -80,8 +80,8 @@ export interface CustomerDetails_user_orders_edges_node { id: string; created: any; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; - total: CustomerDetails_user_orders_edges_node_total | null; + paymentStatus: PaymentChargeStatusEnum; + total: CustomerDetails_user_orders_edges_node_total; } export interface CustomerDetails_user_orders_edges { diff --git a/src/fragments/types/FulfillmentFragment.ts b/src/fragments/types/FulfillmentFragment.ts index 9299ac8f2..94066f13b 100644 --- a/src/fragments/types/FulfillmentFragment.ts +++ b/src/fragments/types/FulfillmentFragment.ts @@ -46,7 +46,7 @@ export interface FulfillmentFragment_lines_orderLine { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: FulfillmentFragment_lines_orderLine_unitPrice | null; + unitPrice: FulfillmentFragment_lines_orderLine_unitPrice; thumbnail: FulfillmentFragment_lines_orderLine_thumbnail | null; } diff --git a/src/fragments/types/MetadataFragment.ts b/src/fragments/types/MetadataFragment.ts index 53ae1cb06..e5952e01d 100644 --- a/src/fragments/types/MetadataFragment.ts +++ b/src/fragments/types/MetadataFragment.ts @@ -19,7 +19,7 @@ export interface MetadataFragment_privateMetadata { } export interface MetadataFragment { - __typename: "App" | "ShippingZone" | "ShippingMethod" | "Product" | "ProductType" | "Attribute" | "Category" | "ProductVariant" | "DigitalContent" | "Collection" | "Page" | "PageType" | "MenuItem" | "Menu" | "User" | "Checkout" | "Order" | "Fulfillment" | "Invoice"; + __typename: "App" | "Warehouse" | "ShippingZone" | "ShippingMethod" | "Product" | "ProductType" | "Attribute" | "Category" | "ProductVariant" | "DigitalContent" | "Collection" | "Page" | "PageType" | "MenuItem" | "Menu" | "User" | "Checkout" | "Order" | "Fulfillment" | "Invoice"; metadata: (MetadataFragment_metadata | null)[]; privateMetadata: (MetadataFragment_privateMetadata | null)[]; } diff --git a/src/fragments/types/OrderDetailsFragment.ts b/src/fragments/types/OrderDetailsFragment.ts index 104e2109f..1fa3cf605 100644 --- a/src/fragments/types/OrderDetailsFragment.ts +++ b/src/fragments/types/OrderDetailsFragment.ts @@ -125,7 +125,7 @@ export interface OrderDetailsFragment_fulfillments_lines_orderLine { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderDetailsFragment_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderDetailsFragment_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderDetailsFragment_fulfillments_lines_orderLine_thumbnail | null; } @@ -190,7 +190,7 @@ export interface OrderDetailsFragment_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderDetailsFragment_lines_unitPrice | null; + unitPrice: OrderDetailsFragment_lines_unitPrice; thumbnail: OrderDetailsFragment_lines_thumbnail | null; } @@ -328,22 +328,22 @@ export interface OrderDetailsFragment { fulfillments: (OrderDetailsFragment_fulfillments | null)[]; lines: (OrderDetailsFragment_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderDetailsFragment_shippingAddress | null; shippingMethod: OrderDetailsFragment_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderDetailsFragment_shippingPrice | null; + shippingPrice: OrderDetailsFragment_shippingPrice; status: OrderStatus; - subtotal: OrderDetailsFragment_subtotal | null; - total: OrderDetailsFragment_total | null; + subtotal: OrderDetailsFragment_subtotal; + total: OrderDetailsFragment_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderDetailsFragment_totalAuthorized | null; - totalCaptured: OrderDetailsFragment_totalCaptured | null; + totalAuthorized: OrderDetailsFragment_totalAuthorized; + totalCaptured: OrderDetailsFragment_totalCaptured; user: OrderDetailsFragment_user | null; userEmail: string | null; availableShippingMethods: (OrderDetailsFragment_availableShippingMethods | null)[] | null; discount: OrderDetailsFragment_discount | null; invoices: (OrderDetailsFragment_invoices | null)[] | null; channel: OrderDetailsFragment_channel; - isPaid: boolean | null; + isPaid: boolean; } diff --git a/src/fragments/types/OrderLineFragment.ts b/src/fragments/types/OrderLineFragment.ts index e61e981a1..737dceff4 100644 --- a/src/fragments/types/OrderLineFragment.ts +++ b/src/fragments/types/OrderLineFragment.ts @@ -44,6 +44,6 @@ export interface OrderLineFragment { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderLineFragment_unitPrice | null; + unitPrice: OrderLineFragment_unitPrice; thumbnail: OrderLineFragment_thumbnail | null; } diff --git a/src/fragments/types/RefundOrderLineFragment.ts b/src/fragments/types/RefundOrderLineFragment.ts index aeb89fa1b..aa7d15d0a 100644 --- a/src/fragments/types/RefundOrderLineFragment.ts +++ b/src/fragments/types/RefundOrderLineFragment.ts @@ -27,6 +27,6 @@ export interface RefundOrderLineFragment { id: string; productName: string; quantity: number; - unitPrice: RefundOrderLineFragment_unitPrice | null; + unitPrice: RefundOrderLineFragment_unitPrice; thumbnail: RefundOrderLineFragment_thumbnail | null; } diff --git a/src/orders/components/OrderHistory/OrderHistory.tsx b/src/orders/components/OrderHistory/OrderHistory.tsx index a1907f037..6bc54407f 100644 --- a/src/orders/components/OrderHistory/OrderHistory.tsx +++ b/src/orders/components/OrderHistory/OrderHistory.tsx @@ -34,7 +34,7 @@ export const getEventMessage = ( defaultMessage: "Order was cancelled", description: "order history message" }); - case OrderEventsEnum.DRAFT_ADDED_PRODUCTS: + case OrderEventsEnum.ADDED_PRODUCTS: return intl.formatMessage({ defaultMessage: "Products were added to draft order", description: "order history message" @@ -44,7 +44,7 @@ export const getEventMessage = ( defaultMessage: "Draft order was created", description: "order history message" }); - case OrderEventsEnum.DRAFT_REMOVED_PRODUCTS: + case OrderEventsEnum.REMOVED_PRODUCTS: return intl.formatMessage({ defaultMessage: "Products were deleted from draft order", description: "order history message" diff --git a/src/orders/mutations.ts b/src/orders/mutations.ts index 393eb7c1e..6acf4c61c 100644 --- a/src/orders/mutations.ts +++ b/src/orders/mutations.ts @@ -473,7 +473,7 @@ const orderLineDeleteMutation = gql` ${fragmentOrderDetails} ${orderErrorFragment} mutation OrderLineDelete($id: ID!) { - draftOrderLineDelete(id: $id) { + orderLineDelete(id: $id) { errors: orderErrors { ...OrderErrorFragment } @@ -492,7 +492,7 @@ const orderLinesAddMutation = gql` ${fragmentOrderDetails} ${orderErrorFragment} mutation OrderLinesAdd($id: ID!, $input: [OrderLineCreateInput]!) { - draftOrderLinesCreate(id: $id, input: $input) { + orderLinesCreate(id: $id, input: $input) { errors: orderErrors { ...OrderErrorFragment } @@ -511,7 +511,7 @@ const orderLineUpdateMutation = gql` ${fragmentOrderDetails} ${orderErrorFragment} mutation OrderLineUpdate($id: ID!, $input: OrderLineInput!) { - draftOrderLineUpdate(id: $id, input: $input) { + orderLineUpdate(id: $id, input: $input) { errors: orderErrors { ...OrderErrorFragment } diff --git a/src/orders/types/FulfillOrder.ts b/src/orders/types/FulfillOrder.ts index 45aeb0896..7693b56ce 100644 --- a/src/orders/types/FulfillOrder.ts +++ b/src/orders/types/FulfillOrder.ts @@ -133,7 +133,7 @@ export interface FulfillOrder_orderFulfill_order_fulfillments_lines_orderLine { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: FulfillOrder_orderFulfill_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: FulfillOrder_orderFulfill_order_fulfillments_lines_orderLine_unitPrice; thumbnail: FulfillOrder_orderFulfill_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -198,7 +198,7 @@ export interface FulfillOrder_orderFulfill_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: FulfillOrder_orderFulfill_order_lines_unitPrice | null; + unitPrice: FulfillOrder_orderFulfill_order_lines_unitPrice; thumbnail: FulfillOrder_orderFulfill_order_lines_thumbnail | null; } @@ -336,24 +336,24 @@ export interface FulfillOrder_orderFulfill_order { fulfillments: (FulfillOrder_orderFulfill_order_fulfillments | null)[]; lines: (FulfillOrder_orderFulfill_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: FulfillOrder_orderFulfill_order_shippingAddress | null; shippingMethod: FulfillOrder_orderFulfill_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: FulfillOrder_orderFulfill_order_shippingPrice | null; + shippingPrice: FulfillOrder_orderFulfill_order_shippingPrice; status: OrderStatus; - subtotal: FulfillOrder_orderFulfill_order_subtotal | null; - total: FulfillOrder_orderFulfill_order_total | null; + subtotal: FulfillOrder_orderFulfill_order_subtotal; + total: FulfillOrder_orderFulfill_order_total; actions: (OrderAction | null)[]; - totalAuthorized: FulfillOrder_orderFulfill_order_totalAuthorized | null; - totalCaptured: FulfillOrder_orderFulfill_order_totalCaptured | null; + totalAuthorized: FulfillOrder_orderFulfill_order_totalAuthorized; + totalCaptured: FulfillOrder_orderFulfill_order_totalCaptured; user: FulfillOrder_orderFulfill_order_user | null; userEmail: string | null; availableShippingMethods: (FulfillOrder_orderFulfill_order_availableShippingMethods | null)[] | null; discount: FulfillOrder_orderFulfill_order_discount | null; invoices: (FulfillOrder_orderFulfill_order_invoices | null)[] | null; channel: FulfillOrder_orderFulfill_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface FulfillOrder_orderFulfill { diff --git a/src/orders/types/OrderCancel.ts b/src/orders/types/OrderCancel.ts index 822c51b6f..649fb708f 100644 --- a/src/orders/types/OrderCancel.ts +++ b/src/orders/types/OrderCancel.ts @@ -131,7 +131,7 @@ export interface OrderCancel_orderCancel_order_fulfillments_lines_orderLine { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderCancel_orderCancel_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderCancel_orderCancel_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderCancel_orderCancel_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderCancel_orderCancel_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderCancel_orderCancel_order_lines_unitPrice | null; + unitPrice: OrderCancel_orderCancel_order_lines_unitPrice; thumbnail: OrderCancel_orderCancel_order_lines_thumbnail | null; } @@ -334,24 +334,24 @@ export interface OrderCancel_orderCancel_order { fulfillments: (OrderCancel_orderCancel_order_fulfillments | null)[]; lines: (OrderCancel_orderCancel_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderCancel_orderCancel_order_shippingAddress | null; shippingMethod: OrderCancel_orderCancel_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderCancel_orderCancel_order_shippingPrice | null; + shippingPrice: OrderCancel_orderCancel_order_shippingPrice; status: OrderStatus; - subtotal: OrderCancel_orderCancel_order_subtotal | null; - total: OrderCancel_orderCancel_order_total | null; + subtotal: OrderCancel_orderCancel_order_subtotal; + total: OrderCancel_orderCancel_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderCancel_orderCancel_order_totalAuthorized | null; - totalCaptured: OrderCancel_orderCancel_order_totalCaptured | null; + totalAuthorized: OrderCancel_orderCancel_order_totalAuthorized; + totalCaptured: OrderCancel_orderCancel_order_totalCaptured; user: OrderCancel_orderCancel_order_user | null; userEmail: string | null; availableShippingMethods: (OrderCancel_orderCancel_order_availableShippingMethods | null)[] | null; discount: OrderCancel_orderCancel_order_discount | null; invoices: (OrderCancel_orderCancel_order_invoices | null)[] | null; channel: OrderCancel_orderCancel_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderCancel_orderCancel { diff --git a/src/orders/types/OrderCapture.ts b/src/orders/types/OrderCapture.ts index 3420640b0..0212eeffe 100644 --- a/src/orders/types/OrderCapture.ts +++ b/src/orders/types/OrderCapture.ts @@ -131,7 +131,7 @@ export interface OrderCapture_orderCapture_order_fulfillments_lines_orderLine { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderCapture_orderCapture_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderCapture_orderCapture_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderCapture_orderCapture_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderCapture_orderCapture_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderCapture_orderCapture_order_lines_unitPrice | null; + unitPrice: OrderCapture_orderCapture_order_lines_unitPrice; thumbnail: OrderCapture_orderCapture_order_lines_thumbnail | null; } @@ -334,24 +334,24 @@ export interface OrderCapture_orderCapture_order { fulfillments: (OrderCapture_orderCapture_order_fulfillments | null)[]; lines: (OrderCapture_orderCapture_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderCapture_orderCapture_order_shippingAddress | null; shippingMethod: OrderCapture_orderCapture_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderCapture_orderCapture_order_shippingPrice | null; + shippingPrice: OrderCapture_orderCapture_order_shippingPrice; status: OrderStatus; - subtotal: OrderCapture_orderCapture_order_subtotal | null; - total: OrderCapture_orderCapture_order_total | null; + subtotal: OrderCapture_orderCapture_order_subtotal; + total: OrderCapture_orderCapture_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderCapture_orderCapture_order_totalAuthorized | null; - totalCaptured: OrderCapture_orderCapture_order_totalCaptured | null; + totalAuthorized: OrderCapture_orderCapture_order_totalAuthorized; + totalCaptured: OrderCapture_orderCapture_order_totalCaptured; user: OrderCapture_orderCapture_order_user | null; userEmail: string | null; availableShippingMethods: (OrderCapture_orderCapture_order_availableShippingMethods | null)[] | null; discount: OrderCapture_orderCapture_order_discount | null; invoices: (OrderCapture_orderCapture_order_invoices | null)[] | null; channel: OrderCapture_orderCapture_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderCapture_orderCapture { diff --git a/src/orders/types/OrderConfirm.ts b/src/orders/types/OrderConfirm.ts index fe95a9613..a2e096f95 100644 --- a/src/orders/types/OrderConfirm.ts +++ b/src/orders/types/OrderConfirm.ts @@ -131,7 +131,7 @@ export interface OrderConfirm_orderConfirm_order_fulfillments_lines_orderLine { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderConfirm_orderConfirm_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderConfirm_orderConfirm_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderConfirm_orderConfirm_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderConfirm_orderConfirm_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderConfirm_orderConfirm_order_lines_unitPrice | null; + unitPrice: OrderConfirm_orderConfirm_order_lines_unitPrice; thumbnail: OrderConfirm_orderConfirm_order_lines_thumbnail | null; } @@ -334,24 +334,24 @@ export interface OrderConfirm_orderConfirm_order { fulfillments: (OrderConfirm_orderConfirm_order_fulfillments | null)[]; lines: (OrderConfirm_orderConfirm_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderConfirm_orderConfirm_order_shippingAddress | null; shippingMethod: OrderConfirm_orderConfirm_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderConfirm_orderConfirm_order_shippingPrice | null; + shippingPrice: OrderConfirm_orderConfirm_order_shippingPrice; status: OrderStatus; - subtotal: OrderConfirm_orderConfirm_order_subtotal | null; - total: OrderConfirm_orderConfirm_order_total | null; + subtotal: OrderConfirm_orderConfirm_order_subtotal; + total: OrderConfirm_orderConfirm_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderConfirm_orderConfirm_order_totalAuthorized | null; - totalCaptured: OrderConfirm_orderConfirm_order_totalCaptured | null; + totalAuthorized: OrderConfirm_orderConfirm_order_totalAuthorized; + totalCaptured: OrderConfirm_orderConfirm_order_totalCaptured; user: OrderConfirm_orderConfirm_order_user | null; userEmail: string | null; availableShippingMethods: (OrderConfirm_orderConfirm_order_availableShippingMethods | null)[] | null; discount: OrderConfirm_orderConfirm_order_discount | null; invoices: (OrderConfirm_orderConfirm_order_invoices | null)[] | null; channel: OrderConfirm_orderConfirm_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderConfirm_orderConfirm { diff --git a/src/orders/types/OrderDetails.ts b/src/orders/types/OrderDetails.ts index 34b754218..8030eca4a 100644 --- a/src/orders/types/OrderDetails.ts +++ b/src/orders/types/OrderDetails.ts @@ -125,7 +125,7 @@ export interface OrderDetails_order_fulfillments_lines_orderLine { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderDetails_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderDetails_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderDetails_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -190,7 +190,7 @@ export interface OrderDetails_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderDetails_order_lines_unitPrice | null; + unitPrice: OrderDetails_order_lines_unitPrice; thumbnail: OrderDetails_order_lines_thumbnail | null; } @@ -328,24 +328,24 @@ export interface OrderDetails_order { fulfillments: (OrderDetails_order_fulfillments | null)[]; lines: (OrderDetails_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderDetails_order_shippingAddress | null; shippingMethod: OrderDetails_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderDetails_order_shippingPrice | null; + shippingPrice: OrderDetails_order_shippingPrice; status: OrderStatus; - subtotal: OrderDetails_order_subtotal | null; - total: OrderDetails_order_total | null; + subtotal: OrderDetails_order_subtotal; + total: OrderDetails_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderDetails_order_totalAuthorized | null; - totalCaptured: OrderDetails_order_totalCaptured | null; + totalAuthorized: OrderDetails_order_totalAuthorized; + totalCaptured: OrderDetails_order_totalCaptured; user: OrderDetails_order_user | null; userEmail: string | null; availableShippingMethods: (OrderDetails_order_availableShippingMethods | null)[] | null; discount: OrderDetails_order_discount | null; invoices: (OrderDetails_order_invoices | null)[] | null; channel: OrderDetails_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderDetails_shop_countries { diff --git a/src/orders/types/OrderDraftCancel.ts b/src/orders/types/OrderDraftCancel.ts index 515e4061b..58100ff8a 100644 --- a/src/orders/types/OrderDraftCancel.ts +++ b/src/orders/types/OrderDraftCancel.ts @@ -131,7 +131,7 @@ export interface OrderDraftCancel_draftOrderDelete_order_fulfillments_lines_orde productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderDraftCancel_draftOrderDelete_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderDraftCancel_draftOrderDelete_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderDraftCancel_draftOrderDelete_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderDraftCancel_draftOrderDelete_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderDraftCancel_draftOrderDelete_order_lines_unitPrice | null; + unitPrice: OrderDraftCancel_draftOrderDelete_order_lines_unitPrice; thumbnail: OrderDraftCancel_draftOrderDelete_order_lines_thumbnail | null; } @@ -334,24 +334,24 @@ export interface OrderDraftCancel_draftOrderDelete_order { fulfillments: (OrderDraftCancel_draftOrderDelete_order_fulfillments | null)[]; lines: (OrderDraftCancel_draftOrderDelete_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderDraftCancel_draftOrderDelete_order_shippingAddress | null; shippingMethod: OrderDraftCancel_draftOrderDelete_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderDraftCancel_draftOrderDelete_order_shippingPrice | null; + shippingPrice: OrderDraftCancel_draftOrderDelete_order_shippingPrice; status: OrderStatus; - subtotal: OrderDraftCancel_draftOrderDelete_order_subtotal | null; - total: OrderDraftCancel_draftOrderDelete_order_total | null; + subtotal: OrderDraftCancel_draftOrderDelete_order_subtotal; + total: OrderDraftCancel_draftOrderDelete_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderDraftCancel_draftOrderDelete_order_totalAuthorized | null; - totalCaptured: OrderDraftCancel_draftOrderDelete_order_totalCaptured | null; + totalAuthorized: OrderDraftCancel_draftOrderDelete_order_totalAuthorized; + totalCaptured: OrderDraftCancel_draftOrderDelete_order_totalCaptured; user: OrderDraftCancel_draftOrderDelete_order_user | null; userEmail: string | null; availableShippingMethods: (OrderDraftCancel_draftOrderDelete_order_availableShippingMethods | null)[] | null; discount: OrderDraftCancel_draftOrderDelete_order_discount | null; invoices: (OrderDraftCancel_draftOrderDelete_order_invoices | null)[] | null; channel: OrderDraftCancel_draftOrderDelete_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderDraftCancel_draftOrderDelete { diff --git a/src/orders/types/OrderDraftFinalize.ts b/src/orders/types/OrderDraftFinalize.ts index d896114bd..508ff56a2 100644 --- a/src/orders/types/OrderDraftFinalize.ts +++ b/src/orders/types/OrderDraftFinalize.ts @@ -131,7 +131,7 @@ export interface OrderDraftFinalize_draftOrderComplete_order_fulfillments_lines_ productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderDraftFinalize_draftOrderComplete_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderDraftFinalize_draftOrderComplete_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderDraftFinalize_draftOrderComplete_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderDraftFinalize_draftOrderComplete_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderDraftFinalize_draftOrderComplete_order_lines_unitPrice | null; + unitPrice: OrderDraftFinalize_draftOrderComplete_order_lines_unitPrice; thumbnail: OrderDraftFinalize_draftOrderComplete_order_lines_thumbnail | null; } @@ -334,24 +334,24 @@ export interface OrderDraftFinalize_draftOrderComplete_order { fulfillments: (OrderDraftFinalize_draftOrderComplete_order_fulfillments | null)[]; lines: (OrderDraftFinalize_draftOrderComplete_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderDraftFinalize_draftOrderComplete_order_shippingAddress | null; shippingMethod: OrderDraftFinalize_draftOrderComplete_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderDraftFinalize_draftOrderComplete_order_shippingPrice | null; + shippingPrice: OrderDraftFinalize_draftOrderComplete_order_shippingPrice; status: OrderStatus; - subtotal: OrderDraftFinalize_draftOrderComplete_order_subtotal | null; - total: OrderDraftFinalize_draftOrderComplete_order_total | null; + subtotal: OrderDraftFinalize_draftOrderComplete_order_subtotal; + total: OrderDraftFinalize_draftOrderComplete_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderDraftFinalize_draftOrderComplete_order_totalAuthorized | null; - totalCaptured: OrderDraftFinalize_draftOrderComplete_order_totalCaptured | null; + totalAuthorized: OrderDraftFinalize_draftOrderComplete_order_totalAuthorized; + totalCaptured: OrderDraftFinalize_draftOrderComplete_order_totalCaptured; user: OrderDraftFinalize_draftOrderComplete_order_user | null; userEmail: string | null; availableShippingMethods: (OrderDraftFinalize_draftOrderComplete_order_availableShippingMethods | null)[] | null; discount: OrderDraftFinalize_draftOrderComplete_order_discount | null; invoices: (OrderDraftFinalize_draftOrderComplete_order_invoices | null)[] | null; channel: OrderDraftFinalize_draftOrderComplete_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderDraftFinalize_draftOrderComplete { diff --git a/src/orders/types/OrderDraftList.ts b/src/orders/types/OrderDraftList.ts index d8ddd8ab5..2ea43c3ad 100644 --- a/src/orders/types/OrderDraftList.ts +++ b/src/orders/types/OrderDraftList.ts @@ -47,9 +47,9 @@ export interface OrderDraftList_draftOrders_edges_node { created: any; id: string; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; status: OrderStatus; - total: OrderDraftList_draftOrders_edges_node_total | null; + total: OrderDraftList_draftOrders_edges_node_total; userEmail: string | null; } diff --git a/src/orders/types/OrderDraftUpdate.ts b/src/orders/types/OrderDraftUpdate.ts index 739060f42..2d3a06c0d 100644 --- a/src/orders/types/OrderDraftUpdate.ts +++ b/src/orders/types/OrderDraftUpdate.ts @@ -131,7 +131,7 @@ export interface OrderDraftUpdate_draftOrderUpdate_order_fulfillments_lines_orde productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderDraftUpdate_draftOrderUpdate_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderDraftUpdate_draftOrderUpdate_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderDraftUpdate_draftOrderUpdate_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderDraftUpdate_draftOrderUpdate_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderDraftUpdate_draftOrderUpdate_order_lines_unitPrice | null; + unitPrice: OrderDraftUpdate_draftOrderUpdate_order_lines_unitPrice; thumbnail: OrderDraftUpdate_draftOrderUpdate_order_lines_thumbnail | null; } @@ -334,24 +334,24 @@ export interface OrderDraftUpdate_draftOrderUpdate_order { fulfillments: (OrderDraftUpdate_draftOrderUpdate_order_fulfillments | null)[]; lines: (OrderDraftUpdate_draftOrderUpdate_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderDraftUpdate_draftOrderUpdate_order_shippingAddress | null; shippingMethod: OrderDraftUpdate_draftOrderUpdate_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderDraftUpdate_draftOrderUpdate_order_shippingPrice | null; + shippingPrice: OrderDraftUpdate_draftOrderUpdate_order_shippingPrice; status: OrderStatus; - subtotal: OrderDraftUpdate_draftOrderUpdate_order_subtotal | null; - total: OrderDraftUpdate_draftOrderUpdate_order_total | null; + subtotal: OrderDraftUpdate_draftOrderUpdate_order_subtotal; + total: OrderDraftUpdate_draftOrderUpdate_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderDraftUpdate_draftOrderUpdate_order_totalAuthorized | null; - totalCaptured: OrderDraftUpdate_draftOrderUpdate_order_totalCaptured | null; + totalAuthorized: OrderDraftUpdate_draftOrderUpdate_order_totalAuthorized; + totalCaptured: OrderDraftUpdate_draftOrderUpdate_order_totalCaptured; user: OrderDraftUpdate_draftOrderUpdate_order_user | null; userEmail: string | null; availableShippingMethods: (OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethods | null)[] | null; discount: OrderDraftUpdate_draftOrderUpdate_order_discount | null; invoices: (OrderDraftUpdate_draftOrderUpdate_order_invoices | null)[] | null; channel: OrderDraftUpdate_draftOrderUpdate_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderDraftUpdate_draftOrderUpdate { diff --git a/src/orders/types/OrderFulfillmentCancel.ts b/src/orders/types/OrderFulfillmentCancel.ts index 54ecd69ee..97708d011 100644 --- a/src/orders/types/OrderFulfillmentCancel.ts +++ b/src/orders/types/OrderFulfillmentCancel.ts @@ -131,7 +131,7 @@ export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_fulfillment productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderFulfillmentCancel_orderFulfillmentCancel_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderFulfillmentCancel_orderFulfillmentCancel_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderFulfillmentCancel_orderFulfillmentCancel_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderFulfillmentCancel_orderFulfillmentCancel_order_lines_unitPrice | null; + unitPrice: OrderFulfillmentCancel_orderFulfillmentCancel_order_lines_unitPrice; thumbnail: OrderFulfillmentCancel_orderFulfillmentCancel_order_lines_thumbnail | null; } @@ -334,24 +334,24 @@ export interface OrderFulfillmentCancel_orderFulfillmentCancel_order { fulfillments: (OrderFulfillmentCancel_orderFulfillmentCancel_order_fulfillments | null)[]; lines: (OrderFulfillmentCancel_orderFulfillmentCancel_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderFulfillmentCancel_orderFulfillmentCancel_order_shippingAddress | null; shippingMethod: OrderFulfillmentCancel_orderFulfillmentCancel_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderFulfillmentCancel_orderFulfillmentCancel_order_shippingPrice | null; + shippingPrice: OrderFulfillmentCancel_orderFulfillmentCancel_order_shippingPrice; status: OrderStatus; - subtotal: OrderFulfillmentCancel_orderFulfillmentCancel_order_subtotal | null; - total: OrderFulfillmentCancel_orderFulfillmentCancel_order_total | null; + subtotal: OrderFulfillmentCancel_orderFulfillmentCancel_order_subtotal; + total: OrderFulfillmentCancel_orderFulfillmentCancel_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderFulfillmentCancel_orderFulfillmentCancel_order_totalAuthorized | null; - totalCaptured: OrderFulfillmentCancel_orderFulfillmentCancel_order_totalCaptured | null; + totalAuthorized: OrderFulfillmentCancel_orderFulfillmentCancel_order_totalAuthorized; + totalCaptured: OrderFulfillmentCancel_orderFulfillmentCancel_order_totalCaptured; user: OrderFulfillmentCancel_orderFulfillmentCancel_order_user | null; userEmail: string | null; availableShippingMethods: (OrderFulfillmentCancel_orderFulfillmentCancel_order_availableShippingMethods | null)[] | null; discount: OrderFulfillmentCancel_orderFulfillmentCancel_order_discount | null; invoices: (OrderFulfillmentCancel_orderFulfillmentCancel_order_invoices | null)[] | null; channel: OrderFulfillmentCancel_orderFulfillmentCancel_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderFulfillmentCancel_orderFulfillmentCancel { diff --git a/src/orders/types/OrderFulfillmentRefundProducts.ts b/src/orders/types/OrderFulfillmentRefundProducts.ts index 5cc66f5a3..6f516cd1e 100644 --- a/src/orders/types/OrderFulfillmentRefundProducts.ts +++ b/src/orders/types/OrderFulfillmentRefundProducts.ts @@ -52,7 +52,7 @@ export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_f productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_fulfillment_lines_orderLine_unitPrice | null; + unitPrice: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_fulfillment_lines_orderLine_unitPrice; thumbnail: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_fulfillment_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_o productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -261,7 +261,7 @@ export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_o productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_lines_unitPrice | null; + unitPrice: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_lines_unitPrice; thumbnail: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_lines_thumbnail | null; } @@ -399,24 +399,24 @@ export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_o fulfillments: (OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_fulfillments | null)[]; lines: (OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_shippingAddress | null; shippingMethod: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_shippingPrice | null; + shippingPrice: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_shippingPrice; status: OrderStatus; - subtotal: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_subtotal | null; - total: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_total | null; + subtotal: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_subtotal; + total: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_totalAuthorized | null; - totalCaptured: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_totalCaptured | null; + totalAuthorized: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_totalAuthorized; + totalCaptured: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_totalCaptured; user: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_user | null; userEmail: string | null; availableShippingMethods: (OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_availableShippingMethods | null)[] | null; discount: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_discount | null; invoices: (OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_invoices | null)[] | null; channel: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts { diff --git a/src/orders/types/OrderFulfillmentUpdateTracking.ts b/src/orders/types/OrderFulfillmentUpdateTracking.ts index 810f4c66f..f3bc4a753 100644 --- a/src/orders/types/OrderFulfillmentUpdateTracking.ts +++ b/src/orders/types/OrderFulfillmentUpdateTracking.ts @@ -131,7 +131,7 @@ export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_o productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_o productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_lines_unitPrice | null; + unitPrice: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_lines_unitPrice; thumbnail: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_lines_thumbnail | null; } @@ -334,24 +334,24 @@ export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_o fulfillments: (OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_fulfillments | null)[]; lines: (OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_shippingAddress | null; shippingMethod: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_shippingPrice | null; + shippingPrice: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_shippingPrice; status: OrderStatus; - subtotal: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_subtotal | null; - total: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_total | null; + subtotal: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_subtotal; + total: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_totalAuthorized | null; - totalCaptured: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_totalCaptured | null; + totalAuthorized: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_totalAuthorized; + totalCaptured: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_totalCaptured; user: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_user | null; userEmail: string | null; availableShippingMethods: (OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_availableShippingMethods | null)[] | null; discount: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_discount | null; invoices: (OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_invoices | null)[] | null; channel: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking { diff --git a/src/orders/types/OrderLineDelete.ts b/src/orders/types/OrderLineDelete.ts index adf804d37..9adc7daef 100644 --- a/src/orders/types/OrderLineDelete.ts +++ b/src/orders/types/OrderLineDelete.ts @@ -8,36 +8,36 @@ import { OrderErrorCode, OrderEventsEmailsEnum, OrderEventsEnum, FulfillmentStat // GraphQL mutation operation: OrderLineDelete // ==================================================== -export interface OrderLineDelete_draftOrderLineDelete_errors { +export interface OrderLineDelete_orderLineDelete_errors { __typename: "OrderError"; code: OrderErrorCode; field: string | null; } -export interface OrderLineDelete_draftOrderLineDelete_order_metadata { +export interface OrderLineDelete_orderLineDelete_order_metadata { __typename: "MetadataItem"; key: string; value: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_privateMetadata { +export interface OrderLineDelete_orderLineDelete_order_privateMetadata { __typename: "MetadataItem"; key: string; value: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_billingAddress_country { +export interface OrderLineDelete_orderLineDelete_order_billingAddress_country { __typename: "CountryDisplay"; code: string; country: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_billingAddress { +export interface OrderLineDelete_orderLineDelete_order_billingAddress { __typename: "Address"; city: string; cityArea: string; companyName: string; - country: OrderLineDelete_draftOrderLineDelete_order_billingAddress_country; + country: OrderLineDelete_orderLineDelete_order_billingAddress_country; countryArea: string; firstName: string; id: string; @@ -48,13 +48,13 @@ export interface OrderLineDelete_draftOrderLineDelete_order_billingAddress { streetAddress2: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_events_relatedOrder { +export interface OrderLineDelete_orderLineDelete_order_events_relatedOrder { __typename: "Order"; id: string; number: string | null; } -export interface OrderLineDelete_draftOrderLineDelete_order_events_user { +export interface OrderLineDelete_orderLineDelete_order_events_user { __typename: "User"; id: string; email: string; @@ -62,20 +62,20 @@ export interface OrderLineDelete_draftOrderLineDelete_order_events_user { lastName: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_events_lines_orderLine { +export interface OrderLineDelete_orderLineDelete_order_events_lines_orderLine { __typename: "OrderLine"; id: string; productName: string; variantName: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_events_lines { +export interface OrderLineDelete_orderLineDelete_order_events_lines { __typename: "OrderEventOrderLineObject"; quantity: number | null; - orderLine: OrderLineDelete_draftOrderLineDelete_order_events_lines_orderLine | null; + orderLine: OrderLineDelete_orderLineDelete_order_events_lines_orderLine | null; } -export interface OrderLineDelete_draftOrderLineDelete_order_events { +export interface OrderLineDelete_orderLineDelete_order_events { __typename: "OrderEvent"; id: string; amount: number | null; @@ -84,134 +84,134 @@ export interface OrderLineDelete_draftOrderLineDelete_order_events { email: string | null; emailType: OrderEventsEmailsEnum | null; invoiceNumber: string | null; - relatedOrder: OrderLineDelete_draftOrderLineDelete_order_events_relatedOrder | null; + relatedOrder: OrderLineDelete_orderLineDelete_order_events_relatedOrder | null; message: string | null; quantity: number | null; transactionReference: string | null; type: OrderEventsEnum | null; - user: OrderLineDelete_draftOrderLineDelete_order_events_user | null; - lines: (OrderLineDelete_draftOrderLineDelete_order_events_lines | null)[] | null; + user: OrderLineDelete_orderLineDelete_order_events_user | null; + lines: (OrderLineDelete_orderLineDelete_order_events_lines | null)[] | null; } -export interface OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines_orderLine_variant { +export interface OrderLineDelete_orderLineDelete_order_fulfillments_lines_orderLine_variant { __typename: "ProductVariant"; id: string; quantityAvailable: number; } -export interface OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines_orderLine_unitPrice_gross { +export interface OrderLineDelete_orderLineDelete_order_fulfillments_lines_orderLine_unitPrice_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines_orderLine_unitPrice_net { +export interface OrderLineDelete_orderLineDelete_order_fulfillments_lines_orderLine_unitPrice_net { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines_orderLine_unitPrice { +export interface OrderLineDelete_orderLineDelete_order_fulfillments_lines_orderLine_unitPrice { __typename: "TaxedMoney"; - gross: OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines_orderLine_unitPrice_gross; - net: OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines_orderLine_unitPrice_net; + gross: OrderLineDelete_orderLineDelete_order_fulfillments_lines_orderLine_unitPrice_gross; + net: OrderLineDelete_orderLineDelete_order_fulfillments_lines_orderLine_unitPrice_net; } -export interface OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines_orderLine_thumbnail { +export interface OrderLineDelete_orderLineDelete_order_fulfillments_lines_orderLine_thumbnail { __typename: "Image"; url: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines_orderLine { +export interface OrderLineDelete_orderLineDelete_order_fulfillments_lines_orderLine { __typename: "OrderLine"; id: string; isShippingRequired: boolean; - variant: OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines_orderLine_variant | null; + variant: OrderLineDelete_orderLineDelete_order_fulfillments_lines_orderLine_variant | null; productName: string; productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines_orderLine_unitPrice | null; - thumbnail: OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines_orderLine_thumbnail | null; + unitPrice: OrderLineDelete_orderLineDelete_order_fulfillments_lines_orderLine_unitPrice; + thumbnail: OrderLineDelete_orderLineDelete_order_fulfillments_lines_orderLine_thumbnail | null; } -export interface OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines { +export interface OrderLineDelete_orderLineDelete_order_fulfillments_lines { __typename: "FulfillmentLine"; id: string; quantity: number; - orderLine: OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines_orderLine | null; + orderLine: OrderLineDelete_orderLineDelete_order_fulfillments_lines_orderLine | null; } -export interface OrderLineDelete_draftOrderLineDelete_order_fulfillments_warehouse { +export interface OrderLineDelete_orderLineDelete_order_fulfillments_warehouse { __typename: "Warehouse"; id: string; name: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_fulfillments { +export interface OrderLineDelete_orderLineDelete_order_fulfillments { __typename: "Fulfillment"; id: string; - lines: (OrderLineDelete_draftOrderLineDelete_order_fulfillments_lines | null)[] | null; + lines: (OrderLineDelete_orderLineDelete_order_fulfillments_lines | null)[] | null; fulfillmentOrder: number; status: FulfillmentStatus; trackingNumber: string; - warehouse: OrderLineDelete_draftOrderLineDelete_order_fulfillments_warehouse | null; + warehouse: OrderLineDelete_orderLineDelete_order_fulfillments_warehouse | null; } -export interface OrderLineDelete_draftOrderLineDelete_order_lines_variant { +export interface OrderLineDelete_orderLineDelete_order_lines_variant { __typename: "ProductVariant"; id: string; quantityAvailable: number; } -export interface OrderLineDelete_draftOrderLineDelete_order_lines_unitPrice_gross { +export interface OrderLineDelete_orderLineDelete_order_lines_unitPrice_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_lines_unitPrice_net { +export interface OrderLineDelete_orderLineDelete_order_lines_unitPrice_net { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_lines_unitPrice { +export interface OrderLineDelete_orderLineDelete_order_lines_unitPrice { __typename: "TaxedMoney"; - gross: OrderLineDelete_draftOrderLineDelete_order_lines_unitPrice_gross; - net: OrderLineDelete_draftOrderLineDelete_order_lines_unitPrice_net; + gross: OrderLineDelete_orderLineDelete_order_lines_unitPrice_gross; + net: OrderLineDelete_orderLineDelete_order_lines_unitPrice_net; } -export interface OrderLineDelete_draftOrderLineDelete_order_lines_thumbnail { +export interface OrderLineDelete_orderLineDelete_order_lines_thumbnail { __typename: "Image"; url: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_lines { +export interface OrderLineDelete_orderLineDelete_order_lines { __typename: "OrderLine"; id: string; isShippingRequired: boolean; - variant: OrderLineDelete_draftOrderLineDelete_order_lines_variant | null; + variant: OrderLineDelete_orderLineDelete_order_lines_variant | null; productName: string; productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderLineDelete_draftOrderLineDelete_order_lines_unitPrice | null; - thumbnail: OrderLineDelete_draftOrderLineDelete_order_lines_thumbnail | null; + unitPrice: OrderLineDelete_orderLineDelete_order_lines_unitPrice; + thumbnail: OrderLineDelete_orderLineDelete_order_lines_thumbnail | null; } -export interface OrderLineDelete_draftOrderLineDelete_order_shippingAddress_country { +export interface OrderLineDelete_orderLineDelete_order_shippingAddress_country { __typename: "CountryDisplay"; code: string; country: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_shippingAddress { +export interface OrderLineDelete_orderLineDelete_order_shippingAddress { __typename: "Address"; city: string; cityArea: string; companyName: string; - country: OrderLineDelete_draftOrderLineDelete_order_shippingAddress_country; + country: OrderLineDelete_orderLineDelete_order_shippingAddress_country; countryArea: string; firstName: string; id: string; @@ -222,89 +222,89 @@ export interface OrderLineDelete_draftOrderLineDelete_order_shippingAddress { streetAddress2: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_shippingMethod { +export interface OrderLineDelete_orderLineDelete_order_shippingMethod { __typename: "ShippingMethod"; id: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_shippingPrice_gross { +export interface OrderLineDelete_orderLineDelete_order_shippingPrice_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_shippingPrice { +export interface OrderLineDelete_orderLineDelete_order_shippingPrice { __typename: "TaxedMoney"; - gross: OrderLineDelete_draftOrderLineDelete_order_shippingPrice_gross; + gross: OrderLineDelete_orderLineDelete_order_shippingPrice_gross; } -export interface OrderLineDelete_draftOrderLineDelete_order_subtotal_gross { +export interface OrderLineDelete_orderLineDelete_order_subtotal_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_subtotal { +export interface OrderLineDelete_orderLineDelete_order_subtotal { __typename: "TaxedMoney"; - gross: OrderLineDelete_draftOrderLineDelete_order_subtotal_gross; + gross: OrderLineDelete_orderLineDelete_order_subtotal_gross; } -export interface OrderLineDelete_draftOrderLineDelete_order_total_gross { +export interface OrderLineDelete_orderLineDelete_order_total_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_total_tax { +export interface OrderLineDelete_orderLineDelete_order_total_tax { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_total { +export interface OrderLineDelete_orderLineDelete_order_total { __typename: "TaxedMoney"; - gross: OrderLineDelete_draftOrderLineDelete_order_total_gross; - tax: OrderLineDelete_draftOrderLineDelete_order_total_tax; + gross: OrderLineDelete_orderLineDelete_order_total_gross; + tax: OrderLineDelete_orderLineDelete_order_total_tax; } -export interface OrderLineDelete_draftOrderLineDelete_order_totalAuthorized { +export interface OrderLineDelete_orderLineDelete_order_totalAuthorized { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_totalCaptured { +export interface OrderLineDelete_orderLineDelete_order_totalCaptured { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_user { +export interface OrderLineDelete_orderLineDelete_order_user { __typename: "User"; id: string; email: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_availableShippingMethods_price { +export interface OrderLineDelete_orderLineDelete_order_availableShippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_availableShippingMethods { +export interface OrderLineDelete_orderLineDelete_order_availableShippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderLineDelete_draftOrderLineDelete_order_availableShippingMethods_price | null; + price: OrderLineDelete_orderLineDelete_order_availableShippingMethods_price | null; } -export interface OrderLineDelete_draftOrderLineDelete_order_discount { +export interface OrderLineDelete_orderLineDelete_order_discount { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_draftOrderLineDelete_order_invoices { +export interface OrderLineDelete_orderLineDelete_order_invoices { __typename: "Invoice"; id: string; number: string | null; @@ -313,7 +313,7 @@ export interface OrderLineDelete_draftOrderLineDelete_order_invoices { status: JobStatusEnum; } -export interface OrderLineDelete_draftOrderLineDelete_order_channel { +export interface OrderLineDelete_orderLineDelete_order_channel { __typename: "Channel"; isActive: boolean; id: string; @@ -321,47 +321,47 @@ export interface OrderLineDelete_draftOrderLineDelete_order_channel { currencyCode: string; } -export interface OrderLineDelete_draftOrderLineDelete_order { +export interface OrderLineDelete_orderLineDelete_order { __typename: "Order"; id: string; - metadata: (OrderLineDelete_draftOrderLineDelete_order_metadata | null)[]; - privateMetadata: (OrderLineDelete_draftOrderLineDelete_order_privateMetadata | null)[]; - billingAddress: OrderLineDelete_draftOrderLineDelete_order_billingAddress | null; + metadata: (OrderLineDelete_orderLineDelete_order_metadata | null)[]; + privateMetadata: (OrderLineDelete_orderLineDelete_order_privateMetadata | null)[]; + billingAddress: OrderLineDelete_orderLineDelete_order_billingAddress | null; canFinalize: boolean; created: any; customerNote: string; - events: (OrderLineDelete_draftOrderLineDelete_order_events | null)[] | null; - fulfillments: (OrderLineDelete_draftOrderLineDelete_order_fulfillments | null)[]; - lines: (OrderLineDelete_draftOrderLineDelete_order_lines | null)[]; + events: (OrderLineDelete_orderLineDelete_order_events | null)[] | null; + fulfillments: (OrderLineDelete_orderLineDelete_order_fulfillments | null)[]; + lines: (OrderLineDelete_orderLineDelete_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; - shippingAddress: OrderLineDelete_draftOrderLineDelete_order_shippingAddress | null; - shippingMethod: OrderLineDelete_draftOrderLineDelete_order_shippingMethod | null; + paymentStatus: PaymentChargeStatusEnum; + shippingAddress: OrderLineDelete_orderLineDelete_order_shippingAddress | null; + shippingMethod: OrderLineDelete_orderLineDelete_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderLineDelete_draftOrderLineDelete_order_shippingPrice | null; + shippingPrice: OrderLineDelete_orderLineDelete_order_shippingPrice; status: OrderStatus; - subtotal: OrderLineDelete_draftOrderLineDelete_order_subtotal | null; - total: OrderLineDelete_draftOrderLineDelete_order_total | null; + subtotal: OrderLineDelete_orderLineDelete_order_subtotal; + total: OrderLineDelete_orderLineDelete_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderLineDelete_draftOrderLineDelete_order_totalAuthorized | null; - totalCaptured: OrderLineDelete_draftOrderLineDelete_order_totalCaptured | null; - user: OrderLineDelete_draftOrderLineDelete_order_user | null; + totalAuthorized: OrderLineDelete_orderLineDelete_order_totalAuthorized; + totalCaptured: OrderLineDelete_orderLineDelete_order_totalCaptured; + user: OrderLineDelete_orderLineDelete_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderLineDelete_draftOrderLineDelete_order_availableShippingMethods | null)[] | null; - discount: OrderLineDelete_draftOrderLineDelete_order_discount | null; - invoices: (OrderLineDelete_draftOrderLineDelete_order_invoices | null)[] | null; - channel: OrderLineDelete_draftOrderLineDelete_order_channel; - isPaid: boolean | null; + availableShippingMethods: (OrderLineDelete_orderLineDelete_order_availableShippingMethods | null)[] | null; + discount: OrderLineDelete_orderLineDelete_order_discount | null; + invoices: (OrderLineDelete_orderLineDelete_order_invoices | null)[] | null; + channel: OrderLineDelete_orderLineDelete_order_channel; + isPaid: boolean; } -export interface OrderLineDelete_draftOrderLineDelete { - __typename: "DraftOrderLineDelete"; - errors: OrderLineDelete_draftOrderLineDelete_errors[]; - order: OrderLineDelete_draftOrderLineDelete_order | null; +export interface OrderLineDelete_orderLineDelete { + __typename: "OrderLineDelete"; + errors: OrderLineDelete_orderLineDelete_errors[]; + order: OrderLineDelete_orderLineDelete_order | null; } export interface OrderLineDelete { - draftOrderLineDelete: OrderLineDelete_draftOrderLineDelete | null; + orderLineDelete: OrderLineDelete_orderLineDelete | null; } export interface OrderLineDeleteVariables { diff --git a/src/orders/types/OrderLineUpdate.ts b/src/orders/types/OrderLineUpdate.ts index 4f373e6ea..86cfbe134 100644 --- a/src/orders/types/OrderLineUpdate.ts +++ b/src/orders/types/OrderLineUpdate.ts @@ -8,36 +8,36 @@ import { OrderLineInput, OrderErrorCode, OrderEventsEmailsEnum, OrderEventsEnum, // GraphQL mutation operation: OrderLineUpdate // ==================================================== -export interface OrderLineUpdate_draftOrderLineUpdate_errors { +export interface OrderLineUpdate_orderLineUpdate_errors { __typename: "OrderError"; code: OrderErrorCode; field: string | null; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_metadata { +export interface OrderLineUpdate_orderLineUpdate_order_metadata { __typename: "MetadataItem"; key: string; value: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_privateMetadata { +export interface OrderLineUpdate_orderLineUpdate_order_privateMetadata { __typename: "MetadataItem"; key: string; value: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_billingAddress_country { +export interface OrderLineUpdate_orderLineUpdate_order_billingAddress_country { __typename: "CountryDisplay"; code: string; country: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_billingAddress { +export interface OrderLineUpdate_orderLineUpdate_order_billingAddress { __typename: "Address"; city: string; cityArea: string; companyName: string; - country: OrderLineUpdate_draftOrderLineUpdate_order_billingAddress_country; + country: OrderLineUpdate_orderLineUpdate_order_billingAddress_country; countryArea: string; firstName: string; id: string; @@ -48,13 +48,13 @@ export interface OrderLineUpdate_draftOrderLineUpdate_order_billingAddress { streetAddress2: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_events_relatedOrder { +export interface OrderLineUpdate_orderLineUpdate_order_events_relatedOrder { __typename: "Order"; id: string; number: string | null; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_events_user { +export interface OrderLineUpdate_orderLineUpdate_order_events_user { __typename: "User"; id: string; email: string; @@ -62,20 +62,20 @@ export interface OrderLineUpdate_draftOrderLineUpdate_order_events_user { lastName: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_events_lines_orderLine { +export interface OrderLineUpdate_orderLineUpdate_order_events_lines_orderLine { __typename: "OrderLine"; id: string; productName: string; variantName: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_events_lines { +export interface OrderLineUpdate_orderLineUpdate_order_events_lines { __typename: "OrderEventOrderLineObject"; quantity: number | null; - orderLine: OrderLineUpdate_draftOrderLineUpdate_order_events_lines_orderLine | null; + orderLine: OrderLineUpdate_orderLineUpdate_order_events_lines_orderLine | null; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_events { +export interface OrderLineUpdate_orderLineUpdate_order_events { __typename: "OrderEvent"; id: string; amount: number | null; @@ -84,134 +84,134 @@ export interface OrderLineUpdate_draftOrderLineUpdate_order_events { email: string | null; emailType: OrderEventsEmailsEnum | null; invoiceNumber: string | null; - relatedOrder: OrderLineUpdate_draftOrderLineUpdate_order_events_relatedOrder | null; + relatedOrder: OrderLineUpdate_orderLineUpdate_order_events_relatedOrder | null; message: string | null; quantity: number | null; transactionReference: string | null; type: OrderEventsEnum | null; - user: OrderLineUpdate_draftOrderLineUpdate_order_events_user | null; - lines: (OrderLineUpdate_draftOrderLineUpdate_order_events_lines | null)[] | null; + user: OrderLineUpdate_orderLineUpdate_order_events_user | null; + lines: (OrderLineUpdate_orderLineUpdate_order_events_lines | null)[] | null; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines_orderLine_variant { +export interface OrderLineUpdate_orderLineUpdate_order_fulfillments_lines_orderLine_variant { __typename: "ProductVariant"; id: string; quantityAvailable: number; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines_orderLine_unitPrice_gross { +export interface OrderLineUpdate_orderLineUpdate_order_fulfillments_lines_orderLine_unitPrice_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines_orderLine_unitPrice_net { +export interface OrderLineUpdate_orderLineUpdate_order_fulfillments_lines_orderLine_unitPrice_net { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines_orderLine_unitPrice { +export interface OrderLineUpdate_orderLineUpdate_order_fulfillments_lines_orderLine_unitPrice { __typename: "TaxedMoney"; - gross: OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines_orderLine_unitPrice_gross; - net: OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines_orderLine_unitPrice_net; + gross: OrderLineUpdate_orderLineUpdate_order_fulfillments_lines_orderLine_unitPrice_gross; + net: OrderLineUpdate_orderLineUpdate_order_fulfillments_lines_orderLine_unitPrice_net; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines_orderLine_thumbnail { +export interface OrderLineUpdate_orderLineUpdate_order_fulfillments_lines_orderLine_thumbnail { __typename: "Image"; url: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines_orderLine { +export interface OrderLineUpdate_orderLineUpdate_order_fulfillments_lines_orderLine { __typename: "OrderLine"; id: string; isShippingRequired: boolean; - variant: OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines_orderLine_variant | null; + variant: OrderLineUpdate_orderLineUpdate_order_fulfillments_lines_orderLine_variant | null; productName: string; productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines_orderLine_unitPrice | null; - thumbnail: OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines_orderLine_thumbnail | null; + unitPrice: OrderLineUpdate_orderLineUpdate_order_fulfillments_lines_orderLine_unitPrice; + thumbnail: OrderLineUpdate_orderLineUpdate_order_fulfillments_lines_orderLine_thumbnail | null; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines { +export interface OrderLineUpdate_orderLineUpdate_order_fulfillments_lines { __typename: "FulfillmentLine"; id: string; quantity: number; - orderLine: OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines_orderLine | null; + orderLine: OrderLineUpdate_orderLineUpdate_order_fulfillments_lines_orderLine | null; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_warehouse { +export interface OrderLineUpdate_orderLineUpdate_order_fulfillments_warehouse { __typename: "Warehouse"; id: string; name: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_fulfillments { +export interface OrderLineUpdate_orderLineUpdate_order_fulfillments { __typename: "Fulfillment"; id: string; - lines: (OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_lines | null)[] | null; + lines: (OrderLineUpdate_orderLineUpdate_order_fulfillments_lines | null)[] | null; fulfillmentOrder: number; status: FulfillmentStatus; trackingNumber: string; - warehouse: OrderLineUpdate_draftOrderLineUpdate_order_fulfillments_warehouse | null; + warehouse: OrderLineUpdate_orderLineUpdate_order_fulfillments_warehouse | null; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_lines_variant { +export interface OrderLineUpdate_orderLineUpdate_order_lines_variant { __typename: "ProductVariant"; id: string; quantityAvailable: number; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_lines_unitPrice_gross { +export interface OrderLineUpdate_orderLineUpdate_order_lines_unitPrice_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_lines_unitPrice_net { +export interface OrderLineUpdate_orderLineUpdate_order_lines_unitPrice_net { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_lines_unitPrice { +export interface OrderLineUpdate_orderLineUpdate_order_lines_unitPrice { __typename: "TaxedMoney"; - gross: OrderLineUpdate_draftOrderLineUpdate_order_lines_unitPrice_gross; - net: OrderLineUpdate_draftOrderLineUpdate_order_lines_unitPrice_net; + gross: OrderLineUpdate_orderLineUpdate_order_lines_unitPrice_gross; + net: OrderLineUpdate_orderLineUpdate_order_lines_unitPrice_net; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_lines_thumbnail { +export interface OrderLineUpdate_orderLineUpdate_order_lines_thumbnail { __typename: "Image"; url: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_lines { +export interface OrderLineUpdate_orderLineUpdate_order_lines { __typename: "OrderLine"; id: string; isShippingRequired: boolean; - variant: OrderLineUpdate_draftOrderLineUpdate_order_lines_variant | null; + variant: OrderLineUpdate_orderLineUpdate_order_lines_variant | null; productName: string; productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderLineUpdate_draftOrderLineUpdate_order_lines_unitPrice | null; - thumbnail: OrderLineUpdate_draftOrderLineUpdate_order_lines_thumbnail | null; + unitPrice: OrderLineUpdate_orderLineUpdate_order_lines_unitPrice; + thumbnail: OrderLineUpdate_orderLineUpdate_order_lines_thumbnail | null; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_shippingAddress_country { +export interface OrderLineUpdate_orderLineUpdate_order_shippingAddress_country { __typename: "CountryDisplay"; code: string; country: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_shippingAddress { +export interface OrderLineUpdate_orderLineUpdate_order_shippingAddress { __typename: "Address"; city: string; cityArea: string; companyName: string; - country: OrderLineUpdate_draftOrderLineUpdate_order_shippingAddress_country; + country: OrderLineUpdate_orderLineUpdate_order_shippingAddress_country; countryArea: string; firstName: string; id: string; @@ -222,89 +222,89 @@ export interface OrderLineUpdate_draftOrderLineUpdate_order_shippingAddress { streetAddress2: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_shippingMethod { +export interface OrderLineUpdate_orderLineUpdate_order_shippingMethod { __typename: "ShippingMethod"; id: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_shippingPrice_gross { +export interface OrderLineUpdate_orderLineUpdate_order_shippingPrice_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_shippingPrice { +export interface OrderLineUpdate_orderLineUpdate_order_shippingPrice { __typename: "TaxedMoney"; - gross: OrderLineUpdate_draftOrderLineUpdate_order_shippingPrice_gross; + gross: OrderLineUpdate_orderLineUpdate_order_shippingPrice_gross; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_subtotal_gross { +export interface OrderLineUpdate_orderLineUpdate_order_subtotal_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_subtotal { +export interface OrderLineUpdate_orderLineUpdate_order_subtotal { __typename: "TaxedMoney"; - gross: OrderLineUpdate_draftOrderLineUpdate_order_subtotal_gross; + gross: OrderLineUpdate_orderLineUpdate_order_subtotal_gross; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_total_gross { +export interface OrderLineUpdate_orderLineUpdate_order_total_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_total_tax { +export interface OrderLineUpdate_orderLineUpdate_order_total_tax { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_total { +export interface OrderLineUpdate_orderLineUpdate_order_total { __typename: "TaxedMoney"; - gross: OrderLineUpdate_draftOrderLineUpdate_order_total_gross; - tax: OrderLineUpdate_draftOrderLineUpdate_order_total_tax; + gross: OrderLineUpdate_orderLineUpdate_order_total_gross; + tax: OrderLineUpdate_orderLineUpdate_order_total_tax; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_totalAuthorized { +export interface OrderLineUpdate_orderLineUpdate_order_totalAuthorized { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_totalCaptured { +export interface OrderLineUpdate_orderLineUpdate_order_totalCaptured { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_user { +export interface OrderLineUpdate_orderLineUpdate_order_user { __typename: "User"; id: string; email: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_availableShippingMethods_price { +export interface OrderLineUpdate_orderLineUpdate_order_availableShippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_availableShippingMethods { +export interface OrderLineUpdate_orderLineUpdate_order_availableShippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderLineUpdate_draftOrderLineUpdate_order_availableShippingMethods_price | null; + price: OrderLineUpdate_orderLineUpdate_order_availableShippingMethods_price | null; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_discount { +export interface OrderLineUpdate_orderLineUpdate_order_discount { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_invoices { +export interface OrderLineUpdate_orderLineUpdate_order_invoices { __typename: "Invoice"; id: string; number: string | null; @@ -313,7 +313,7 @@ export interface OrderLineUpdate_draftOrderLineUpdate_order_invoices { status: JobStatusEnum; } -export interface OrderLineUpdate_draftOrderLineUpdate_order_channel { +export interface OrderLineUpdate_orderLineUpdate_order_channel { __typename: "Channel"; isActive: boolean; id: string; @@ -321,47 +321,47 @@ export interface OrderLineUpdate_draftOrderLineUpdate_order_channel { currencyCode: string; } -export interface OrderLineUpdate_draftOrderLineUpdate_order { +export interface OrderLineUpdate_orderLineUpdate_order { __typename: "Order"; id: string; - metadata: (OrderLineUpdate_draftOrderLineUpdate_order_metadata | null)[]; - privateMetadata: (OrderLineUpdate_draftOrderLineUpdate_order_privateMetadata | null)[]; - billingAddress: OrderLineUpdate_draftOrderLineUpdate_order_billingAddress | null; + metadata: (OrderLineUpdate_orderLineUpdate_order_metadata | null)[]; + privateMetadata: (OrderLineUpdate_orderLineUpdate_order_privateMetadata | null)[]; + billingAddress: OrderLineUpdate_orderLineUpdate_order_billingAddress | null; canFinalize: boolean; created: any; customerNote: string; - events: (OrderLineUpdate_draftOrderLineUpdate_order_events | null)[] | null; - fulfillments: (OrderLineUpdate_draftOrderLineUpdate_order_fulfillments | null)[]; - lines: (OrderLineUpdate_draftOrderLineUpdate_order_lines | null)[]; + events: (OrderLineUpdate_orderLineUpdate_order_events | null)[] | null; + fulfillments: (OrderLineUpdate_orderLineUpdate_order_fulfillments | null)[]; + lines: (OrderLineUpdate_orderLineUpdate_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; - shippingAddress: OrderLineUpdate_draftOrderLineUpdate_order_shippingAddress | null; - shippingMethod: OrderLineUpdate_draftOrderLineUpdate_order_shippingMethod | null; + paymentStatus: PaymentChargeStatusEnum; + shippingAddress: OrderLineUpdate_orderLineUpdate_order_shippingAddress | null; + shippingMethod: OrderLineUpdate_orderLineUpdate_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderLineUpdate_draftOrderLineUpdate_order_shippingPrice | null; + shippingPrice: OrderLineUpdate_orderLineUpdate_order_shippingPrice; status: OrderStatus; - subtotal: OrderLineUpdate_draftOrderLineUpdate_order_subtotal | null; - total: OrderLineUpdate_draftOrderLineUpdate_order_total | null; + subtotal: OrderLineUpdate_orderLineUpdate_order_subtotal; + total: OrderLineUpdate_orderLineUpdate_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderLineUpdate_draftOrderLineUpdate_order_totalAuthorized | null; - totalCaptured: OrderLineUpdate_draftOrderLineUpdate_order_totalCaptured | null; - user: OrderLineUpdate_draftOrderLineUpdate_order_user | null; + totalAuthorized: OrderLineUpdate_orderLineUpdate_order_totalAuthorized; + totalCaptured: OrderLineUpdate_orderLineUpdate_order_totalCaptured; + user: OrderLineUpdate_orderLineUpdate_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderLineUpdate_draftOrderLineUpdate_order_availableShippingMethods | null)[] | null; - discount: OrderLineUpdate_draftOrderLineUpdate_order_discount | null; - invoices: (OrderLineUpdate_draftOrderLineUpdate_order_invoices | null)[] | null; - channel: OrderLineUpdate_draftOrderLineUpdate_order_channel; - isPaid: boolean | null; + availableShippingMethods: (OrderLineUpdate_orderLineUpdate_order_availableShippingMethods | null)[] | null; + discount: OrderLineUpdate_orderLineUpdate_order_discount | null; + invoices: (OrderLineUpdate_orderLineUpdate_order_invoices | null)[] | null; + channel: OrderLineUpdate_orderLineUpdate_order_channel; + isPaid: boolean; } -export interface OrderLineUpdate_draftOrderLineUpdate { - __typename: "DraftOrderLineUpdate"; - errors: OrderLineUpdate_draftOrderLineUpdate_errors[]; - order: OrderLineUpdate_draftOrderLineUpdate_order | null; +export interface OrderLineUpdate_orderLineUpdate { + __typename: "OrderLineUpdate"; + errors: OrderLineUpdate_orderLineUpdate_errors[]; + order: OrderLineUpdate_orderLineUpdate_order | null; } export interface OrderLineUpdate { - draftOrderLineUpdate: OrderLineUpdate_draftOrderLineUpdate | null; + orderLineUpdate: OrderLineUpdate_orderLineUpdate | null; } export interface OrderLineUpdateVariables { diff --git a/src/orders/types/OrderLinesAdd.ts b/src/orders/types/OrderLinesAdd.ts index 4d2390378..cf65df69e 100644 --- a/src/orders/types/OrderLinesAdd.ts +++ b/src/orders/types/OrderLinesAdd.ts @@ -8,36 +8,36 @@ import { OrderLineCreateInput, OrderErrorCode, OrderEventsEmailsEnum, OrderEvent // GraphQL mutation operation: OrderLinesAdd // ==================================================== -export interface OrderLinesAdd_draftOrderLinesCreate_errors { +export interface OrderLinesAdd_orderLinesCreate_errors { __typename: "OrderError"; code: OrderErrorCode; field: string | null; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_metadata { +export interface OrderLinesAdd_orderLinesCreate_order_metadata { __typename: "MetadataItem"; key: string; value: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_privateMetadata { +export interface OrderLinesAdd_orderLinesCreate_order_privateMetadata { __typename: "MetadataItem"; key: string; value: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_billingAddress_country { +export interface OrderLinesAdd_orderLinesCreate_order_billingAddress_country { __typename: "CountryDisplay"; code: string; country: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_billingAddress { +export interface OrderLinesAdd_orderLinesCreate_order_billingAddress { __typename: "Address"; city: string; cityArea: string; companyName: string; - country: OrderLinesAdd_draftOrderLinesCreate_order_billingAddress_country; + country: OrderLinesAdd_orderLinesCreate_order_billingAddress_country; countryArea: string; firstName: string; id: string; @@ -48,13 +48,13 @@ export interface OrderLinesAdd_draftOrderLinesCreate_order_billingAddress { streetAddress2: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_events_relatedOrder { +export interface OrderLinesAdd_orderLinesCreate_order_events_relatedOrder { __typename: "Order"; id: string; number: string | null; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_events_user { +export interface OrderLinesAdd_orderLinesCreate_order_events_user { __typename: "User"; id: string; email: string; @@ -62,20 +62,20 @@ export interface OrderLinesAdd_draftOrderLinesCreate_order_events_user { lastName: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_events_lines_orderLine { +export interface OrderLinesAdd_orderLinesCreate_order_events_lines_orderLine { __typename: "OrderLine"; id: string; productName: string; variantName: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_events_lines { +export interface OrderLinesAdd_orderLinesCreate_order_events_lines { __typename: "OrderEventOrderLineObject"; quantity: number | null; - orderLine: OrderLinesAdd_draftOrderLinesCreate_order_events_lines_orderLine | null; + orderLine: OrderLinesAdd_orderLinesCreate_order_events_lines_orderLine | null; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_events { +export interface OrderLinesAdd_orderLinesCreate_order_events { __typename: "OrderEvent"; id: string; amount: number | null; @@ -84,134 +84,134 @@ export interface OrderLinesAdd_draftOrderLinesCreate_order_events { email: string | null; emailType: OrderEventsEmailsEnum | null; invoiceNumber: string | null; - relatedOrder: OrderLinesAdd_draftOrderLinesCreate_order_events_relatedOrder | null; + relatedOrder: OrderLinesAdd_orderLinesCreate_order_events_relatedOrder | null; message: string | null; quantity: number | null; transactionReference: string | null; type: OrderEventsEnum | null; - user: OrderLinesAdd_draftOrderLinesCreate_order_events_user | null; - lines: (OrderLinesAdd_draftOrderLinesCreate_order_events_lines | null)[] | null; + user: OrderLinesAdd_orderLinesCreate_order_events_user | null; + lines: (OrderLinesAdd_orderLinesCreate_order_events_lines | null)[] | null; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines_orderLine_variant { +export interface OrderLinesAdd_orderLinesCreate_order_fulfillments_lines_orderLine_variant { __typename: "ProductVariant"; id: string; quantityAvailable: number; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines_orderLine_unitPrice_gross { +export interface OrderLinesAdd_orderLinesCreate_order_fulfillments_lines_orderLine_unitPrice_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines_orderLine_unitPrice_net { +export interface OrderLinesAdd_orderLinesCreate_order_fulfillments_lines_orderLine_unitPrice_net { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines_orderLine_unitPrice { +export interface OrderLinesAdd_orderLinesCreate_order_fulfillments_lines_orderLine_unitPrice { __typename: "TaxedMoney"; - gross: OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines_orderLine_unitPrice_gross; - net: OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines_orderLine_unitPrice_net; + gross: OrderLinesAdd_orderLinesCreate_order_fulfillments_lines_orderLine_unitPrice_gross; + net: OrderLinesAdd_orderLinesCreate_order_fulfillments_lines_orderLine_unitPrice_net; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines_orderLine_thumbnail { +export interface OrderLinesAdd_orderLinesCreate_order_fulfillments_lines_orderLine_thumbnail { __typename: "Image"; url: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines_orderLine { +export interface OrderLinesAdd_orderLinesCreate_order_fulfillments_lines_orderLine { __typename: "OrderLine"; id: string; isShippingRequired: boolean; - variant: OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines_orderLine_variant | null; + variant: OrderLinesAdd_orderLinesCreate_order_fulfillments_lines_orderLine_variant | null; productName: string; productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines_orderLine_unitPrice | null; - thumbnail: OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines_orderLine_thumbnail | null; + unitPrice: OrderLinesAdd_orderLinesCreate_order_fulfillments_lines_orderLine_unitPrice; + thumbnail: OrderLinesAdd_orderLinesCreate_order_fulfillments_lines_orderLine_thumbnail | null; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines { +export interface OrderLinesAdd_orderLinesCreate_order_fulfillments_lines { __typename: "FulfillmentLine"; id: string; quantity: number; - orderLine: OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines_orderLine | null; + orderLine: OrderLinesAdd_orderLinesCreate_order_fulfillments_lines_orderLine | null; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_warehouse { +export interface OrderLinesAdd_orderLinesCreate_order_fulfillments_warehouse { __typename: "Warehouse"; id: string; name: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_fulfillments { +export interface OrderLinesAdd_orderLinesCreate_order_fulfillments { __typename: "Fulfillment"; id: string; - lines: (OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_lines | null)[] | null; + lines: (OrderLinesAdd_orderLinesCreate_order_fulfillments_lines | null)[] | null; fulfillmentOrder: number; status: FulfillmentStatus; trackingNumber: string; - warehouse: OrderLinesAdd_draftOrderLinesCreate_order_fulfillments_warehouse | null; + warehouse: OrderLinesAdd_orderLinesCreate_order_fulfillments_warehouse | null; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_lines_variant { +export interface OrderLinesAdd_orderLinesCreate_order_lines_variant { __typename: "ProductVariant"; id: string; quantityAvailable: number; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_lines_unitPrice_gross { +export interface OrderLinesAdd_orderLinesCreate_order_lines_unitPrice_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_lines_unitPrice_net { +export interface OrderLinesAdd_orderLinesCreate_order_lines_unitPrice_net { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_lines_unitPrice { +export interface OrderLinesAdd_orderLinesCreate_order_lines_unitPrice { __typename: "TaxedMoney"; - gross: OrderLinesAdd_draftOrderLinesCreate_order_lines_unitPrice_gross; - net: OrderLinesAdd_draftOrderLinesCreate_order_lines_unitPrice_net; + gross: OrderLinesAdd_orderLinesCreate_order_lines_unitPrice_gross; + net: OrderLinesAdd_orderLinesCreate_order_lines_unitPrice_net; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_lines_thumbnail { +export interface OrderLinesAdd_orderLinesCreate_order_lines_thumbnail { __typename: "Image"; url: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_lines { +export interface OrderLinesAdd_orderLinesCreate_order_lines { __typename: "OrderLine"; id: string; isShippingRequired: boolean; - variant: OrderLinesAdd_draftOrderLinesCreate_order_lines_variant | null; + variant: OrderLinesAdd_orderLinesCreate_order_lines_variant | null; productName: string; productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderLinesAdd_draftOrderLinesCreate_order_lines_unitPrice | null; - thumbnail: OrderLinesAdd_draftOrderLinesCreate_order_lines_thumbnail | null; + unitPrice: OrderLinesAdd_orderLinesCreate_order_lines_unitPrice; + thumbnail: OrderLinesAdd_orderLinesCreate_order_lines_thumbnail | null; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_shippingAddress_country { +export interface OrderLinesAdd_orderLinesCreate_order_shippingAddress_country { __typename: "CountryDisplay"; code: string; country: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_shippingAddress { +export interface OrderLinesAdd_orderLinesCreate_order_shippingAddress { __typename: "Address"; city: string; cityArea: string; companyName: string; - country: OrderLinesAdd_draftOrderLinesCreate_order_shippingAddress_country; + country: OrderLinesAdd_orderLinesCreate_order_shippingAddress_country; countryArea: string; firstName: string; id: string; @@ -222,89 +222,89 @@ export interface OrderLinesAdd_draftOrderLinesCreate_order_shippingAddress { streetAddress2: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_shippingMethod { +export interface OrderLinesAdd_orderLinesCreate_order_shippingMethod { __typename: "ShippingMethod"; id: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_shippingPrice_gross { +export interface OrderLinesAdd_orderLinesCreate_order_shippingPrice_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_shippingPrice { +export interface OrderLinesAdd_orderLinesCreate_order_shippingPrice { __typename: "TaxedMoney"; - gross: OrderLinesAdd_draftOrderLinesCreate_order_shippingPrice_gross; + gross: OrderLinesAdd_orderLinesCreate_order_shippingPrice_gross; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_subtotal_gross { +export interface OrderLinesAdd_orderLinesCreate_order_subtotal_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_subtotal { +export interface OrderLinesAdd_orderLinesCreate_order_subtotal { __typename: "TaxedMoney"; - gross: OrderLinesAdd_draftOrderLinesCreate_order_subtotal_gross; + gross: OrderLinesAdd_orderLinesCreate_order_subtotal_gross; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_total_gross { +export interface OrderLinesAdd_orderLinesCreate_order_total_gross { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_total_tax { +export interface OrderLinesAdd_orderLinesCreate_order_total_tax { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_total { +export interface OrderLinesAdd_orderLinesCreate_order_total { __typename: "TaxedMoney"; - gross: OrderLinesAdd_draftOrderLinesCreate_order_total_gross; - tax: OrderLinesAdd_draftOrderLinesCreate_order_total_tax; + gross: OrderLinesAdd_orderLinesCreate_order_total_gross; + tax: OrderLinesAdd_orderLinesCreate_order_total_tax; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_totalAuthorized { +export interface OrderLinesAdd_orderLinesCreate_order_totalAuthorized { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_totalCaptured { +export interface OrderLinesAdd_orderLinesCreate_order_totalCaptured { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_user { +export interface OrderLinesAdd_orderLinesCreate_order_user { __typename: "User"; id: string; email: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_availableShippingMethods_price { +export interface OrderLinesAdd_orderLinesCreate_order_availableShippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_availableShippingMethods { +export interface OrderLinesAdd_orderLinesCreate_order_availableShippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderLinesAdd_draftOrderLinesCreate_order_availableShippingMethods_price | null; + price: OrderLinesAdd_orderLinesCreate_order_availableShippingMethods_price | null; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_discount { +export interface OrderLinesAdd_orderLinesCreate_order_discount { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_invoices { +export interface OrderLinesAdd_orderLinesCreate_order_invoices { __typename: "Invoice"; id: string; number: string | null; @@ -313,7 +313,7 @@ export interface OrderLinesAdd_draftOrderLinesCreate_order_invoices { status: JobStatusEnum; } -export interface OrderLinesAdd_draftOrderLinesCreate_order_channel { +export interface OrderLinesAdd_orderLinesCreate_order_channel { __typename: "Channel"; isActive: boolean; id: string; @@ -321,47 +321,47 @@ export interface OrderLinesAdd_draftOrderLinesCreate_order_channel { currencyCode: string; } -export interface OrderLinesAdd_draftOrderLinesCreate_order { +export interface OrderLinesAdd_orderLinesCreate_order { __typename: "Order"; id: string; - metadata: (OrderLinesAdd_draftOrderLinesCreate_order_metadata | null)[]; - privateMetadata: (OrderLinesAdd_draftOrderLinesCreate_order_privateMetadata | null)[]; - billingAddress: OrderLinesAdd_draftOrderLinesCreate_order_billingAddress | null; + metadata: (OrderLinesAdd_orderLinesCreate_order_metadata | null)[]; + privateMetadata: (OrderLinesAdd_orderLinesCreate_order_privateMetadata | null)[]; + billingAddress: OrderLinesAdd_orderLinesCreate_order_billingAddress | null; canFinalize: boolean; created: any; customerNote: string; - events: (OrderLinesAdd_draftOrderLinesCreate_order_events | null)[] | null; - fulfillments: (OrderLinesAdd_draftOrderLinesCreate_order_fulfillments | null)[]; - lines: (OrderLinesAdd_draftOrderLinesCreate_order_lines | null)[]; + events: (OrderLinesAdd_orderLinesCreate_order_events | null)[] | null; + fulfillments: (OrderLinesAdd_orderLinesCreate_order_fulfillments | null)[]; + lines: (OrderLinesAdd_orderLinesCreate_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; - shippingAddress: OrderLinesAdd_draftOrderLinesCreate_order_shippingAddress | null; - shippingMethod: OrderLinesAdd_draftOrderLinesCreate_order_shippingMethod | null; + paymentStatus: PaymentChargeStatusEnum; + shippingAddress: OrderLinesAdd_orderLinesCreate_order_shippingAddress | null; + shippingMethod: OrderLinesAdd_orderLinesCreate_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderLinesAdd_draftOrderLinesCreate_order_shippingPrice | null; + shippingPrice: OrderLinesAdd_orderLinesCreate_order_shippingPrice; status: OrderStatus; - subtotal: OrderLinesAdd_draftOrderLinesCreate_order_subtotal | null; - total: OrderLinesAdd_draftOrderLinesCreate_order_total | null; + subtotal: OrderLinesAdd_orderLinesCreate_order_subtotal; + total: OrderLinesAdd_orderLinesCreate_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderLinesAdd_draftOrderLinesCreate_order_totalAuthorized | null; - totalCaptured: OrderLinesAdd_draftOrderLinesCreate_order_totalCaptured | null; - user: OrderLinesAdd_draftOrderLinesCreate_order_user | null; + totalAuthorized: OrderLinesAdd_orderLinesCreate_order_totalAuthorized; + totalCaptured: OrderLinesAdd_orderLinesCreate_order_totalCaptured; + user: OrderLinesAdd_orderLinesCreate_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderLinesAdd_draftOrderLinesCreate_order_availableShippingMethods | null)[] | null; - discount: OrderLinesAdd_draftOrderLinesCreate_order_discount | null; - invoices: (OrderLinesAdd_draftOrderLinesCreate_order_invoices | null)[] | null; - channel: OrderLinesAdd_draftOrderLinesCreate_order_channel; - isPaid: boolean | null; + availableShippingMethods: (OrderLinesAdd_orderLinesCreate_order_availableShippingMethods | null)[] | null; + discount: OrderLinesAdd_orderLinesCreate_order_discount | null; + invoices: (OrderLinesAdd_orderLinesCreate_order_invoices | null)[] | null; + channel: OrderLinesAdd_orderLinesCreate_order_channel; + isPaid: boolean; } -export interface OrderLinesAdd_draftOrderLinesCreate { - __typename: "DraftOrderLinesCreate"; - errors: OrderLinesAdd_draftOrderLinesCreate_errors[]; - order: OrderLinesAdd_draftOrderLinesCreate_order | null; +export interface OrderLinesAdd_orderLinesCreate { + __typename: "OrderLinesCreate"; + errors: OrderLinesAdd_orderLinesCreate_errors[]; + order: OrderLinesAdd_orderLinesCreate_order | null; } export interface OrderLinesAdd { - draftOrderLinesCreate: OrderLinesAdd_draftOrderLinesCreate | null; + orderLinesCreate: OrderLinesAdd_orderLinesCreate | null; } export interface OrderLinesAddVariables { diff --git a/src/orders/types/OrderList.ts b/src/orders/types/OrderList.ts index e1fcdb607..71a1bb178 100644 --- a/src/orders/types/OrderList.ts +++ b/src/orders/types/OrderList.ts @@ -47,9 +47,9 @@ export interface OrderList_orders_edges_node { created: any; id: string; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; status: OrderStatus; - total: OrderList_orders_edges_node_total | null; + total: OrderList_orders_edges_node_total; userEmail: string | null; } diff --git a/src/orders/types/OrderMarkAsPaid.ts b/src/orders/types/OrderMarkAsPaid.ts index 4ac19d2b8..0b664b6a9 100644 --- a/src/orders/types/OrderMarkAsPaid.ts +++ b/src/orders/types/OrderMarkAsPaid.ts @@ -131,7 +131,7 @@ export interface OrderMarkAsPaid_orderMarkAsPaid_order_fulfillments_lines_orderL productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderMarkAsPaid_orderMarkAsPaid_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderMarkAsPaid_orderMarkAsPaid_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderMarkAsPaid_orderMarkAsPaid_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderMarkAsPaid_orderMarkAsPaid_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderMarkAsPaid_orderMarkAsPaid_order_lines_unitPrice | null; + unitPrice: OrderMarkAsPaid_orderMarkAsPaid_order_lines_unitPrice; thumbnail: OrderMarkAsPaid_orderMarkAsPaid_order_lines_thumbnail | null; } @@ -334,24 +334,24 @@ export interface OrderMarkAsPaid_orderMarkAsPaid_order { fulfillments: (OrderMarkAsPaid_orderMarkAsPaid_order_fulfillments | null)[]; lines: (OrderMarkAsPaid_orderMarkAsPaid_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderMarkAsPaid_orderMarkAsPaid_order_shippingAddress | null; shippingMethod: OrderMarkAsPaid_orderMarkAsPaid_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderMarkAsPaid_orderMarkAsPaid_order_shippingPrice | null; + shippingPrice: OrderMarkAsPaid_orderMarkAsPaid_order_shippingPrice; status: OrderStatus; - subtotal: OrderMarkAsPaid_orderMarkAsPaid_order_subtotal | null; - total: OrderMarkAsPaid_orderMarkAsPaid_order_total | null; + subtotal: OrderMarkAsPaid_orderMarkAsPaid_order_subtotal; + total: OrderMarkAsPaid_orderMarkAsPaid_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderMarkAsPaid_orderMarkAsPaid_order_totalAuthorized | null; - totalCaptured: OrderMarkAsPaid_orderMarkAsPaid_order_totalCaptured | null; + totalAuthorized: OrderMarkAsPaid_orderMarkAsPaid_order_totalAuthorized; + totalCaptured: OrderMarkAsPaid_orderMarkAsPaid_order_totalCaptured; user: OrderMarkAsPaid_orderMarkAsPaid_order_user | null; userEmail: string | null; availableShippingMethods: (OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods | null)[] | null; discount: OrderMarkAsPaid_orderMarkAsPaid_order_discount | null; invoices: (OrderMarkAsPaid_orderMarkAsPaid_order_invoices | null)[] | null; channel: OrderMarkAsPaid_orderMarkAsPaid_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderMarkAsPaid_orderMarkAsPaid { diff --git a/src/orders/types/OrderRefund.ts b/src/orders/types/OrderRefund.ts index 55c3b8887..7919326e4 100644 --- a/src/orders/types/OrderRefund.ts +++ b/src/orders/types/OrderRefund.ts @@ -131,7 +131,7 @@ export interface OrderRefund_orderRefund_order_fulfillments_lines_orderLine { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderRefund_orderRefund_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderRefund_orderRefund_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderRefund_orderRefund_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderRefund_orderRefund_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderRefund_orderRefund_order_lines_unitPrice | null; + unitPrice: OrderRefund_orderRefund_order_lines_unitPrice; thumbnail: OrderRefund_orderRefund_order_lines_thumbnail | null; } @@ -334,24 +334,24 @@ export interface OrderRefund_orderRefund_order { fulfillments: (OrderRefund_orderRefund_order_fulfillments | null)[]; lines: (OrderRefund_orderRefund_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderRefund_orderRefund_order_shippingAddress | null; shippingMethod: OrderRefund_orderRefund_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderRefund_orderRefund_order_shippingPrice | null; + shippingPrice: OrderRefund_orderRefund_order_shippingPrice; status: OrderStatus; - subtotal: OrderRefund_orderRefund_order_subtotal | null; - total: OrderRefund_orderRefund_order_total | null; + subtotal: OrderRefund_orderRefund_order_subtotal; + total: OrderRefund_orderRefund_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderRefund_orderRefund_order_totalAuthorized | null; - totalCaptured: OrderRefund_orderRefund_order_totalCaptured | null; + totalAuthorized: OrderRefund_orderRefund_order_totalAuthorized; + totalCaptured: OrderRefund_orderRefund_order_totalCaptured; user: OrderRefund_orderRefund_order_user | null; userEmail: string | null; availableShippingMethods: (OrderRefund_orderRefund_order_availableShippingMethods | null)[] | null; discount: OrderRefund_orderRefund_order_discount | null; invoices: (OrderRefund_orderRefund_order_invoices | null)[] | null; channel: OrderRefund_orderRefund_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderRefund_orderRefund { diff --git a/src/orders/types/OrderRefundData.ts b/src/orders/types/OrderRefundData.ts index 31c134628..7eb447030 100644 --- a/src/orders/types/OrderRefundData.ts +++ b/src/orders/types/OrderRefundData.ts @@ -57,7 +57,7 @@ export interface OrderRefundData_order_lines { id: string; productName: string; quantity: number; - unitPrice: OrderRefundData_order_lines_unitPrice | null; + unitPrice: OrderRefundData_order_lines_unitPrice; thumbnail: OrderRefundData_order_lines_thumbnail | null; quantityFulfilled: number; } @@ -83,7 +83,7 @@ export interface OrderRefundData_order_fulfillments_lines_orderLine { id: string; productName: string; quantity: number; - unitPrice: OrderRefundData_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderRefundData_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderRefundData_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -106,9 +106,9 @@ export interface OrderRefundData_order { __typename: "Order"; id: string; number: string | null; - total: OrderRefundData_order_total | null; - totalCaptured: OrderRefundData_order_totalCaptured | null; - shippingPrice: OrderRefundData_order_shippingPrice | null; + total: OrderRefundData_order_total; + totalCaptured: OrderRefundData_order_totalCaptured; + shippingPrice: OrderRefundData_order_shippingPrice; lines: (OrderRefundData_order_lines | null)[]; fulfillments: (OrderRefundData_order_fulfillments | null)[]; } diff --git a/src/orders/types/OrderShippingMethodUpdate.ts b/src/orders/types/OrderShippingMethodUpdate.ts index 7a91fdbf9..7d6687ab9 100644 --- a/src/orders/types/OrderShippingMethodUpdate.ts +++ b/src/orders/types/OrderShippingMethodUpdate.ts @@ -50,7 +50,7 @@ export interface OrderShippingMethodUpdate_orderUpdateShipping_order { id: string; shippingMethod: OrderShippingMethodUpdate_orderUpdateShipping_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderShippingMethodUpdate_orderUpdateShipping_order_shippingPrice | null; + shippingPrice: OrderShippingMethodUpdate_orderUpdateShipping_order_shippingPrice; } export interface OrderShippingMethodUpdate_orderUpdateShipping { diff --git a/src/orders/types/OrderUpdate.ts b/src/orders/types/OrderUpdate.ts index 3e496557c..06cf8928d 100644 --- a/src/orders/types/OrderUpdate.ts +++ b/src/orders/types/OrderUpdate.ts @@ -131,7 +131,7 @@ export interface OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderUpdate_orderUpdate_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderUpdate_orderUpdate_order_lines_unitPrice | null; + unitPrice: OrderUpdate_orderUpdate_order_lines_unitPrice; thumbnail: OrderUpdate_orderUpdate_order_lines_thumbnail | null; } @@ -334,24 +334,24 @@ export interface OrderUpdate_orderUpdate_order { fulfillments: (OrderUpdate_orderUpdate_order_fulfillments | null)[]; lines: (OrderUpdate_orderUpdate_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderUpdate_orderUpdate_order_shippingAddress | null; shippingMethod: OrderUpdate_orderUpdate_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderUpdate_orderUpdate_order_shippingPrice | null; + shippingPrice: OrderUpdate_orderUpdate_order_shippingPrice; status: OrderStatus; - subtotal: OrderUpdate_orderUpdate_order_subtotal | null; - total: OrderUpdate_orderUpdate_order_total | null; + subtotal: OrderUpdate_orderUpdate_order_subtotal; + total: OrderUpdate_orderUpdate_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderUpdate_orderUpdate_order_totalAuthorized | null; - totalCaptured: OrderUpdate_orderUpdate_order_totalCaptured | null; + totalAuthorized: OrderUpdate_orderUpdate_order_totalAuthorized; + totalCaptured: OrderUpdate_orderUpdate_order_totalCaptured; user: OrderUpdate_orderUpdate_order_user | null; userEmail: string | null; availableShippingMethods: (OrderUpdate_orderUpdate_order_availableShippingMethods | null)[] | null; discount: OrderUpdate_orderUpdate_order_discount | null; invoices: (OrderUpdate_orderUpdate_order_invoices | null)[] | null; channel: OrderUpdate_orderUpdate_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderUpdate_orderUpdate { diff --git a/src/orders/types/OrderVoid.ts b/src/orders/types/OrderVoid.ts index a772e25e1..2f6f3ed8f 100644 --- a/src/orders/types/OrderVoid.ts +++ b/src/orders/types/OrderVoid.ts @@ -131,7 +131,7 @@ export interface OrderVoid_orderVoid_order_fulfillments_lines_orderLine { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderVoid_orderVoid_order_fulfillments_lines_orderLine_unitPrice | null; + unitPrice: OrderVoid_orderVoid_order_fulfillments_lines_orderLine_unitPrice; thumbnail: OrderVoid_orderVoid_order_fulfillments_lines_orderLine_thumbnail | null; } @@ -196,7 +196,7 @@ export interface OrderVoid_orderVoid_order_lines { productSku: string; quantity: number; quantityFulfilled: number; - unitPrice: OrderVoid_orderVoid_order_lines_unitPrice | null; + unitPrice: OrderVoid_orderVoid_order_lines_unitPrice; thumbnail: OrderVoid_orderVoid_order_lines_thumbnail | null; } @@ -334,24 +334,24 @@ export interface OrderVoid_orderVoid_order { fulfillments: (OrderVoid_orderVoid_order_fulfillments | null)[]; lines: (OrderVoid_orderVoid_order_lines | null)[]; number: string | null; - paymentStatus: PaymentChargeStatusEnum | null; + paymentStatus: PaymentChargeStatusEnum; shippingAddress: OrderVoid_orderVoid_order_shippingAddress | null; shippingMethod: OrderVoid_orderVoid_order_shippingMethod | null; shippingMethodName: string | null; - shippingPrice: OrderVoid_orderVoid_order_shippingPrice | null; + shippingPrice: OrderVoid_orderVoid_order_shippingPrice; status: OrderStatus; - subtotal: OrderVoid_orderVoid_order_subtotal | null; - total: OrderVoid_orderVoid_order_total | null; + subtotal: OrderVoid_orderVoid_order_subtotal; + total: OrderVoid_orderVoid_order_total; actions: (OrderAction | null)[]; - totalAuthorized: OrderVoid_orderVoid_order_totalAuthorized | null; - totalCaptured: OrderVoid_orderVoid_order_totalCaptured | null; + totalAuthorized: OrderVoid_orderVoid_order_totalAuthorized; + totalCaptured: OrderVoid_orderVoid_order_totalCaptured; user: OrderVoid_orderVoid_order_user | null; userEmail: string | null; availableShippingMethods: (OrderVoid_orderVoid_order_availableShippingMethods | null)[] | null; discount: OrderVoid_orderVoid_order_discount | null; invoices: (OrderVoid_orderVoid_order_invoices | null)[] | null; channel: OrderVoid_orderVoid_order_channel; - isPaid: boolean | null; + isPaid: boolean; } export interface OrderVoid_orderVoid { diff --git a/src/orders/views/OrderDetails/OrderDetailsMessages.tsx b/src/orders/views/OrderDetails/OrderDetailsMessages.tsx index 25067ffea..27492db0f 100644 --- a/src/orders/views/OrderDetails/OrderDetailsMessages.tsx +++ b/src/orders/views/OrderDetails/OrderDetailsMessages.tsx @@ -174,7 +174,7 @@ export const OrderDetailsMessages: React.FC = ({ } }; const handleOrderLineDelete = (data: OrderLineDelete) => { - const errs = data.draftOrderLineDelete?.errors; + const errs = data.orderLineDelete?.errors; if (errs.length === 0) { pushMessage({ status: "success", @@ -185,7 +185,7 @@ export const OrderDetailsMessages: React.FC = ({ } }; const handleOrderLinesAdd = (data: OrderLinesAdd) => { - const errs = data.draftOrderLinesCreate?.errors; + const errs = data.orderLinesCreate?.errors; if (errs.length === 0) { pushMessage({ status: "success", @@ -197,7 +197,7 @@ export const OrderDetailsMessages: React.FC = ({ } }; const handleOrderLineUpdate = (data: OrderLineUpdate) => { - const errs = data.draftOrderLineUpdate?.errors; + const errs = data.orderLineUpdate?.errors; if (errs.length === 0) { pushMessage({ status: "success", diff --git a/src/orders/views/OrderDetails/index.tsx b/src/orders/views/OrderDetails/index.tsx index 18405ac20..480bf7d89 100644 --- a/src/orders/views/OrderDetails/index.tsx +++ b/src/orders/views/OrderDetails/index.tsx @@ -559,8 +559,8 @@ export const OrderDetails: React.FC = ({ id, params }) => { Date: Fri, 29 Jan 2021 14:14:31 +0100 Subject: [PATCH 02/22] Unconfirmed order view contents --- .../OrderDetailsPage/OrderDetailsPage.tsx | 53 +- .../components/OrderHistory/OrderHistory.tsx | 4 +- src/orders/views/OrderDetails/index.tsx | 752 ++++++++++++------ 3 files changed, 568 insertions(+), 241 deletions(-) diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx index ddaaedb23..9fa2d71f1 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx @@ -26,6 +26,8 @@ import { OrderStatus } from "../../../types/globalTypes"; import { OrderDetails_order } from "../../types/OrderDetails"; import OrderCustomer from "../OrderCustomer"; import OrderCustomerNote from "../OrderCustomerNote"; +import OrderDraftDetails from "../OrderDraftDetails/OrderDraftDetails"; +import { FormData as OrderDraftDetailsProductsFormData } from "../OrderDraftDetailsProducts"; import OrderFulfilledProductsCard from "../OrderFulfilledProductsCard"; import OrderHistory, { FormData as HistoryFormData } from "../OrderHistory"; import OrderInvoiceList from "../OrderInvoiceList"; @@ -77,6 +79,13 @@ export interface OrderDetailsPageProps extends UserPermissionProps { onNoteAdd(data: HistoryFormData); onProfileView(); onOrderReturn(); + onOrderLineAdd: () => void; + onOrderLineChange: ( + id: string, + data: OrderDraftDetailsProductsFormData + ) => void; + onOrderLineRemove: (id: string) => void; + onShippingMethodEdit(); onInvoiceClick(invoiceId: string); onInvoiceGenerate(); onInvoiceSend(invoiceId: string); @@ -121,6 +130,10 @@ const OrderDetailsPage: React.FC = props => { onInvoiceGenerate, onInvoiceSend, onOrderReturn, + onOrderLineAdd, + onOrderLineChange, + onOrderLineRemove, + onShippingMethodEdit, onSubmit } = props; const classes = useStyles(props); @@ -214,11 +227,25 @@ const OrderDetailsPage: React.FC = props => {
- + {order?.status !== OrderStatus.UNCONFIRMED ? ( + + ) : ( + <> + + + + )} {order?.fulfillments?.map(fulfillment => ( = props => { /> ))} - + {order?.status !== OrderStatus.UNCONFIRMED && ( + + )} = ({ id, params }) => { orderInvoiceSend }) => ( <> - {order?.status !== OrderStatus.DRAFT ? ( - <> - + + navigate(orderReturnPath(id))} + disabled={ + updateMetadataOpts.loading || + updatePrivateMetadataOpts.loading + } + onNoteAdd={variables => + orderAddNote.mutate({ + input: variables, + order: id + }) + } + onBack={handleBack} + order={order} + saveButtonBarState={getMutationState( + updateMetadataOpts.called || + updatePrivateMetadataOpts.called, + updateMetadataOpts.loading || + updatePrivateMetadataOpts.loading, + [ + ...(updateMetadataOpts.data?.deleteMetadata + .errors || []), + ...(updateMetadataOpts.data?.updateMetadata + .errors || []), + ...(updatePrivateMetadataOpts.data + ?.deletePrivateMetadata.errors || []), + ...(updatePrivateMetadataOpts.data + ?.updatePrivateMetadata.errors || []) + ] + )} + shippingMethods={maybe( + () => data.order.availableShippingMethods, + [] + )} + userPermissions={user?.userPermissions || []} + onOrderCancel={() => openModal("cancel")} + onOrderFulfill={() => navigate(orderFulfillUrl(id))} + onFulfillmentCancel={fulfillmentId => + navigate( + orderUrl(id, { + action: "cancel-fulfillment", + id: fulfillmentId + }) ) } - )} - /> - navigate(orderReturnPath(id))} - disabled={ - updateMetadataOpts.loading || - updatePrivateMetadataOpts.loading - } - onNoteAdd={variables => - orderAddNote.mutate({ - input: variables, - order: id - }) - } - onBack={handleBack} - order={order} - saveButtonBarState={getMutationState( - updateMetadataOpts.called || - updatePrivateMetadataOpts.called, - updateMetadataOpts.loading || - updatePrivateMetadataOpts.loading, - [ - ...(updateMetadataOpts.data?.deleteMetadata - .errors || []), - ...(updateMetadataOpts.data?.updateMetadata - .errors || []), - ...(updatePrivateMetadataOpts.data - ?.deletePrivateMetadata.errors || []), - ...(updatePrivateMetadataOpts.data - ?.updatePrivateMetadata.errors || []) - ] - )} - shippingMethods={maybe( - () => data.order.availableShippingMethods, - [] - )} - userPermissions={user?.userPermissions || []} - onOrderCancel={() => openModal("cancel")} - onOrderFulfill={() => navigate(orderFulfillUrl(id))} - onFulfillmentCancel={fulfillmentId => - navigate( - orderUrl(id, { - action: "cancel-fulfillment", - id: fulfillmentId + onFulfillmentTrackingNumberUpdate={fulfillmentId => + navigate( + orderUrl(id, { + action: "edit-fulfillment", + id: fulfillmentId + }) + ) + } + onPaymentCapture={() => openModal("capture")} + onPaymentVoid={() => openModal("void")} + onPaymentRefund={() => navigate(orderRefundUrl(id))} + onProductClick={id => () => + navigate(productUrl(id))} + onBillingAddressEdit={() => + openModal("edit-billing-address") + } + onShippingAddressEdit={() => + openModal("edit-shipping-address") + } + onPaymentPaid={() => openModal("mark-paid")} + onProfileView={() => + navigate(customerUrl(order.user.id)) + } + onInvoiceClick={id => + window.open( + order.invoices.find( + invoice => invoice.id === id + )?.url, + "_blank" + ) + } + onInvoiceGenerate={() => + orderInvoiceRequest.mutate({ + orderId: id }) - ) - } - onFulfillmentTrackingNumberUpdate={fulfillmentId => - navigate( - orderUrl(id, { - action: "edit-fulfillment", - id: fulfillmentId + } + onInvoiceSend={id => + openModal("invoice-send", { id }) + } + onSubmit={handleSubmit} + /> + + fulfillment.status === + FulfillmentStatus.FULFILLED + ) + } + /> + + orderCancel.mutate({ + id }) - ) - } - onPaymentCapture={() => openModal("capture")} - onPaymentVoid={() => openModal("void")} - onPaymentRefund={() => navigate(orderRefundUrl(id))} - onProductClick={id => () => navigate(productUrl(id))} - onBillingAddressEdit={() => - openModal("edit-billing-address") - } - onShippingAddressEdit={() => - openModal("edit-shipping-address") - } - onPaymentPaid={() => openModal("mark-paid")} - onProfileView={() => - navigate(customerUrl(order.user.id)) - } - onInvoiceClick={id => - window.open( - order.invoices.find(invoice => invoice.id === id) - ?.url, - "_blank" - ) - } - onInvoiceGenerate={() => - orderInvoiceRequest.mutate({ - orderId: id - }) - } - onInvoiceSend={id => - openModal("invoice-send", { id }) - } - onSubmit={handleSubmit} - /> - - fulfillment.status === - FulfillmentStatus.FULFILLED - ) - } - /> - - orderCancel.mutate({ - id - }) - } - /> - - orderPaymentMarkAsPaid.mutate({ - id, - transactionReference - }) - } - open={params.action === "mark-paid"} - transactionReference={transactionReference} - handleTransactionReference={({ target }) => - setTransactionReference(target.value) - } - /> - orderVoid.mutate({ id })} - /> - - orderPaymentCapture.mutate({ - ...variables, - id - }) - } - /> - edge.node - ) || [] - } - onConfirm={variables => - orderFulfillmentCancel.mutate({ - id: params.id, - input: variables - }) - } - onClose={closeModal} - /> - fulfillment.id === params.id - )?.trackingNumber - )} - onConfirm={variables => - orderFulfillmentUpdateTracking.mutate({ - id: params.id, - input: { + } + /> + + orderPaymentMarkAsPaid.mutate({ + id, + transactionReference + }) + } + open={params.action === "mark-paid"} + transactionReference={transactionReference} + handleTransactionReference={({ target }) => + setTransactionReference(target.value) + } + /> + orderVoid.mutate({ id })} + /> + + orderPaymentCapture.mutate({ ...variables, - notifyCustomer: true - } - }) - } - onClose={closeModal} - /> - invoice.id === params.id - )} - onClose={closeModal} - onSend={() => - orderInvoiceSend.mutate({ id: params.id }) - } - /> - - ) : ( + id + }) + } + /> + edge.node + ) || [] + } + onConfirm={variables => + orderFulfillmentCancel.mutate({ + id: params.id, + input: variables + }) + } + onClose={closeModal} + /> + fulfillment.id === params.id + )?.trackingNumber + )} + onConfirm={variables => + orderFulfillmentUpdateTracking.mutate({ + id: params.id, + input: { + ...variables, + notifyCustomer: true + } + }) + } + onClose={closeModal} + /> + invoice.id === params.id + )} + onClose={closeModal} + onSend={() => + orderInvoiceSend.mutate({ id: params.id }) + } + /> + + )} + {order?.status === OrderStatus.DRAFT && ( <> = ({ id, params }) => { /> )} + {order?.status === OrderStatus.UNCONFIRMED && ( + <> + + navigate(orderReturnPath(id))} + disabled={ + updateMetadataOpts.loading || + updatePrivateMetadataOpts.loading + } + onNoteAdd={variables => + orderAddNote.mutate({ + input: variables, + order: id + }) + } + onBack={handleBack} + order={order} + onOrderLineAdd={() => openModal("add-order-line")} + onOrderLineChange={(id, data) => + orderLineUpdate.mutate({ + id, + input: data + }) + } + onOrderLineRemove={id => + orderLineDelete.mutate({ id }) + } + onShippingMethodEdit={() => + openModal("edit-shipping") + } + saveButtonBarState={getMutationState( + updateMetadataOpts.called || + updatePrivateMetadataOpts.called, + updateMetadataOpts.loading || + updatePrivateMetadataOpts.loading, + [ + ...(updateMetadataOpts.data?.deleteMetadata + .errors || []), + ...(updateMetadataOpts.data?.updateMetadata + .errors || []), + ...(updatePrivateMetadataOpts.data + ?.deletePrivateMetadata.errors || []), + ...(updatePrivateMetadataOpts.data + ?.updatePrivateMetadata.errors || []) + ] + )} + shippingMethods={maybe( + () => data.order.availableShippingMethods, + [] + )} + userPermissions={user?.userPermissions || []} + onOrderCancel={() => openModal("cancel")} + onOrderFulfill={() => navigate(orderFulfillUrl(id))} + onFulfillmentCancel={fulfillmentId => + navigate( + orderUrl(id, { + action: "cancel-fulfillment", + id: fulfillmentId + }) + ) + } + onFulfillmentTrackingNumberUpdate={fulfillmentId => + navigate( + orderUrl(id, { + action: "edit-fulfillment", + id: fulfillmentId + }) + ) + } + onPaymentCapture={() => openModal("capture")} + onPaymentVoid={() => openModal("void")} + onPaymentRefund={() => navigate(orderRefundUrl(id))} + onProductClick={id => () => navigate(productUrl(id))} + onBillingAddressEdit={() => + openModal("edit-billing-address") + } + onShippingAddressEdit={() => + openModal("edit-shipping-address") + } + onPaymentPaid={() => openModal("mark-paid")} + onProfileView={() => + navigate(customerUrl(order.user.id)) + } + onInvoiceClick={id => + window.open( + order.invoices.find(invoice => invoice.id === id) + ?.url, + "_blank" + ) + } + onInvoiceGenerate={() => + orderInvoiceRequest.mutate({ + orderId: id + }) + } + onInvoiceSend={id => + openModal("invoice-send", { id }) + } + onSubmit={handleSubmit} + /> + + fulfillment.status === + FulfillmentStatus.FULFILLED + ) + } + /> + + orderCancel.mutate({ + id + }) + } + /> + + orderShippingMethodUpdate.mutate({ + id, + input: { + shippingMethod: variables.shippingMethod + } + }) + } + /> + edge.node + )} + selectedChannelId={order?.channel?.id} + onClose={closeModal} + onFetch={variantSearch} + onFetchMore={loadMore} + onSubmit={variants => + orderLinesAdd.mutate({ + id, + input: variants.map(variant => ({ + quantity: 1, + variantId: variant.id + })) + }) + } + /> + + orderPaymentMarkAsPaid.mutate({ + id, + transactionReference + }) + } + open={params.action === "mark-paid"} + transactionReference={transactionReference} + handleTransactionReference={({ target }) => + setTransactionReference(target.value) + } + /> + orderVoid.mutate({ id })} + /> + + orderPaymentCapture.mutate({ + ...variables, + id + }) + } + /> + edge.node + ) || [] + } + onConfirm={variables => + orderFulfillmentCancel.mutate({ + id: params.id, + input: variables + }) + } + onClose={closeModal} + /> + fulfillment.id === params.id + )?.trackingNumber + )} + onConfirm={variables => + orderFulfillmentUpdateTracking.mutate({ + id: params.id, + input: { + ...variables, + notifyCustomer: true + } + }) + } + onClose={closeModal} + /> + invoice.id === params.id + )} + onClose={closeModal} + onSend={() => + orderInvoiceSend.mutate({ id: params.id }) + } + /> + + )} Date: Tue, 2 Feb 2021 11:49:46 +0100 Subject: [PATCH 03/22] Linter, translations --- locale/defaultMessages.json | 16 ++++++++-------- .../OrderDetailsPage/OrderDetailsPage.tsx | 14 +++++++------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json index bafa10e42..a9f22820b 100644 --- a/locale/defaultMessages.json +++ b/locale/defaultMessages.json @@ -3482,6 +3482,10 @@ "context": "order history message", "string": "Payment was voided" }, + "src_dot_orders_dot_components_dot_OrderHistory_dot_2607524598": { + "context": "order history message", + "string": "Products were deleted from an order" + }, "src_dot_orders_dot_components_dot_OrderHistory_dot_2655541129": { "context": "order history message", "string": "Order was fully paid" @@ -3514,14 +3518,14 @@ "context": "order history message", "string": "Payment was refunded" }, - "src_dot_orders_dot_components_dot_OrderHistory_dot_3506022286": { - "context": "order history message", - "string": "Products were added to draft order" - }, "src_dot_orders_dot_components_dot_OrderHistory_dot_3731274949": { "context": "order history message", "string": "Order was refunded by {refundedBy}" }, + "src_dot_orders_dot_components_dot_OrderHistory_dot_3796744261": { + "context": "order history message", + "string": "Products were added to an order" + }, "src_dot_orders_dot_components_dot_OrderHistory_dot_393045022": { "context": "order history message", "string": "Invoice no. {invoiceNumber} was updated" @@ -3533,10 +3537,6 @@ "context": "order history message", "string": "Oversold {quantity} items" }, - "src_dot_orders_dot_components_dot_OrderHistory_dot_4067959693": { - "context": "order history message", - "string": "Products were deleted from draft order" - }, "src_dot_orders_dot_components_dot_OrderHistory_dot_4121987561": { "context": "order history message", "string": "Order refund information was sent to customer" diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx index 9fa2d71f1..5a8589a6a 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx @@ -64,6 +64,13 @@ export interface OrderDetailsPageProps extends UserPermissionProps { }>; disabled: boolean; saveButtonBarState: ConfirmButtonTransitionState; + onOrderLineAdd?: () => void; + onOrderLineChange?: ( + id: string, + data: OrderDraftDetailsProductsFormData + ) => void; + onOrderLineRemove?: (id: string) => void; + onShippingMethodEdit?: () => void; onBack(); onBillingAddressEdit(); onFulfillmentCancel(id: string); @@ -79,13 +86,6 @@ export interface OrderDetailsPageProps extends UserPermissionProps { onNoteAdd(data: HistoryFormData); onProfileView(); onOrderReturn(); - onOrderLineAdd: () => void; - onOrderLineChange: ( - id: string, - data: OrderDraftDetailsProductsFormData - ) => void; - onOrderLineRemove: (id: string) => void; - onShippingMethodEdit(); onInvoiceClick(invoiceId: string); onInvoiceGenerate(); onInvoiceSend(invoiceId: string); From beee789294bf76222bb51843b0a4ca15f46bcbf8 Mon Sep 17 00:00:00 2001 From: Tomasz Szymanski Date: Tue, 2 Feb 2021 12:12:00 +0100 Subject: [PATCH 04/22] Hide metadata on unconfirmed order --- .../OrderDetailsPage/OrderDetailsPage.tsx | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx index 5a8589a6a..06aea7af3 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx @@ -262,16 +262,18 @@ const OrderDetailsPage: React.FC = props => { ))} {order?.status !== OrderStatus.UNCONFIRMED && ( - + <> + + + + )} - - Date: Tue, 2 Feb 2021 14:24:35 +0100 Subject: [PATCH 05/22] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88c8d972c..d343e43a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ All notable, unreleased changes to this project will be documented in this file. - Drop descriptionJson and contentJson fields - #950 by @jwm0 - Add error tracking with Sentry adapter - #956 by @jwm0 - Add OAuth2 login with OpenID support - #963 by @orzechdev +- Unconfirmed order manipulation - #967 by @tomaszszymanski129 # 2.11.1 From cfb5bb51681bbef1cf832a59f454d7200751d978 Mon Sep 17 00:00:00 2001 From: Tomasz Szymanski Date: Wed, 3 Feb 2021 13:19:26 +0100 Subject: [PATCH 06/22] Forbid confirmation of order that has not products inside --- src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx index 06aea7af3..ea1539b41 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx @@ -177,8 +177,9 @@ const OrderDetailsPage: React.FC = props => { const allowSave = (hasChanged: boolean) => { if (order?.status !== OrderStatus.UNCONFIRMED) { return disabled || !hasChanged; + } else if (!order?.lines?.length) { + return true; } - return disabled; }; From 2c2d07be0c4e5d4b1738eb4539e128fb2d663bf7 Mon Sep 17 00:00:00 2001 From: Tomasz Szymanski Date: Fri, 5 Feb 2021 13:46:15 +0100 Subject: [PATCH 07/22] CR changes, switch net to gross prices --- .../OrderDraftDetailsProducts.tsx | 10 +- src/orders/views/OrderDetails/index.tsx | 464 +++++++++--------- 2 files changed, 237 insertions(+), 237 deletions(-) diff --git a/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx b/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx index 1c39bb069..c23750998 100644 --- a/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx +++ b/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx @@ -181,18 +181,18 @@ const OrderDraftDetailsProducts: React.FC = prop )} - {maybe(() => line.unitPrice.net) ? ( - + {maybe(() => line.unitPrice.gross) ? ( + ) : ( )} - {maybe(() => line.unitPrice.net && line.quantity) ? ( + {maybe(() => line.unitPrice.gross && line.quantity) ? ( ) : ( diff --git a/src/orders/views/OrderDetails/index.tsx b/src/orders/views/OrderDetails/index.tsx index 594e3f483..aae9cceff 100644 --- a/src/orders/views/OrderDetails/index.tsx +++ b/src/orders/views/OrderDetails/index.tsx @@ -126,6 +126,9 @@ export const OrderDetails: React.FC = ({ id, params }) => { return ; } + const isOrderUnconfirmed = order?.status === OrderStatus.UNCONFIRMED; + const isOrderDraft = order?.status === OrderStatus.DRAFT; + const handleSubmit = async (data: MetadataFormData) => { if (order?.status === OrderStatus.UNCONFIRMED) { await orderConfirm({ variables: { id: order?.id } }); @@ -212,242 +215,239 @@ export const OrderDetails: React.FC = ({ id, params }) => { orderInvoiceSend }) => ( <> - {order?.status !== OrderStatus.DRAFT && - order?.status !== OrderStatus.UNCONFIRMED && ( - <> - - navigate(orderReturnPath(id))} - disabled={ - updateMetadataOpts.loading || - updatePrivateMetadataOpts.loading - } - onNoteAdd={variables => - orderAddNote.mutate({ - input: variables, - order: id - }) - } - onBack={handleBack} - order={order} - saveButtonBarState={getMutationState( - updateMetadataOpts.called || - updatePrivateMetadataOpts.called, - updateMetadataOpts.loading || - updatePrivateMetadataOpts.loading, - [ - ...(updateMetadataOpts.data?.deleteMetadata - .errors || []), - ...(updateMetadataOpts.data?.updateMetadata - .errors || []), - ...(updatePrivateMetadataOpts.data - ?.deletePrivateMetadata.errors || []), - ...(updatePrivateMetadataOpts.data - ?.updatePrivateMetadata.errors || []) - ] - )} - shippingMethods={maybe( - () => data.order.availableShippingMethods, - [] - )} - userPermissions={user?.userPermissions || []} - onOrderCancel={() => openModal("cancel")} - onOrderFulfill={() => navigate(orderFulfillUrl(id))} - onFulfillmentCancel={fulfillmentId => - navigate( - orderUrl(id, { - action: "cancel-fulfillment", - id: fulfillmentId - }) + {!isOrderDraft && !isOrderUnconfirmed && ( + <> + - navigate( - orderUrl(id, { - action: "edit-fulfillment", - id: fulfillmentId - }) - ) - } - onPaymentCapture={() => openModal("capture")} - onPaymentVoid={() => openModal("void")} - onPaymentRefund={() => navigate(orderRefundUrl(id))} - onProductClick={id => () => - navigate(productUrl(id))} - onBillingAddressEdit={() => - openModal("edit-billing-address") - } - onShippingAddressEdit={() => - openModal("edit-shipping-address") - } - onPaymentPaid={() => openModal("mark-paid")} - onProfileView={() => - navigate(customerUrl(order.user.id)) - } - onInvoiceClick={id => - window.open( - order.invoices.find( - invoice => invoice.id === id - )?.url, - "_blank" - ) - } - onInvoiceGenerate={() => - orderInvoiceRequest.mutate({ - orderId: id + )} + /> + navigate(orderReturnPath(id))} + disabled={ + updateMetadataOpts.loading || + updatePrivateMetadataOpts.loading + } + onNoteAdd={variables => + orderAddNote.mutate({ + input: variables, + order: id + }) + } + onBack={handleBack} + order={order} + saveButtonBarState={getMutationState( + updateMetadataOpts.called || + updatePrivateMetadataOpts.called, + updateMetadataOpts.loading || + updatePrivateMetadataOpts.loading, + [ + ...(updateMetadataOpts.data?.deleteMetadata + .errors || []), + ...(updateMetadataOpts.data?.updateMetadata + .errors || []), + ...(updatePrivateMetadataOpts.data + ?.deletePrivateMetadata.errors || []), + ...(updatePrivateMetadataOpts.data + ?.updatePrivateMetadata.errors || []) + ] + )} + shippingMethods={maybe( + () => data.order.availableShippingMethods, + [] + )} + userPermissions={user?.userPermissions || []} + onOrderCancel={() => openModal("cancel")} + onOrderFulfill={() => navigate(orderFulfillUrl(id))} + onFulfillmentCancel={fulfillmentId => + navigate( + orderUrl(id, { + action: "cancel-fulfillment", + id: fulfillmentId }) - } - onInvoiceSend={id => - openModal("invoice-send", { id }) - } - onSubmit={handleSubmit} - /> - - fulfillment.status === - FulfillmentStatus.FULFILLED - ) - } - /> - - orderCancel.mutate({ - id + ) + } + onFulfillmentTrackingNumberUpdate={fulfillmentId => + navigate( + orderUrl(id, { + action: "edit-fulfillment", + id: fulfillmentId }) - } - /> - - orderPaymentMarkAsPaid.mutate({ - id, - transactionReference - }) - } - open={params.action === "mark-paid"} - transactionReference={transactionReference} - handleTransactionReference={({ target }) => - setTransactionReference(target.value) - } - /> - orderVoid.mutate({ id })} - /> - - orderPaymentCapture.mutate({ + ) + } + onPaymentCapture={() => openModal("capture")} + onPaymentVoid={() => openModal("void")} + onPaymentRefund={() => navigate(orderRefundUrl(id))} + onProductClick={id => () => navigate(productUrl(id))} + onBillingAddressEdit={() => + openModal("edit-billing-address") + } + onShippingAddressEdit={() => + openModal("edit-shipping-address") + } + onPaymentPaid={() => openModal("mark-paid")} + onProfileView={() => + navigate(customerUrl(order.user.id)) + } + onInvoiceClick={id => + window.open( + order.invoices.find(invoice => invoice.id === id) + ?.url, + "_blank" + ) + } + onInvoiceGenerate={() => + orderInvoiceRequest.mutate({ + orderId: id + }) + } + onInvoiceSend={id => + openModal("invoice-send", { id }) + } + onSubmit={handleSubmit} + /> + + fulfillment.status === + FulfillmentStatus.FULFILLED + ) + } + /> + + orderCancel.mutate({ + id + }) + } + /> + + orderPaymentMarkAsPaid.mutate({ + id, + transactionReference + }) + } + open={params.action === "mark-paid"} + transactionReference={transactionReference} + handleTransactionReference={({ target }) => + setTransactionReference(target.value) + } + /> + orderVoid.mutate({ id })} + /> + + orderPaymentCapture.mutate({ + ...variables, + id + }) + } + /> + edge.node + ) || [] + } + onConfirm={variables => + orderFulfillmentCancel.mutate({ + id: params.id, + input: variables + }) + } + onClose={closeModal} + /> + fulfillment.id === params.id + )?.trackingNumber + )} + onConfirm={variables => + orderFulfillmentUpdateTracking.mutate({ + id: params.id, + input: { ...variables, - id - }) - } - /> - edge.node - ) || [] - } - onConfirm={variables => - orderFulfillmentCancel.mutate({ - id: params.id, - input: variables - }) - } - onClose={closeModal} - /> - fulfillment.id === params.id - )?.trackingNumber - )} - onConfirm={variables => - orderFulfillmentUpdateTracking.mutate({ - id: params.id, - input: { - ...variables, - notifyCustomer: true - } - }) - } - onClose={closeModal} - /> - invoice.id === params.id - )} - onClose={closeModal} - onSend={() => - orderInvoiceSend.mutate({ id: params.id }) - } - /> - - )} - {order?.status === OrderStatus.DRAFT && ( + notifyCustomer: true + } + }) + } + onClose={closeModal} + /> + invoice.id === params.id + )} + onClose={closeModal} + onSend={() => + orderInvoiceSend.mutate({ id: params.id }) + } + /> + + )} + {isOrderDraft && ( <> = ({ id, params }) => { /> )} - {order?.status === OrderStatus.UNCONFIRMED && ( + {isOrderUnconfirmed && ( <> Date: Mon, 8 Feb 2021 10:07:52 +0100 Subject: [PATCH 08/22] Fix invalid order history event --- src/orders/components/OrderHistory/OrderHistory.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/orders/components/OrderHistory/OrderHistory.tsx b/src/orders/components/OrderHistory/OrderHistory.tsx index 6b092823b..281998594 100644 --- a/src/orders/components/OrderHistory/OrderHistory.tsx +++ b/src/orders/components/OrderHistory/OrderHistory.tsx @@ -61,7 +61,7 @@ export const getEventMessage = ( defaultMessage: "Fulfillment confirmation was sent to customer", description: "order history message" }); - case OrderEventsEmailsEnum.ORDER_CONFIRMATION: + case OrderEventsEmailsEnum.CONFIRMED: return intl.formatMessage({ defaultMessage: "Order confirmation was sent to customer", description: "order history message" From 49124e2014cd69c8d51faf7395ebcc47d5ae1e1a Mon Sep 17 00:00:00 2001 From: Tomasz Szymanski Date: Mon, 8 Feb 2021 11:28:48 +0100 Subject: [PATCH 09/22] Drop maybe in favor of optional operator --- .../OrderDraftDetailsProducts.tsx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx b/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx index c23750998..ba76e4dde 100644 --- a/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx +++ b/src/orders/components/OrderDraftDetailsProducts/OrderDraftDetailsProducts.tsx @@ -19,7 +19,7 @@ import createNonNegativeValueChangeHandler from "@saleor/utils/handlers/nonNegat import React from "react"; import { FormattedMessage } from "react-intl"; -import { maybe, renderCollection } from "../../../misc"; +import { renderCollection } from "../../../misc"; import { OrderDetails_order_lines } from "../../types/OrderDetails"; export interface FormData { @@ -82,7 +82,7 @@ const OrderDraftDetailsProducts: React.FC = prop return ( - {maybe(() => !!lines.length) && ( + {!!lines?.length && ( @@ -113,7 +113,7 @@ const OrderDraftDetailsProducts: React.FC = prop )} - {maybe(() => lines.length) === 0 ? ( + {lines?.length === 0 ? ( @@ -124,9 +124,9 @@ const OrderDraftDetailsProducts: React.FC = prop line.thumbnail.url)} + thumbnail={line?.thumbnail?.url} > - {maybe(() => line.productName && line.productSku) ? ( + {line?.productName && line?.productSku ? ( <> <> @@ -142,7 +142,7 @@ const OrderDraftDetailsProducts: React.FC = prop )} - {maybe(() => line.quantity) ? ( + {line?.quantity ? (
onOrderLineChange(line.id, data)} @@ -181,14 +181,14 @@ const OrderDraftDetailsProducts: React.FC = prop )} - {maybe(() => line.unitPrice.gross) ? ( + {line?.unitPrice?.gross ? ( ) : ( )} - {maybe(() => line.unitPrice.gross && line.quantity) ? ( + {line?.unitPrice?.gross && line?.quantity ? ( Date: Mon, 8 Feb 2021 14:30:06 +0100 Subject: [PATCH 10/22] CR changes --- .../OrderDetailsPage/OrderDetailsPage.tsx | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx index ea1539b41..785d49e17 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx @@ -145,10 +145,11 @@ const OrderDetailsPage: React.FC = props => { makeChangeHandler: makeMetadataChangeHandler } = useMetadataChangeTrigger(); - const canCancel = maybe(() => order.status) !== OrderStatus.CANCELED; - const canEditAddresses = maybe(() => order.status) !== OrderStatus.CANCELED; - const canFulfill = maybe(() => order.status) !== OrderStatus.CANCELED; - const unfulfilled = maybe(() => order.lines, []).filter( + const isOrderUnconfirmed = order?.status === OrderStatus.UNCONFIRMED; + const canCancel = order?.status !== OrderStatus.CANCELED; + const canEditAddresses = order?.status !== OrderStatus.CANCELED; + const canFulfill = order?.status !== OrderStatus.CANCELED; + const unfulfilled = (order?.lines || []).filter( line => line.quantityFulfilled < line.quantity ); @@ -169,13 +170,12 @@ const OrderDetailsPage: React.FC = props => { privateMetadata: order?.privateMetadata.map(mapMetadataItemToInput) }; - const saveLabel = - order?.status === OrderStatus.UNCONFIRMED - ? intl.formatMessage(messages.confirmOrder) - : undefined; + const saveLabel = isOrderUnconfirmed + ? intl.formatMessage(messages.confirmOrder) + : undefined; const allowSave = (hasChanged: boolean) => { - if (order?.status !== OrderStatus.UNCONFIRMED) { + if (!isOrderUnconfirmed) { return disabled || !hasChanged; } else if (!order?.lines?.length) { return true; @@ -228,7 +228,7 @@ const OrderDetailsPage: React.FC = props => {
- {order?.status !== OrderStatus.UNCONFIRMED ? ( + {!isOrderUnconfirmed ? ( = props => { /> ))} - {order?.status !== OrderStatus.UNCONFIRMED && ( + {!isOrderUnconfirmed && ( <> = props => { selectedChannelName={order?.channel?.name} /> - {order?.status !== OrderStatus.UNCONFIRMED && ( + {!isOrderUnconfirmed && ( <> Date: Fri, 12 Feb 2021 09:01:51 +0100 Subject: [PATCH 11/22] Display proper prices of selected channel in products add dialog --- .../OrderProductAddDialog/OrderProductAddDialog.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx b/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx index f1a57145b..66c91aa80 100644 --- a/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx +++ b/src/orders/components/OrderProductAddDialog/OrderProductAddDialog.tsx @@ -332,10 +332,12 @@ const OrderProductAddDialog: React.FC = props => {
- {variant?.channelListings[0]?.price && ( - + {variant.channelListings.map( + listing => + listing.channel.id === + selectedChannelId && ( + + ) )} From c561b0a7f76d2a83e934f24c92eea149b17da211 Mon Sep 17 00:00:00 2001 From: Tomasz Szymanski Date: Fri, 12 Feb 2021 09:28:17 +0100 Subject: [PATCH 12/22] Fix bug with tax calculation after shipping method update --- src/orders/mutations.ts | 10 ++++++++++ src/orders/types/OrderShippingMethodUpdate.ts | 19 +++++++++++++++++++ src/orders/views/OrderDetails/index.tsx | 7 ++++--- 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/src/orders/mutations.ts b/src/orders/mutations.ts index 6acf4c61c..45c40931d 100644 --- a/src/orders/mutations.ts +++ b/src/orders/mutations.ts @@ -426,6 +426,16 @@ const orderShippingMethodUpdateMutation = gql` id name } + total { + tax { + amount + currency + } + gross { + amount + currency + } + } id shippingMethod { id diff --git a/src/orders/types/OrderShippingMethodUpdate.ts b/src/orders/types/OrderShippingMethodUpdate.ts index 7d6687ab9..a070298bf 100644 --- a/src/orders/types/OrderShippingMethodUpdate.ts +++ b/src/orders/types/OrderShippingMethodUpdate.ts @@ -20,6 +20,24 @@ export interface OrderShippingMethodUpdate_orderUpdateShipping_order_availableSh name: string; } +export interface OrderShippingMethodUpdate_orderUpdateShipping_order_total_tax { + __typename: "Money"; + amount: number; + currency: string; +} + +export interface OrderShippingMethodUpdate_orderUpdateShipping_order_total_gross { + __typename: "Money"; + amount: number; + currency: string; +} + +export interface OrderShippingMethodUpdate_orderUpdateShipping_order_total { + __typename: "TaxedMoney"; + tax: OrderShippingMethodUpdate_orderUpdateShipping_order_total_tax; + gross: OrderShippingMethodUpdate_orderUpdateShipping_order_total_gross; +} + export interface OrderShippingMethodUpdate_orderUpdateShipping_order_shippingMethod_price { __typename: "Money"; amount: number; @@ -47,6 +65,7 @@ export interface OrderShippingMethodUpdate_orderUpdateShipping_order_shippingPri export interface OrderShippingMethodUpdate_orderUpdateShipping_order { __typename: "Order"; availableShippingMethods: (OrderShippingMethodUpdate_orderUpdateShipping_order_availableShippingMethods | null)[] | null; + total: OrderShippingMethodUpdate_orderUpdateShipping_order_total; id: string; shippingMethod: OrderShippingMethodUpdate_orderUpdateShipping_order_shippingMethod | null; shippingMethodName: string | null; diff --git a/src/orders/views/OrderDetails/index.tsx b/src/orders/views/OrderDetails/index.tsx index aae9cceff..51f836bde 100644 --- a/src/orders/views/OrderDetails/index.tsx +++ b/src/orders/views/OrderDetails/index.tsx @@ -163,9 +163,10 @@ export const OrderDetails: React.FC = ({ id, params }) => { onPaymentCapture={orderMessages.handlePaymentCapture} onUpdate={orderMessages.handleUpdate} onDraftUpdate={orderMessages.handleDraftUpdate} - onShippingMethodUpdate={ - orderMessages.handleShippingMethodUpdate - } + onShippingMethodUpdate={data => { + orderMessages.handleShippingMethodUpdate(data); + order.total = data.orderUpdateShipping.order.total; + }} onOrderLineDelete={orderMessages.handleOrderLineDelete} onOrderLinesAdd={orderMessages.handleOrderLinesAdd} onOrderLineUpdate={orderMessages.handleOrderLineUpdate} From e637b77fb4315c8d5ee6baa388d055d420fe5b41 Mon Sep 17 00:00:00 2001 From: Tomasz Szymanski Date: Mon, 22 Mar 2021 12:16:48 +0100 Subject: [PATCH 13/22] Missing emails event --- src/orders/components/OrderHistory/OrderHistory.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/orders/components/OrderHistory/OrderHistory.tsx b/src/orders/components/OrderHistory/OrderHistory.tsx index 080b42d79..da236583e 100644 --- a/src/orders/components/OrderHistory/OrderHistory.tsx +++ b/src/orders/components/OrderHistory/OrderHistory.tsx @@ -84,6 +84,11 @@ export const getEventMessage = ( defaultMessage: "Order cancel information was sent to customer", description: "order history message" }); + case OrderEventsEmailsEnum.ORDER_CONFIRMATION: + return intl.formatMessage({ + defaultMessage: "Order placed information was sent to customer", + description: "order history message" + }); case OrderEventsEmailsEnum.ORDER_REFUND: return intl.formatMessage({ defaultMessage: "Order refund information was sent to customer", From 755fed7cc748e8f9a4b4f8cc5cfaa48165672e7a Mon Sep 17 00:00:00 2001 From: Tomasz Szymanski Date: Mon, 22 Mar 2021 12:34:28 +0100 Subject: [PATCH 14/22] Fix missing email event --- locale/defaultMessages.json | 4 + .../__snapshots__/Stories.test.ts.snap | 11957 +++++----------- 2 files changed, 3931 insertions(+), 8030 deletions(-) diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json index 93494722c..aaa2ce9a6 100644 --- a/locale/defaultMessages.json +++ b/locale/defaultMessages.json @@ -3563,6 +3563,10 @@ "context": "order history message", "string": "Note was added to the order" }, + "src_dot_orders_dot_components_dot_OrderHistory_dot_2308853031": { + "context": "order history message", + "string": "Order placed information was sent to customer" + }, "src_dot_orders_dot_components_dot_OrderHistory_dot_2369495522": { "context": "order history message", "string": "Order confirmation was sent to customer" diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap index ffed753f7..55e920221 100644 --- a/src/storybook/__snapshots__/Stories.test.ts.snap +++ b/src/storybook/__snapshots__/Stories.test.ts.snap @@ -29,7 +29,7 @@ exports[`Storyshots Attributes / Attributes default 1`] = ` style="padding:24px" >