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

Add back button

Browse source
This commit is contained in:
dominik-zeglen 2020-04-20 19:24:54 +02:00
parent dca0208173
commit 0f52e427cb
2 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/orders/components/OrderFulfillPage/OrderFulfillPage.tsx
View file

@ -27,6 +27,7 @@ import { update } from "@saleor/utils/lists";
import ControlledCheckbox from "@saleor/components/ControlledCheckbox"; import ControlledCheckbox from "@saleor/components/ControlledCheckbox";
import { renderCollection } from "@saleor/misc"; import { renderCollection } from "@saleor/misc";
import Skeleton from "@saleor/components/Skeleton"; import Skeleton from "@saleor/components/Skeleton";
import AppHeader from "@saleor/components/AppHeader";
const useStyles = makeStyles( const useStyles = makeStyles(
theme => ({ theme => ({
@ -136,6 +137,22 @@ const OrderFulfillPage: React.FC<OrderFulfillPageProps> = ({
return ( return (
<Container> <Container>
<AppHeader onBack={onBack}>
{order?.number
? intl.formatMessage(
{
defaultMessage: "Order #{orderNumber}",
description: "page header with order number"
},
{
orderNumber: order.number
}
)
: intl.formatMessage({
defaultMessage: "Order",
description: "page header"
})}
</AppHeader>
<PageHeader <PageHeader
title={intl.formatMessage( title={intl.formatMessage(
{ {

39
src/orders/views/OrderFulfill/OrderFulfill.tsx
View file

@ -1,3 +1,4 @@
import { useIntl } from "react-intl";
import React from "react"; import React from "react";
import { useOrderFulfillData } from "@saleor/orders/queries"; import { useOrderFulfillData } from "@saleor/orders/queries";
@ -5,6 +6,7 @@ import OrderFulfillPage from "@saleor/orders/components/OrderFulfillPage";
import useNavigator from "@saleor/hooks/useNavigator"; import useNavigator from "@saleor/hooks/useNavigator";
import { orderUrl } from "@saleor/orders/urls"; import { orderUrl } from "@saleor/orders/urls";
import { useWarehouseList } from "@saleor/warehouses/queries"; import { useWarehouseList } from "@saleor/warehouses/queries";
import { WindowTitle } from "@saleor/components/WindowTitle";
export interface OrderFulfillProps { export interface OrderFulfillProps {
orderId: string; orderId: string;
@ -12,6 +14,7 @@ export interface OrderFulfillProps {
const OrderFulfill: React.FC<OrderFulfillProps> = ({ orderId }) => { const OrderFulfill: React.FC<OrderFulfillProps> = ({ orderId }) => {
const navigate = useNavigator(); const navigate = useNavigator();
const intl = useIntl();
const { data, loading } = useOrderFulfillData({ const { data, loading } = useOrderFulfillData({
displayLoader: true, displayLoader: true,
variables: { variables: {
@ -26,14 +29,34 @@ const OrderFulfill: React.FC<OrderFulfillProps> = ({ orderId }) => {
}); });
return ( return (
<OrderFulfillPage <>
disabled={loading || warehousesLoading} <WindowTitle
onBack={() => navigate(orderUrl(orderId))} title={
onSubmit={() => undefined} data?.order?.number
order={data?.order} ? intl.formatMessage(
saveButtonBar="default" {
warehouses={warehouseData?.warehouses.edges.map(edge => edge.node)} defaultMessage: "Fulfill Order #{orderNumber}",
/> description: "window title"
},
{
orderNumber: data.order.number
}
)
: intl.formatMessage({
defaultMessage: "Fulfill Order",
description: "window title"
})
}
/>
<OrderFulfillPage
disabled={loading || warehousesLoading}
onBack={() => navigate(orderUrl(orderId))}
onSubmit={() => undefined}
order={data?.order}
saveButtonBar="default"
warehouses={warehouseData?.warehouses.edges.map(edge => edge.node)}
/>
</>
); );
}; };