djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #711 from mirumee/fix/order-details-update

Browse source 
Fix updating order details on address change
This commit is contained in:
Dawid Tarasiuk 2020-09-17 16:16:21 +02:00 committed by GitHub
commit 40d27a9280
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 270 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -96,6 +96,7 @@ All notable, unreleased changes to this project will be documented in this file.
- Update product stock management to newest design - #515 by @dominik-zeglen - Update product stock management to newest design - #515 by @dominik-zeglen
- Handle untracked products - #523 by @dominik-zeglen - Handle untracked products - #523 by @dominik-zeglen
- Display correct error if there were no graphql errors - #525 by @dominik-zeglen - Display correct error if there were no graphql errors - #525 by @dominik-zeglen
- Fix updating order details on address change #711 - by @orzechdev
## 2.0.0 ## 2.0.0

12
src/orders/mutations.ts
View file

@ -1,4 +1,3 @@
import { fragmentAddress } from "@saleor/fragments/address";
import { import {
invoiceErrorFragment, invoiceErrorFragment,
orderErrorFragment orderErrorFragment
@ -282,7 +281,7 @@ export const TypedOrderAddNoteMutation = TypedMutation<
>(orderAddNoteMutation); >(orderAddNoteMutation);
const orderUpdateMutation = gql` const orderUpdateMutation = gql`
${fragmentAddress} ${fragmentOrderDetails}
${orderErrorFragment} ${orderErrorFragment}
mutation OrderUpdate($id: ID!, $input: OrderUpdateInput!) { mutation OrderUpdate($id: ID!, $input: OrderUpdateInput!) {
orderUpdate(id: $id, input: $input) { orderUpdate(id: $id, input: $input) {
@ -290,14 +289,7 @@ const orderUpdateMutation = gql`
...OrderErrorFragment ...OrderErrorFragment
} }
order { order {
id ...OrderDetailsFragment
userEmail
billingAddress {
...AddressFragment
}
shippingAddress {
...AddressFragment
}
} }
} }
} }

269
src/orders/types/OrderUpdate.ts
View file

@ -2,7 +2,7 @@
/* eslint-disable */ /* eslint-disable */
// This file was automatically generated and should not be edited. // This file was automatically generated and should not be edited.
import { OrderUpdateInput, OrderErrorCode } from "./../../types/globalTypes"; import { OrderUpdateInput, OrderErrorCode, OrderEventsEmailsEnum, OrderEventsEnum, FulfillmentStatus, PaymentChargeStatusEnum, OrderStatus, OrderAction, JobStatusEnum } from "./../../types/globalTypes";
// ==================================================== // ====================================================
// GraphQL mutation operation: OrderUpdate // GraphQL mutation operation: OrderUpdate
@ -14,6 +14,18 @@ export interface OrderUpdate_orderUpdate_errors {
field: string | null; field: string | null;
} }
export interface OrderUpdate_orderUpdate_order_metadata {
__typename: "MetadataItem";
key: string;
value: string;
}
export interface OrderUpdate_orderUpdate_order_privateMetadata {
__typename: "MetadataItem";
key: string;
value: string;
}
export interface OrderUpdate_orderUpdate_order_billingAddress_country { export interface OrderUpdate_orderUpdate_order_billingAddress_country {
__typename: "CountryDisplay"; __typename: "CountryDisplay";
code: string; code: string;
@ -36,6 +48,145 @@ export interface OrderUpdate_orderUpdate_order_billingAddress {
streetAddress2: string; streetAddress2: string;
} }
export interface OrderUpdate_orderUpdate_order_events_user {
__typename: "User";
id: string;
email: string;
}
export interface OrderUpdate_orderUpdate_order_events {
__typename: "OrderEvent";
id: string;
amount: number | null;
date: any | null;
email: string | null;
emailType: OrderEventsEmailsEnum | null;
invoiceNumber: string | null;
message: string | null;
quantity: number | null;
type: OrderEventsEnum | null;
user: OrderUpdate_orderUpdate_order_events_user | null;
}
export interface OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_variant_product {
__typename: "Product";
isAvailableForPurchase: boolean | null;
isPublished: boolean;
}
export interface OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_variant {
__typename: "ProductVariant";
product: OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_variant_product;
quantityAvailable: number;
}
export interface OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_unitPrice_gross {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_unitPrice_net {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_unitPrice {
__typename: "TaxedMoney";
gross: OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_unitPrice_gross;
net: OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_unitPrice_net;
}
export interface OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_thumbnail {
__typename: "Image";
url: string;
}
export interface OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine {
__typename: "OrderLine";
id: string;
isShippingRequired: boolean;
variant: OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_variant | null;
productName: string;
productSku: string;
quantity: number;
quantityFulfilled: number;
unitPrice: OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_unitPrice | null;
thumbnail: OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine_thumbnail | null;
}
export interface OrderUpdate_orderUpdate_order_fulfillments_lines {
__typename: "FulfillmentLine";
id: string;
quantity: number;
orderLine: OrderUpdate_orderUpdate_order_fulfillments_lines_orderLine | null;
}
export interface OrderUpdate_orderUpdate_order_fulfillments_warehouse {
__typename: "Warehouse";
id: string;
name: string;
}
export interface OrderUpdate_orderUpdate_order_fulfillments {
__typename: "Fulfillment";
id: string;
lines: (OrderUpdate_orderUpdate_order_fulfillments_lines | null)[] | null;
fulfillmentOrder: number;
status: FulfillmentStatus;
trackingNumber: string;
warehouse: OrderUpdate_orderUpdate_order_fulfillments_warehouse | null;
}
export interface OrderUpdate_orderUpdate_order_lines_variant_product {
__typename: "Product";
isAvailableForPurchase: boolean | null;
isPublished: boolean;
}
export interface OrderUpdate_orderUpdate_order_lines_variant {
__typename: "ProductVariant";
product: OrderUpdate_orderUpdate_order_lines_variant_product;
quantityAvailable: number;
}
export interface OrderUpdate_orderUpdate_order_lines_unitPrice_gross {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_lines_unitPrice_net {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_lines_unitPrice {
__typename: "TaxedMoney";
gross: OrderUpdate_orderUpdate_order_lines_unitPrice_gross;
net: OrderUpdate_orderUpdate_order_lines_unitPrice_net;
}
export interface OrderUpdate_orderUpdate_order_lines_thumbnail {
__typename: "Image";
url: string;
}
export interface OrderUpdate_orderUpdate_order_lines {
__typename: "OrderLine";
id: string;
isShippingRequired: boolean;
variant: OrderUpdate_orderUpdate_order_lines_variant | null;
productName: string;
productSku: string;
quantity: number;
quantityFulfilled: number;
unitPrice: OrderUpdate_orderUpdate_order_lines_unitPrice | null;
thumbnail: OrderUpdate_orderUpdate_order_lines_thumbnail | null;
}
export interface OrderUpdate_orderUpdate_order_shippingAddress_country { export interface OrderUpdate_orderUpdate_order_shippingAddress_country {
__typename: "CountryDisplay"; __typename: "CountryDisplay";
code: string; code: string;
@ -58,12 +209,126 @@ export interface OrderUpdate_orderUpdate_order_shippingAddress {
streetAddress2: string; streetAddress2: string;
} }
export interface OrderUpdate_orderUpdate_order_shippingMethod {
__typename: "ShippingMethod";
id: string;
}
export interface OrderUpdate_orderUpdate_order_shippingPrice_gross {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_shippingPrice {
__typename: "TaxedMoney";
gross: OrderUpdate_orderUpdate_order_shippingPrice_gross;
}
export interface OrderUpdate_orderUpdate_order_subtotal_gross {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_subtotal {
__typename: "TaxedMoney";
gross: OrderUpdate_orderUpdate_order_subtotal_gross;
}
export interface OrderUpdate_orderUpdate_order_total_gross {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_total_tax {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_total {
__typename: "TaxedMoney";
gross: OrderUpdate_orderUpdate_order_total_gross;
tax: OrderUpdate_orderUpdate_order_total_tax;
}
export interface OrderUpdate_orderUpdate_order_totalAuthorized {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_totalCaptured {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_user {
__typename: "User";
id: string;
email: string;
}
export interface OrderUpdate_orderUpdate_order_availableShippingMethods_price {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_availableShippingMethods {
__typename: "ShippingMethod";
id: string;
name: string;
price: OrderUpdate_orderUpdate_order_availableShippingMethods_price | null;
}
export interface OrderUpdate_orderUpdate_order_discount {
__typename: "Money";
amount: number;
currency: string;
}
export interface OrderUpdate_orderUpdate_order_invoices {
__typename: "Invoice";
id: string;
number: string | null;
createdAt: any;
url: string | null;
status: JobStatusEnum;
}
export interface OrderUpdate_orderUpdate_order { export interface OrderUpdate_orderUpdate_order {
__typename: "Order"; __typename: "Order";
id: string; id: string;
userEmail: string | null; metadata: (OrderUpdate_orderUpdate_order_metadata | null)[];
privateMetadata: (OrderUpdate_orderUpdate_order_privateMetadata | null)[];
billingAddress: OrderUpdate_orderUpdate_order_billingAddress | null; billingAddress: OrderUpdate_orderUpdate_order_billingAddress | null;
canFinalize: boolean;
created: any;
customerNote: string;
events: (OrderUpdate_orderUpdate_order_events | null)[] | null;
fulfillments: (OrderUpdate_orderUpdate_order_fulfillments | null)[];
lines: (OrderUpdate_orderUpdate_order_lines | null)[];
number: string | null;
paymentStatus: PaymentChargeStatusEnum | null;
shippingAddress: OrderUpdate_orderUpdate_order_shippingAddress | null; shippingAddress: OrderUpdate_orderUpdate_order_shippingAddress | null;
shippingMethod: OrderUpdate_orderUpdate_order_shippingMethod | null;
shippingMethodName: string | null;
shippingPrice: OrderUpdate_orderUpdate_order_shippingPrice | null;
status: OrderStatus;
subtotal: OrderUpdate_orderUpdate_order_subtotal | null;
total: OrderUpdate_orderUpdate_order_total | null;
actions: (OrderAction | null)[];
totalAuthorized: OrderUpdate_orderUpdate_order_totalAuthorized | null;
totalCaptured: OrderUpdate_orderUpdate_order_totalCaptured | null;
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;
} }
export interface OrderUpdate_orderUpdate { export interface OrderUpdate_orderUpdate {