Remove all success delivery polls
[MAILPOET-2596]
This commit is contained in:
committed by
Jack Kitterhing
parent
3222ec4e16
commit
b287a6e609
@ -28,13 +28,6 @@
|
|||||||
margin-left: auto;
|
margin-left: auto;
|
||||||
margin-right: auto;
|
margin-right: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.typeform-widget {
|
|
||||||
height: 350px;
|
|
||||||
margin: 0 auto 30px;
|
|
||||||
max-width: 100%;
|
|
||||||
width: 500px;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.mailpoet_congratulate_success.mailpoet_congratulate_mss_pitch {
|
.mailpoet_congratulate_success.mailpoet_congratulate_mss_pitch {
|
||||||
|
@ -335,7 +335,6 @@ Module.SidebarPreviewView = Marionette.View.extend({
|
|||||||
CommunicationComponent.previewNewsletter(data).always(function () {
|
CommunicationComponent.previewNewsletter(data).always(function () {
|
||||||
MailPoet.Modal.loading(false);
|
MailPoet.Modal.loading(false);
|
||||||
}).done(function () {
|
}).done(function () {
|
||||||
var showSuccessDeliveryPoll;
|
|
||||||
MailPoet.Notice.success(
|
MailPoet.Notice.success(
|
||||||
MailPoet.I18n.t('newsletterPreviewSent'),
|
MailPoet.I18n.t('newsletterPreviewSent'),
|
||||||
{ scroll: true }
|
{ scroll: true }
|
||||||
@ -347,11 +346,6 @@ Module.SidebarPreviewView = Marionette.View.extend({
|
|||||||
if (App.getConfig().get('validation.validateSPFRecord')) {
|
if (App.getConfig().get('validation.validateSPFRecord')) {
|
||||||
checkSPFRecord();
|
checkSPFRecord();
|
||||||
}
|
}
|
||||||
showSuccessDeliveryPoll = MailPoet.Poll.successDelivery.canShow('preview');
|
|
||||||
if (showSuccessDeliveryPoll) {
|
|
||||||
MailPoet.Poll.successDelivery.showModal('preview', 'IHedf1');
|
|
||||||
MailPoet.Poll.successDelivery.setPollShown('preview');
|
|
||||||
}
|
|
||||||
}).fail(function (response) {
|
}).fail(function (response) {
|
||||||
if (response.errors.length > 0) {
|
if (response.errors.length > 0) {
|
||||||
MailPoet.Notice.error(
|
MailPoet.Notice.error(
|
||||||
|
@ -19,28 +19,10 @@ function renderHeader(newsletter) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function MSSUserSuccess(props) {
|
function MSSUserSuccess(props) {
|
||||||
const showSuccessDeliveryPoll = (
|
|
||||||
props.newsletter.type === 'standard'
|
|
||||||
&& props.newsletter.status !== 'scheduled'
|
|
||||||
);
|
|
||||||
if (showSuccessDeliveryPoll) {
|
|
||||||
MailPoet.Poll.successDelivery.initTypeformScript();
|
|
||||||
}
|
|
||||||
return (
|
return (
|
||||||
<div className="mailpoet_congratulate_success">
|
<div className="mailpoet_congratulate_success">
|
||||||
<h1>{renderHeader(props.newsletter)}</h1>
|
<h1>{renderHeader(props.newsletter)}</h1>
|
||||||
<img src={props.illustrationImageUrl} alt="" width="750" height="250" />
|
<img src={props.illustrationImageUrl} alt="" width="750" height="250" />
|
||||||
{showSuccessDeliveryPoll
|
|
||||||
&& (
|
|
||||||
<div
|
|
||||||
className="typeform-widget"
|
|
||||||
data-url="https://mailpoet.typeform.com/to/ciWID6"
|
|
||||||
data-transparency="100"
|
|
||||||
data-hide-headers="true"
|
|
||||||
data-hide-footer="true"
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
<button type="button" className="button" onClick={props.successClicked}>{MailPoet.I18n.t('close')}</button>
|
<button type="button" className="button" onClick={props.successClicked}>{MailPoet.I18n.t('close')}</button>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
@ -1,55 +0,0 @@
|
|||||||
import MailPoet from 'mailpoet';
|
|
||||||
|
|
||||||
const getSettingsKey = (pollType) => `show_poll_success_delivery_${pollType}`;
|
|
||||||
|
|
||||||
const initTypeformScript = () => {
|
|
||||||
if (!document.getElementById('typef_orm')) {
|
|
||||||
const js = document.createElement('script');
|
|
||||||
js.id = 'typef_orm';
|
|
||||||
js.src = 'https://embed.typeform.com/embed.js';
|
|
||||||
const q = document.getElementsByTagName('script')[0];
|
|
||||||
q.parentNode.insertBefore(js, q);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const setPollShown = (pollType) => {
|
|
||||||
const data = {};
|
|
||||||
data[getSettingsKey(pollType)] = '0';
|
|
||||||
MailPoet.Ajax.post({
|
|
||||||
api_version: window.mailpoet_api_version,
|
|
||||||
endpoint: 'settings',
|
|
||||||
action: 'set',
|
|
||||||
data,
|
|
||||||
});
|
|
||||||
// since poll trigger can be called multiple times on single page load
|
|
||||||
// it must be also locally changed in settings
|
|
||||||
window.mailpoet_polls_visibility[getSettingsKey(pollType)] = '0';
|
|
||||||
};
|
|
||||||
|
|
||||||
const Poll = {
|
|
||||||
successDelivery: {
|
|
||||||
canShow: (pollType, skipMtaMethod) => (
|
|
||||||
window.mailpoet_locale === 'en'
|
|
||||||
&& window.mailpoet_polls_visibility[getSettingsKey(pollType)] === '1'
|
|
||||||
&& (skipMtaMethod || window.mailpoet_polls_data.mta_method === 'PHPMail')
|
|
||||||
),
|
|
||||||
initTypeformScript,
|
|
||||||
setPollShown,
|
|
||||||
showModal: (pollType, typeformId) => {
|
|
||||||
MailPoet.Modal.popup({
|
|
||||||
onInit: initTypeformScript,
|
|
||||||
template: `
|
|
||||||
<div class="typeform-widget"
|
|
||||||
data-url="https://mailpoet.typeform.com/to/${typeformId}"
|
|
||||||
data-transparency="100"
|
|
||||||
data-hide-headers="true"
|
|
||||||
data-hide-footer="true"
|
|
||||||
style="width: 500px; height: 500px; max-width: 100%; max-height: 100%;"
|
|
||||||
></div>
|
|
||||||
`,
|
|
||||||
});
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
MailPoet.Poll = Poll;
|
|
@ -14,7 +14,6 @@ import 'forms/forms.jsx'; // side effect - renders ReactDOM to document
|
|||||||
import 'settings/tabs.js'; // side effect - assigns to MailPoet.Router, executes code on doc ready
|
import 'settings/tabs.js'; // side effect - assigns to MailPoet.Router, executes code on doc ready
|
||||||
import 'settings/premium_tab/premium_tab.jsx'; // side effect - renders ReactDOM to document
|
import 'settings/premium_tab/premium_tab.jsx'; // side effect - renders ReactDOM to document
|
||||||
import 'help/help.jsx'; // side effect - renders ReactDOM to document
|
import 'help/help.jsx'; // side effect - renders ReactDOM to document
|
||||||
import 'poll.jsx'; // side effect - assigns to MailPoet.Poll
|
|
||||||
import 'settings/reinstall_from_scratch.js'; // side effect - adds event handler to document
|
import 'settings/reinstall_from_scratch.js'; // side effect - adds event handler to document
|
||||||
import 'subscribers/importExport/import.jsx'; // side effect - executes on doc ready, adds events
|
import 'subscribers/importExport/import.jsx'; // side effect - executes on doc ready, adds events
|
||||||
import 'subscribers/importExport/export.js'; // side effect - executes on doc ready
|
import 'subscribers/importExport/export.js'; // side effect - executes on doc ready
|
||||||
|
@ -84,7 +84,6 @@ class Changelog {
|
|||||||
|
|
||||||
private function setupNewInstallation() {
|
private function setupNewInstallation() {
|
||||||
$this->settings->set('show_congratulate_after_first_newsletter', true);
|
$this->settings->set('show_congratulate_after_first_newsletter', true);
|
||||||
$this->settings->set('show_poll_success_delivery_preview', true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private function checkWelcomeWizard() {
|
private function checkWelcomeWizard() {
|
||||||
|
@ -41,7 +41,6 @@ class Renderer {
|
|||||||
$this->setupHandlebars();
|
$this->setupHandlebars();
|
||||||
$this->setupHelpscout();
|
$this->setupHelpscout();
|
||||||
$this->setupAnalytics();
|
$this->setupAnalytics();
|
||||||
$this->setupPolls();
|
|
||||||
$this->setupGlobalVariables();
|
$this->setupGlobalVariables();
|
||||||
$this->setupSyntax();
|
$this->setupSyntax();
|
||||||
}
|
}
|
||||||
@ -70,10 +69,6 @@ class Renderer {
|
|||||||
$this->renderer->addExtension(new Twig\Analytics());
|
$this->renderer->addExtension(new Twig\Analytics());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function setupPolls() {
|
|
||||||
$this->renderer->addExtension(new Twig\Polls());
|
|
||||||
}
|
|
||||||
|
|
||||||
public function setupGlobalVariables() {
|
public function setupGlobalVariables() {
|
||||||
$this->renderer->addExtension(new Twig\Assets([
|
$this->renderer->addExtension(new Twig\Assets([
|
||||||
'version' => Env::$version,
|
'version' => Env::$version,
|
||||||
|
@ -1,44 +0,0 @@
|
|||||||
<?php
|
|
||||||
|
|
||||||
namespace MailPoet\Twig;
|
|
||||||
|
|
||||||
use MailPoet\Settings\SettingsController;
|
|
||||||
use MailPoetVendor\Twig\Extension\AbstractExtension;
|
|
||||||
use MailPoetVendor\Twig\TwigFunction;
|
|
||||||
|
|
||||||
class Polls extends AbstractExtension {
|
|
||||||
|
|
||||||
/** @var SettingsController */
|
|
||||||
private $settings;
|
|
||||||
|
|
||||||
public function __construct() {
|
|
||||||
$this->settings = SettingsController::getInstance();
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getFunctions() {
|
|
||||||
return [
|
|
||||||
new TwigFunction(
|
|
||||||
'get_polls_data',
|
|
||||||
[$this, 'getPollsData'],
|
|
||||||
['is_safe' => ['all']]
|
|
||||||
),
|
|
||||||
new TwigFunction(
|
|
||||||
'get_polls_visiblity',
|
|
||||||
[$this, 'getPollsVisibility'],
|
|
||||||
['is_safe' => ['all']]
|
|
||||||
),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getPollsData() {
|
|
||||||
return [
|
|
||||||
'mta_method' => $this->settings->get('mta.method'),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getPollsVisibility() {
|
|
||||||
return [
|
|
||||||
'show_poll_success_delivery_preview' => $this->settings->get('show_poll_success_delivery_preview'),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
|
@ -51,8 +51,6 @@ jQuery('.toplevel_page_mailpoet-newsletters.menu-top-last')
|
|||||||
var mailpoet_time_format = "<%= wp_time_format()|escape('js') %>";
|
var mailpoet_time_format = "<%= wp_time_format()|escape('js') %>";
|
||||||
var mailpoet_version = "<%= mailpoet_version() %>";
|
var mailpoet_version = "<%= mailpoet_version() %>";
|
||||||
var mailpoet_locale = "<%= mailpoet_locale() %>";
|
var mailpoet_locale = "<%= mailpoet_locale() %>";
|
||||||
var mailpoet_polls_data = <%= json_encode(get_polls_data()) %>;
|
|
||||||
var mailpoet_polls_visibility = <%= json_encode(get_polls_visiblity()) %>;
|
|
||||||
var mailpoet_premium_version = <%= json_encode(mailpoet_premium_version()) %>;
|
var mailpoet_premium_version = <%= json_encode(mailpoet_premium_version()) %>;
|
||||||
var mailpoet_analytics_enabled = <%= is_analytics_enabled() | json_encode %>;
|
var mailpoet_analytics_enabled = <%= is_analytics_enabled() | json_encode %>;
|
||||||
var mailpoet_analytics_data = <%= json_encode(get_analytics_data()) %>;
|
var mailpoet_analytics_data = <%= json_encode(get_analytics_data()) %>;
|
||||||
|
@ -729,12 +729,6 @@
|
|||||||
{ scroll: true }
|
{ scroll: true }
|
||||||
);
|
);
|
||||||
trackTestEmailSent(mailer, true);
|
trackTestEmailSent(mailer, true);
|
||||||
|
|
||||||
const showSuccessDeliveryPoll = MailPoet.Poll.successDelivery.canShow('preview', true) && $('#mailpoet_smtp_method').val() === 'server';
|
|
||||||
if (showSuccessDeliveryPoll) {
|
|
||||||
MailPoet.Poll.successDelivery.showModal('preview', 'IHedf1');
|
|
||||||
MailPoet.Poll.successDelivery.setPollShown('preview');
|
|
||||||
}
|
|
||||||
}).fail(function(response) {
|
}).fail(function(response) {
|
||||||
if (response.errors.length > 0) {
|
if (response.errors.length > 0) {
|
||||||
MailPoet.Notice.error(
|
MailPoet.Notice.error(
|
||||||
|
Reference in New Issue
Block a user