diff --git a/assets/js/src/newsletters/newsletters.jsx b/assets/js/src/newsletters/newsletters.jsx index e03772c039..3b14f413db 100644 --- a/assets/js/src/newsletters/newsletters.jsx +++ b/assets/js/src/newsletters/newsletters.jsx @@ -9,7 +9,6 @@ import NewsletterTemplates from 'newsletters/templates.jsx' import NewsletterSend from 'newsletters/send.jsx' import NewsletterTypeStandard from 'newsletters/types/standard.jsx' -import NewsletterTypeWelcome from 'newsletters/types/welcome/welcome.jsx' import NewsletterTypeNotification from 'newsletters/types/notification/notification.jsx' import NewsletterListStandard from 'newsletters/listings/standard.jsx' @@ -44,7 +43,6 @@ if(container) { {/* New newsletter: types */} - {/* Template selection */} diff --git a/assets/js/src/newsletters/types.jsx b/assets/js/src/newsletters/types.jsx index 91aef404b0..ffc8b229ff 100644 --- a/assets/js/src/newsletters/types.jsx +++ b/assets/js/src/newsletters/types.jsx @@ -63,7 +63,9 @@ define( 'action': function() { return (
- Premium feature text (TBD) + + {MailPoet.I18n.t('getPremiumVersion')} +
) }() @@ -74,7 +76,7 @@ define( 'description': MailPoet.I18n.t('postNotificationNewsletterTypeDescription'), 'action': function() { return ( - + {MailPoet.I18n.t('setUp')} ) @@ -82,7 +84,7 @@ define( } ]; - types = Hooks.applyFilters('mailpoet_newsletters_types', types); + types = Hooks.applyFilters('mailpoet_newsletters_types', types, this); return (
diff --git a/assets/js/src/newsletters/types/welcome/welcome.jsx b/assets/js/src/newsletters/types/welcome/welcome.jsx deleted file mode 100644 index 78facf4009..0000000000 --- a/assets/js/src/newsletters/types/welcome/welcome.jsx +++ /dev/null @@ -1,103 +0,0 @@ -define( - [ - 'underscore', - 'react', - 'react-router', - 'mailpoet', - 'newsletters/types/welcome/scheduling.jsx', - 'newsletters/breadcrumb.jsx' - ], - function( - _, - React, - Router, - MailPoet, - Scheduling, - Breadcrumb - ) { - - var field = { - name: 'options', - label: 'Event', - type: 'reactComponent', - component: Scheduling, - }; - - var availableSegments = window.mailpoet_segments || {}, - defaultSegment = 1; - - if (_.size(availableSegments) > 0) { - defaultSegment = _.first(availableSegments).id; - } - - var NewsletterWelcome = React.createClass({ - contextTypes: { - router: React.PropTypes.object.isRequired - }, - getInitialState: function() { - return { - options: { - event: 'segment', - segment: defaultSegment, - role: 'subscriber', - afterTimeNumber: 1, - afterTimeType: 'immediate', - } - }; - }, - handleValueChange: function(event) { - var state = this.state; - state[event.target.name] = event.target.value; - this.setState(state); - }, - handleNext: function() { - MailPoet.Ajax.post({ - api_version: window.mailpoet_api_version, - endpoint: 'newsletters', - action: 'create', - data: _.extend({}, this.state, { - type: 'welcome', - subject: MailPoet.I18n.t('draftNewsletterTitle'), - }) - }).done((response) => { - this.showTemplateSelection(response.data.id); - }).fail((response) => { - if (response.errors.length > 0) { - MailPoet.Notice.error( - response.errors.map(function(error) { return error.message; }), - { scroll: true } - ); - } - }); - }, - showTemplateSelection: function(newsletterId) { - this.context.router.push(`/template/${newsletterId}`); - }, - render: function() { - return ( -
-

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

- - -

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

- - - -

- -

-
- ); - }, - }); - - return NewsletterWelcome; - } -); diff --git a/views/newsletters.html b/views/newsletters.html index 5052ea131c..6d5c6f4d23 100644 --- a/views/newsletters.html +++ b/views/newsletters.html @@ -121,6 +121,7 @@ 'create': __('Create'), 'welcomeNewsletterTypeTitle': __('Welcome Email'), 'welcomeNewsletterTypeDescription': __('Automatically send an email (or series of emails) to new subscribers or WordPress users. Send a day, a week, or a month after they sign up.'), + 'getPremiumVersion': __('Get premium version!'), 'setUp': __('Set up'), 'postNotificationNewsletterTypeTitle': __('Latest Post Notifications'), 'postNotificationNewsletterTypeDescription': __('Let MailPoet email your subscribers with your latest content. You can send daily, weekly, monthly, or even immediately after publication.'),