diff --git a/assets/js/src/newsletters/types.jsx b/assets/js/src/newsletters/types.jsx index f8ae2b9969..d0070db44a 100644 --- a/assets/js/src/newsletters/types.jsx +++ b/assets/js/src/newsletters/types.jsx @@ -48,6 +48,8 @@ const NewsletterTypes = React.createClass({ return _.map(window.mailpoet_automatic_emails, (automaticEmail) => { const email = automaticEmail; const onClick = _.partial(this.setupNewsletter, automaticEmail.slug); + email.title = (email.beta) ? + `${email.title} (${MailPoet.I18n.t('beta')})` : email.title; email.action = (() => (
-

{event.title} {event.soon ? `(${MailPoet.I18n.t('soon').toLowerCase()})` : ''}

+

{event.title} {event.soon ? `(${MailPoet.I18n.t('soon')})` : ''}

{event.badge ? ( {event.badge.text} diff --git a/assets/js/src/newsletters/types/automatic_emails/events_list.jsx b/assets/js/src/newsletters/types/automatic_emails/events_list.jsx index 4e088ef96a..f09d31ad95 100644 --- a/assets/js/src/newsletters/types/automatic_emails/events_list.jsx +++ b/assets/js/src/newsletters/types/automatic_emails/events_list.jsx @@ -42,7 +42,7 @@ class AutomaticEmailEventsList extends React.Component { return (

- {heading} ({MailPoet.I18n.t('beta').toLowerCase()}) + {heading}

diff --git a/assets/js/src/newsletters/types/woocommerce.jsx b/assets/js/src/newsletters/types/woocommerce.jsx deleted file mode 100644 index 8ad71f13a4..0000000000 --- a/assets/js/src/newsletters/types/woocommerce.jsx +++ /dev/null @@ -1,148 +0,0 @@ -import React from 'react'; -import MailPoet from 'mailpoet'; -import Breadcrumb from 'newsletters/breadcrumb.jsx'; - -const WooCommerceAutomaticEmail = React.createClass({ - contextTypes: { - router: React.PropTypes.object.isRequired, - }, - setupNewsletter: function setupNewsletter(type) { - if (type !== undefined) { - this.context.router.push(`/new/${type}`); - MailPoet.trackEvent('Emails > Type selected', { - 'MailPoet Free version': window.mailpoet_version, - 'Email type': type, - }); - } - }, - createNewsletter: function createNewsletter(type) { - MailPoet.trackEvent('Emails > Type selected', { - 'MailPoet Free version': window.mailpoet_version, - 'Email type': type, - }); - MailPoet.Ajax.post({ - api_version: window.mailpoet_api_version, - endpoint: 'newsletters', - action: 'create', - data: { - type, - subject: MailPoet.I18n.t('draftNewsletterTitle'), - }, - }).done((response) => { - this.context.router.push(`/template/${response.data.id}`); - }).fail((response) => { - if (response.errors.length > 0) { - MailPoet.Notice.error( - response.errors.map(error => error.message), - { scroll: true } - ); - } - }); - }, - render: function render() { - const types = [ - { - id: 'woocommerce', - title: MailPoet.I18n.t('wooCommerceEventAbandonedCartTitle'), - description: MailPoet.I18n.t('wooCommerceEventAbandonedCartDescription'), - badge: { - text: MailPoet.I18n.t('wooCommerceEventAbandonedCartBadge'), - style: 'red', - }, - }, - { - id: 'woocommerce', - title: MailPoet.I18n.t('wooCommerceEventFirstPurchaseTitle'), - description: MailPoet.I18n.t('wooCommerceEventFirstPurchaseDescription'), - badge: { - text: MailPoet.I18n.t('wooCommerceEventFirstPurchaseBadge'), - style: 'yellow', - }, - }, - { - id: 'woocommerce', - title: MailPoet.I18n.t('wooCommerceEventPurchasedProductTitle'), - description: MailPoet.I18n.t('wooCommerceEventPurchasedProductDescription'), - }, - { - id: 'woocommerce', - title: MailPoet.I18n.t('wooCommerceEventPurchasedInCategoryTitle'), - description: MailPoet.I18n.t('wooCommerceEventPurchasedInCategoryDescription'), - soon: true, - }, - { - id: 'woocommerce', - title: MailPoet.I18n.t('wooCommerceEventBigSpenderTitle'), - description: MailPoet.I18n.t('wooCommerceEventBigSpenderDescription'), - soon: true, - badge: { - text: MailPoet.I18n.t('wooCommerceEventSmartToHaveBadge'), - style: 'teal', - }, - }, - ]; - - const steps = [ - { - name: 'type', - label: MailPoet.I18n.t('selectType'), - link: '/new', - }, - { - name: 'events', - label: MailPoet.I18n.t('wooCommerceBreadcrumbsEvents'), - }, - { - name: 'conditions', - label: MailPoet.I18n.t('wooCommerceBreadcrumbsConditions'), - }, - { - name: 'template', - label: MailPoet.I18n.t('template'), - }, - { - name: 'editor', - label: MailPoet.I18n.t('designer'), - }, - { - name: 'send', - label: MailPoet.I18n.t('send'), - }, - ]; - - return ( -
-

{MailPoet.I18n.t('wooCommerceSelectEventHeading')}

- - - -
-
- ); - }, -}); - -module.exports = WooCommerceAutomaticEmail; diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php index 485d703f38..8ffc870bf0 100644 --- a/lib/Config/Menu.php +++ b/lib/Config/Menu.php @@ -584,6 +584,7 @@ class Menu { $data['automatic_emails'] = array( array( 'slug' => 'woocommerce', + 'beta' => true, 'premium' => true, 'title' => __('WooCommerce', 'mailpoet'), 'description' => __('Automatically send an email when there is a new WooCommerce product, order and some other action takes place.', 'mailpoet'),