Merge branch 'master' of github.com:mirumee/saleor-dashboard into feature/unconfirmed-order-line-manipulation
This commit is contained in:
commit
e5fdef53df
11 changed files with 3958 additions and 1316 deletions
18
.release-it.json
Normal file
18
.release-it.json
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
{
|
||||||
|
"github": {
|
||||||
|
"release": true,
|
||||||
|
"draft": true,
|
||||||
|
"releaseName": "${version}"
|
||||||
|
},
|
||||||
|
"npm": {
|
||||||
|
"publish": false
|
||||||
|
},
|
||||||
|
"plugins": {
|
||||||
|
"@release-it/bumper": {
|
||||||
|
"in": "package.json",
|
||||||
|
"out": [
|
||||||
|
"package.json"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -26,6 +26,7 @@ All notable, unreleased changes to this project will be documented in this file.
|
||||||
- Add product variant webhooks - #1006 by @piotrgrundas
|
- Add product variant webhooks - #1006 by @piotrgrundas
|
||||||
- Use default sort for search products list - #997 by @orzechdev
|
- Use default sort for search products list - #997 by @orzechdev
|
||||||
- Update CollectionBulkDelete error type - #1030 by @d-wysocki
|
- Update CollectionBulkDelete error type - #1030 by @d-wysocki
|
||||||
|
- Remove mailing settings - #1027 by @dominik-zeglen
|
||||||
- Unconfirmed order manipulation - #967 by @tomaszszymanski129
|
- Unconfirmed order manipulation - #967 by @tomaszszymanski129
|
||||||
|
|
||||||
# 2.11.1
|
# 2.11.1
|
||||||
|
|
|
@ -436,10 +436,6 @@
|
||||||
"context": "autocomplete select label",
|
"context": "autocomplete select label",
|
||||||
"string": "Warehouse"
|
"string": "Warehouse"
|
||||||
},
|
},
|
||||||
"siteSettingsMailingHelperText": {
|
|
||||||
"context": "helper text",
|
|
||||||
"string": "Mailing Configuration"
|
|
||||||
},
|
|
||||||
"src_dot_accept": {
|
"src_dot_accept": {
|
||||||
"context": "button",
|
"context": "button",
|
||||||
"string": "Accept"
|
"string": "Accept"
|
||||||
|
@ -6029,32 +6025,6 @@
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsDetails_dot_529433178": {
|
"src_dot_siteSettings_dot_components_dot_SiteSettingsDetails_dot_529433178": {
|
||||||
"string": "Store description is shown on taskbar after your store name"
|
"string": "Store description is shown on taskbar after your store name"
|
||||||
},
|
},
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_1124962330": {
|
|
||||||
"string": "Mailing email address"
|
|
||||||
},
|
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_1672275992": {
|
|
||||||
"context": "email sender",
|
|
||||||
"string": "This will be visible as \"from\" name"
|
|
||||||
},
|
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_280712237": {
|
|
||||||
"context": "section header",
|
|
||||||
"string": "Mailing Configuration"
|
|
||||||
},
|
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_297689661": {
|
|
||||||
"string": "Configurate your email address from which all automatic emails will be sent to your customers."
|
|
||||||
},
|
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_3211348653": {
|
|
||||||
"string": "Customer password reset URL"
|
|
||||||
},
|
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_3447841451": {
|
|
||||||
"string": "This URL will be used as a main URL for password resets. It will be sent via email."
|
|
||||||
},
|
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_50742153": {
|
|
||||||
"string": "URL address"
|
|
||||||
},
|
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_70179174": {
|
|
||||||
"string": "Mailing email sender"
|
|
||||||
},
|
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_1004240342": {
|
"src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_1004240342": {
|
||||||
"string": "This adress will be used to generate invoices and calculate shipping rates."
|
"string": "This adress will be used to generate invoices and calculate shipping rates."
|
||||||
},
|
},
|
||||||
|
@ -6066,19 +6036,12 @@
|
||||||
"context": "section header",
|
"context": "section header",
|
||||||
"string": "Company Information"
|
"string": "Company Information"
|
||||||
},
|
},
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_280712237": {
|
|
||||||
"context": "section header",
|
|
||||||
"string": "Mailing Configuration"
|
|
||||||
},
|
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_3657173399": {
|
"src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_3657173399": {
|
||||||
"string": "Email adress you provide here will be used as a contact adress for your customers."
|
"string": "Email adress you provide here will be used as a contact adress for your customers."
|
||||||
},
|
},
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_3799756739": {
|
"src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_3799756739": {
|
||||||
"string": "These are general information about your store. They define what is the URL of your store and what is shown in browsers taskbar."
|
"string": "These are general information about your store. They define what is the URL of your store and what is shown in browsers taskbar."
|
||||||
},
|
},
|
||||||
"src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_866304242": {
|
|
||||||
"string": "This where you will find all of the settings determining your stores e-mails. You can determine main email address and some of the contents of your emails."
|
|
||||||
},
|
|
||||||
"src_dot_somethingWentWrong": {
|
"src_dot_somethingWentWrong": {
|
||||||
"string": "Saleor ran into an unexpected problem"
|
"string": "Saleor ran into an unexpected problem"
|
||||||
},
|
},
|
||||||
|
|
4507
package-lock.json
generated
4507
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -17,7 +17,7 @@
|
||||||
"npm": ">=6.11.0 <7"
|
"npm": ">=6.11.0 <7"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@editorjs/editorjs": "^2.19.1",
|
"@editorjs/editorjs": "^2.19.3",
|
||||||
"@editorjs/header": "^2.6.1",
|
"@editorjs/header": "^2.6.1",
|
||||||
"@editorjs/image": "^2.6.0",
|
"@editorjs/image": "^2.6.0",
|
||||||
"@editorjs/list": "^1.6.1",
|
"@editorjs/list": "^1.6.1",
|
||||||
|
@ -45,6 +45,7 @@
|
||||||
"editorjs-undo": "^0.1.4",
|
"editorjs-undo": "^0.1.4",
|
||||||
"faker": "^5.1.0",
|
"faker": "^5.1.0",
|
||||||
"fast-array-diff": "^0.2.0",
|
"fast-array-diff": "^0.2.0",
|
||||||
|
"fsevents": "^1.2.9",
|
||||||
"fuzzaldrin": "^2.1.0",
|
"fuzzaldrin": "^2.1.0",
|
||||||
"graphql": "^14.4.2",
|
"graphql": "^14.4.2",
|
||||||
"graphql-tag": "^2.11.0",
|
"graphql-tag": "^2.11.0",
|
||||||
|
@ -156,6 +157,7 @@
|
||||||
"react-intl-translations-manager": "^5.0.3",
|
"react-intl-translations-manager": "^5.0.3",
|
||||||
"react-test-renderer": "^16.12.0",
|
"react-test-renderer": "^16.12.0",
|
||||||
"regenerator-runtime": "^0.11.1",
|
"regenerator-runtime": "^0.11.1",
|
||||||
|
"release-it": "^14.5.0",
|
||||||
"require-context.macro": "^1.1.1",
|
"require-context.macro": "^1.1.1",
|
||||||
"rimraf": "^3.0.0",
|
"rimraf": "^3.0.0",
|
||||||
"setup-polly-jest": "^0.9.1",
|
"setup-polly-jest": "^0.9.1",
|
||||||
|
@ -231,6 +233,7 @@
|
||||||
"test": "jest src/",
|
"test": "jest src/",
|
||||||
"transpile-messages": "node scripts/transpile-tx.js",
|
"transpile-messages": "node scripts/transpile-tx.js",
|
||||||
"lint": "npx eslint \"src/**/*.@(tsx|ts|jsx|js)\" --fix ; npx prettier --check \"src/**/*.@(tsx|ts|jsx|js)\" --write",
|
"lint": "npx eslint \"src/**/*.@(tsx|ts|jsx|js)\" --fix ; npx prettier --check \"src/**/*.@(tsx|ts|jsx|js)\" --write",
|
||||||
"postbuild": "rimraf ./build/**/*.js.map"
|
"postbuild": "rimraf ./build/**/*.js.map",
|
||||||
|
"release": "release-it"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,7 +12,8 @@ export const SentryAdapter = (config: Config): TrackerMethods => {
|
||||||
if (config?.dsn) {
|
if (config?.dsn) {
|
||||||
Sentry.init({
|
Sentry.init({
|
||||||
dsn: config.dsn,
|
dsn: config.dsn,
|
||||||
environment: config.environment
|
environment: config.environment,
|
||||||
|
ignoreErrors: ["Editor's content can not be saved in read-only mode"]
|
||||||
});
|
});
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,141 +0,0 @@
|
||||||
import Card from "@material-ui/core/Card";
|
|
||||||
import CardContent from "@material-ui/core/CardContent";
|
|
||||||
import TextField from "@material-ui/core/TextField";
|
|
||||||
import Typography from "@material-ui/core/Typography";
|
|
||||||
import CardTitle from "@saleor/components/CardTitle";
|
|
||||||
import FormSpacer from "@saleor/components/FormSpacer";
|
|
||||||
import Hr from "@saleor/components/Hr";
|
|
||||||
import { ShopErrorFragment } from "@saleor/fragments/types/ShopErrorFragment";
|
|
||||||
import { makeStyles } from "@saleor/theme";
|
|
||||||
import { getFormErrors } from "@saleor/utils/errors";
|
|
||||||
import getShopErrorMessage from "@saleor/utils/errors/shop";
|
|
||||||
import React from "react";
|
|
||||||
import { FormattedMessage, useIntl } from "react-intl";
|
|
||||||
|
|
||||||
export interface SiteSettingsMailingFormData {
|
|
||||||
defaultMailSenderName: string;
|
|
||||||
defaultMailSenderAddress: string;
|
|
||||||
customerSetPasswordUrl: string;
|
|
||||||
}
|
|
||||||
interface SiteSettingsMailingProps {
|
|
||||||
data: SiteSettingsMailingFormData;
|
|
||||||
errors: ShopErrorFragment[];
|
|
||||||
disabled: boolean;
|
|
||||||
onChange: (event: React.ChangeEvent<any>) => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
const useStyles = makeStyles(
|
|
||||||
theme => ({
|
|
||||||
cardHelperText: {
|
|
||||||
position: "relative",
|
|
||||||
top: -theme.spacing(1)
|
|
||||||
},
|
|
||||||
cardHelperTextCaption: {
|
|
||||||
marginBottom: theme.spacing(2)
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
{
|
|
||||||
name: "SiteSettingsMailing"
|
|
||||||
}
|
|
||||||
);
|
|
||||||
|
|
||||||
const SiteSettingsMailing: React.FC<SiteSettingsMailingProps> = props => {
|
|
||||||
const { data, disabled, errors, onChange } = props;
|
|
||||||
|
|
||||||
const classes = useStyles(props);
|
|
||||||
const intl = useIntl();
|
|
||||||
|
|
||||||
const formErrors = getFormErrors(
|
|
||||||
[
|
|
||||||
"defaultMailSenderAddress",
|
|
||||||
"defaultMailSenderName",
|
|
||||||
"customerSetPasswordUrl"
|
|
||||||
],
|
|
||||||
errors
|
|
||||||
);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Card>
|
|
||||||
<CardTitle
|
|
||||||
title={intl.formatMessage({
|
|
||||||
defaultMessage: "Mailing Configuration",
|
|
||||||
description: "section header"
|
|
||||||
})}
|
|
||||||
/>
|
|
||||||
<CardContent>
|
|
||||||
<Typography className={classes.cardHelperText}>
|
|
||||||
<FormattedMessage
|
|
||||||
defaultMessage="Mailing Configuration"
|
|
||||||
description="helper text"
|
|
||||||
id="siteSettingsMailingHelperText"
|
|
||||||
/>
|
|
||||||
</Typography>
|
|
||||||
<Typography className={classes.cardHelperTextCaption} variant="body2">
|
|
||||||
<FormattedMessage defaultMessage="Configurate your email address from which all automatic emails will be sent to your customers." />
|
|
||||||
</Typography>
|
|
||||||
<TextField
|
|
||||||
disabled={disabled}
|
|
||||||
error={!!formErrors.defaultMailSenderAddress}
|
|
||||||
fullWidth
|
|
||||||
name="defaultMailSenderAddress"
|
|
||||||
label={intl.formatMessage({
|
|
||||||
defaultMessage: "Mailing email address"
|
|
||||||
})}
|
|
||||||
helperText={getShopErrorMessage(
|
|
||||||
formErrors.defaultMailSenderAddress,
|
|
||||||
intl
|
|
||||||
)}
|
|
||||||
value={data.defaultMailSenderAddress}
|
|
||||||
onChange={onChange}
|
|
||||||
/>
|
|
||||||
<FormSpacer />
|
|
||||||
<TextField
|
|
||||||
disabled={disabled}
|
|
||||||
error={!!formErrors.defaultMailSenderName}
|
|
||||||
fullWidth
|
|
||||||
name="defaultMailSenderName"
|
|
||||||
label={intl.formatMessage({
|
|
||||||
defaultMessage: "Mailing email sender"
|
|
||||||
})}
|
|
||||||
helperText={
|
|
||||||
getShopErrorMessage(formErrors.defaultMailSenderName, intl) ||
|
|
||||||
intl.formatMessage({
|
|
||||||
defaultMessage: 'This will be visible as "from" name',
|
|
||||||
description: "email sender"
|
|
||||||
})
|
|
||||||
}
|
|
||||||
value={data.defaultMailSenderName}
|
|
||||||
onChange={onChange}
|
|
||||||
/>
|
|
||||||
<FormSpacer />
|
|
||||||
<Hr />
|
|
||||||
<FormSpacer />
|
|
||||||
<TextField
|
|
||||||
disabled={disabled}
|
|
||||||
error={!!formErrors.customerSetPasswordUrl}
|
|
||||||
fullWidth
|
|
||||||
autoComplete="off"
|
|
||||||
type="url"
|
|
||||||
name="customerSetPasswordUrl"
|
|
||||||
label={intl.formatMessage({
|
|
||||||
defaultMessage: "Customer password reset URL"
|
|
||||||
})}
|
|
||||||
placeholder={intl.formatMessage({
|
|
||||||
defaultMessage: "URL address"
|
|
||||||
})}
|
|
||||||
helperText={
|
|
||||||
getShopErrorMessage(formErrors.customerSetPasswordUrl, intl) ||
|
|
||||||
intl.formatMessage({
|
|
||||||
defaultMessage:
|
|
||||||
"This URL will be used as a main URL for password resets. It will be sent via email."
|
|
||||||
})
|
|
||||||
}
|
|
||||||
value={data.customerSetPasswordUrl}
|
|
||||||
onChange={onChange}
|
|
||||||
/>
|
|
||||||
</CardContent>
|
|
||||||
</Card>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
SiteSettingsMailing.displayName = "SiteSettingsMailing";
|
|
||||||
export default SiteSettingsMailing;
|
|
|
@ -1,2 +0,0 @@
|
||||||
export { default } from "./SiteSettingsMailing";
|
|
||||||
export * from "./SiteSettingsMailing";
|
|
|
@ -22,9 +22,6 @@ import { FormattedMessage, useIntl } from "react-intl";
|
||||||
import { maybe } from "../../../misc";
|
import { maybe } from "../../../misc";
|
||||||
import { SiteSettings_shop } from "../../types/SiteSettings";
|
import { SiteSettings_shop } from "../../types/SiteSettings";
|
||||||
import SiteSettingsDetails from "../SiteSettingsDetails/SiteSettingsDetails";
|
import SiteSettingsDetails from "../SiteSettingsDetails/SiteSettingsDetails";
|
||||||
import SiteSettingsMailing, {
|
|
||||||
SiteSettingsMailingFormData
|
|
||||||
} from "../SiteSettingsMailing";
|
|
||||||
|
|
||||||
export interface SiteSettingsPageAddressFormData {
|
export interface SiteSettingsPageAddressFormData {
|
||||||
city: string;
|
city: string;
|
||||||
|
@ -38,8 +35,7 @@ export interface SiteSettingsPageAddressFormData {
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface SiteSettingsPageFormData
|
export interface SiteSettingsPageFormData
|
||||||
extends SiteSettingsPageAddressFormData,
|
extends SiteSettingsPageAddressFormData {
|
||||||
SiteSettingsMailingFormData {
|
|
||||||
description: string;
|
description: string;
|
||||||
domain: string;
|
domain: string;
|
||||||
name: string;
|
name: string;
|
||||||
|
@ -114,9 +110,6 @@ const SiteSettingsPage: React.FC<SiteSettingsPageProps> = props => {
|
||||||
};
|
};
|
||||||
const initialForm: SiteSettingsPageFormData = {
|
const initialForm: SiteSettingsPageFormData = {
|
||||||
...initialFormAddress,
|
...initialFormAddress,
|
||||||
customerSetPasswordUrl: maybe(() => shop.customerSetPasswordUrl, ""),
|
|
||||||
defaultMailSenderAddress: maybe(() => shop.defaultMailSenderAddress, ""),
|
|
||||||
defaultMailSenderName: maybe(() => shop.defaultMailSenderName, ""),
|
|
||||||
description: maybe(() => shop.description, ""),
|
description: maybe(() => shop.description, ""),
|
||||||
domain: maybe(() => shop.domain.host, ""),
|
domain: maybe(() => shop.domain.host, ""),
|
||||||
name: maybe(() => shop.name, "")
|
name: maybe(() => shop.name, "")
|
||||||
|
@ -165,24 +158,6 @@ const SiteSettingsPage: React.FC<SiteSettingsPageProps> = props => {
|
||||||
onChange={change}
|
onChange={change}
|
||||||
/>
|
/>
|
||||||
<Hr className={classes.hr} />
|
<Hr className={classes.hr} />
|
||||||
<div>
|
|
||||||
<Typography>
|
|
||||||
<FormattedMessage
|
|
||||||
defaultMessage="Mailing Configuration"
|
|
||||||
description="section header"
|
|
||||||
/>
|
|
||||||
</Typography>
|
|
||||||
<Typography variant="body2">
|
|
||||||
<FormattedMessage defaultMessage="This where you will find all of the settings determining your stores e-mails. You can determine main email address and some of the contents of your emails." />
|
|
||||||
</Typography>
|
|
||||||
</div>
|
|
||||||
<SiteSettingsMailing
|
|
||||||
data={data}
|
|
||||||
errors={errors}
|
|
||||||
disabled={disabled}
|
|
||||||
onChange={change}
|
|
||||||
/>
|
|
||||||
<Hr className={classes.hr} />
|
|
||||||
<div>
|
<div>
|
||||||
<Typography>
|
<Typography>
|
||||||
<FormattedMessage
|
<FormattedMessage
|
||||||
|
|
|
@ -77,9 +77,6 @@ export const SiteSettings: React.FC<SiteSettingsProps> = () => {
|
||||||
name: data.name
|
name: data.name
|
||||||
},
|
},
|
||||||
shopSettingsInput: {
|
shopSettingsInput: {
|
||||||
customerSetPasswordUrl: data.customerSetPasswordUrl,
|
|
||||||
defaultMailSenderAddress: data.defaultMailSenderAddress,
|
|
||||||
defaultMailSenderName: data.defaultMailSenderName,
|
|
||||||
description: data.description
|
description: data.description
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -214086,180 +214086,6 @@ exports[`Storyshots Views / Site settings / Page default 1`] = `
|
||||||
<hr
|
<hr
|
||||||
class="Hr-root-id SiteSettingsPage-hr-id"
|
class="Hr-root-id SiteSettingsPage-hr-id"
|
||||||
/>
|
/>
|
||||||
<div>
|
|
||||||
<div
|
|
||||||
class="MuiTypography-root-id MuiTypography-body1-id"
|
|
||||||
>
|
|
||||||
Mailing Configuration
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="MuiTypography-root-id MuiTypography-body2-id"
|
|
||||||
>
|
|
||||||
This where you will find all of the settings determining your stores e-mails. You can determine main email address and some of the contents of your emails.
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="MuiPaper-root-id MuiCard-root-id MuiPaper-elevation0-id MuiPaper-rounded-id"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="CardTitle-root-id"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
class="MuiTypography-root-id CardTitle-title-id MuiTypography-h5-id"
|
|
||||||
>
|
|
||||||
Mailing Configuration
|
|
||||||
</span>
|
|
||||||
<div
|
|
||||||
class="CardTitle-toolbar-id"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="CardTitle-children-id"
|
|
||||||
/>
|
|
||||||
<hr
|
|
||||||
class="CardTitle-hr-id"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="MuiCardContent-root-id"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="MuiTypography-root-id SiteSettingsMailing-cardHelperText-id MuiTypography-body1-id"
|
|
||||||
>
|
|
||||||
Mailing Configuration
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="MuiTypography-root-id SiteSettingsMailing-cardHelperTextCaption-id MuiTypography-body2-id"
|
|
||||||
>
|
|
||||||
Configurate your email address from which all automatic emails will be sent to your customers.
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
|
||||||
>
|
|
||||||
<label
|
|
||||||
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
|
|
||||||
data-shrink="true"
|
|
||||||
>
|
|
||||||
Mailing email address
|
|
||||||
</label>
|
|
||||||
<div
|
|
||||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
aria-invalid="false"
|
|
||||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
|
|
||||||
name="defaultMailSenderAddress"
|
|
||||||
type="text"
|
|
||||||
value="noreply@example.com"
|
|
||||||
/>
|
|
||||||
<fieldset
|
|
||||||
aria-hidden="true"
|
|
||||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
|
||||||
>
|
|
||||||
<legend
|
|
||||||
class="PrivateNotchedOutline-legendLabelled-id PrivateNotchedOutline-legendNotched-id"
|
|
||||||
>
|
|
||||||
<span>
|
|
||||||
Mailing email address
|
|
||||||
</span>
|
|
||||||
</legend>
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="FormSpacer-spacer-id"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
|
||||||
>
|
|
||||||
<label
|
|
||||||
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
|
|
||||||
data-shrink="true"
|
|
||||||
>
|
|
||||||
Mailing email sender
|
|
||||||
</label>
|
|
||||||
<div
|
|
||||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
aria-invalid="false"
|
|
||||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
|
|
||||||
name="defaultMailSenderName"
|
|
||||||
type="text"
|
|
||||||
value="Saleor"
|
|
||||||
/>
|
|
||||||
<fieldset
|
|
||||||
aria-hidden="true"
|
|
||||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
|
||||||
>
|
|
||||||
<legend
|
|
||||||
class="PrivateNotchedOutline-legendLabelled-id PrivateNotchedOutline-legendNotched-id"
|
|
||||||
>
|
|
||||||
<span>
|
|
||||||
Mailing email sender
|
|
||||||
</span>
|
|
||||||
</legend>
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
|
||||||
<p
|
|
||||||
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-filled-id"
|
|
||||||
>
|
|
||||||
This will be visible as "from" name
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="FormSpacer-spacer-id"
|
|
||||||
/>
|
|
||||||
<hr
|
|
||||||
class="Hr-root-id"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="FormSpacer-spacer-id"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
|
||||||
>
|
|
||||||
<label
|
|
||||||
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-filled-id"
|
|
||||||
data-shrink="true"
|
|
||||||
>
|
|
||||||
Customer password reset URL
|
|
||||||
</label>
|
|
||||||
<div
|
|
||||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
aria-invalid="false"
|
|
||||||
autocomplete="off"
|
|
||||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
|
|
||||||
name="customerSetPasswordUrl"
|
|
||||||
placeholder="URL address"
|
|
||||||
type="url"
|
|
||||||
value="https://example.com/reset-password"
|
|
||||||
/>
|
|
||||||
<fieldset
|
|
||||||
aria-hidden="true"
|
|
||||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
|
||||||
>
|
|
||||||
<legend
|
|
||||||
class="PrivateNotchedOutline-legendLabelled-id PrivateNotchedOutline-legendNotched-id"
|
|
||||||
>
|
|
||||||
<span>
|
|
||||||
Customer password reset URL
|
|
||||||
</span>
|
|
||||||
</legend>
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
|
||||||
<p
|
|
||||||
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-filled-id"
|
|
||||||
>
|
|
||||||
This URL will be used as a main URL for password resets. It will be sent via email.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<hr
|
|
||||||
class="Hr-root-id SiteSettingsPage-hr-id"
|
|
||||||
/>
|
|
||||||
<div>
|
<div>
|
||||||
<div
|
<div
|
||||||
class="MuiTypography-root-id MuiTypography-body1-id"
|
class="MuiTypography-root-id MuiTypography-body1-id"
|
||||||
|
@ -214805,185 +214631,6 @@ exports[`Storyshots Views / Site settings / Page form errors 1`] = `
|
||||||
<hr
|
<hr
|
||||||
class="Hr-root-id SiteSettingsPage-hr-id"
|
class="Hr-root-id SiteSettingsPage-hr-id"
|
||||||
/>
|
/>
|
||||||
<div>
|
|
||||||
<div
|
|
||||||
class="MuiTypography-root-id MuiTypography-body1-id"
|
|
||||||
>
|
|
||||||
Mailing Configuration
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="MuiTypography-root-id MuiTypography-body2-id"
|
|
||||||
>
|
|
||||||
This where you will find all of the settings determining your stores e-mails. You can determine main email address and some of the contents of your emails.
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="MuiPaper-root-id MuiCard-root-id MuiPaper-elevation0-id MuiPaper-rounded-id"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="CardTitle-root-id"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
class="MuiTypography-root-id CardTitle-title-id MuiTypography-h5-id"
|
|
||||||
>
|
|
||||||
Mailing Configuration
|
|
||||||
</span>
|
|
||||||
<div
|
|
||||||
class="CardTitle-toolbar-id"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="CardTitle-children-id"
|
|
||||||
/>
|
|
||||||
<hr
|
|
||||||
class="CardTitle-hr-id"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="MuiCardContent-root-id"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="MuiTypography-root-id SiteSettingsMailing-cardHelperText-id MuiTypography-body1-id"
|
|
||||||
>
|
|
||||||
Mailing Configuration
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="MuiTypography-root-id SiteSettingsMailing-cardHelperTextCaption-id MuiTypography-body2-id"
|
|
||||||
>
|
|
||||||
Configurate your email address from which all automatic emails will be sent to your customers.
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
|
||||||
>
|
|
||||||
<label
|
|
||||||
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-error-id MuiInputLabel-error-id MuiFormLabel-filled-id"
|
|
||||||
data-shrink="true"
|
|
||||||
>
|
|
||||||
Mailing email address
|
|
||||||
</label>
|
|
||||||
<div
|
|
||||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
aria-invalid="true"
|
|
||||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
|
|
||||||
name="defaultMailSenderAddress"
|
|
||||||
type="text"
|
|
||||||
value="noreply@example.com"
|
|
||||||
/>
|
|
||||||
<fieldset
|
|
||||||
aria-hidden="true"
|
|
||||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
|
||||||
>
|
|
||||||
<legend
|
|
||||||
class="PrivateNotchedOutline-legendLabelled-id PrivateNotchedOutline-legendNotched-id"
|
|
||||||
>
|
|
||||||
<span>
|
|
||||||
Mailing email address
|
|
||||||
</span>
|
|
||||||
</legend>
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
|
||||||
<p
|
|
||||||
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id MuiFormHelperText-filled-id"
|
|
||||||
>
|
|
||||||
Invalid value
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="FormSpacer-spacer-id"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
|
||||||
>
|
|
||||||
<label
|
|
||||||
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-error-id MuiInputLabel-error-id MuiFormLabel-filled-id"
|
|
||||||
data-shrink="true"
|
|
||||||
>
|
|
||||||
Mailing email sender
|
|
||||||
</label>
|
|
||||||
<div
|
|
||||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
aria-invalid="true"
|
|
||||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
|
|
||||||
name="defaultMailSenderName"
|
|
||||||
type="text"
|
|
||||||
value="Saleor"
|
|
||||||
/>
|
|
||||||
<fieldset
|
|
||||||
aria-hidden="true"
|
|
||||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
|
||||||
>
|
|
||||||
<legend
|
|
||||||
class="PrivateNotchedOutline-legendLabelled-id PrivateNotchedOutline-legendNotched-id"
|
|
||||||
>
|
|
||||||
<span>
|
|
||||||
Mailing email sender
|
|
||||||
</span>
|
|
||||||
</legend>
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
|
||||||
<p
|
|
||||||
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id MuiFormHelperText-filled-id"
|
|
||||||
>
|
|
||||||
Invalid value
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="FormSpacer-spacer-id"
|
|
||||||
/>
|
|
||||||
<hr
|
|
||||||
class="Hr-root-id"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="FormSpacer-spacer-id"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
|
||||||
>
|
|
||||||
<label
|
|
||||||
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-shrink-id MuiInputLabel-outlined-id MuiFormLabel-error-id MuiInputLabel-error-id MuiFormLabel-filled-id"
|
|
||||||
data-shrink="true"
|
|
||||||
>
|
|
||||||
Customer password reset URL
|
|
||||||
</label>
|
|
||||||
<div
|
|
||||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-error-id MuiOutlinedInput-error-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
aria-invalid="true"
|
|
||||||
autocomplete="off"
|
|
||||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id"
|
|
||||||
name="customerSetPasswordUrl"
|
|
||||||
placeholder="URL address"
|
|
||||||
type="url"
|
|
||||||
value="https://example.com/reset-password"
|
|
||||||
/>
|
|
||||||
<fieldset
|
|
||||||
aria-hidden="true"
|
|
||||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
|
||||||
>
|
|
||||||
<legend
|
|
||||||
class="PrivateNotchedOutline-legendLabelled-id PrivateNotchedOutline-legendNotched-id"
|
|
||||||
>
|
|
||||||
<span>
|
|
||||||
Customer password reset URL
|
|
||||||
</span>
|
|
||||||
</legend>
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
|
||||||
<p
|
|
||||||
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-error-id MuiFormHelperText-filled-id"
|
|
||||||
>
|
|
||||||
Invalid value
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<hr
|
|
||||||
class="Hr-root-id SiteSettingsPage-hr-id"
|
|
||||||
/>
|
|
||||||
<div>
|
<div>
|
||||||
<div
|
<div
|
||||||
class="MuiTypography-root-id MuiTypography-body1-id"
|
class="MuiTypography-root-id MuiTypography-body1-id"
|
||||||
|
@ -215527,183 +215174,6 @@ exports[`Storyshots Views / Site settings / Page loading 1`] = `
|
||||||
<hr
|
<hr
|
||||||
class="Hr-root-id SiteSettingsPage-hr-id"
|
class="Hr-root-id SiteSettingsPage-hr-id"
|
||||||
/>
|
/>
|
||||||
<div>
|
|
||||||
<div
|
|
||||||
class="MuiTypography-root-id MuiTypography-body1-id"
|
|
||||||
>
|
|
||||||
Mailing Configuration
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="MuiTypography-root-id MuiTypography-body2-id"
|
|
||||||
>
|
|
||||||
This where you will find all of the settings determining your stores e-mails. You can determine main email address and some of the contents of your emails.
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="MuiPaper-root-id MuiCard-root-id MuiPaper-elevation0-id MuiPaper-rounded-id"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="CardTitle-root-id"
|
|
||||||
>
|
|
||||||
<span
|
|
||||||
class="MuiTypography-root-id CardTitle-title-id MuiTypography-h5-id"
|
|
||||||
>
|
|
||||||
Mailing Configuration
|
|
||||||
</span>
|
|
||||||
<div
|
|
||||||
class="CardTitle-toolbar-id"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="CardTitle-children-id"
|
|
||||||
/>
|
|
||||||
<hr
|
|
||||||
class="CardTitle-hr-id"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="MuiCardContent-root-id"
|
|
||||||
>
|
|
||||||
<div
|
|
||||||
class="MuiTypography-root-id SiteSettingsMailing-cardHelperText-id MuiTypography-body1-id"
|
|
||||||
>
|
|
||||||
Mailing Configuration
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="MuiTypography-root-id SiteSettingsMailing-cardHelperTextCaption-id MuiTypography-body2-id"
|
|
||||||
>
|
|
||||||
Configurate your email address from which all automatic emails will be sent to your customers.
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
|
||||||
>
|
|
||||||
<label
|
|
||||||
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id"
|
|
||||||
data-shrink="false"
|
|
||||||
>
|
|
||||||
Mailing email address
|
|
||||||
</label>
|
|
||||||
<div
|
|
||||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
aria-invalid="false"
|
|
||||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
|
|
||||||
disabled=""
|
|
||||||
name="defaultMailSenderAddress"
|
|
||||||
type="text"
|
|
||||||
value=""
|
|
||||||
/>
|
|
||||||
<fieldset
|
|
||||||
aria-hidden="true"
|
|
||||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
|
||||||
>
|
|
||||||
<legend
|
|
||||||
class="PrivateNotchedOutline-legendLabelled-id"
|
|
||||||
>
|
|
||||||
<span>
|
|
||||||
Mailing email address
|
|
||||||
</span>
|
|
||||||
</legend>
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="FormSpacer-spacer-id"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
|
||||||
>
|
|
||||||
<label
|
|
||||||
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id"
|
|
||||||
data-shrink="false"
|
|
||||||
>
|
|
||||||
Mailing email sender
|
|
||||||
</label>
|
|
||||||
<div
|
|
||||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
aria-invalid="false"
|
|
||||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
|
|
||||||
disabled=""
|
|
||||||
name="defaultMailSenderName"
|
|
||||||
type="text"
|
|
||||||
value=""
|
|
||||||
/>
|
|
||||||
<fieldset
|
|
||||||
aria-hidden="true"
|
|
||||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
|
||||||
>
|
|
||||||
<legend
|
|
||||||
class="PrivateNotchedOutline-legendLabelled-id"
|
|
||||||
>
|
|
||||||
<span>
|
|
||||||
Mailing email sender
|
|
||||||
</span>
|
|
||||||
</legend>
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
|
||||||
<p
|
|
||||||
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-disabled-id"
|
|
||||||
>
|
|
||||||
This will be visible as "from" name
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<div
|
|
||||||
class="FormSpacer-spacer-id"
|
|
||||||
/>
|
|
||||||
<hr
|
|
||||||
class="Hr-root-id"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="FormSpacer-spacer-id"
|
|
||||||
/>
|
|
||||||
<div
|
|
||||||
class="MuiFormControl-root-id MuiTextField-root-id MuiFormControl-fullWidth-id"
|
|
||||||
>
|
|
||||||
<label
|
|
||||||
class="MuiFormLabel-root-id MuiInputLabel-root-id MuiInputLabel-formControl-id MuiInputLabel-animated-id MuiInputLabel-outlined-id MuiFormLabel-disabled-id MuiInputLabel-disabled-id"
|
|
||||||
data-shrink="false"
|
|
||||||
>
|
|
||||||
Customer password reset URL
|
|
||||||
</label>
|
|
||||||
<div
|
|
||||||
class="MuiInputBase-root-id MuiOutlinedInput-root-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id MuiInputBase-fullWidth-id MuiInputBase-formControl-id"
|
|
||||||
>
|
|
||||||
<input
|
|
||||||
aria-invalid="false"
|
|
||||||
autocomplete="off"
|
|
||||||
class="MuiInputBase-input-id MuiOutlinedInput-input-id MuiInputBase-disabled-id MuiOutlinedInput-disabled-id"
|
|
||||||
disabled=""
|
|
||||||
name="customerSetPasswordUrl"
|
|
||||||
placeholder="URL address"
|
|
||||||
type="url"
|
|
||||||
value=""
|
|
||||||
/>
|
|
||||||
<fieldset
|
|
||||||
aria-hidden="true"
|
|
||||||
class="PrivateNotchedOutline-root-id MuiOutlinedInput-notchedOutline-id"
|
|
||||||
>
|
|
||||||
<legend
|
|
||||||
class="PrivateNotchedOutline-legendLabelled-id"
|
|
||||||
>
|
|
||||||
<span>
|
|
||||||
Customer password reset URL
|
|
||||||
</span>
|
|
||||||
</legend>
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
|
||||||
<p
|
|
||||||
class="MuiFormHelperText-root-id MuiFormHelperText-contained-id MuiFormHelperText-disabled-id"
|
|
||||||
>
|
|
||||||
This URL will be used as a main URL for password resets. It will be sent via email.
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<hr
|
|
||||||
class="Hr-root-id SiteSettingsPage-hr-id"
|
|
||||||
/>
|
|
||||||
<div>
|
<div>
|
||||||
<div
|
<div
|
||||||
class="MuiTypography-root-id MuiTypography-body1-id"
|
class="MuiTypography-root-id MuiTypography-body1-id"
|
||||||
|
|
Loading…
Reference in a new issue