From 12f56b3c96098e864fbbca2771d0118cc59021c4 Mon Sep 17 00:00:00 2001 From: Dawid Tarasiuk Date: Thu, 8 Oct 2020 12:39:26 +0200 Subject: [PATCH 1/2] Fix order draft back button redirect --- src/orders/views/OrderDetails/index.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/orders/views/OrderDetails/index.tsx b/src/orders/views/OrderDetails/index.tsx index bdc0e1363..fa9f48385 100644 --- a/src/orders/views/OrderDetails/index.tsx +++ b/src/orders/views/OrderDetails/index.tsx @@ -54,6 +54,7 @@ import OrderOperations from "../../containers/OrderOperations"; import { TypedOrderDetailsQuery, useOrderVariantSearch } from "../../queries"; import { OrderDetails_order } from "../../types/OrderDetails"; import { + orderDraftListUrl, orderFulfillUrl, orderListUrl, orderUrl, @@ -515,7 +516,7 @@ export const OrderDetails: React.FC = ({ id, params }) => { onDraftFinalize={() => openModal("finalize")} onDraftRemove={() => openModal("cancel")} onOrderLineAdd={() => openModal("add-order-line")} - onBack={() => navigate(orderListUrl())} + onBack={() => navigate(orderDraftListUrl())} order={order} countries={maybe(() => data.shop.countries, []).map( country => ({ From 0423b24716b80d6ea1d22a2403a506becc83072e Mon Sep 17 00:00:00 2001 From: Dawid Tarasiuk Date: Thu, 8 Oct 2020 12:46:20 +0200 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ac2284e6f..5c9489724 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 - Allow taxes to be configured per product - #728 by @dominik-zeglen - Fix style of product type attributes empty table - #744 by @orzechdev +- Fix order draft back button redirect - #753 by @orzechdev ## 2.10.1