diff --git a/packages/admin-ui/src/lib/core/src/common/generated-types.ts b/packages/admin-ui/src/lib/core/src/common/generated-types.ts index 30dad0cb7d..2c7eac09a7 100644 --- a/packages/admin-ui/src/lib/core/src/common/generated-types.ts +++ b/packages/admin-ui/src/lib/core/src/common/generated-types.ts @@ -5134,7 +5134,7 @@ export type OrderDetailFragment = ( & Pick )>, shippingMethod?: Maybe<( { __typename?: 'ShippingMethod' } - & Pick + & Pick )>, shippingAddress?: Maybe<( { __typename?: 'OrderAddress' } & OrderAddressFragment diff --git a/packages/admin-ui/src/lib/core/src/data/definitions/order-definitions.ts b/packages/admin-ui/src/lib/core/src/data/definitions/order-definitions.ts index 840bb1564e..a578933c74 100644 --- a/packages/admin-ui/src/lib/core/src/data/definitions/order-definitions.ts +++ b/packages/admin-ui/src/lib/core/src/data/definitions/order-definitions.ts @@ -137,6 +137,7 @@ export const ORDER_DETAIL_FRAGMENT = gql` shippingMethod { id code + name description } shippingAddress { diff --git a/packages/admin-ui/src/lib/order/src/components/fulfill-order-dialog/fulfill-order-dialog.component.html b/packages/admin-ui/src/lib/order/src/components/fulfill-order-dialog/fulfill-order-dialog.component.html index 9175b897d6..27f7e97e71 100644 --- a/packages/admin-ui/src/lib/order/src/components/fulfill-order-dialog/fulfill-order-dialog.component.html +++ b/packages/admin-ui/src/lib/order/src/components/fulfill-order-dialog/fulfill-order-dialog.component.html @@ -41,7 +41,7 @@
{{ 'order.shipping-method' | translate }}
- {{ order.shippingMethod?.description }} + {{ order.shippingMethod?.name }} {{ order.shipping / 100 | currency: order.currencyCode }} diff --git a/packages/admin-ui/src/lib/order/src/components/fulfill-order-dialog/fulfill-order-dialog.component.ts b/packages/admin-ui/src/lib/order/src/components/fulfill-order-dialog/fulfill-order-dialog.component.ts index 4ef79dd482..b2e15410b1 100644 --- a/packages/admin-ui/src/lib/order/src/components/fulfill-order-dialog/fulfill-order-dialog.component.ts +++ b/packages/admin-ui/src/lib/order/src/components/fulfill-order-dialog/fulfill-order-dialog.component.ts @@ -38,7 +38,7 @@ export class FulfillOrderDialogComponent implements Dialog, O }); if (this.order.shippingMethod) { - this.method = this.order.shippingMethod.description; + this.method = this.order.shippingMethod.name; } } diff --git a/packages/dev-server/dev-config.ts b/packages/dev-server/dev-config.ts index fac1d2124e..ae612a2268 100644 --- a/packages/dev-server/dev-config.ts +++ b/packages/dev-server/dev-config.ts @@ -52,12 +52,7 @@ export const devConfig: VendureConfig = { paymentOptions: { paymentMethodHandlers: [examplePaymentHandler], }, - customFields: { - ShippingMethod: [ - { name: 'isGood', type: 'boolean' }, - { name: 'localName', type: 'localeString' }, - ], - }, + customFields: {}, logger: new DefaultLogger({ level: LogLevel.Info }), importExportOptions: { importAssetsDir: path.join(__dirname, 'import-assets'),