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

Call proper mutation on address change for draft / non draft order

Browse source
This commit is contained in:
Tomasz Szymanski 2020-10-28 14:11:22 +01:00
parent e4fc4489df
commit 66f435bba0
2 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/orders/views/OrderDetails/OrderDetailsMessages.tsx
View file

@ -173,6 +173,7 @@ export const OrderDetailsMessages: React.FC<OrderDetailsMessages> = ({
})
});
}
closeModal();
};
const handleShippingMethodUpdate = (data: OrderShippingMethodUpdate) => {
const errs = data.orderUpdateShipping?.errors;

48
src/orders/views/OrderDetails/index.tsx
View file

@ -580,7 +580,11 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
</>
)}
<OrderAddressEditDialog
confirmButtonState={orderUpdate.opts.status}
confirmButtonState={
order?.status === OrderStatus.DRAFT
? orderDraftUpdate.opts.status
: orderUpdate.opts.status
}
address={transformAddressToForm(order?.shippingAddress)}
countries={
data?.shop?.countries.map(country => ({
@ -588,21 +592,33 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
label: country.country
})) || []
}
errors={orderUpdate.opts.data?.orderUpdate.errors || []}
errors={
(order?.status === OrderStatus.DRAFT
? orderDraftUpdate.opts.data?.draftOrderUpdate.errors
: orderUpdate.opts.data?.orderUpdate.errors) || []
}
open={params.action === "edit-shipping-address"}
variant="shipping"
onClose={closeModal}
onConfirm={shippingAddress =>
orderUpdate.mutate({
onConfirm={shippingAddress => {
const updateMutation =
order?.status === OrderStatus.DRAFT
? orderDraftUpdate
: orderUpdate;
updateMutation.mutate({
id,
input: {
shippingAddress
}
})
}
});
}}
/>
<OrderAddressEditDialog
confirmButtonState={orderUpdate.opts.status}
confirmButtonState={
order?.status === OrderStatus.DRAFT
? orderDraftUpdate.opts.status
: orderUpdate.opts.status
}
address={transformAddressToForm(order?.billingAddress)}
countries={
data?.shop?.countries.map(country => ({
@ -610,18 +626,26 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
label: country.country
})) || []
}
errors={orderUpdate.opts.data?.orderUpdate.errors || []}
errors={
(order?.status === OrderStatus.DRAFT
? orderDraftUpdate.opts.data?.draftOrderUpdate.errors
: orderUpdate.opts.data?.orderUpdate.errors) || []
}
open={params.action === "edit-billing-address"}
variant="billing"
onClose={closeModal}
onConfirm={billingAddress =>
orderUpdate.mutate({
onConfirm={billingAddress => {
const updateMutation =
order?.status === OrderStatus.DRAFT
? orderDraftUpdate
: orderUpdate;
updateMutation.mutate({
id,
input: {
billingAddress
}
})
}
});
}}
/>
</>
)}