Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove misleading currency caption #3620

Merged
merged 8 commits into from
Jun 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions locale/defaultMessages.json
Original file line number Diff line number Diff line change
Expand Up @@ -3085,9 +3085,6 @@
"context": "delete attribute value",
"string": "Are you sure you want to delete \"{name}\" value?"
},
"K+ROF8": {
"string": "Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency"
},
"K+vjtE": {
"string": "Search Variants"
},
Expand Down Expand Up @@ -4691,10 +4688,6 @@
"context": "header",
"string": "Order settings"
},
"VvA7ai": {
"context": "info text",
"string": "Channels that don’t have assigned prices will use their parent channel to define the price. Price will be converted to channel’s currency"
},
"VvFJ/T": {
"context": "PageTypeDeleteWarningDialog single no assigned items description",
"string": "Are you sure you want to delete <b>{typeName}</b>? If you remove it you won’t be able to assign it to created pages."
Expand Down Expand Up @@ -5691,10 +5684,6 @@
"cdxwA8": {
"string": "{amount, plural,one {One product out of stock}other {{amount} products out of stock}}"
},
"cehiWu": {
"context": "channels sale info",
"string": "Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency"
},
"cfQf0w": {
"context": "button",
"string": "Create Order"
Expand Down Expand Up @@ -7440,9 +7429,6 @@
"context": "bulk delete label",
"string": "Delete"
},
"qnPzX7": {
"string": "Channels that don’t have assigned discounts will use their parent channel to define the value. Value will be converted to channel’s currency"
},
"qov29K": {
"context": "dialog content",
"string": "Select one of customer addresses or add a new address:"
Expand Down Expand Up @@ -7899,10 +7885,6 @@
"context": "independent of any particular day, eg. 11:35",
"string": "Time"
},
"u5c/tR": {
"context": "channels discount info",
"string": "Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency"
},
"u9/vj9": {
"context": "webhook input label",
"string": "Target URL"
Expand Down
10 changes: 0 additions & 10 deletions src/discounts/components/SaleValue/SaleValue.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { getFormErrors } from "@dashboard/utils/errors";
import getDiscountErrorMessage from "@dashboard/utils/errors/discounts";
import {
Card,
CardContent,
TableBody,
TableCell,
TableHead,
Expand Down Expand Up @@ -51,15 +50,6 @@ const SaleValue: React.FC<SaleValueProps> = ({
description: "sale value, header",
})}
/>
<CardContent className={classes.card}>
<Typography variant="caption" className={classes.info}>
<FormattedMessage
id="cehiWu"
defaultMessage="Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency"
description="channels sale info"
/>
</Typography>
</CardContent>
<ResponsiveTable className={classes.table}>
<colgroup>
<col />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,6 @@ const VoucherRequirements = ({
) && <FormSpacer />}
{data.requirementsPicker === RequirementsPicker.ORDER ? (
<>
<Typography variant="caption">
<FormattedMessage
id="K+ROF8"
defaultMessage="Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency"
/>
</Typography>
<div className={classes.tableContainer}>
<ResponsiveTable className={classes.table}>
<TableHead
Expand Down
6 changes: 0 additions & 6 deletions src/discounts/components/VoucherValue/VoucherValue.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@ const VoucherValue: React.FC<VoucherValueProps> = props => {
})}
/>
<CardContent>
<Typography variant="caption">
<FormattedMessage
id="qnPzX7"
defaultMessage="Channels that don’t have assigned discounts will use their parent channel to define the value. Value will be converted to channel’s currency"
/>
</Typography>
<div className={classes.tableContainer}>
<ResponsiveTable className={classes.table}>
<TableHead colSpan={numberOfColumns} disabled={disabled} items={[]}>
Expand Down
2 changes: 1 addition & 1 deletion src/graphql/types.generated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10840,4 +10840,4 @@ export type WarehouseDetailsQuery = { __typename: 'Query', warehouse: { __typena
export type WarehousesCountQueryVariables = Exact<{ [key: string]: never; }>;


export type WarehousesCountQuery = { __typename: 'Query', warehouses: { __typename: 'WarehouseCountableConnection', totalCount: number | null } | null };
export type WarehousesCountQuery = { __typename: 'Query', warehouses: { __typename: 'WarehouseCountableConnection', totalCount: number | null } | null };
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,6 @@ export const ProductVariantPrice: React.FC<
description: "product pricing, section header",
})}
</DashboardCard.Title>
<DashboardCard.Content>
<Text variant="body">
{intl.formatMessage({
id: "VvA7ai",
defaultMessage:
"Channels that don’t have assigned prices will use their parent channel to define the price. Price will be converted to channel’s currency",
description: "info text",
})}
</Text>
</DashboardCard.Content>
<ResponsiveTable>
<TableHead>
<TableRowLink>
Expand Down
8 changes: 0 additions & 8 deletions src/shipping/components/OrderValue/OrderValue.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import PriceField from "@dashboard/components/PriceField";
import ResponsiveTable from "@dashboard/components/ResponsiveTable";
import TableHead from "@dashboard/components/TableHead";
import TableRowLink from "@dashboard/components/TableRowLink";
import VerticalSpacer from "@dashboard/components/VerticalSpacer";
import { ShippingChannelsErrorFragment } from "@dashboard/graphql";
import { ChangeEvent } from "@dashboard/hooks/useForm";
import {
Expand Down Expand Up @@ -82,13 +81,6 @@ export const OrderValue: React.FC<OrderValueProps> = ({
onChange={onChange}
disabled={disabled}
/>
<VerticalSpacer />
<FormattedMessage
id="u5c/tR"
defaultMessage="Channels that don’t have assigned discounts will use their parent channel to define the price. Price will be converted to channel’s currency"
description="channels discount info"
/>
<VerticalSpacer />
</div>
{orderValueRestricted && (
<ResponsiveTable className={classes.table}>
Expand Down
8 changes: 0 additions & 8 deletions src/shipping/components/PricingCard/PricingCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,6 @@ export const PricingCard: React.FC<PricingCardProps> = ({
})}
/>
<CardContent className={classes.pricingContent}>
<Typography variant="caption" className={classes.caption}>
{intl.formatMessage({
id: "VvA7ai",
defaultMessage:
"Channels that don’t have assigned prices will use their parent channel to define the price. Price will be converted to channel’s currency",
description: "info text",
})}
</Typography>
<ResponsiveTable className={classes.table}>
<TableHead colSpan={numberOfColumns} disabled={disabled} items={[]}>
<TableCell className={classes.colName}>
Expand Down