Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Always show 'Customize' button for WC email customizer [MAILPOET-2520]

Browse Source
This commit is contained in:
wxa
2019-11-13 21:43:05 +03:00
committed by Jack Kitterhing
parent b528b732a5
commit 98f18a48fb
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/src/newsletters/types.jsx
View File

@@ -86,7 +86,7 @@ class NewsletterTypes extends React.Component {
} }
}} }}
> >
{MailPoet.I18n.t(window.mailpoet_woocommerce_customizer_enabled ? 'customize' : 'activate_and_customize')} {MailPoet.I18n.t('customize')}
</a> </a>
), ),
}, },
@@ -99,7 +99,7 @@ class NewsletterTypes extends React.Component {
'Email type': 'wc_transactional', 'Email type': 'wc_transactional',
}); });
let emailId = window.mailpoet_woocommerce_transactional_email_id; let emailId = window.mailpoet_woocommerce_transactional_email_id;
if (!window.mailpoet_woocommerce_customizer_enabled) { if (!emailId) {
try { try {
const response = await MailPoet.Ajax.post({ const response = await MailPoet.Ajax.post({
api_version: window.mailpoet_api_version, api_version: window.mailpoet_api_version,

1
lib/AdminPages/Pages/Newsletters.php
View File

@@ -163,7 +163,6 @@ class Newsletters {
$data['is_new_user'] = $this->installation->isNewInstallation(); $data['is_new_user'] = $this->installation->isNewInstallation();
$data['sent_newsletters_count'] = (int)Newsletter::where('status', Newsletter::STATUS_SENT)->count(); $data['sent_newsletters_count'] = (int)Newsletter::where('status', Newsletter::STATUS_SENT)->count();
$data['woocommerce_customizer_enabled'] = (bool)$this->settings->get('woocommerce.use_mailpoet_editor');
$data['woocommerce_transactional_email_id'] = $this->settings->get(TransactionalEmails::SETTING_EMAIL_ID); $data['woocommerce_transactional_email_id'] = $this->settings->get(TransactionalEmails::SETTING_EMAIL_ID);
$data['display_detailed_stats'] = Installer::getPremiumStatus()['premium_plugin_initialized']; $data['display_detailed_stats'] = Installer::getPremiumStatus()['premium_plugin_initialized'];
$this->wp->wpEnqueueScript('jquery-ui'); $this->wp->wpEnqueueScript('jquery-ui');

2
views/newsletters.html
View File

@@ -31,7 +31,6 @@
var mailpoet_feature_flags = <%= json_encode(mailpoet_feature_flags) %>; var mailpoet_feature_flags = <%= json_encode(mailpoet_feature_flags) %>;
var mailpoet_woocommerce_active = <%= json_encode(is_woocommerce_active) %>; var mailpoet_woocommerce_active = <%= json_encode(is_woocommerce_active) %>;
var mailpoet_woocommerce_customizer_enabled = <%= json_encode(woocommerce_customizer_enabled) %>;
var mailpoet_woocommerce_transactional_email_id = <%= json_encode(woocommerce_transactional_email_id) %>; var mailpoet_woocommerce_transactional_email_id = <%= json_encode(woocommerce_transactional_email_id) %>;
var mailpoet_display_detailed_stats = <%= json_encode(display_detailed_stats) %>; var mailpoet_display_detailed_stats = <%= json_encode(display_detailed_stats) %>;
var mailpoet_automatic_emails = <%= json_encode(automatic_emails) %>; var mailpoet_automatic_emails = <%= json_encode(automatic_emails) %>;
@@ -177,7 +176,6 @@
'wooCommerceCustomizerTypeTitle': __('WooCommerce Emails Customizer'), 'wooCommerceCustomizerTypeTitle': __('WooCommerce Emails Customizer'),
'wooCommerceCustomizerTypeDescription': __("Customize the template used for your WooCommerce emails using MailPoet's editor. Example of WooCommerce email: Order processing notification, Order failed notification, ..."), 'wooCommerceCustomizerTypeDescription': __("Customize the template used for your WooCommerce emails using MailPoet's editor. Example of WooCommerce email: Order processing notification, Order failed notification, ..."),
'customize': 'Customize', 'customize': 'Customize',
'activate_and_customize': 'Activate & Customize',
'welcomeNewsletterTypeTitle': __('Welcome Email'), '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.'), '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.'),
'premiumFeatureLink': __('This is a Premium feature'), 'premiumFeatureLink': __('This is a Premium feature'),