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

Merge pull request #753 from mirumee/fix/order-draft-back-button

Browse source 
Fix order draft back button redirect
This commit is contained in:
Dawid Tarasiuk 2020-10-09 11:01:52 +02:00 committed by GitHub
commit f75366ce73
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -50,6 +50,7 @@ All notable, unreleased changes to this project will be documented in this file.
- Fix misaligned rich text draft controls - #725 by @orzechdev - Fix misaligned rich text draft controls - #725 by @orzechdev
- Allow taxes to be configured per product - #728 by @dominik-zeglen - Allow taxes to be configured per product - #728 by @dominik-zeglen
- Fix style of product type attributes empty table - #744 by @orzechdev - Fix style of product type attributes empty table - #744 by @orzechdev
- Fix order draft back button redirect - #753 by @orzechdev
## 2.10.1 ## 2.10.1

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

@ -54,6 +54,7 @@ import OrderOperations from "../../containers/OrderOperations";
import { TypedOrderDetailsQuery, useOrderVariantSearch } from "../../queries"; import { TypedOrderDetailsQuery, useOrderVariantSearch } from "../../queries";
import { OrderDetails_order } from "../../types/OrderDetails"; import { OrderDetails_order } from "../../types/OrderDetails";
import { import {
orderDraftListUrl,
orderFulfillUrl, orderFulfillUrl,
orderListUrl, orderListUrl,
orderUrl, orderUrl,
@ -515,7 +516,7 @@ export const OrderDetails: React.FC<OrderDetailsProps> = ({ id, params }) => {
onDraftFinalize={() => openModal("finalize")} onDraftFinalize={() => openModal("finalize")}
onDraftRemove={() => openModal("cancel")} onDraftRemove={() => openModal("cancel")}
onOrderLineAdd={() => openModal("add-order-line")} onOrderLineAdd={() => openModal("add-order-line")}
onBack={() => navigate(orderListUrl())} onBack={() => navigate(orderDraftListUrl())}
order={order} order={order}
countries={maybe(() => data.shop.countries, []).map( countries={maybe(() => data.shop.countries, []).map(
country => ({ country => ({