diff --git a/.changeset/good-beers-wash.md b/.changeset/good-beers-wash.md new file mode 100644 index 000000000..db6b202b7 --- /dev/null +++ b/.changeset/good-beers-wash.md @@ -0,0 +1,5 @@ +--- +"saleor-dashboard": patch +--- + +Order page adjustments diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json index de55bc67f..6f66557e1 100644 --- a/locale/defaultMessages.json +++ b/locale/defaultMessages.json @@ -5561,6 +5561,10 @@ "context": "click and collect", "string": "Click&Collect" }, + "biDgQS": { + "context": "button, opens modal to create transaction in order", + "string": "Manual transaction" + }, "biVFKU": { "context": "subsection header", "string": "Billing Address" @@ -6286,10 +6290,6 @@ "context": "docs link label", "string": "Learn more..." }, - "hnaOnB": { - "context": "button, opens modal to create transaction in order", - "string": "Capture manual transaction" - }, "ho75Lr": { "context": "status label deactivated", "string": "Deactivated" diff --git a/src/orders/components/OrderAddTransaction/messages.ts b/src/orders/components/OrderAddTransaction/messages.ts index 125c9f8d3..11556dd9b 100644 --- a/src/orders/components/OrderAddTransaction/messages.ts +++ b/src/orders/components/OrderAddTransaction/messages.ts @@ -2,8 +2,8 @@ import { defineMessages } from "react-intl"; export const addTransactionMessages = defineMessages({ captureTransaction: { - defaultMessage: "Capture manual transaction", - id: "hnaOnB", + defaultMessage: "Manual transaction", + id: "biDgQS", description: "button, opens modal to create transaction in order", }, markAsPaid: { diff --git a/src/orders/components/OrderTransaction/components/CardTitle/CardTitle.tsx b/src/orders/components/OrderTransaction/components/CardTitle/CardTitle.tsx index 5df75f182..5f266f514 100644 --- a/src/orders/components/OrderTransaction/components/CardTitle/CardTitle.tsx +++ b/src/orders/components/OrderTransaction/components/CardTitle/CardTitle.tsx @@ -3,6 +3,7 @@ import { TransactionActionEnum, TransactionItemFragment, } from "@dashboard/graphql"; +import { capitalize } from "@dashboard/misc"; import { FakeTransaction } from "@dashboard/orders/types"; import { IconButton } from "@material-ui/core"; import { Button, LinkIcon } from "@saleor/macaw-ui"; @@ -44,9 +45,10 @@ export const CardTitle: React.FC = ({ chargePendingAmount, canceledAmount, chargedAmount, - authorizedAmount, + authorizedAmount } = transaction; + const title = capitalize(transaction.name || "Transaction") return ( = ({ )} - {transaction.name} + {title}
- {showActions && - transaction.actions - .filter(action => action !== TransactionActionEnum.REFUND) - .map(action => ( - - ))} - {cancelPendingAmount.amount > 0 && ( = ({ money={authorizedAmount} /> )} + + {showActions && + transaction.actions + .filter(action => action !== TransactionActionEnum.REFUND) + .map(action => ( +
+ +
+ ))}
} diff --git a/src/orders/components/OrderTransaction/components/CardTitle/MoneyDisplay.tsx b/src/orders/components/OrderTransaction/components/CardTitle/MoneyDisplay.tsx index 2924251d1..fad2ab681 100644 --- a/src/orders/components/OrderTransaction/components/CardTitle/MoneyDisplay.tsx +++ b/src/orders/components/OrderTransaction/components/CardTitle/MoneyDisplay.tsx @@ -1,7 +1,6 @@ import { formatMoneyAmount } from "@dashboard/components/Money"; import useLocale from "@dashboard/hooks/useLocale"; import { IMoney } from "@dashboard/utils/intl"; -import { Typography } from "@material-ui/core"; import React from "react"; import { useMoneyDisplayStyles } from "./styles"; @@ -18,16 +17,12 @@ export const MoneyDisplay = ({ label, money }: MoneyDisplayProps) => { const amount = formatMoneyAmount(money, locale); return ( -
-
{label}
- - {money.currency}  - {amount} - -
+
+
{label}
+
+ {money.currency}  + {amount} +
+
); }; diff --git a/src/orders/components/OrderTransaction/components/CardTitle/styles.ts b/src/orders/components/OrderTransaction/components/CardTitle/styles.ts index 6cb1c225a..f3b76492b 100644 --- a/src/orders/components/OrderTransaction/components/CardTitle/styles.ts +++ b/src/orders/components/OrderTransaction/components/CardTitle/styles.ts @@ -1,4 +1,5 @@ import { makeStyles } from "@saleor/macaw-ui"; +import { vars } from "@saleor/macaw-ui/next"; export const useStyles = makeStyles( theme => ({ @@ -12,15 +13,11 @@ export const useStyles = makeStyles( display: "flex", gap: theme.spacing(1), alignItems: "center", - fontWeight: 600, }, dataDisplay: { display: "flex", - gap: theme.spacing(2), - - "& > dl": { - minWidth: "73px", // aligns amounts with < 10 to each other - }, + gap: vars.spacing[7], + alignItems: "center", }, }), { name: "OrderTransactionCardTitle" }, @@ -29,25 +26,10 @@ export const useStyles = makeStyles( export const useMoneyDisplayStyles = makeStyles( theme => ({ wrapper: { + fontSize: vars.fontSize.captionSmall, + lineHeight: vars.lineHeight.captionSmall, color: theme.palette.saleor.main[2], margin: 0, - textAlign: "left", - }, - label: { - fontWeight: 600, - lineHeight: "12px", - fontSize: theme.spacing(1.25), - textTransform: "uppercase", - }, - moneyWrapper: { - margin: 0, - fontSize: 14, - }, - currency: { - fontWeight: 400, - }, - amount: { - fontWeight: 600, }, }), { diff --git a/src/orders/components/OrderTransaction/components/TransactionEvents/TransactionEvents.tsx b/src/orders/components/OrderTransaction/components/TransactionEvents/TransactionEvents.tsx index ea64b06b1..0c4defe89 100644 --- a/src/orders/components/OrderTransaction/components/TransactionEvents/TransactionEvents.tsx +++ b/src/orders/components/OrderTransaction/components/TransactionEvents/TransactionEvents.tsx @@ -4,6 +4,7 @@ import { renderCollection } from "@dashboard/misc"; import { TransactionFakeEvent } from "@dashboard/orders/types"; import { TableCell, TableRow } from "@material-ui/core"; import { makeStyles, ResponsiveTable } from "@saleor/macaw-ui"; +import { vars } from "@saleor/macaw-ui/next"; import React, { useState } from "react"; import { FormattedMessage } from "react-intl"; @@ -18,12 +19,10 @@ const useStyles = makeStyles( theme => ({ table: { "&& td": { - // Gap = 24px - paddingLeft: "12px", - paddingRight: "12px", + paddingLeft: vars.spacing[4], + paddingRight: vars.spacing[4], "&:first-child": { - // Override for Material first td - paddingRight: "12px", + paddingLeft: vars.spacing[9], }, }, }, diff --git a/src/orders/components/OrderTransaction/components/TransactionEvents/components/EventStatus.tsx b/src/orders/components/OrderTransaction/components/TransactionEvents/components/EventStatus.tsx index a1d5fef88..5071fe82c 100644 --- a/src/orders/components/OrderTransaction/components/TransactionEvents/components/EventStatus.tsx +++ b/src/orders/components/OrderTransaction/components/TransactionEvents/components/EventStatus.tsx @@ -17,6 +17,7 @@ export const EventStatus: React.FC = ({ status }) => { return ( ); @@ -24,6 +25,7 @@ export const EventStatus: React.FC = ({ status }) => { return ( ); @@ -31,16 +33,25 @@ export const EventStatus: React.FC = ({ status }) => { return ( ); case "REQUEST": return ( - + ); case "INFO": return ( - + ); default: const _exhaustiveCheck: never = status; diff --git a/src/orders/components/OrderTransaction/components/TransactionEvents/components/EventType.tsx b/src/orders/components/OrderTransaction/components/TransactionEvents/components/EventType.tsx index d1d9e26c4..de8aa1f1c 100644 --- a/src/orders/components/OrderTransaction/components/TransactionEvents/components/EventType.tsx +++ b/src/orders/components/OrderTransaction/components/TransactionEvents/components/EventType.tsx @@ -1,4 +1,5 @@ // @ts-strict-ignore +import { capitalize } from "@dashboard/misc"; import { transactionEventTypeMap } from "@dashboard/orders/messages"; import { TransactionEventType } from "@dashboard/orders/types"; import { makeStyles } from "@saleor/macaw-ui"; @@ -27,10 +28,9 @@ export const EventType = ({ type, message }: EventTypeProps) => { const classes = useStyles(); const mapEventToMessage = transactionEventTypeMap[type]; - const displayType = mapEventToMessage - ? intl.formatMessage(mapEventToMessage) - : message || type; - + const displayType = capitalize( + mapEventToMessage ? intl.formatMessage(mapEventToMessage) : message || type, + ); return ( {displayType}