diff --git a/assets/css/src/components/_newsletterCongratulate.scss b/assets/css/src/components/_newsletterCongratulate.scss index 2f921835de..25ee24ef0f 100644 --- a/assets/css/src/components/_newsletterCongratulate.scss +++ b/assets/css/src/components/_newsletterCongratulate.scss @@ -28,13 +28,6 @@ margin-left: auto; margin-right: auto; } - - .typeform-widget { - height: 350px; - margin: 0 auto 30px; - max-width: 100%; - width: 500px; - } } .mailpoet_congratulate_success.mailpoet_congratulate_mss_pitch { diff --git a/assets/js/src/newsletter_editor/components/sidebar.js b/assets/js/src/newsletter_editor/components/sidebar.js index 463dddef1c..2da43182c1 100644 --- a/assets/js/src/newsletter_editor/components/sidebar.js +++ b/assets/js/src/newsletter_editor/components/sidebar.js @@ -335,7 +335,6 @@ Module.SidebarPreviewView = Marionette.View.extend({ CommunicationComponent.previewNewsletter(data).always(function () { MailPoet.Modal.loading(false); }).done(function () { - var showSuccessDeliveryPoll; MailPoet.Notice.success( MailPoet.I18n.t('newsletterPreviewSent'), { scroll: true } @@ -347,11 +346,6 @@ Module.SidebarPreviewView = Marionette.View.extend({ if (App.getConfig().get('validation.validateSPFRecord')) { checkSPFRecord(); } - showSuccessDeliveryPoll = MailPoet.Poll.successDelivery.canShow('preview'); - if (showSuccessDeliveryPoll) { - MailPoet.Poll.successDelivery.showModal('preview', 'IHedf1'); - MailPoet.Poll.successDelivery.setPollShown('preview'); - } }).fail(function (response) { if (response.errors.length > 0) { MailPoet.Notice.error( diff --git a/assets/js/src/newsletters/send/congratulate/success_for_mss_users.jsx b/assets/js/src/newsletters/send/congratulate/success_for_mss_users.jsx index bf6135e8d1..ebfae46372 100644 --- a/assets/js/src/newsletters/send/congratulate/success_for_mss_users.jsx +++ b/assets/js/src/newsletters/send/congratulate/success_for_mss_users.jsx @@ -19,28 +19,10 @@ function renderHeader(newsletter) { } function MSSUserSuccess(props) { - const showSuccessDeliveryPoll = ( - props.newsletter.type === 'standard' - && props.newsletter.status !== 'scheduled' - ); - if (showSuccessDeliveryPoll) { - MailPoet.Poll.successDelivery.initTypeformScript(); - } return (

{renderHeader(props.newsletter)}

- {showSuccessDeliveryPoll - && ( -
- ) - }
); diff --git a/assets/js/src/poll.jsx b/assets/js/src/poll.jsx deleted file mode 100644 index f38c7092b5..0000000000 --- a/assets/js/src/poll.jsx +++ /dev/null @@ -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: ` -
- `, - }); - }, - }, -}; - -MailPoet.Poll = Poll; diff --git a/assets/js/src/webpack_admin_index.jsx b/assets/js/src/webpack_admin_index.jsx index 021761aad3..3545155201 100644 --- a/assets/js/src/webpack_admin_index.jsx +++ b/assets/js/src/webpack_admin_index.jsx @@ -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/premium_tab/premium_tab.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 'subscribers/importExport/import.jsx'; // side effect - executes on doc ready, adds events import 'subscribers/importExport/export.js'; // side effect - executes on doc ready diff --git a/lib/Config/Changelog.php b/lib/Config/Changelog.php index e38b928dce..bbf7612462 100644 --- a/lib/Config/Changelog.php +++ b/lib/Config/Changelog.php @@ -84,7 +84,6 @@ class Changelog { private function setupNewInstallation() { $this->settings->set('show_congratulate_after_first_newsletter', true); - $this->settings->set('show_poll_success_delivery_preview', true); } private function checkWelcomeWizard() { diff --git a/lib/Config/Renderer.php b/lib/Config/Renderer.php index 3e9f2e750c..fd309c4521 100644 --- a/lib/Config/Renderer.php +++ b/lib/Config/Renderer.php @@ -41,7 +41,6 @@ class Renderer { $this->setupHandlebars(); $this->setupHelpscout(); $this->setupAnalytics(); - $this->setupPolls(); $this->setupGlobalVariables(); $this->setupSyntax(); } @@ -70,10 +69,6 @@ class Renderer { $this->renderer->addExtension(new Twig\Analytics()); } - public function setupPolls() { - $this->renderer->addExtension(new Twig\Polls()); - } - public function setupGlobalVariables() { $this->renderer->addExtension(new Twig\Assets([ 'version' => Env::$version, diff --git a/lib/Twig/Polls.php b/lib/Twig/Polls.php deleted file mode 100644 index 1ec106909c..0000000000 --- a/lib/Twig/Polls.php +++ /dev/null @@ -1,44 +0,0 @@ -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'), - ]; - } -} diff --git a/views/layout.html b/views/layout.html index 3d45e1647b..2b6fbaefdc 100644 --- a/views/layout.html +++ b/views/layout.html @@ -51,8 +51,6 @@ jQuery('.toplevel_page_mailpoet-newsletters.menu-top-last') var mailpoet_time_format = "<%= wp_time_format()|escape('js') %>"; var mailpoet_version = "<%= mailpoet_version() %>"; 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_analytics_enabled = <%= is_analytics_enabled() | json_encode %>; var mailpoet_analytics_data = <%= json_encode(get_analytics_data()) %>; diff --git a/views/settings/mta.html b/views/settings/mta.html index 0bc19e243e..2c25d18f5a 100644 --- a/views/settings/mta.html +++ b/views/settings/mta.html @@ -729,12 +729,6 @@ { scroll: 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) { if (response.errors.length > 0) { MailPoet.Notice.error(