diff --git a/package.json b/package.json index e94c6b0fa..1041f5550 100644 --- a/package.json +++ b/package.json @@ -196,7 +196,6 @@ "check-types": "tsc --noEmit", "extract-json-messages": "rimraf build/locale && cross-env NODE_ENV=extract babel src 'src/**/*.{ts,tsx}' -o build/dashboard.bundle.js", "extract-messages": "npm run extract-json-messages && npm run transpile-messages", - "generate-component": "plop --plopfile .plop/plopfile.js", "heroku-postbuild": "npm run build", "serve:lhci": "NODE_ENV=production npm run server", "start": "webpack-dev-server -d", diff --git a/src/intl.ts b/src/intl.ts index 43c150b65..50ebb2148 100644 --- a/src/intl.ts +++ b/src/intl.ts @@ -141,6 +141,10 @@ export const buttonMessages = defineMessages({ defaultMessage: "Save", description: "button" }, + send: { + defaultMessage: "Send", + description: "button" + }, show: { defaultMessage: "Show", description: "button" diff --git a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx index 41d023559..8bdb319c2 100644 --- a/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx +++ b/src/orders/components/OrderDetailsPage/OrderDetailsPage.tsx @@ -20,6 +20,7 @@ import OrderCustomer from "../OrderCustomer"; import OrderCustomerNote from "../OrderCustomerNote"; import OrderFulfillment from "../OrderFulfillment"; import OrderHistory, { FormData as HistoryFormData } from "../OrderHistory"; +import OrderInvoiceList from "../OrderInvoiceList"; import OrderPayment from "../OrderPayment/OrderPayment"; import OrderUnfulfilledItems from "../OrderUnfulfilledItems/OrderUnfulfilledItems"; @@ -179,6 +180,8 @@ const OrderDetailsPage: React.FC = props => { onProfileView={onProfileView} /> + + order.customerNote)} /> diff --git a/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx b/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx new file mode 100644 index 000000000..0449bbe33 --- /dev/null +++ b/src/orders/components/OrderInvoiceList/OrderInvoiceList.tsx @@ -0,0 +1,95 @@ +import Button from "@material-ui/core/Button"; +import Card from "@material-ui/core/Card"; +import CardContent from "@material-ui/core/CardContent"; +import { makeStyles } from "@material-ui/core/styles"; +import TableBody from "@material-ui/core/TableBody"; +import TableCell from "@material-ui/core/TableCell"; +import TableHead from "@material-ui/core/TableHead"; +import TableRow from "@material-ui/core/TableRow"; +import Typography from "@material-ui/core/Typography"; +import CardTitle from "@saleor/components/CardTitle"; +import ResponsiveTable from "@saleor/components/ResponsiveTable"; +import TableCellHeader from "@saleor/components/TableCellHeader"; +import { buttonMessages } from "@saleor/intl"; +import React from "react"; +import { useIntl } from "react-intl"; +import { FormattedMessage } from "react-intl"; + +const useStyles = makeStyles( + () => ({ + cardContent: { + "&:last-child": { + padding: 0 + }, + padding: 0 + }, + colAction: { width: "auto" }, + colNumber: { width: "100%" } + }), + { name: "OrderInvoiceList" } +); + +const OrderInvoiceList: React.FC = props => { + const classes = useStyles(props); + + const intl = useIntl(); + + return ( + + + + + + + + + + + + + + {/* + ** TODO: populate with real invoice data + */} + + + Invoice 12/01/242BF + created 20/12/2019 + + + + + + + + Invoice 12/01/242BF + created 20/12/2019 + + + + + + + + + + ); +}; + +OrderInvoiceList.displayName = "OrderInvoiceList"; +export default OrderInvoiceList; diff --git a/src/orders/components/OrderInvoiceList/index.ts b/src/orders/components/OrderInvoiceList/index.ts new file mode 100644 index 000000000..155c0f16e --- /dev/null +++ b/src/orders/components/OrderInvoiceList/index.ts @@ -0,0 +1,2 @@ +export { default } from "./OrderInvoiceList"; +export * from "./OrderInvoiceList";