* changed order draft label from 'add customers first' to 'add shipping address first' * ran extract-messages * moved messages to a separate file * changed exports from default to named
This commit is contained in:
parent
19e9b0ffc2
commit
5c986799f0
3 changed files with 45 additions and 42 deletions
|
@ -3879,14 +3879,14 @@
|
||||||
"context": "total price of ordered products",
|
"context": "total price of ordered products",
|
||||||
"string": "Total"
|
"string": "Total"
|
||||||
},
|
},
|
||||||
"src_dot_orders_dot_components_dot_OrderDraftDetailsSummary_dot_addCustomerInfo": {
|
|
||||||
"context": "add customer first label",
|
|
||||||
"string": "add customer first"
|
|
||||||
},
|
|
||||||
"src_dot_orders_dot_components_dot_OrderDraftDetailsSummary_dot_addDiscount": {
|
"src_dot_orders_dot_components_dot_OrderDraftDetailsSummary_dot_addDiscount": {
|
||||||
"context": "add discount button",
|
"context": "add discount button",
|
||||||
"string": "Add Discount"
|
"string": "Add Discount"
|
||||||
},
|
},
|
||||||
|
"src_dot_orders_dot_components_dot_OrderDraftDetailsSummary_dot_addShippingAddressInfo": {
|
||||||
|
"context": "add shipping address first label",
|
||||||
|
"string": "add shipping address first"
|
||||||
|
},
|
||||||
"src_dot_orders_dot_components_dot_OrderDraftDetailsSummary_dot_addShippingCarrier": {
|
"src_dot_orders_dot_components_dot_OrderDraftDetailsSummary_dot_addShippingCarrier": {
|
||||||
"context": "add shipping carrier button",
|
"context": "add shipping carrier button",
|
||||||
"string": "Add shipping carrier"
|
"string": "Add shipping carrier"
|
||||||
|
|
|
@ -8,11 +8,11 @@ import { OrderDiscountData } from "@saleor/products/components/OrderDiscountProv
|
||||||
import { DiscountValueTypeEnum } from "@saleor/types/globalTypes";
|
import { DiscountValueTypeEnum } from "@saleor/types/globalTypes";
|
||||||
import React, { useRef } from "react";
|
import React, { useRef } from "react";
|
||||||
import { useIntl } from "react-intl";
|
import { useIntl } from "react-intl";
|
||||||
import { defineMessages } from "react-intl";
|
|
||||||
|
|
||||||
import { OrderDetails_order } from "../../types/OrderDetails";
|
import { OrderDetails_order } from "../../types/OrderDetails";
|
||||||
import OrderDiscountCommonModal from "../OrderDiscountCommonModal";
|
import OrderDiscountCommonModal from "../OrderDiscountCommonModal";
|
||||||
import { ORDER_DISCOUNT } from "../OrderDiscountCommonModal/types";
|
import { ORDER_DISCOUNT } from "../OrderDiscountCommonModal/types";
|
||||||
|
import { messages } from "./messages";
|
||||||
|
|
||||||
const useStyles = makeStyles(
|
const useStyles = makeStyles(
|
||||||
theme => ({
|
theme => ({
|
||||||
|
@ -46,41 +46,6 @@ const useStyles = makeStyles(
|
||||||
{ name: "OrderDraftDetailsSummary" }
|
{ name: "OrderDraftDetailsSummary" }
|
||||||
);
|
);
|
||||||
|
|
||||||
const messages = defineMessages({
|
|
||||||
addCustomerInfo: {
|
|
||||||
defaultMessage: "add customer first",
|
|
||||||
description: "add customer first label"
|
|
||||||
},
|
|
||||||
subtotal: {
|
|
||||||
defaultMessage: "Subtotal",
|
|
||||||
description: "subtotal price"
|
|
||||||
},
|
|
||||||
addDiscount: {
|
|
||||||
defaultMessage: "Add Discount",
|
|
||||||
description: "add discount button"
|
|
||||||
},
|
|
||||||
discount: {
|
|
||||||
defaultMessage: "Discount",
|
|
||||||
description: "discount button"
|
|
||||||
},
|
|
||||||
addShippingCarrier: {
|
|
||||||
defaultMessage: "Add shipping carrier",
|
|
||||||
description: "add shipping carrier button"
|
|
||||||
},
|
|
||||||
noShippingCarriers: {
|
|
||||||
defaultMessage: "No applicable shipping carriers",
|
|
||||||
description: "no shipping carriers title"
|
|
||||||
},
|
|
||||||
total: {
|
|
||||||
defaultMessage: "Total",
|
|
||||||
description: "total price"
|
|
||||||
},
|
|
||||||
taxes: {
|
|
||||||
defaultMessage: "Taxes (VAT included)",
|
|
||||||
description: "taxes title"
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const PRICE_PLACEHOLDER = "---";
|
const PRICE_PLACEHOLDER = "---";
|
||||||
|
|
||||||
interface OrderDraftDetailsSummaryProps
|
interface OrderDraftDetailsSummaryProps
|
||||||
|
@ -181,7 +146,9 @@ const OrderDraftDetailsSummary: React.FC<OrderDraftDetailsSummaryProps> = props
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const addCustomerInfo = intl.formatMessage(messages.addCustomerInfo);
|
const addShippingAddressInfo = intl.formatMessage(
|
||||||
|
messages.addShippingAddressInfo
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={classes.shippingMethodContainer}>
|
<div className={classes.shippingMethodContainer}>
|
||||||
|
@ -189,7 +156,7 @@ const OrderDraftDetailsSummary: React.FC<OrderDraftDetailsSummaryProps> = props
|
||||||
{shippingCarrierBase}
|
{shippingCarrierBase}
|
||||||
</Link>
|
</Link>
|
||||||
<HorizontalSpacer />
|
<HorizontalSpacer />
|
||||||
<Typography variant="caption">{`(${addCustomerInfo})`}</Typography>
|
<Typography variant="caption">{`(${addShippingAddressInfo})`}</Typography>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
36
src/orders/components/OrderDraftDetailsSummary/messages.ts
Normal file
36
src/orders/components/OrderDraftDetailsSummary/messages.ts
Normal file
|
@ -0,0 +1,36 @@
|
||||||
|
import { defineMessages } from "react-intl";
|
||||||
|
|
||||||
|
export const messages = defineMessages({
|
||||||
|
addShippingAddressInfo: {
|
||||||
|
defaultMessage: "add shipping address first",
|
||||||
|
description: "add shipping address first label"
|
||||||
|
},
|
||||||
|
subtotal: {
|
||||||
|
defaultMessage: "Subtotal",
|
||||||
|
description: "subtotal price"
|
||||||
|
},
|
||||||
|
addDiscount: {
|
||||||
|
defaultMessage: "Add Discount",
|
||||||
|
description: "add discount button"
|
||||||
|
},
|
||||||
|
discount: {
|
||||||
|
defaultMessage: "Discount",
|
||||||
|
description: "discount button"
|
||||||
|
},
|
||||||
|
addShippingCarrier: {
|
||||||
|
defaultMessage: "Add shipping carrier",
|
||||||
|
description: "add shipping carrier button"
|
||||||
|
},
|
||||||
|
noShippingCarriers: {
|
||||||
|
defaultMessage: "No applicable shipping carriers",
|
||||||
|
description: "no shipping carriers title"
|
||||||
|
},
|
||||||
|
total: {
|
||||||
|
defaultMessage: "Total",
|
||||||
|
description: "total price"
|
||||||
|
},
|
||||||
|
taxes: {
|
||||||
|
defaultMessage: "Taxes (VAT included)",
|
||||||
|
description: "taxes title"
|
||||||
|
}
|
||||||
|
});
|
Loading…
Reference in a new issue