From 80f3af4e5eb69644a0b3832e34d24896a2fdfe67 Mon Sep 17 00:00:00 2001 From: Krzysztof Kulig Date: Mon, 24 Jan 2022 14:50:17 +0100 Subject: [PATCH] Port new shipping method schema to 3.1 (#1768) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update schema * refactor(shippingMethods): change name from availableShippingMethods to shippingMethod * refactor(shippingMethods): change shippingMethod to shippingMethodType * Add missing files * refactor(order): add active and message prop to the shippingMethod field * Add support for new webhook types * refactor(OrderShippingMethodEditDialog): show inactive shipping method as disabled * refactor(SingleSelectField): change the disabled prop strictly boolean Co-authored-by: Dominik Żegleń * refactor(OrderShippingMethodEditDialog): remove unused style Co-authored-by: Michal Zajac Co-authored-by: Michal Zajac <50200782+Michal99Zajac@users.noreply.github.com> Co-authored-by: Dominik Żegleń --- fragmentTypes.json | 6 ++ schema.graphql | 66 ++++++++----- .../SingleSelectField/SingleSelectField.tsx | 2 + src/fragments/orders.ts | 4 +- src/fragments/shipping.ts | 16 ++-- src/fragments/types/MetadataFragment.ts | 2 +- src/fragments/types/OrderDetailsFragment.ts | 10 +- src/fragments/types/ShippingMethodFragment.ts | 92 ------------------- .../ShippingMethodTranslationFragment.ts | 2 +- .../types/ShippingMethodTypeFragment.ts | 92 +++++++++++++++++++ ...ppingMethodWithExcludedProductsFragment.ts | 2 +- .../ShippingMethodWithPostalCodesFragment.ts | 2 +- .../types/ShippingZoneDetailsFragment.ts | 2 +- .../OrderDraftDetailsSummary.tsx | 11 +-- .../OrderShippingMethodEditDialog.tsx | 45 +++++---- src/orders/fixtures.ts | 16 +++- src/orders/mutations.ts | 2 +- src/orders/types/FulfillOrder.ts | 10 +- src/orders/types/OrderCancel.ts | 10 +- src/orders/types/OrderCapture.ts | 10 +- src/orders/types/OrderConfirm.ts | 10 +- src/orders/types/OrderDetails.ts | 10 +- src/orders/types/OrderDiscountAdd.ts | 10 +- src/orders/types/OrderDiscountDelete.ts | 10 +- src/orders/types/OrderDiscountUpdate.ts | 10 +- src/orders/types/OrderDraftCancel.ts | 10 +- src/orders/types/OrderDraftFinalize.ts | 10 +- src/orders/types/OrderDraftUpdate.ts | 10 +- src/orders/types/OrderFulfillmentApprove.ts | 8 +- src/orders/types/OrderFulfillmentCancel.ts | 10 +- .../types/OrderFulfillmentRefundProducts.ts | 10 +- .../types/OrderFulfillmentUpdateTracking.ts | 10 +- src/orders/types/OrderLineDelete.ts | 10 +- src/orders/types/OrderLineDiscountAdd.ts | 8 +- src/orders/types/OrderLineDiscountDelete.ts | 8 +- src/orders/types/OrderLineDiscountRemove.ts | 10 +- src/orders/types/OrderLineDiscountUpdate.ts | 10 +- src/orders/types/OrderLineUpdate.ts | 10 +- src/orders/types/OrderLinesAdd.ts | 10 +- src/orders/types/OrderMarkAsPaid.ts | 10 +- src/orders/types/OrderRefund.ts | 10 +- src/orders/types/OrderShippingMethodUpdate.ts | 12 ++- src/orders/types/OrderUpdate.ts | 10 +- src/orders/types/OrderVoid.ts | 10 +- src/orders/utils/data.test.ts | 2 +- .../OrderDetails/OrderDraftDetails/index.tsx | 2 +- .../OrderDetails/OrderNormalDetails/index.tsx | 2 +- .../OrderUnconfirmedDetails/index.tsx | 4 +- .../ShippingZonePostalCodes.tsx | 10 +- .../ShippingZoneRatesCreatePage.tsx | 4 +- .../ShippingZoneRatesPage.tsx | 6 +- src/shipping/fixtures.ts | 8 +- src/shipping/handlers.ts | 14 +-- src/shipping/mutations.ts | 14 +-- src/shipping/types/CreateShippingRate.ts | 4 +- src/shipping/types/DeleteShippingRate.ts | 2 +- .../ShippingMethodChannelListingUpdate.ts | 2 +- src/shipping/types/ShippingZone.ts | 2 +- src/shipping/types/ShippingZoneDetails.ts | 2 +- src/shipping/types/UpdateShippingRate.ts | 2 +- .../orders/OrderShippingMethodEditDialog.tsx | 2 +- .../types/ShippingMethodTranslationDetails.ts | 2 +- .../types/ShippingMethodTranslations.ts | 2 +- .../types/UpdateShippingMethodTranslations.ts | 2 +- src/types/globalTypes.ts | 2 + src/utils/metadata/types/UpdateMetadata.ts | 4 +- .../metadata/types/UpdatePrivateMetadata.ts | 4 +- 67 files changed, 420 insertions(+), 316 deletions(-) delete mode 100644 src/fragments/types/ShippingMethodFragment.ts create mode 100644 src/fragments/types/ShippingMethodTypeFragment.ts diff --git a/fragmentTypes.json b/fragmentTypes.json index 9152cc87a..c208f3b17 100644 --- a/fragmentTypes.json +++ b/fragmentTypes.json @@ -227,6 +227,9 @@ { "name": "ShippingMethodTranslation" }, + { + "name": "ShippingMethodType" + }, { "name": "ShippingZone" }, @@ -329,6 +332,9 @@ { "name": "ShippingMethod" }, + { + "name": "ShippingMethodType" + }, { "name": "ShippingZone" }, diff --git a/schema.graphql b/schema.graphql index b3024ae56..723093b89 100644 --- a/schema.graphql +++ b/schema.graphql @@ -1022,10 +1022,11 @@ type Checkout implements Node & ObjectWithMetadata { id: ID! privateMetadata: [MetadataItem]! metadata: [MetadataItem]! - availableShippingMethods: [ShippingMethod]! + availableShippingMethods: [ShippingMethod]! @deprecated(reason: "This field will be removed in Saleor 4.0. Use `shippingMethods` instead.") + shippingMethods: [ShippingMethod]! availableCollectionPoints: [Warehouse!]! availablePaymentGateways: [PaymentGateway!]! - email: String! + email: String isShippingRequired: Boolean! quantity: Int! stockReservationExpires: DateTime @@ -1144,6 +1145,7 @@ enum CheckoutErrorCode { MISSING_CHANNEL_SLUG CHANNEL_INACTIVE UNAVAILABLE_VARIANT_IN_CHANNEL + EMAIL_NOT_SET } input CheckoutFilterInput { @@ -4076,7 +4078,8 @@ type Order implements Node & ObjectWithMetadata { fulfillments: [Fulfillment]! lines: [OrderLine]! actions: [OrderAction]! - availableShippingMethods: [ShippingMethod] + availableShippingMethods: [ShippingMethod] @deprecated(reason: "Use `shippingMethods`, this field will be removed in 4.0") + shippingMethods: [ShippingMethod] availableCollectionPoints: [Warehouse!]! invoices: [Invoice] number: String @@ -4966,6 +4969,7 @@ enum PaymentErrorCode { NOT_SUPPORTED_GATEWAY CHANNEL_INACTIVE BALANCE_CHECK_ERROR + CHECKOUT_EMAIL_NOT_SET } input PaymentFilterInput { @@ -6200,20 +6204,19 @@ type ShippingMethod implements Node & ObjectWithMetadata { id: ID! privateMetadata: [MetadataItem]! metadata: [MetadataItem]! + type: ShippingMethodTypeEnum @deprecated(reason: "This field will be removed in Saleor 4.0.") name: String! description: JSONString - type: ShippingMethodTypeEnum - translation(languageCode: LanguageCodeEnum!): ShippingMethodTranslation - channelListings: [ShippingMethodChannelListing!] - price: Money - maximumOrderPrice: Money - minimumOrderPrice: Money - postalCodeRules: [ShippingMethodPostalCodeRule] - excludedProducts(before: String, after: String, first: Int, last: Int): ProductCountableConnection - minimumOrderWeight: Weight - maximumOrderWeight: Weight maximumDeliveryDays: Int minimumDeliveryDays: Int + maximumOrderWeight: Weight @deprecated(reason: "This field will be removed in Saleor 4.0.") + minimumOrderWeight: Weight @deprecated(reason: "This field will be removed in Saleor 4.0.") + translation(languageCode: LanguageCodeEnum!): ShippingMethodTranslation + price: Money! + maximumOrderPrice: Money + minimumOrderPrice: Money + active: Boolean! + message: String } type ShippingMethodChannelListing implements Node { @@ -6237,7 +6240,7 @@ input ShippingMethodChannelListingInput { } type ShippingMethodChannelListingUpdate { - shippingMethod: ShippingMethod + shippingMethod: ShippingMethodType shippingErrors: [ShippingError!]! @deprecated(reason: "This field will be removed in Saleor 4.0. Use `errors` field instead.") errors: [ShippingError!]! } @@ -6254,7 +6257,7 @@ type ShippingMethodTranslatableContent implements Node { name: String! description: JSONString translation(languageCode: LanguageCodeEnum!): ShippingMethodTranslation - shippingMethod: ShippingMethod @deprecated(reason: "This field will be removed in Saleor 4.0. Get model fields from the root level queries.") + shippingMethod: ShippingMethodType @deprecated(reason: "This field will be removed in Saleor 4.0. Get model fields from the root level queries.") } type ShippingMethodTranslation implements Node { @@ -6264,6 +6267,25 @@ type ShippingMethodTranslation implements Node { language: LanguageDisplay! } +type ShippingMethodType implements Node & ObjectWithMetadata { + id: ID! + privateMetadata: [MetadataItem]! + metadata: [MetadataItem]! + name: String! + description: JSONString + type: ShippingMethodTypeEnum + translation(languageCode: LanguageCodeEnum!): ShippingMethodTranslation + channelListings: [ShippingMethodChannelListing!] + maximumOrderPrice: Money + minimumOrderPrice: Money + postalCodeRules: [ShippingMethodPostalCodeRule] + excludedProducts(before: String, after: String, first: Int, last: Int): ProductCountableConnection + minimumOrderWeight: Weight + maximumOrderWeight: Weight + maximumDeliveryDays: Int + minimumDeliveryDays: Int +} + enum ShippingMethodTypeEnum { PRICE WEIGHT @@ -6282,20 +6304,20 @@ type ShippingPriceBulkDelete { type ShippingPriceCreate { shippingZone: ShippingZone - shippingMethod: ShippingMethod + shippingMethod: ShippingMethodType shippingErrors: [ShippingError!]! @deprecated(reason: "This field will be removed in Saleor 4.0. Use `errors` field instead.") errors: [ShippingError!]! } type ShippingPriceDelete { - shippingMethod: ShippingMethod + shippingMethod: ShippingMethodType shippingZone: ShippingZone shippingErrors: [ShippingError!]! @deprecated(reason: "This field will be removed in Saleor 4.0. Use `errors` field instead.") errors: [ShippingError!]! } type ShippingPriceExcludeProducts { - shippingMethod: ShippingMethod + shippingMethod: ShippingMethodType shippingErrors: [ShippingError!]! @deprecated(reason: "This field will be removed in Saleor 4.0. Use `errors` field instead.") errors: [ShippingError!]! } @@ -6319,7 +6341,7 @@ input ShippingPriceInput { } type ShippingPriceRemoveProductFromExclude { - shippingMethod: ShippingMethod + shippingMethod: ShippingMethodType shippingErrors: [ShippingError!]! @deprecated(reason: "This field will be removed in Saleor 4.0. Use `errors` field instead.") errors: [ShippingError!]! } @@ -6327,7 +6349,7 @@ type ShippingPriceRemoveProductFromExclude { type ShippingPriceTranslate { translationErrors: [TranslationError!]! @deprecated(reason: "This field will be removed in Saleor 4.0. Use `errors` field instead.") errors: [TranslationError!]! - shippingMethod: ShippingMethod + shippingMethod: ShippingMethodType } input ShippingPriceTranslationInput { @@ -6337,7 +6359,7 @@ input ShippingPriceTranslationInput { type ShippingPriceUpdate { shippingZone: ShippingZone - shippingMethod: ShippingMethod + shippingMethod: ShippingMethodType shippingErrors: [ShippingError!]! @deprecated(reason: "This field will be removed in Saleor 4.0. Use `errors` field instead.") errors: [ShippingError!]! } @@ -6350,7 +6372,7 @@ type ShippingZone implements Node & ObjectWithMetadata { metadata: [MetadataItem]! priceRange: MoneyRange countries: [CountryDisplay] - shippingMethods: [ShippingMethod] + shippingMethods: [ShippingMethodType] warehouses: [Warehouse!]! channels: [Channel!]! description: String diff --git a/src/components/SingleSelectField/SingleSelectField.tsx b/src/components/SingleSelectField/SingleSelectField.tsx index 92a545118..6fa34ee57 100644 --- a/src/components/SingleSelectField/SingleSelectField.tsx +++ b/src/components/SingleSelectField/SingleSelectField.tsx @@ -34,6 +34,7 @@ const useStyles = makeStyles( export interface Choice { value: T; label: L; + disabled?: boolean; } export type Choices = Choice[]; @@ -114,6 +115,7 @@ export const SingleSelectField: React.FC = props => { {choices.length > 0 ? ( choices.map(choice => ( = props total, shippingMethod, shippingMethodName, - availableShippingMethods, + shippingMethods, shippingPrice, shippingAddress, isShippingRequired @@ -93,8 +93,7 @@ const OrderDraftDetailsSummary: React.FC = props const hasChosenShippingMethod = shippingMethod !== null && shippingMethodName !== null; - const hasAvailableShippingMethods = - !!availableShippingMethods?.length || isShippingRequired; + const hasShippingMethods = !!shippingMethods?.length || isShippingRequired; const discountTitle = orderDiscount ? messages.discount @@ -194,11 +193,9 @@ const OrderDraftDetailsSummary: React.FC = props - {hasAvailableShippingMethods && ( - {getShippingMethodComponent()} - )} + {hasShippingMethods && {getShippingMethodComponent()}} - {!hasAvailableShippingMethods && ( + {!hasShippingMethods && ( {intl.formatMessage(messages.noShippingCarriers)} )} diff --git a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx index ac58393ed..95294dce7 100644 --- a/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx +++ b/src/orders/components/OrderShippingMethodEditDialog/OrderShippingMethodEditDialog.tsx @@ -4,7 +4,8 @@ import { DialogActions, DialogContent, DialogContentText, - DialogTitle + DialogTitle, + Typography } from "@material-ui/core"; import ConfirmButton, { ConfirmButtonTransitionState @@ -22,7 +23,7 @@ import getOrderErrorMessage from "@saleor/utils/errors/order"; import React from "react"; import { FormattedMessage, useIntl } from "react-intl"; -import { OrderDetails_order_availableShippingMethods } from "../../types/OrderDetails"; +import { OrderDetails_order_shippingMethods } from "../../types/OrderDetails"; export interface FormData { shippingMethod: string; @@ -35,7 +36,8 @@ const useStyles = makeStyles( }, menuItem: { display: "flex", - width: "100%" + width: "100%", + flexWrap: "wrap" }, price: { marginRight: theme.spacing(3) @@ -50,6 +52,9 @@ const useStyles = makeStyles( flex: 1, overflowX: "hidden", textOverflow: "ellipsis" + }, + message: { + width: "100%" } }), { name: "OrderShippingMethodEditDialog" } @@ -60,7 +65,7 @@ export interface OrderShippingMethodEditDialogProps { errors: OrderErrorFragment[]; open: boolean; shippingMethod: string; - shippingMethods?: OrderDetails_order_availableShippingMethods[]; + shippingMethods?: OrderDetails_order_shippingMethods[]; onClose(); onSubmit?(data: FormData); } @@ -84,18 +89,26 @@ const OrderShippingMethodEditDialog: React.FC !formFields.includes(err.field)); const choices = shippingMethods - ? shippingMethods.map(s => ({ - label: ( -
- {s.name} -   - - - -
- ), - value: s.id - })) + ? shippingMethods + .map(s => ({ + label: ( +
+ {s.name} +   + + + + {!s.active && ( + + {s.message} + + )} +
+ ), + disabled: !s.active, + value: s.id + })) + .sort((x, y) => (x.disabled === y.disabled ? 0 : x.disabled ? 1 : -1)) : []; const initialForm: FormData = { shippingMethod diff --git a/src/orders/fixtures.ts b/src/orders/fixtures.ts index 3852a6dba..08b80c471 100644 --- a/src/orders/fixtures.ts +++ b/src/orders/fixtures.ts @@ -779,7 +779,7 @@ export const order = (placeholder: string): OrderDetails_order => ({ OrderAction.REFUND, OrderAction.VOID ], - availableShippingMethods: [ + shippingMethods: [ { __typename: "ShippingMethod", id: "U2hpcHBpbmdNZXRob2Q6NQ==", @@ -788,7 +788,9 @@ export const order = (placeholder: string): OrderDetails_order => ({ __typename: "Money", amount: 12.41, currency: "USD" - } + }, + active: false, + message: "shipping method is disactive" }, { __typename: "ShippingMethod", @@ -798,7 +800,9 @@ export const order = (placeholder: string): OrderDetails_order => ({ __typename: "Money", amount: 9.12, currency: "USD" - } + }, + active: true, + message: null }, { __typename: "ShippingMethod", @@ -808,7 +812,9 @@ export const order = (placeholder: string): OrderDetails_order => ({ __typename: "Money", amount: 7.6, currency: "USD" - } + }, + active: true, + message: null } ], billingAddress: { @@ -1419,7 +1425,7 @@ export const draftOrder = (placeholder: string): OrderDetails_order => ({ __typename: "Order" as "Order", giftCards: [], actions: [OrderAction.CAPTURE], - availableShippingMethods: null, + shippingMethods: null, billingAddress: null, canFinalize: true, channel: { diff --git a/src/orders/mutations.ts b/src/orders/mutations.ts index 0b47685fd..226e26eae 100644 --- a/src/orders/mutations.ts +++ b/src/orders/mutations.ts @@ -577,7 +577,7 @@ const orderShippingMethodUpdateMutation = gql` ...OrderErrorFragment } order { - availableShippingMethods { + shippingMethods { id name } diff --git a/src/orders/types/FulfillOrder.ts b/src/orders/types/FulfillOrder.ts index 5b97fcb86..4ccc6ff11 100644 --- a/src/orders/types/FulfillOrder.ts +++ b/src/orders/types/FulfillOrder.ts @@ -526,17 +526,19 @@ export interface FulfillOrder_orderFulfill_order_user { email: string; } -export interface FulfillOrder_orderFulfill_order_availableShippingMethods_price { +export interface FulfillOrder_orderFulfill_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface FulfillOrder_orderFulfill_order_availableShippingMethods { +export interface FulfillOrder_orderFulfill_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: FulfillOrder_orderFulfill_order_availableShippingMethods_price | null; + price: FulfillOrder_orderFulfill_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface FulfillOrder_orderFulfill_order_invoices { @@ -597,7 +599,7 @@ export interface FulfillOrder_orderFulfill_order { undiscountedTotal: FulfillOrder_orderFulfill_order_undiscountedTotal; user: FulfillOrder_orderFulfill_order_user | null; userEmail: string | null; - availableShippingMethods: (FulfillOrder_orderFulfill_order_availableShippingMethods | null)[] | null; + shippingMethods: FulfillOrder_orderFulfill_order_shippingMethods[]; invoices: (FulfillOrder_orderFulfill_order_invoices | null)[] | null; channel: FulfillOrder_orderFulfill_order_channel; } diff --git a/src/orders/types/OrderCancel.ts b/src/orders/types/OrderCancel.ts index 3027e7664..9ce76791e 100644 --- a/src/orders/types/OrderCancel.ts +++ b/src/orders/types/OrderCancel.ts @@ -524,17 +524,19 @@ export interface OrderCancel_orderCancel_order_user { email: string; } -export interface OrderCancel_orderCancel_order_availableShippingMethods_price { +export interface OrderCancel_orderCancel_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderCancel_orderCancel_order_availableShippingMethods { +export interface OrderCancel_orderCancel_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderCancel_orderCancel_order_availableShippingMethods_price | null; + price: OrderCancel_orderCancel_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderCancel_orderCancel_order_invoices { @@ -595,7 +597,7 @@ export interface OrderCancel_orderCancel_order { undiscountedTotal: OrderCancel_orderCancel_order_undiscountedTotal; user: OrderCancel_orderCancel_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderCancel_orderCancel_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderCancel_orderCancel_order_shippingMethods[]; invoices: (OrderCancel_orderCancel_order_invoices | null)[] | null; channel: OrderCancel_orderCancel_order_channel; } diff --git a/src/orders/types/OrderCapture.ts b/src/orders/types/OrderCapture.ts index d4ee36967..4b20c4f36 100644 --- a/src/orders/types/OrderCapture.ts +++ b/src/orders/types/OrderCapture.ts @@ -524,17 +524,19 @@ export interface OrderCapture_orderCapture_order_user { email: string; } -export interface OrderCapture_orderCapture_order_availableShippingMethods_price { +export interface OrderCapture_orderCapture_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderCapture_orderCapture_order_availableShippingMethods { +export interface OrderCapture_orderCapture_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderCapture_orderCapture_order_availableShippingMethods_price | null; + price: OrderCapture_orderCapture_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderCapture_orderCapture_order_invoices { @@ -595,7 +597,7 @@ export interface OrderCapture_orderCapture_order { undiscountedTotal: OrderCapture_orderCapture_order_undiscountedTotal; user: OrderCapture_orderCapture_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderCapture_orderCapture_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderCapture_orderCapture_order_shippingMethods[]; invoices: (OrderCapture_orderCapture_order_invoices | null)[] | null; channel: OrderCapture_orderCapture_order_channel; } diff --git a/src/orders/types/OrderConfirm.ts b/src/orders/types/OrderConfirm.ts index 1a7a6af93..e0b3c6109 100644 --- a/src/orders/types/OrderConfirm.ts +++ b/src/orders/types/OrderConfirm.ts @@ -524,17 +524,19 @@ export interface OrderConfirm_orderConfirm_order_user { email: string; } -export interface OrderConfirm_orderConfirm_order_availableShippingMethods_price { +export interface OrderConfirm_orderConfirm_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderConfirm_orderConfirm_order_availableShippingMethods { +export interface OrderConfirm_orderConfirm_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderConfirm_orderConfirm_order_availableShippingMethods_price | null; + price: OrderConfirm_orderConfirm_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderConfirm_orderConfirm_order_invoices { @@ -595,7 +597,7 @@ export interface OrderConfirm_orderConfirm_order { undiscountedTotal: OrderConfirm_orderConfirm_order_undiscountedTotal; user: OrderConfirm_orderConfirm_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderConfirm_orderConfirm_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderConfirm_orderConfirm_order_shippingMethods[]; invoices: (OrderConfirm_orderConfirm_order_invoices | null)[] | null; channel: OrderConfirm_orderConfirm_order_channel; } diff --git a/src/orders/types/OrderDetails.ts b/src/orders/types/OrderDetails.ts index 0112e8e01..e69dc8c99 100644 --- a/src/orders/types/OrderDetails.ts +++ b/src/orders/types/OrderDetails.ts @@ -517,17 +517,19 @@ export interface OrderDetails_order_user { email: string; } -export interface OrderDetails_order_availableShippingMethods_price { +export interface OrderDetails_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderDetails_order_availableShippingMethods { +export interface OrderDetails_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderDetails_order_availableShippingMethods_price | null; + price: OrderDetails_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderDetails_order_invoices { @@ -588,7 +590,7 @@ export interface OrderDetails_order { undiscountedTotal: OrderDetails_order_undiscountedTotal; user: OrderDetails_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderDetails_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderDetails_order_shippingMethods[]; invoices: (OrderDetails_order_invoices | null)[] | null; channel: OrderDetails_order_channel; } diff --git a/src/orders/types/OrderDiscountAdd.ts b/src/orders/types/OrderDiscountAdd.ts index f7ff25e10..6caed785b 100644 --- a/src/orders/types/OrderDiscountAdd.ts +++ b/src/orders/types/OrderDiscountAdd.ts @@ -524,17 +524,19 @@ export interface OrderDiscountAdd_orderDiscountAdd_order_user { email: string; } -export interface OrderDiscountAdd_orderDiscountAdd_order_availableShippingMethods_price { +export interface OrderDiscountAdd_orderDiscountAdd_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderDiscountAdd_orderDiscountAdd_order_availableShippingMethods { +export interface OrderDiscountAdd_orderDiscountAdd_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderDiscountAdd_orderDiscountAdd_order_availableShippingMethods_price | null; + price: OrderDiscountAdd_orderDiscountAdd_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderDiscountAdd_orderDiscountAdd_order_invoices { @@ -595,7 +597,7 @@ export interface OrderDiscountAdd_orderDiscountAdd_order { undiscountedTotal: OrderDiscountAdd_orderDiscountAdd_order_undiscountedTotal; user: OrderDiscountAdd_orderDiscountAdd_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderDiscountAdd_orderDiscountAdd_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderDiscountAdd_orderDiscountAdd_order_shippingMethods[]; invoices: (OrderDiscountAdd_orderDiscountAdd_order_invoices | null)[] | null; channel: OrderDiscountAdd_orderDiscountAdd_order_channel; } diff --git a/src/orders/types/OrderDiscountDelete.ts b/src/orders/types/OrderDiscountDelete.ts index de98826f4..43bbc51c2 100644 --- a/src/orders/types/OrderDiscountDelete.ts +++ b/src/orders/types/OrderDiscountDelete.ts @@ -524,17 +524,19 @@ export interface OrderDiscountDelete_orderDiscountDelete_order_user { email: string; } -export interface OrderDiscountDelete_orderDiscountDelete_order_availableShippingMethods_price { +export interface OrderDiscountDelete_orderDiscountDelete_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderDiscountDelete_orderDiscountDelete_order_availableShippingMethods { +export interface OrderDiscountDelete_orderDiscountDelete_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderDiscountDelete_orderDiscountDelete_order_availableShippingMethods_price | null; + price: OrderDiscountDelete_orderDiscountDelete_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderDiscountDelete_orderDiscountDelete_order_invoices { @@ -595,7 +597,7 @@ export interface OrderDiscountDelete_orderDiscountDelete_order { undiscountedTotal: OrderDiscountDelete_orderDiscountDelete_order_undiscountedTotal; user: OrderDiscountDelete_orderDiscountDelete_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderDiscountDelete_orderDiscountDelete_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderDiscountDelete_orderDiscountDelete_order_shippingMethods[]; invoices: (OrderDiscountDelete_orderDiscountDelete_order_invoices | null)[] | null; channel: OrderDiscountDelete_orderDiscountDelete_order_channel; } diff --git a/src/orders/types/OrderDiscountUpdate.ts b/src/orders/types/OrderDiscountUpdate.ts index 3ab245c36..3435dc407 100644 --- a/src/orders/types/OrderDiscountUpdate.ts +++ b/src/orders/types/OrderDiscountUpdate.ts @@ -524,17 +524,19 @@ export interface OrderDiscountUpdate_orderDiscountUpdate_order_user { email: string; } -export interface OrderDiscountUpdate_orderDiscountUpdate_order_availableShippingMethods_price { +export interface OrderDiscountUpdate_orderDiscountUpdate_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderDiscountUpdate_orderDiscountUpdate_order_availableShippingMethods { +export interface OrderDiscountUpdate_orderDiscountUpdate_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderDiscountUpdate_orderDiscountUpdate_order_availableShippingMethods_price | null; + price: OrderDiscountUpdate_orderDiscountUpdate_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderDiscountUpdate_orderDiscountUpdate_order_invoices { @@ -595,7 +597,7 @@ export interface OrderDiscountUpdate_orderDiscountUpdate_order { undiscountedTotal: OrderDiscountUpdate_orderDiscountUpdate_order_undiscountedTotal; user: OrderDiscountUpdate_orderDiscountUpdate_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderDiscountUpdate_orderDiscountUpdate_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderDiscountUpdate_orderDiscountUpdate_order_shippingMethods[]; invoices: (OrderDiscountUpdate_orderDiscountUpdate_order_invoices | null)[] | null; channel: OrderDiscountUpdate_orderDiscountUpdate_order_channel; } diff --git a/src/orders/types/OrderDraftCancel.ts b/src/orders/types/OrderDraftCancel.ts index a730bbb10..f62b51889 100644 --- a/src/orders/types/OrderDraftCancel.ts +++ b/src/orders/types/OrderDraftCancel.ts @@ -524,17 +524,19 @@ export interface OrderDraftCancel_draftOrderDelete_order_user { email: string; } -export interface OrderDraftCancel_draftOrderDelete_order_availableShippingMethods_price { +export interface OrderDraftCancel_draftOrderDelete_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderDraftCancel_draftOrderDelete_order_availableShippingMethods { +export interface OrderDraftCancel_draftOrderDelete_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderDraftCancel_draftOrderDelete_order_availableShippingMethods_price | null; + price: OrderDraftCancel_draftOrderDelete_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderDraftCancel_draftOrderDelete_order_invoices { @@ -595,7 +597,7 @@ export interface OrderDraftCancel_draftOrderDelete_order { undiscountedTotal: OrderDraftCancel_draftOrderDelete_order_undiscountedTotal; user: OrderDraftCancel_draftOrderDelete_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderDraftCancel_draftOrderDelete_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderDraftCancel_draftOrderDelete_order_shippingMethods[]; invoices: (OrderDraftCancel_draftOrderDelete_order_invoices | null)[] | null; channel: OrderDraftCancel_draftOrderDelete_order_channel; } diff --git a/src/orders/types/OrderDraftFinalize.ts b/src/orders/types/OrderDraftFinalize.ts index 45c3c8514..7f3aa3e4d 100644 --- a/src/orders/types/OrderDraftFinalize.ts +++ b/src/orders/types/OrderDraftFinalize.ts @@ -524,17 +524,19 @@ export interface OrderDraftFinalize_draftOrderComplete_order_user { email: string; } -export interface OrderDraftFinalize_draftOrderComplete_order_availableShippingMethods_price { +export interface OrderDraftFinalize_draftOrderComplete_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderDraftFinalize_draftOrderComplete_order_availableShippingMethods { +export interface OrderDraftFinalize_draftOrderComplete_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderDraftFinalize_draftOrderComplete_order_availableShippingMethods_price | null; + price: OrderDraftFinalize_draftOrderComplete_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderDraftFinalize_draftOrderComplete_order_invoices { @@ -595,7 +597,7 @@ export interface OrderDraftFinalize_draftOrderComplete_order { undiscountedTotal: OrderDraftFinalize_draftOrderComplete_order_undiscountedTotal; user: OrderDraftFinalize_draftOrderComplete_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderDraftFinalize_draftOrderComplete_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderDraftFinalize_draftOrderComplete_order_shippingMethods[]; invoices: (OrderDraftFinalize_draftOrderComplete_order_invoices | null)[] | null; channel: OrderDraftFinalize_draftOrderComplete_order_channel; } diff --git a/src/orders/types/OrderDraftUpdate.ts b/src/orders/types/OrderDraftUpdate.ts index db7f3d20a..150be89be 100644 --- a/src/orders/types/OrderDraftUpdate.ts +++ b/src/orders/types/OrderDraftUpdate.ts @@ -524,17 +524,19 @@ export interface OrderDraftUpdate_draftOrderUpdate_order_user { email: string; } -export interface OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethods_price { +export interface OrderDraftUpdate_draftOrderUpdate_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethods { +export interface OrderDraftUpdate_draftOrderUpdate_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethods_price | null; + price: OrderDraftUpdate_draftOrderUpdate_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderDraftUpdate_draftOrderUpdate_order_invoices { @@ -595,7 +597,7 @@ export interface OrderDraftUpdate_draftOrderUpdate_order { undiscountedTotal: OrderDraftUpdate_draftOrderUpdate_order_undiscountedTotal; user: OrderDraftUpdate_draftOrderUpdate_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderDraftUpdate_draftOrderUpdate_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderDraftUpdate_draftOrderUpdate_order_shippingMethods[]; invoices: (OrderDraftUpdate_draftOrderUpdate_order_invoices | null)[] | null; channel: OrderDraftUpdate_draftOrderUpdate_order_channel; } diff --git a/src/orders/types/OrderFulfillmentApprove.ts b/src/orders/types/OrderFulfillmentApprove.ts index 8b31d9464..2add7b58d 100644 --- a/src/orders/types/OrderFulfillmentApprove.ts +++ b/src/orders/types/OrderFulfillmentApprove.ts @@ -524,17 +524,17 @@ export interface OrderFulfillmentApprove_orderFulfillmentApprove_order_user { email: string; } -export interface OrderFulfillmentApprove_orderFulfillmentApprove_order_availableShippingMethods_price { +export interface OrderFulfillmentApprove_orderFulfillmentApprove_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderFulfillmentApprove_orderFulfillmentApprove_order_availableShippingMethods { +export interface OrderFulfillmentApprove_orderFulfillmentApprove_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderFulfillmentApprove_orderFulfillmentApprove_order_availableShippingMethods_price | null; + price: OrderFulfillmentApprove_orderFulfillmentApprove_order_shippingMethods_price; } export interface OrderFulfillmentApprove_orderFulfillmentApprove_order_invoices { @@ -595,7 +595,7 @@ export interface OrderFulfillmentApprove_orderFulfillmentApprove_order { undiscountedTotal: OrderFulfillmentApprove_orderFulfillmentApprove_order_undiscountedTotal; user: OrderFulfillmentApprove_orderFulfillmentApprove_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderFulfillmentApprove_orderFulfillmentApprove_order_availableShippingMethods | null)[] | null; + shippingMethods: (OrderFulfillmentApprove_orderFulfillmentApprove_order_shippingMethods | null)[] | null; invoices: (OrderFulfillmentApprove_orderFulfillmentApprove_order_invoices | null)[] | null; channel: OrderFulfillmentApprove_orderFulfillmentApprove_order_channel; } diff --git a/src/orders/types/OrderFulfillmentCancel.ts b/src/orders/types/OrderFulfillmentCancel.ts index 101d21c3d..7f764a5c0 100644 --- a/src/orders/types/OrderFulfillmentCancel.ts +++ b/src/orders/types/OrderFulfillmentCancel.ts @@ -524,17 +524,19 @@ export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_user { email: string; } -export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_availableShippingMethods_price { +export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_availableShippingMethods { +export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderFulfillmentCancel_orderFulfillmentCancel_order_availableShippingMethods_price | null; + price: OrderFulfillmentCancel_orderFulfillmentCancel_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderFulfillmentCancel_orderFulfillmentCancel_order_invoices { @@ -595,7 +597,7 @@ export interface OrderFulfillmentCancel_orderFulfillmentCancel_order { undiscountedTotal: OrderFulfillmentCancel_orderFulfillmentCancel_order_undiscountedTotal; user: OrderFulfillmentCancel_orderFulfillmentCancel_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderFulfillmentCancel_orderFulfillmentCancel_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderFulfillmentCancel_orderFulfillmentCancel_order_shippingMethods[]; invoices: (OrderFulfillmentCancel_orderFulfillmentCancel_order_invoices | null)[] | null; channel: OrderFulfillmentCancel_orderFulfillmentCancel_order_channel; } diff --git a/src/orders/types/OrderFulfillmentRefundProducts.ts b/src/orders/types/OrderFulfillmentRefundProducts.ts index 3297c2f34..1f4069785 100644 --- a/src/orders/types/OrderFulfillmentRefundProducts.ts +++ b/src/orders/types/OrderFulfillmentRefundProducts.ts @@ -626,17 +626,19 @@ export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_o email: string; } -export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_availableShippingMethods_price { +export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_availableShippingMethods { +export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_availableShippingMethods_price | null; + price: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_invoices { @@ -697,7 +699,7 @@ export interface OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_o undiscountedTotal: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_undiscountedTotal; user: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_shippingMethods[]; invoices: (OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_invoices | null)[] | null; channel: OrderFulfillmentRefundProducts_orderFulfillmentRefundProducts_order_channel; } diff --git a/src/orders/types/OrderFulfillmentUpdateTracking.ts b/src/orders/types/OrderFulfillmentUpdateTracking.ts index 9242aa96c..27db92f14 100644 --- a/src/orders/types/OrderFulfillmentUpdateTracking.ts +++ b/src/orders/types/OrderFulfillmentUpdateTracking.ts @@ -524,17 +524,19 @@ export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_o email: string; } -export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_availableShippingMethods_price { +export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_availableShippingMethods { +export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_availableShippingMethods_price | null; + price: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_invoices { @@ -595,7 +597,7 @@ export interface OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_o undiscountedTotal: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_undiscountedTotal; user: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_shippingMethods[]; invoices: (OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_invoices | null)[] | null; channel: OrderFulfillmentUpdateTracking_orderFulfillmentUpdateTracking_order_channel; } diff --git a/src/orders/types/OrderLineDelete.ts b/src/orders/types/OrderLineDelete.ts index c38f03246..6f8cae9c5 100644 --- a/src/orders/types/OrderLineDelete.ts +++ b/src/orders/types/OrderLineDelete.ts @@ -524,17 +524,19 @@ export interface OrderLineDelete_orderLineDelete_order_user { email: string; } -export interface OrderLineDelete_orderLineDelete_order_availableShippingMethods_price { +export interface OrderLineDelete_orderLineDelete_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDelete_orderLineDelete_order_availableShippingMethods { +export interface OrderLineDelete_orderLineDelete_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderLineDelete_orderLineDelete_order_availableShippingMethods_price | null; + price: OrderLineDelete_orderLineDelete_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderLineDelete_orderLineDelete_order_invoices { @@ -595,7 +597,7 @@ export interface OrderLineDelete_orderLineDelete_order { undiscountedTotal: OrderLineDelete_orderLineDelete_order_undiscountedTotal; user: OrderLineDelete_orderLineDelete_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderLineDelete_orderLineDelete_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderLineDelete_orderLineDelete_order_shippingMethods[]; invoices: (OrderLineDelete_orderLineDelete_order_invoices | null)[] | null; channel: OrderLineDelete_orderLineDelete_order_channel; } diff --git a/src/orders/types/OrderLineDiscountAdd.ts b/src/orders/types/OrderLineDiscountAdd.ts index dcdc4ad6c..ddc637990 100644 --- a/src/orders/types/OrderLineDiscountAdd.ts +++ b/src/orders/types/OrderLineDiscountAdd.ts @@ -287,17 +287,17 @@ export interface OrderLineDiscountAdd_orderLineDiscountAdd_order_user { email: string; } -export interface OrderLineDiscountAdd_orderLineDiscountAdd_order_availableShippingMethods_price { +export interface OrderLineDiscountAdd_orderLineDiscountAdd_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDiscountAdd_orderLineDiscountAdd_order_availableShippingMethods { +export interface OrderLineDiscountAdd_orderLineDiscountAdd_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderLineDiscountAdd_orderLineDiscountAdd_order_availableShippingMethods_price | null; + price: OrderLineDiscountAdd_orderLineDiscountAdd_order_shippingMethods_price | null; } export interface OrderLineDiscountAdd_orderLineDiscountAdd_order_discount { @@ -349,7 +349,7 @@ export interface OrderLineDiscountAdd_orderLineDiscountAdd_order { totalCaptured: OrderLineDiscountAdd_orderLineDiscountAdd_order_totalCaptured; user: OrderLineDiscountAdd_orderLineDiscountAdd_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderLineDiscountAdd_orderLineDiscountAdd_order_availableShippingMethods | null)[] | null; + shippingMethods: (OrderLineDiscountAdd_orderLineDiscountAdd_order_shippingMethods | null)[] | null; discount: OrderLineDiscountAdd_orderLineDiscountAdd_order_discount | null; invoices: (OrderLineDiscountAdd_orderLineDiscountAdd_order_invoices | null)[] | null; channel: OrderLineDiscountAdd_orderLineDiscountAdd_order_channel; diff --git a/src/orders/types/OrderLineDiscountDelete.ts b/src/orders/types/OrderLineDiscountDelete.ts index 600f8d7f5..f309b1ff0 100644 --- a/src/orders/types/OrderLineDiscountDelete.ts +++ b/src/orders/types/OrderLineDiscountDelete.ts @@ -287,17 +287,17 @@ export interface OrderLineDiscountDelete_orderLineDiscountDelete_order_user { email: string; } -export interface OrderLineDiscountDelete_orderLineDiscountDelete_order_availableShippingMethods_price { +export interface OrderLineDiscountDelete_orderLineDiscountDelete_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDiscountDelete_orderLineDiscountDelete_order_availableShippingMethods { +export interface OrderLineDiscountDelete_orderLineDiscountDelete_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderLineDiscountDelete_orderLineDiscountDelete_order_availableShippingMethods_price | null; + price: OrderLineDiscountDelete_orderLineDiscountDelete_order_shippingMethods_price | null; } export interface OrderLineDiscountDelete_orderLineDiscountDelete_order_discount { @@ -349,7 +349,7 @@ export interface OrderLineDiscountDelete_orderLineDiscountDelete_order { totalCaptured: OrderLineDiscountDelete_orderLineDiscountDelete_order_totalCaptured; user: OrderLineDiscountDelete_orderLineDiscountDelete_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderLineDiscountDelete_orderLineDiscountDelete_order_availableShippingMethods | null)[] | null; + shippingMethods: (OrderLineDiscountDelete_orderLineDiscountDelete_order_shippingMethods | null)[] | null; discount: OrderLineDiscountDelete_orderLineDiscountDelete_order_discount | null; invoices: (OrderLineDiscountDelete_orderLineDiscountDelete_order_invoices | null)[] | null; channel: OrderLineDiscountDelete_orderLineDiscountDelete_order_channel; diff --git a/src/orders/types/OrderLineDiscountRemove.ts b/src/orders/types/OrderLineDiscountRemove.ts index 6a506c3b3..813892974 100644 --- a/src/orders/types/OrderLineDiscountRemove.ts +++ b/src/orders/types/OrderLineDiscountRemove.ts @@ -524,17 +524,19 @@ export interface OrderLineDiscountRemove_orderLineDiscountRemove_order_user { email: string; } -export interface OrderLineDiscountRemove_orderLineDiscountRemove_order_availableShippingMethods_price { +export interface OrderLineDiscountRemove_orderLineDiscountRemove_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDiscountRemove_orderLineDiscountRemove_order_availableShippingMethods { +export interface OrderLineDiscountRemove_orderLineDiscountRemove_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderLineDiscountRemove_orderLineDiscountRemove_order_availableShippingMethods_price | null; + price: OrderLineDiscountRemove_orderLineDiscountRemove_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderLineDiscountRemove_orderLineDiscountRemove_order_invoices { @@ -595,7 +597,7 @@ export interface OrderLineDiscountRemove_orderLineDiscountRemove_order { undiscountedTotal: OrderLineDiscountRemove_orderLineDiscountRemove_order_undiscountedTotal; user: OrderLineDiscountRemove_orderLineDiscountRemove_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderLineDiscountRemove_orderLineDiscountRemove_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderLineDiscountRemove_orderLineDiscountRemove_order_shippingMethods[]; invoices: (OrderLineDiscountRemove_orderLineDiscountRemove_order_invoices | null)[] | null; channel: OrderLineDiscountRemove_orderLineDiscountRemove_order_channel; } diff --git a/src/orders/types/OrderLineDiscountUpdate.ts b/src/orders/types/OrderLineDiscountUpdate.ts index f01d08491..7f7455c54 100644 --- a/src/orders/types/OrderLineDiscountUpdate.ts +++ b/src/orders/types/OrderLineDiscountUpdate.ts @@ -524,17 +524,19 @@ export interface OrderLineDiscountUpdate_orderLineDiscountUpdate_order_user { email: string; } -export interface OrderLineDiscountUpdate_orderLineDiscountUpdate_order_availableShippingMethods_price { +export interface OrderLineDiscountUpdate_orderLineDiscountUpdate_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineDiscountUpdate_orderLineDiscountUpdate_order_availableShippingMethods { +export interface OrderLineDiscountUpdate_orderLineDiscountUpdate_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_availableShippingMethods_price | null; + price: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderLineDiscountUpdate_orderLineDiscountUpdate_order_invoices { @@ -595,7 +597,7 @@ export interface OrderLineDiscountUpdate_orderLineDiscountUpdate_order { undiscountedTotal: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_undiscountedTotal; user: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderLineDiscountUpdate_orderLineDiscountUpdate_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_shippingMethods[]; invoices: (OrderLineDiscountUpdate_orderLineDiscountUpdate_order_invoices | null)[] | null; channel: OrderLineDiscountUpdate_orderLineDiscountUpdate_order_channel; } diff --git a/src/orders/types/OrderLineUpdate.ts b/src/orders/types/OrderLineUpdate.ts index eeaa3ca9b..49a2dac9b 100644 --- a/src/orders/types/OrderLineUpdate.ts +++ b/src/orders/types/OrderLineUpdate.ts @@ -524,17 +524,19 @@ export interface OrderLineUpdate_orderLineUpdate_order_user { email: string; } -export interface OrderLineUpdate_orderLineUpdate_order_availableShippingMethods_price { +export interface OrderLineUpdate_orderLineUpdate_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderLineUpdate_orderLineUpdate_order_availableShippingMethods { +export interface OrderLineUpdate_orderLineUpdate_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderLineUpdate_orderLineUpdate_order_availableShippingMethods_price | null; + price: OrderLineUpdate_orderLineUpdate_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderLineUpdate_orderLineUpdate_order_invoices { @@ -595,7 +597,7 @@ export interface OrderLineUpdate_orderLineUpdate_order { undiscountedTotal: OrderLineUpdate_orderLineUpdate_order_undiscountedTotal; user: OrderLineUpdate_orderLineUpdate_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderLineUpdate_orderLineUpdate_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderLineUpdate_orderLineUpdate_order_shippingMethods[]; invoices: (OrderLineUpdate_orderLineUpdate_order_invoices | null)[] | null; channel: OrderLineUpdate_orderLineUpdate_order_channel; } diff --git a/src/orders/types/OrderLinesAdd.ts b/src/orders/types/OrderLinesAdd.ts index 1624446bd..2dee208e5 100644 --- a/src/orders/types/OrderLinesAdd.ts +++ b/src/orders/types/OrderLinesAdd.ts @@ -524,17 +524,19 @@ export interface OrderLinesAdd_orderLinesCreate_order_user { email: string; } -export interface OrderLinesAdd_orderLinesCreate_order_availableShippingMethods_price { +export interface OrderLinesAdd_orderLinesCreate_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderLinesAdd_orderLinesCreate_order_availableShippingMethods { +export interface OrderLinesAdd_orderLinesCreate_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderLinesAdd_orderLinesCreate_order_availableShippingMethods_price | null; + price: OrderLinesAdd_orderLinesCreate_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderLinesAdd_orderLinesCreate_order_invoices { @@ -595,7 +597,7 @@ export interface OrderLinesAdd_orderLinesCreate_order { undiscountedTotal: OrderLinesAdd_orderLinesCreate_order_undiscountedTotal; user: OrderLinesAdd_orderLinesCreate_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderLinesAdd_orderLinesCreate_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderLinesAdd_orderLinesCreate_order_shippingMethods[]; invoices: (OrderLinesAdd_orderLinesCreate_order_invoices | null)[] | null; channel: OrderLinesAdd_orderLinesCreate_order_channel; } diff --git a/src/orders/types/OrderMarkAsPaid.ts b/src/orders/types/OrderMarkAsPaid.ts index b06950a1e..176c7bec3 100644 --- a/src/orders/types/OrderMarkAsPaid.ts +++ b/src/orders/types/OrderMarkAsPaid.ts @@ -524,17 +524,19 @@ export interface OrderMarkAsPaid_orderMarkAsPaid_order_user { email: string; } -export interface OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods_price { +export interface OrderMarkAsPaid_orderMarkAsPaid_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods { +export interface OrderMarkAsPaid_orderMarkAsPaid_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods_price | null; + price: OrderMarkAsPaid_orderMarkAsPaid_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderMarkAsPaid_orderMarkAsPaid_order_invoices { @@ -595,7 +597,7 @@ export interface OrderMarkAsPaid_orderMarkAsPaid_order { undiscountedTotal: OrderMarkAsPaid_orderMarkAsPaid_order_undiscountedTotal; user: OrderMarkAsPaid_orderMarkAsPaid_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderMarkAsPaid_orderMarkAsPaid_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderMarkAsPaid_orderMarkAsPaid_order_shippingMethods[]; invoices: (OrderMarkAsPaid_orderMarkAsPaid_order_invoices | null)[] | null; channel: OrderMarkAsPaid_orderMarkAsPaid_order_channel; } diff --git a/src/orders/types/OrderRefund.ts b/src/orders/types/OrderRefund.ts index 8ecf664cd..440106ae7 100644 --- a/src/orders/types/OrderRefund.ts +++ b/src/orders/types/OrderRefund.ts @@ -524,17 +524,19 @@ export interface OrderRefund_orderRefund_order_user { email: string; } -export interface OrderRefund_orderRefund_order_availableShippingMethods_price { +export interface OrderRefund_orderRefund_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderRefund_orderRefund_order_availableShippingMethods { +export interface OrderRefund_orderRefund_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderRefund_orderRefund_order_availableShippingMethods_price | null; + price: OrderRefund_orderRefund_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderRefund_orderRefund_order_invoices { @@ -595,7 +597,7 @@ export interface OrderRefund_orderRefund_order { undiscountedTotal: OrderRefund_orderRefund_order_undiscountedTotal; user: OrderRefund_orderRefund_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderRefund_orderRefund_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderRefund_orderRefund_order_shippingMethods[]; invoices: (OrderRefund_orderRefund_order_invoices | null)[] | null; channel: OrderRefund_orderRefund_order_channel; } diff --git a/src/orders/types/OrderShippingMethodUpdate.ts b/src/orders/types/OrderShippingMethodUpdate.ts index 1d5eb4934..af0935930 100644 --- a/src/orders/types/OrderShippingMethodUpdate.ts +++ b/src/orders/types/OrderShippingMethodUpdate.ts @@ -16,17 +16,19 @@ export interface OrderShippingMethodUpdate_orderUpdateShipping_errors { addressType: AddressTypeEnum | null; } -export interface OrderShippingMethodUpdate_orderUpdateShipping_order_availableShippingMethods_price { +export interface OrderShippingMethodUpdate_orderUpdateShipping_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderShippingMethodUpdate_orderUpdateShipping_order_availableShippingMethods { +export interface OrderShippingMethodUpdate_orderUpdateShipping_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderShippingMethodUpdate_orderUpdateShipping_order_availableShippingMethods_price | null; + price: OrderShippingMethodUpdate_orderUpdateShipping_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderShippingMethodUpdate_orderUpdateShipping_order_total_tax { @@ -64,7 +66,7 @@ export interface OrderShippingMethodUpdate_orderUpdateShipping_order_shippingMet __typename: "ShippingMethod"; id: string; name: string; - price: OrderShippingMethodUpdate_orderUpdateShipping_order_shippingMethod_price | null; + price: OrderShippingMethodUpdate_orderUpdateShipping_order_shippingMethod_price; } export interface OrderShippingMethodUpdate_orderUpdateShipping_order_shippingPrice_gross { @@ -571,7 +573,7 @@ export interface OrderShippingMethodUpdate_orderUpdateShipping_order_channel { export interface OrderShippingMethodUpdate_orderUpdateShipping_order { __typename: "Order"; - availableShippingMethods: (OrderShippingMethodUpdate_orderUpdateShipping_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderShippingMethodUpdate_orderUpdateShipping_order_shippingMethods[]; total: OrderShippingMethodUpdate_orderUpdateShipping_order_total; id: string; shippingMethod: OrderShippingMethodUpdate_orderUpdateShipping_order_shippingMethod | null; diff --git a/src/orders/types/OrderUpdate.ts b/src/orders/types/OrderUpdate.ts index 88520bc16..bb5e4ac8a 100644 --- a/src/orders/types/OrderUpdate.ts +++ b/src/orders/types/OrderUpdate.ts @@ -524,17 +524,19 @@ export interface OrderUpdate_orderUpdate_order_user { email: string; } -export interface OrderUpdate_orderUpdate_order_availableShippingMethods_price { +export interface OrderUpdate_orderUpdate_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderUpdate_orderUpdate_order_availableShippingMethods { +export interface OrderUpdate_orderUpdate_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderUpdate_orderUpdate_order_availableShippingMethods_price | null; + price: OrderUpdate_orderUpdate_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderUpdate_orderUpdate_order_invoices { @@ -595,7 +597,7 @@ export interface OrderUpdate_orderUpdate_order { undiscountedTotal: OrderUpdate_orderUpdate_order_undiscountedTotal; user: OrderUpdate_orderUpdate_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderUpdate_orderUpdate_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderUpdate_orderUpdate_order_shippingMethods[]; invoices: (OrderUpdate_orderUpdate_order_invoices | null)[] | null; channel: OrderUpdate_orderUpdate_order_channel; } diff --git a/src/orders/types/OrderVoid.ts b/src/orders/types/OrderVoid.ts index 00eead8ad..6d6f1ab64 100644 --- a/src/orders/types/OrderVoid.ts +++ b/src/orders/types/OrderVoid.ts @@ -524,17 +524,19 @@ export interface OrderVoid_orderVoid_order_user { email: string; } -export interface OrderVoid_orderVoid_order_availableShippingMethods_price { +export interface OrderVoid_orderVoid_order_shippingMethods_price { __typename: "Money"; amount: number; currency: string; } -export interface OrderVoid_orderVoid_order_availableShippingMethods { +export interface OrderVoid_orderVoid_order_shippingMethods { __typename: "ShippingMethod"; id: string; name: string; - price: OrderVoid_orderVoid_order_availableShippingMethods_price | null; + price: OrderVoid_orderVoid_order_shippingMethods_price; + active: boolean; + message: string | null; } export interface OrderVoid_orderVoid_order_invoices { @@ -595,7 +597,7 @@ export interface OrderVoid_orderVoid_order { undiscountedTotal: OrderVoid_orderVoid_order_undiscountedTotal; user: OrderVoid_orderVoid_order_user | null; userEmail: string | null; - availableShippingMethods: (OrderVoid_orderVoid_order_availableShippingMethods | null)[] | null; + shippingMethods: OrderVoid_orderVoid_order_shippingMethods[]; invoices: (OrderVoid_orderVoid_order_invoices | null)[] | null; channel: OrderVoid_orderVoid_order_channel; } diff --git a/src/orders/utils/data.test.ts b/src/orders/utils/data.test.ts index 561728423..c99cc1f7e 100644 --- a/src/orders/utils/data.test.ts +++ b/src/orders/utils/data.test.ts @@ -31,7 +31,7 @@ import { const orderBase: OrderDetails_order = { __typename: "Order", actions: [], - availableShippingMethods: [], + shippingMethods: [], canFinalize: true, channel: null, billingAddress: { diff --git a/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx b/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx index a11dca43e..781343779 100644 --- a/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx +++ b/src/orders/views/OrderDetails/OrderDraftDetails/index.tsx @@ -222,7 +222,7 @@ export const OrderDraftDetails: React.FC = ({ } open={params.action === "edit-shipping"} shippingMethod={order?.shippingMethod?.id} - shippingMethods={order?.availableShippingMethods} + shippingMethods={order?.shippingMethods} onClose={closeModal} onSubmit={variables => orderShippingMethodUpdate.mutate({ diff --git a/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx b/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx index f915d3f40..9125cd393 100644 --- a/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx +++ b/src/orders/views/OrderDetails/OrderNormalDetails/index.tsx @@ -133,7 +133,7 @@ export const OrderNormalDetails: React.FC = ({ []) ] )} - shippingMethods={data?.order?.availableShippingMethods || []} + shippingMethods={data?.order?.shippingMethods || []} userPermissions={user?.userPermissions || []} onOrderCancel={() => openModal("cancel")} onOrderFulfill={() => navigate(orderFulfillUrl(id))} diff --git a/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx b/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx index 83e6eca04..809665745 100644 --- a/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx +++ b/src/orders/views/OrderDetails/OrderUnconfirmedDetails/index.tsx @@ -165,7 +165,7 @@ export const OrderUnconfirmedDetails: React.FC = ( .errors || []) ] )} - shippingMethods={data?.order?.availableShippingMethods || []} + shippingMethods={data?.order?.shippingMethods || []} userPermissions={user?.userPermissions || []} onOrderCancel={() => openModal("cancel")} onOrderFulfill={() => navigate(orderFulfillUrl(id))} @@ -245,7 +245,7 @@ export const OrderUnconfirmedDetails: React.FC = ( } open={params.action === "edit-shipping"} shippingMethod={order?.shippingMethod?.id} - shippingMethods={order?.availableShippingMethods} + shippingMethods={order?.shippingMethods} onClose={closeModal} onSubmit={variables => orderShippingMethodUpdate.mutate({ diff --git a/src/shipping/components/ShippingZonePostalCodes/ShippingZonePostalCodes.tsx b/src/shipping/components/ShippingZonePostalCodes/ShippingZonePostalCodes.tsx index 623b898f8..ea67b1f53 100644 --- a/src/shipping/components/ShippingZonePostalCodes/ShippingZonePostalCodes.tsx +++ b/src/shipping/components/ShippingZonePostalCodes/ShippingZonePostalCodes.tsx @@ -14,7 +14,7 @@ import CardTitle from "@saleor/components/CardTitle"; import RadioGroupField from "@saleor/components/RadioGroupField"; import ResponsiveTable from "@saleor/components/ResponsiveTable"; import Skeleton from "@saleor/components/Skeleton"; -import { ShippingMethodFragment_postalCodeRules } from "@saleor/fragments/types/ShippingMethodFragment"; +import { ShippingMethodTypeFragment_postalCodeRules } from "@saleor/fragments/types/ShippingMethodTypeFragment"; import ArrowDropdown from "@saleor/icons/ArrowDropdown"; import { makeStyles } from "@saleor/macaw-ui"; import { renderCollection } from "@saleor/misc"; @@ -26,11 +26,13 @@ import { FormattedMessage, useIntl } from "react-intl"; export interface ShippingZonePostalCodesProps { disabled: boolean; initialExpanded?: boolean; - postalCodes: ShippingMethodFragment_postalCodeRules[] | undefined; + postalCodes: ShippingMethodTypeFragment_postalCodeRules[] | undefined; onPostalCodeInclusionChange: ( inclusion: PostalCodeRuleInclusionTypeEnum ) => void; - onPostalCodeDelete: (code: ShippingMethodFragment_postalCodeRules) => void; + onPostalCodeDelete: ( + code: ShippingMethodTypeFragment_postalCodeRules + ) => void; onPostalCodeRangeAdd: () => void; } @@ -91,7 +93,7 @@ const ShippingZonePostalCodes: React.FC = ({ }; const getPostalCodeRangeLabel = ( - postalCodeRange: ShippingMethodFragment_postalCodeRules + postalCodeRange: ShippingMethodTypeFragment_postalCodeRules ) => { if (!postalCodeRange?.start) { return ; diff --git a/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx b/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx index 666d6aa5d..6328aef44 100644 --- a/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx +++ b/src/shipping/components/ShippingZoneRatesCreatePage/ShippingZoneRatesCreatePage.tsx @@ -10,7 +10,7 @@ import PageHeader from "@saleor/components/PageHeader"; import Savebar from "@saleor/components/Savebar"; import { ShippingChannelsErrorFragment } from "@saleor/fragments/types/ShippingChannelsErrorFragment"; import { ShippingErrorFragment } from "@saleor/fragments/types/ShippingErrorFragment"; -import { ShippingMethodFragment_postalCodeRules } from "@saleor/fragments/types/ShippingMethodFragment"; +import { ShippingMethodTypeFragment_postalCodeRules } from "@saleor/fragments/types/ShippingMethodTypeFragment"; import { Backlink } from "@saleor/macaw-ui"; import { validatePrice } from "@saleor/products/utils/validation"; import OrderValue from "@saleor/shipping/components/OrderValue"; @@ -34,7 +34,7 @@ export interface ShippingZoneRatesCreatePageProps { shippingChannels: ChannelShippingData[]; disabled: boolean; hasChannelChanged?: boolean; - postalCodes?: ShippingMethodFragment_postalCodeRules[]; + postalCodes?: ShippingMethodTypeFragment_postalCodeRules[]; channelErrors: ShippingChannelsErrorFragment[]; errors: ShippingErrorFragment[]; saveButtonBarState: ConfirmButtonTransitionState; diff --git a/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx b/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx index b2492757f..1ebf9063f 100644 --- a/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx +++ b/src/shipping/components/ShippingZoneRatesPage/ShippingZoneRatesPage.tsx @@ -11,7 +11,7 @@ import PageHeader from "@saleor/components/PageHeader"; import Savebar from "@saleor/components/Savebar"; import { ShippingChannelsErrorFragment } from "@saleor/fragments/types/ShippingChannelsErrorFragment"; import { ShippingErrorFragment } from "@saleor/fragments/types/ShippingErrorFragment"; -import { ShippingMethodFragment_postalCodeRules } from "@saleor/fragments/types/ShippingMethodFragment"; +import { ShippingMethodTypeFragment_postalCodeRules } from "@saleor/fragments/types/ShippingMethodTypeFragment"; import { Backlink } from "@saleor/macaw-ui"; import { validatePrice } from "@saleor/products/utils/validation"; import OrderValue from "@saleor/shipping/components/OrderValue"; @@ -58,7 +58,9 @@ export interface ShippingZoneRatesPageProps inclusion: PostalCodeRuleInclusionTypeEnum ) => void; onPostalCodeAssign: () => void; - onPostalCodeUnassign: (code: ShippingMethodFragment_postalCodeRules) => void; + onPostalCodeUnassign: ( + code: ShippingMethodTypeFragment_postalCodeRules + ) => void; onChannelsChange: (data: ChannelShippingData[]) => void; openChannelsModal: () => void; onProductAssign: () => void; diff --git a/src/shipping/fixtures.ts b/src/shipping/fixtures.ts index e91057991..4f45dca59 100644 --- a/src/shipping/fixtures.ts +++ b/src/shipping/fixtures.ts @@ -1574,7 +1574,7 @@ export const shippingZone: ShippingZone_shippingZone = { privateMetadata: [], shippingMethods: [ { - __typename: "ShippingMethod", + __typename: "ShippingMethodType", channelListings: [ { __typename: "ShippingMethodChannelListing", @@ -1669,7 +1669,7 @@ export const shippingZone: ShippingZone_shippingZone = { type: ShippingMethodTypeEnum.WEIGHT }, { - __typename: "ShippingMethod", + __typename: "ShippingMethodType", channelListings: [], excludedProducts: { __typename: "ProductCountableConnection", @@ -1734,7 +1734,7 @@ export const shippingZone: ShippingZone_shippingZone = { type: ShippingMethodTypeEnum.WEIGHT }, { - __typename: "ShippingMethod", + __typename: "ShippingMethodType", channelListings: [], excludedProducts: { __typename: "ProductCountableConnection", @@ -1799,7 +1799,7 @@ export const shippingZone: ShippingZone_shippingZone = { type: ShippingMethodTypeEnum.PRICE }, { - __typename: "ShippingMethod", + __typename: "ShippingMethodType", channelListings: [], excludedProducts: { __typename: "ProductCountableConnection", diff --git a/src/shipping/handlers.ts b/src/shipping/handlers.ts index ee0f93138..a2a30a390 100644 --- a/src/shipping/handlers.ts +++ b/src/shipping/handlers.ts @@ -1,5 +1,5 @@ import { ChannelShippingData } from "@saleor/channels/utils"; -import { ShippingMethodFragment_postalCodeRules } from "@saleor/fragments/types/ShippingMethodFragment"; +import { ShippingMethodTypeFragment_postalCodeRules } from "@saleor/fragments/types/ShippingMethodTypeFragment"; import useNavigator from "@saleor/hooks/useNavigator"; import useNotifier from "@saleor/hooks/useNotifier"; import { commonMessages } from "@saleor/intl"; @@ -48,7 +48,7 @@ export const createChannelsChangeHandler = ( }; const getPostalCodeRulesToAdd = ( - rules: ShippingMethodFragment_postalCodeRules[] + rules: ShippingMethodTypeFragment_postalCodeRules[] ) => rules .filter(code => !code.id || code.id === "0") @@ -63,7 +63,7 @@ const getPostalCodeRulesToAdd = ( export function getCreateShippingPriceRateVariables( data: ShippingZoneRateCommonFormData, id: string, - addPostalCodeRules: ShippingMethodFragment_postalCodeRules[], + addPostalCodeRules: ShippingMethodTypeFragment_postalCodeRules[], inclusionType: PostalCodeRuleInclusionTypeEnum ): CreateShippingRateVariables { const parsedMinDays = parseInt(data.minDays, 10); @@ -86,7 +86,7 @@ export function getCreateShippingPriceRateVariables( export function getCreateShippingWeightRateVariables( data: ShippingZoneRateCommonFormData, id: string, - addPostalCodeRules: ShippingMethodFragment_postalCodeRules[], + addPostalCodeRules: ShippingMethodTypeFragment_postalCodeRules[], inclusionType: PostalCodeRuleInclusionTypeEnum ): CreateShippingRateVariables { const parsedMinValue = parseFloat(data.minValue); @@ -115,7 +115,7 @@ export function getUpdateShippingPriceRateVariables( data: ShippingZoneRateCommonFormData, id: string, rateId: string, - addPostalCodeRules: ShippingMethodFragment_postalCodeRules[], + addPostalCodeRules: ShippingMethodTypeFragment_postalCodeRules[], deletePostalCodeRules: string[] ): UpdateShippingRateVariables { const parsedMinDays = parseInt(data.minDays, 10); @@ -143,7 +143,7 @@ export function getUpdateShippingWeightRateVariables( data: ShippingZoneRateCommonFormData, id: string, rateId: string, - addPostalCodeRules: ShippingMethodFragment_postalCodeRules[], + addPostalCodeRules: ShippingMethodTypeFragment_postalCodeRules[], deletePostalCodeRules: string[] ): UpdateShippingRateVariables { const parsedMinValue = parseFloat(data.minValue); @@ -201,7 +201,7 @@ export function getShippingMethodChannelVariables( export function useShippingRateCreator( shippingZoneId: string, type: ShippingMethodTypeEnum, - postalCodes: ShippingMethodFragment_postalCodeRules[], + postalCodes: ShippingMethodTypeFragment_postalCodeRules[], inclusionType: PostalCodeRuleInclusionTypeEnum ) { const intl = useIntl(); diff --git a/src/shipping/mutations.ts b/src/shipping/mutations.ts index 9ff757e86..b78fa3a78 100644 --- a/src/shipping/mutations.ts +++ b/src/shipping/mutations.ts @@ -3,7 +3,7 @@ import { shippingErrorFragment } from "@saleor/fragments/errors"; import { - shippingMethodFragment, + shippingMethodTypeFragment, shippingZoneDetailsFragment } from "@saleor/fragments/shipping"; import { countryFragment } from "@saleor/fragments/taxes"; @@ -157,14 +157,14 @@ export const useShippingZoneUpdate = makeMutation< const updateShippingRate = gql` ${shippingErrorFragment} - ${shippingMethodFragment} + ${shippingMethodTypeFragment} mutation UpdateShippingRate($id: ID!, $input: ShippingPriceInput!) { shippingPriceUpdate(id: $id, input: $input) { errors { ...ShippingErrorFragment } shippingMethod { - ...ShippingMethodFragment + ...ShippingMethodTypeFragment } } } @@ -176,7 +176,7 @@ export const useShippingRateUpdate = makeMutation< const createShippingRate = gql` ${shippingErrorFragment} - ${shippingMethodFragment} + ${shippingMethodTypeFragment} ${shippingZoneDetailsFragment} mutation CreateShippingRate($input: ShippingPriceInput!) { shippingPriceCreate(input: $input) { @@ -187,7 +187,7 @@ const createShippingRate = gql` ...ShippingZoneDetailsFragment } shippingMethod { - ...ShippingMethodFragment + ...ShippingMethodTypeFragment } } } @@ -233,14 +233,14 @@ export const useShippingRateBulkDelete = makeMutation< export const shippingMethodChannelListingUpdate = gql` ${shippingChannelsErrorFragment} - ${shippingMethodFragment} + ${shippingMethodTypeFragment} mutation ShippingMethodChannelListingUpdate( $id: ID! $input: ShippingMethodChannelListingInput! ) { shippingMethodChannelListingUpdate(id: $id, input: $input) { shippingMethod { - ...ShippingMethodFragment + ...ShippingMethodTypeFragment } errors { ...ShippingChannelsErrorFragment diff --git a/src/shipping/types/CreateShippingRate.ts b/src/shipping/types/CreateShippingRate.ts index b0c3f4470..1061d4ecf 100644 --- a/src/shipping/types/CreateShippingRate.ts +++ b/src/shipping/types/CreateShippingRate.ts @@ -100,7 +100,7 @@ export interface CreateShippingRate_shippingPriceCreate_shippingZone_shippingMet } export interface CreateShippingRate_shippingPriceCreate_shippingZone_shippingMethods { - __typename: "ShippingMethod"; + __typename: "ShippingMethodType"; id: string; postalCodeRules: (CreateShippingRate_shippingPriceCreate_shippingZone_shippingMethods_postalCodeRules | null)[] | null; metadata: (CreateShippingRate_shippingPriceCreate_shippingZone_shippingMethods_metadata | null)[]; @@ -201,7 +201,7 @@ export interface CreateShippingRate_shippingPriceCreate_shippingMethod_channelLi } export interface CreateShippingRate_shippingPriceCreate_shippingMethod { - __typename: "ShippingMethod"; + __typename: "ShippingMethodType"; id: string; postalCodeRules: (CreateShippingRate_shippingPriceCreate_shippingMethod_postalCodeRules | null)[] | null; metadata: (CreateShippingRate_shippingPriceCreate_shippingMethod_metadata | null)[]; diff --git a/src/shipping/types/DeleteShippingRate.ts b/src/shipping/types/DeleteShippingRate.ts index 27fdc3b05..184f49f60 100644 --- a/src/shipping/types/DeleteShippingRate.ts +++ b/src/shipping/types/DeleteShippingRate.ts @@ -100,7 +100,7 @@ export interface DeleteShippingRate_shippingPriceDelete_shippingZone_shippingMet } export interface DeleteShippingRate_shippingPriceDelete_shippingZone_shippingMethods { - __typename: "ShippingMethod"; + __typename: "ShippingMethodType"; id: string; postalCodeRules: (DeleteShippingRate_shippingPriceDelete_shippingZone_shippingMethods_postalCodeRules | null)[] | null; metadata: (DeleteShippingRate_shippingPriceDelete_shippingZone_shippingMethods_metadata | null)[]; diff --git a/src/shipping/types/ShippingMethodChannelListingUpdate.ts b/src/shipping/types/ShippingMethodChannelListingUpdate.ts index 64cadd981..806a43ded 100644 --- a/src/shipping/types/ShippingMethodChannelListingUpdate.ts +++ b/src/shipping/types/ShippingMethodChannelListingUpdate.ts @@ -76,7 +76,7 @@ export interface ShippingMethodChannelListingUpdate_shippingMethodChannelListing } export interface ShippingMethodChannelListingUpdate_shippingMethodChannelListingUpdate_shippingMethod { - __typename: "ShippingMethod"; + __typename: "ShippingMethodType"; id: string; postalCodeRules: (ShippingMethodChannelListingUpdate_shippingMethodChannelListingUpdate_shippingMethod_postalCodeRules | null)[] | null; metadata: (ShippingMethodChannelListingUpdate_shippingMethodChannelListingUpdate_shippingMethod_metadata | null)[]; diff --git a/src/shipping/types/ShippingZone.ts b/src/shipping/types/ShippingZone.ts index 53dc818f5..b444f3763 100644 --- a/src/shipping/types/ShippingZone.ts +++ b/src/shipping/types/ShippingZone.ts @@ -125,7 +125,7 @@ export interface ShippingZone_shippingZone_shippingMethods_excludedProducts { } export interface ShippingZone_shippingZone_shippingMethods { - __typename: "ShippingMethod"; + __typename: "ShippingMethodType"; id: string; postalCodeRules: (ShippingZone_shippingZone_shippingMethods_postalCodeRules | null)[] | null; metadata: (ShippingZone_shippingZone_shippingMethods_metadata | null)[]; diff --git a/src/shipping/types/ShippingZoneDetails.ts b/src/shipping/types/ShippingZoneDetails.ts index 0fd16d10a..0619eb021 100644 --- a/src/shipping/types/ShippingZoneDetails.ts +++ b/src/shipping/types/ShippingZoneDetails.ts @@ -125,7 +125,7 @@ export interface ShippingZoneDetails_shippingZone_shippingMethods_excludedProduc } export interface ShippingZoneDetails_shippingZone_shippingMethods { - __typename: "ShippingMethod"; + __typename: "ShippingMethodType"; id: string; postalCodeRules: (ShippingZoneDetails_shippingZone_shippingMethods_postalCodeRules | null)[] | null; metadata: (ShippingZoneDetails_shippingZone_shippingMethods_metadata | null)[]; diff --git a/src/shipping/types/UpdateShippingRate.ts b/src/shipping/types/UpdateShippingRate.ts index 2cc5b8891..051325856 100644 --- a/src/shipping/types/UpdateShippingRate.ts +++ b/src/shipping/types/UpdateShippingRate.ts @@ -82,7 +82,7 @@ export interface UpdateShippingRate_shippingPriceUpdate_shippingMethod_channelLi } export interface UpdateShippingRate_shippingPriceUpdate_shippingMethod { - __typename: "ShippingMethod"; + __typename: "ShippingMethodType"; id: string; postalCodeRules: (UpdateShippingRate_shippingPriceUpdate_shippingMethod_postalCodeRules | null)[] | null; metadata: (UpdateShippingRate_shippingPriceUpdate_shippingMethod_metadata | null)[]; diff --git a/src/storybook/stories/orders/OrderShippingMethodEditDialog.tsx b/src/storybook/stories/orders/OrderShippingMethodEditDialog.tsx index b3bcc1b71..6f590e84c 100644 --- a/src/storybook/stories/orders/OrderShippingMethodEditDialog.tsx +++ b/src/storybook/stories/orders/OrderShippingMethodEditDialog.tsx @@ -16,7 +16,7 @@ const props: OrderShippingMethodEditDialogProps = { onSubmit: () => undefined, open: true, shippingMethod: null, - shippingMethods: order.availableShippingMethods + shippingMethods: order.shippingMethods }; storiesOf("Orders / OrderShippingMethodEditDialog", module) diff --git a/src/translations/types/ShippingMethodTranslationDetails.ts b/src/translations/types/ShippingMethodTranslationDetails.ts index 896d05d48..25d6fb488 100644 --- a/src/translations/types/ShippingMethodTranslationDetails.ts +++ b/src/translations/types/ShippingMethodTranslationDetails.ts @@ -14,7 +14,7 @@ export interface ShippingMethodTranslationDetails_translation_ProductTranslatabl } export interface ShippingMethodTranslationDetails_translation_ShippingMethodTranslatableContent_shippingMethod { - __typename: "ShippingMethod"; + __typename: "ShippingMethodType"; id: string; } diff --git a/src/translations/types/ShippingMethodTranslations.ts b/src/translations/types/ShippingMethodTranslations.ts index 0bd33e5be..7cb670345 100644 --- a/src/translations/types/ShippingMethodTranslations.ts +++ b/src/translations/types/ShippingMethodTranslations.ts @@ -14,7 +14,7 @@ export interface ShippingMethodTranslations_translations_edges_node_ProductTrans } export interface ShippingMethodTranslations_translations_edges_node_ShippingMethodTranslatableContent_shippingMethod { - __typename: "ShippingMethod"; + __typename: "ShippingMethodType"; id: string; } diff --git a/src/translations/types/UpdateShippingMethodTranslations.ts b/src/translations/types/UpdateShippingMethodTranslations.ts index 1a6c0ac6d..f75d05f9d 100644 --- a/src/translations/types/UpdateShippingMethodTranslations.ts +++ b/src/translations/types/UpdateShippingMethodTranslations.ts @@ -29,7 +29,7 @@ export interface UpdateShippingMethodTranslations_shippingPriceTranslate_shippin } export interface UpdateShippingMethodTranslations_shippingPriceTranslate_shippingMethod { - __typename: "ShippingMethod"; + __typename: "ShippingMethodType"; id: string; name: string; description: any | null; diff --git a/src/types/globalTypes.ts b/src/types/globalTypes.ts index 7ca53f72c..45f0bc62c 100644 --- a/src/types/globalTypes.ts +++ b/src/types/globalTypes.ts @@ -1860,6 +1860,7 @@ export enum WebhookEventTypeAsyncEnum { export enum WebhookEventTypeEnum { ANY_EVENTS = "ANY_EVENTS", CHECKOUT_CREATED = "CHECKOUT_CREATED", + CHECKOUT_FILTER_SHIPPING_METHODS = "CHECKOUT_FILTER_SHIPPING_METHODS", CHECKOUT_UPDATED = "CHECKOUT_UPDATED", CUSTOMER_CREATED = "CUSTOMER_CREATED", CUSTOMER_UPDATED = "CUSTOMER_UPDATED", @@ -1875,6 +1876,7 @@ export enum WebhookEventTypeEnum { ORDER_CANCELLED = "ORDER_CANCELLED", ORDER_CONFIRMED = "ORDER_CONFIRMED", ORDER_CREATED = "ORDER_CREATED", + ORDER_FILTER_SHIPPING_METHODS = "ORDER_FILTER_SHIPPING_METHODS", ORDER_FULFILLED = "ORDER_FULFILLED", ORDER_FULLY_PAID = "ORDER_FULLY_PAID", ORDER_UPDATED = "ORDER_UPDATED", diff --git a/src/utils/metadata/types/UpdateMetadata.ts b/src/utils/metadata/types/UpdateMetadata.ts index 0ad9ba7ab..a6b95eefa 100644 --- a/src/utils/metadata/types/UpdateMetadata.ts +++ b/src/utils/metadata/types/UpdateMetadata.ts @@ -28,7 +28,7 @@ export interface UpdateMetadata_updateMetadata_item_privateMetadata { } export interface UpdateMetadata_updateMetadata_item { - __typename: "App" | "Attribute" | "Category" | "Checkout" | "Collection" | "DigitalContent" | "Fulfillment" | "GiftCard" | "Invoice" | "Menu" | "MenuItem" | "Order" | "Page" | "PageType" | "Payment" | "Product" | "ProductType" | "ProductVariant" | "Sale" | "ShippingMethod" | "ShippingZone" | "User" | "Voucher" | "Warehouse"; + __typename: "App" | "Attribute" | "Category" | "Checkout" | "Collection" | "DigitalContent" | "Fulfillment" | "GiftCard" | "Invoice" | "Menu" | "MenuItem" | "Order" | "Page" | "PageType" | "Payment" | "Product" | "ProductType" | "ProductVariant" | "Sale" | "ShippingMethod" | "ShippingMethodType" | "ShippingZone" | "User" | "Voucher" | "Warehouse"; metadata: (UpdateMetadata_updateMetadata_item_metadata | null)[]; privateMetadata: (UpdateMetadata_updateMetadata_item_privateMetadata | null)[]; id: string; @@ -59,7 +59,7 @@ export interface UpdateMetadata_deleteMetadata_item_privateMetadata { } export interface UpdateMetadata_deleteMetadata_item { - __typename: "App" | "Attribute" | "Category" | "Checkout" | "Collection" | "DigitalContent" | "Fulfillment" | "GiftCard" | "Invoice" | "Menu" | "MenuItem" | "Order" | "Page" | "PageType" | "Payment" | "Product" | "ProductType" | "ProductVariant" | "Sale" | "ShippingMethod" | "ShippingZone" | "User" | "Voucher" | "Warehouse"; + __typename: "App" | "Attribute" | "Category" | "Checkout" | "Collection" | "DigitalContent" | "Fulfillment" | "GiftCard" | "Invoice" | "Menu" | "MenuItem" | "Order" | "Page" | "PageType" | "Payment" | "Product" | "ProductType" | "ProductVariant" | "Sale" | "ShippingMethod" | "ShippingMethodType" | "ShippingZone" | "User" | "Voucher" | "Warehouse"; metadata: (UpdateMetadata_deleteMetadata_item_metadata | null)[]; privateMetadata: (UpdateMetadata_deleteMetadata_item_privateMetadata | null)[]; id: string; diff --git a/src/utils/metadata/types/UpdatePrivateMetadata.ts b/src/utils/metadata/types/UpdatePrivateMetadata.ts index b737cac7f..e846523d2 100644 --- a/src/utils/metadata/types/UpdatePrivateMetadata.ts +++ b/src/utils/metadata/types/UpdatePrivateMetadata.ts @@ -28,7 +28,7 @@ export interface UpdatePrivateMetadata_updatePrivateMetadata_item_privateMetadat } export interface UpdatePrivateMetadata_updatePrivateMetadata_item { - __typename: "App" | "Attribute" | "Category" | "Checkout" | "Collection" | "DigitalContent" | "Fulfillment" | "GiftCard" | "Invoice" | "Menu" | "MenuItem" | "Order" | "Page" | "PageType" | "Payment" | "Product" | "ProductType" | "ProductVariant" | "Sale" | "ShippingMethod" | "ShippingZone" | "User" | "Voucher" | "Warehouse"; + __typename: "App" | "Attribute" | "Category" | "Checkout" | "Collection" | "DigitalContent" | "Fulfillment" | "GiftCard" | "Invoice" | "Menu" | "MenuItem" | "Order" | "Page" | "PageType" | "Payment" | "Product" | "ProductType" | "ProductVariant" | "Sale" | "ShippingMethod" | "ShippingMethodType" | "ShippingZone" | "User" | "Voucher" | "Warehouse"; metadata: (UpdatePrivateMetadata_updatePrivateMetadata_item_metadata | null)[]; privateMetadata: (UpdatePrivateMetadata_updatePrivateMetadata_item_privateMetadata | null)[]; id: string; @@ -59,7 +59,7 @@ export interface UpdatePrivateMetadata_deletePrivateMetadata_item_privateMetadat } export interface UpdatePrivateMetadata_deletePrivateMetadata_item { - __typename: "App" | "Attribute" | "Category" | "Checkout" | "Collection" | "DigitalContent" | "Fulfillment" | "GiftCard" | "Invoice" | "Menu" | "MenuItem" | "Order" | "Page" | "PageType" | "Payment" | "Product" | "ProductType" | "ProductVariant" | "Sale" | "ShippingMethod" | "ShippingZone" | "User" | "Voucher" | "Warehouse"; + __typename: "App" | "Attribute" | "Category" | "Checkout" | "Collection" | "DigitalContent" | "Fulfillment" | "GiftCard" | "Invoice" | "Menu" | "MenuItem" | "Order" | "Page" | "PageType" | "Payment" | "Product" | "ProductType" | "ProductVariant" | "Sale" | "ShippingMethod" | "ShippingMethodType" | "ShippingZone" | "User" | "Voucher" | "Warehouse"; metadata: (UpdatePrivateMetadata_deletePrivateMetadata_item_metadata | null)[]; privateMetadata: (UpdatePrivateMetadata_deletePrivateMetadata_item_privateMetadata | null)[]; id: string;