diff --git a/locale/messages.pot b/locale/messages.pot index 30ee8797c..d1446a81e 100644 --- a/locale/messages.pot +++ b/locale/messages.pot @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 2019-11-07T13:40:04.787Z\n" +"POT-Creation-Date: 2019-11-07T13:41:50.654Z\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "MIME-Version: 1.0\n" @@ -623,6 +623,14 @@ msgctxt "product attribute error" msgid "All attributes should have value" msgstr "" +#: build/locale/src/webhooks/components/WebhookEvents/WebhookEvents.json +#. [src.webhooks.components.WebhookEvents.2454751033] - event +#. defaultMessage is: +#. All events +msgctxt "event" +msgid "All events" +msgstr "" + #: build/locale/src/taxes/components/TaxConfiguration/TaxConfiguration.json #. [src.taxes.components.TaxConfiguration.142803418] #. defaultMessage is: @@ -663,14 +671,6 @@ msgctxt "description" msgid "Anonymous user" msgstr "" -#: build/locale/src/webhooks/components/WebhookEvents/WebhookEvents.json -#. [src.webhooks.components.WebhookEvents.3053363669] - event -#. defaultMessage is: -#. Any events -msgctxt "event" -msgid "Any events" -msgstr "" - #: build/locale/src/discounts/components/VoucherSummary/VoucherSummary.json #. [src.discounts.components.VoucherSummary.2735425668] - voucher #. defaultMessage is: @@ -1080,11 +1080,11 @@ msgid "Are you sure you want to delete {voucherCode}?" msgstr "" #: build/locale/src/orders/components/OrderDraftFinalizeDialog/OrderDraftFinalizeDialog.json -#. [src.orders.components.OrderDraftFinalizeDialog.1489195029] +#. [src.orders.components.OrderDraftFinalizeDialog.3358029330] #. defaultMessage is: -#. Are you sure you want to finalize draft #{number}? +#. Are you sure you want to finalize draft #{orderNumber}? msgctxt "description" -msgid "Are you sure you want to finalize draft #{number}?" +msgid "Are you sure you want to finalize draft #{orderNumber}?" msgstr "" #: build/locale/src/orders/components/OrderMarkAsPaidDialog/OrderMarkAsPaidDialog.json @@ -1136,11 +1136,11 @@ msgid "Are you sure you want to unassign {attributeName} from {productTypeName}? msgstr "" #: build/locale/src/productTypes/components/ProductTypeBulkAttributeUnassignDialog/ProductTypeBulkAttributeUnassignDialog.json -#. [src.productTypes.components.ProductTypeBulkAttributeUnassignDialog.600602031] - unassign multiple attributes from product type +#. [src.productTypes.components.ProductTypeBulkAttributeUnassignDialog.1465383223] - unassign multiple attributes from product type #. defaultMessage is: -#. Are you sure you want to unassign {counter,plural,one{this attribute} other{{displayQuantity} attributes}} from {productTypeName}? +#. Are you sure you want to unassign {counter,plural,one{this attribute} other{{attributeQuantity} attributes}} from {productTypeName}? msgctxt "unassign multiple attributes from product type" -msgid "Are you sure you want to unassign {counter,plural,one{this attribute} other{{displayQuantity} attributes}} from {productTypeName}?" +msgid "Are you sure you want to unassign {counter,plural,one{this attribute} other{{attributeQuantity} attributes}} from {productTypeName}?" msgstr "" #: build/locale/src/discounts/views/SaleDetails.json @@ -5507,6 +5507,14 @@ msgctxt "description" msgid "Order draft succesfully created" msgstr "" +#: build/locale/src/webhooks/components/WebhookEvents/WebhookEvents.json +#. [src.webhooks.components.WebhookEvents.3907151399] - event +#. defaultMessage is: +#. Order fulfilled +msgctxt "event" +msgid "Order fulfilled" +msgstr "" + #: build/locale/src/webhooks/components/WebhookEvents/WebhookEvents.json #. [src.webhooks.components.WebhookEvents.3345061702] - event #. defaultMessage is: diff --git a/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx b/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx index c1bc3f754..e5647a944 100644 --- a/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx +++ b/src/auth/components/ResetPasswordPage/ResetPasswordPage.tsx @@ -11,10 +11,10 @@ import { commonMessages } from "@saleor/intl"; const useStyles = makeStyles( theme => ({ + errorText: { + color: theme.palette.error.contrastText + }, panel: { - "& span": { - color: theme.palette.error.contrastText - }, background: theme.palette.error.main, borderRadius: theme.spacing(), marginBottom: theme.spacing(3), @@ -50,7 +50,9 @@ const ResetPasswordPage: React.FC = props => { <> {!!error && (
- {error} + + {error} +
)} diff --git a/src/components/ActionDialog/ActionDialog.tsx b/src/components/ActionDialog/ActionDialog.tsx index 01f8a5ad7..5607851ba 100644 --- a/src/components/ActionDialog/ActionDialog.tsx +++ b/src/components/ActionDialog/ActionDialog.tsx @@ -55,7 +55,7 @@ const ActionDialog: React.FC = props => { const intl = useIntl(); return ( - + {title} {children} diff --git a/src/components/TableFilter/FilterChips.tsx b/src/components/TableFilter/FilterChips.tsx index 8c14e28ec..c71d71984 100644 --- a/src/components/TableFilter/FilterChips.tsx +++ b/src/components/TableFilter/FilterChips.tsx @@ -24,14 +24,15 @@ const useStyles = makeStyles( display: "flex", height: "38px", justifyContent: "space-around", - margin: theme.spacing(2, 1), + margin: theme.spacing(0, 1, 2), marginLeft: 0, padding: theme.spacing(0, 2) }, filterChipContainer: { display: "flex", flex: 1, - flexWrap: "wrap" + flexWrap: "wrap", + paddingTop: theme.spacing(2) }, filterContainer: { "& a": { diff --git a/src/orders/components/OrderDraftFinalizeDialog/OrderDraftFinalizeDialog.tsx b/src/orders/components/OrderDraftFinalizeDialog/OrderDraftFinalizeDialog.tsx index 53a29a98d..32eed24dc 100644 --- a/src/orders/components/OrderDraftFinalizeDialog/OrderDraftFinalizeDialog.tsx +++ b/src/orders/components/OrderDraftFinalizeDialog/OrderDraftFinalizeDialog.tsx @@ -94,7 +94,7 @@ const OrderDraftFinalizeDialog: React.FC = ({ )} {attributeQuantity}, diff --git a/src/webhooks/components/WebhookEvents/WebhookEvents.tsx b/src/webhooks/components/WebhookEvents/WebhookEvents.tsx index dedb7a6d0..9d47b533c 100644 --- a/src/webhooks/components/WebhookEvents/WebhookEvents.tsx +++ b/src/webhooks/components/WebhookEvents/WebhookEvents.tsx @@ -27,9 +27,9 @@ const WebhookEvents: React.FC = ({ const intl = useIntl(); const eventsEnum = Object.values(WebhookEventTypeEnum); - const translatedEvents = { + const translatedEvents: Record = { [WebhookEventTypeEnum.ANY_EVENTS]: intl.formatMessage({ - defaultMessage: "Any events", + defaultMessage: "All events", description: "event" }), [WebhookEventTypeEnum.CUSTOMER_CREATED]: intl.formatMessage({ @@ -44,6 +44,10 @@ const WebhookEvents: React.FC = ({ defaultMessage: "Order created", description: "event" }), + [WebhookEventTypeEnum.ORDER_FULFILLED]: intl.formatMessage({ + defaultMessage: "Order fulfilled", + description: "event" + }), [WebhookEventTypeEnum.ORDER_FULLY_PAID]: intl.formatMessage({ defaultMessage: "Order fully paid", description: "event" diff --git a/src/webhooks/components/WebhooksDetailsPage/WebhooksDetailsPage.stories.tsx b/src/webhooks/components/WebhooksDetailsPage/WebhooksDetailsPage.stories.tsx index 5e30a9cc9..eae113115 100644 --- a/src/webhooks/components/WebhooksDetailsPage/WebhooksDetailsPage.stories.tsx +++ b/src/webhooks/components/WebhooksDetailsPage/WebhooksDetailsPage.stories.tsx @@ -3,6 +3,7 @@ import React from "react"; import Decorator from "@saleor/storybook/Decorator"; import { WebhookErrorCode } from "@saleor/types/globalTypes"; +import { webhook } from "../../fixtures"; import WebhooksDetailsPage, { WebhooksDetailsPageProps } from "./WebhooksDetailsPage"; @@ -16,7 +17,7 @@ const props: WebhooksDetailsPageProps = { onSubmit: () => undefined, saveButtonBarState: "default", services: [], - webhook: null + webhook }; storiesOf("Views / Webhooks / Webhook details", module) .addDecorator(Decorator)