diff --git a/client/src/lists/forms/CUD.js b/client/src/lists/forms/CUD.js index 5f1eba0c..8e5a239d 100644 --- a/client/src/lists/forms/CUD.js +++ b/client/src/lists/forms/CUD.js @@ -410,6 +410,7 @@ export default class CUD extends Component { const response = await axios.post(getUrl('rest/forms-preview'), data); this.setState({ + previewKey: formKey, previewContents: response.data.content, previewLabel: this.templateSettings[formKey].label }); @@ -504,10 +505,15 @@ export default class CUD extends Component { {this.state.previewContents &&
- {this.state.fullscreen && } -
{t('formPreview') + ' ' + this.state.previewLabel}
- this.setState({previewContents: null, previewFullscreen: false})}> - this.setState({previewFullscreen: !this.state.previewFullscreen})}> +
+ {this.state.fullscreen && } +
{t('formPreview') + ' ' + this.state.previewLabel}
+
+
+ this.preview(this.state.previewKey)} title={t('Refresh')}> + this.setState({previewFullscreen: !this.state.previewFullscreen})} title={t('Maximize editor')}> + this.setState({previewContents: null, previewFullscreen: false})} title={t('Close preview')}> +
diff --git a/client/src/lists/imports/RunStatus.js b/client/src/lists/imports/RunStatus.js index 13f98faf..3667eb99 100644 --- a/client/src/lists/imports/RunStatus.js +++ b/client/src/lists/imports/RunStatus.js @@ -92,7 +92,7 @@ export default class Status extends Component { const columns = [ { data: 1, title: t('row') }, { data: 2, title: t('email') }, - { data: 3, title: t('reason') } + { data: 3, title: t('reason'), render: data => t(...JSON.parse(data)) } ]; return ( diff --git a/client/src/lists/imports/Status.js b/client/src/lists/imports/Status.js index 6a5163f2..69d039fe 100644 --- a/client/src/lists/imports/Status.js +++ b/client/src/lists/imports/Status.js @@ -150,7 +150,7 @@ export default class Status extends Component { } actions.push({ - label: , + label: , link: `/lists/${this.props.list.id}/imports/${this.props.entity.id}/status/${data[0]}` }); diff --git a/locales/en-US/common.json b/locales/en-US/common.json index 72791706..6147867a 100644 --- a/locales/en-US/common.json +++ b/locales/en-US/common.json @@ -929,7 +929,7 @@ "invalidEmailAddressEmailMxRecordNotFound": "Invalid email address \"{{email}}\": MX record not found for domain", "invalidEmailAddressEmailAddressDomainNot": "Invalid email address \"{{email}}\": Address domain not found", "invalidEmailAddressEmailAddressDomain": "Invalid email address \"{{email}}\": Address domain name is required", - "invalidEmailGeneric": "invalidEmailGeneric", + "invalidEmailGeneric": "Invalid email address \"{{email}}\"", "mailerPasswordChangeRequest": "Mailer password change request", "mailtrain": "Mailtrain", "emailAddressChanged": "Email address changed", diff --git a/server/lib/campaign-sender.js b/server/lib/campaign-sender.js index cacb4a1b..0fecb466 100644 --- a/server/lib/campaign-sender.js +++ b/server/lib/campaign-sender.js @@ -394,6 +394,18 @@ class CampaignSender { try { const info = await mailer.sendMassMail(mail); status = SubscriptionStatus.SUBSCRIBED; + + /* + ZoneMTA + info.response: 250 Message queued as 1691ad7f7ae00080fd + info.messageId: + + Postal Mail Server + info.response: 250 OK + info.messageId: (postal messageId) + */ + + console.log(`response: ${info.response} messageId: ${info.messageId}`); response = info.response || info.messageId; await knex('campaigns').where('id', campaign.id).increment('delivered');