From fc5bba9f11187abaf470e9482fdd5fec19eadae0 Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel@mailpoet.com>
Date: Thu, 27 Sep 2018 08:54:40 +0200
Subject: [PATCH 1/4] Show NPS survey for all users

[MAILPOET-1539]
---
 lib/Config/Menu.php    |  1 +
 views/layout.html      |  4 ++++
 views/newsletters.html | 11 +++++++++++
 3 files changed, 16 insertions(+)

diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php
index 4871d73904..8986e7c8bf 100644
--- a/lib/Config/Menu.php
+++ b/lib/Config/Menu.php
@@ -558,6 +558,7 @@ class Menu {
     });
     $data['segments'] = $segments;
     $data['settings'] = Setting::getAll();
+    $data['current_wp_user'] = wp_get_current_user()->to_array();
     $data['roles'] = $wp_roles->get_names();
     $data['roles']['mailpoet_all'] = __('In any WordPress role', 'mailpoet');
 
diff --git a/views/layout.html b/views/layout.html
index 6bfebefb05..55cf46b241 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -122,4 +122,8 @@ jQuery('.toplevel_page_mailpoet-newsletters.menu-top-last')
   </script>
 <% endif %>
 
+<script>
+  // SatisMeter for tracking NPS score
+  (function() { window.satismeter = window.satismeter || function() {(window.satismeter.q = window.satismeter.q || []).push(arguments);};window.satismeter.l = 1 * new Date();var script = document.createElement("script");var parent = document.getElementsByTagName("script")[0].parentNode;script.async = 1;script.src = "https://app.satismeter.com/satismeter.js";parent.appendChild(script);})();
+</script>
 <% block after_javascript %><% endblock %>
diff --git a/views/newsletters.html b/views/newsletters.html
index 33f0a463f8..533fa53736 100644
--- a/views/newsletters.html
+++ b/views/newsletters.html
@@ -318,4 +318,15 @@
   });
 </script>
 <% endif %>
+<script>
+  satismeter({
+    writeKey: '6L479eVPXk7pBn6S',
+    userId: '<%= current_wp_user.ID %>',
+    traits: {
+      name: '<%= current_wp_user.user_nicename %>',
+      email: '<%= current_wp_user.user_email %>',
+      createdAt: '<%= settings["installed_at"] %>'
+    }
+  });
+</script>
 <% endblock %>

From 94efc67658e1be04a2c4d39c493d84edd00413de Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel@mailpoet.com>
Date: Thu, 27 Sep 2018 10:38:11 +0200
Subject: [PATCH 2/4] Move tracking code into a sepparate file

[MAILPOET-1539]
---
 assets/js/src/nps_poll.jsx | 15 +++++++++++++++
 lib/Config/Menu.php        |  1 +
 views/newsletters.html     | 15 ++++-----------
 webpack.config.js          |  3 ++-
 4 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 assets/js/src/nps_poll.jsx

diff --git a/assets/js/src/nps_poll.jsx b/assets/js/src/nps_poll.jsx
new file mode 100644
index 0000000000..14419729d9
--- /dev/null
+++ b/assets/js/src/nps_poll.jsx
@@ -0,0 +1,15 @@
+function displayPoll() {
+  if (window.display_nps_poll && window.satismeter) {
+    window.satismeter({
+      writeKey: '6L479eVPXk7pBn6S',
+      userId: window.current_wp_user.ID + window.site_url,
+      traits: {
+        name: window.current_wp_user.user_nicename,
+        email: window.current_wp_user.user_email,
+        createdAt: window.mailpoet_settings.installed_at,
+      },
+    });
+  }
+}
+
+setImmediate(displayPoll);
diff --git a/lib/Config/Menu.php b/lib/Config/Menu.php
index 8986e7c8bf..351a21ef88 100644
--- a/lib/Config/Menu.php
+++ b/lib/Config/Menu.php
@@ -559,6 +559,7 @@ class Menu {
     $data['segments'] = $segments;
     $data['settings'] = Setting::getAll();
     $data['current_wp_user'] = wp_get_current_user()->to_array();
+    $data['site_url'] = site_url();
     $data['roles'] = $wp_roles->get_names();
     $data['roles']['mailpoet_all'] = __('In any WordPress role', 'mailpoet');
 
diff --git a/views/newsletters.html b/views/newsletters.html
index 533fa53736..dec753ffeb 100644
--- a/views/newsletters.html
+++ b/views/newsletters.html
@@ -4,15 +4,19 @@
   <div id="newsletters_container"></div>
 
   <script type="text/javascript">
+    var mailpoet_listing_per_page = <%= items_per_page %>;
+    var display_nps_poll = true;
     var mailpoet_listing_per_page = <%= items_per_page %>;
     var mailpoet_segments = <%= json_encode(segments) %>;
     var mailpoet_settings = <%= json_encode(settings) %>;
+    var current_wp_user = <%= json_encode(current_wp_user) %>;
     var mailpoet_lists = <%= json_encode(lists) %>;
     var mailpoet_roles = <%= json_encode(roles) %>;
     var mailpoet_current_date = <%= json_encode(current_date) %>;
     var mailpoet_current_time = <%= json_encode(current_time) %>;
     var mailpoet_schedule_time_of_day = <%= json_encode(schedule_time_of_day) %>;
     var mailpoet_date_display_format = "<%= wp_date_format() %>";
+    var site_url = "<%= site_url %>";
     var mailpoet_date_storage_format = "Y-m-d";
     var mailpoet_tracking_enabled = <%= json_encode(tracking_enabled) %>;
     var mailpoet_premium_active = <%= json_encode(premium_plugin_active) %>;
@@ -318,15 +322,4 @@
   });
 </script>
 <% endif %>
-<script>
-  satismeter({
-    writeKey: '6L479eVPXk7pBn6S',
-    userId: '<%= current_wp_user.ID %>',
-    traits: {
-      name: '<%= current_wp_user.user_nicename %>',
-      email: '<%= current_wp_user.user_email %>',
-      createdAt: '<%= settings["installed_at"] %>'
-    }
-  });
-</script>
 <% endblock %>
diff --git a/webpack.config.js b/webpack.config.js
index 6ffe1b0e71..4b54eed87f 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -272,7 +272,8 @@ var adminConfig = {
       'settings/reinstall_from_scratch.js',
       'subscribers/importExport/import.js',
       'subscribers/importExport/export.js',
-      'welcome_wizard/wizard.jsx'
+      'welcome_wizard/wizard.jsx',
+      'nps_poll.jsx'
     ],
     form_editor: [
       'form_editor/form_editor.js',

From 281e3c7eaa399acd57a8de968350f30646e13e8e Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel@mailpoet.com>
Date: Thu, 27 Sep 2018 13:28:30 +0200
Subject: [PATCH 3/4] Show the poll on standard listings only

[MAILPOET-1539]
---
 views/newsletters.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/newsletters.html b/views/newsletters.html
index dec753ffeb..c24ab5f81b 100644
--- a/views/newsletters.html
+++ b/views/newsletters.html
@@ -5,7 +5,7 @@
 
   <script type="text/javascript">
     var mailpoet_listing_per_page = <%= items_per_page %>;
-    var display_nps_poll = true;
+    var display_nps_poll = location.hash === '#/standard';
     var mailpoet_listing_per_page = <%= items_per_page %>;
     var mailpoet_segments = <%= json_encode(segments) %>;
     var mailpoet_settings = <%= json_encode(settings) %>;

From da059ad4b245eeb26952f7bc7a83c157c674e2fa Mon Sep 17 00:00:00 2001
From: Pavel Dohnal <pavel@mailpoet.com>
Date: Mon, 1 Oct 2018 08:36:47 +0200
Subject: [PATCH 4/4] Prefix all global variables

[MAILPOET-1539]
---
 assets/js/src/nps_poll.jsx | 8 ++++----
 views/newsletters.html     | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/assets/js/src/nps_poll.jsx b/assets/js/src/nps_poll.jsx
index 14419729d9..4ee4d3cc42 100644
--- a/assets/js/src/nps_poll.jsx
+++ b/assets/js/src/nps_poll.jsx
@@ -1,11 +1,11 @@
 function displayPoll() {
-  if (window.display_nps_poll && window.satismeter) {
+  if (window.mailpoet_display_nps_poll && window.satismeter) {
     window.satismeter({
       writeKey: '6L479eVPXk7pBn6S',
-      userId: window.current_wp_user.ID + window.site_url,
+      userId: window.mailpoet_current_wp_user.ID + window.mailpoet_site_url,
       traits: {
-        name: window.current_wp_user.user_nicename,
-        email: window.current_wp_user.user_email,
+        name: window.mailpoet_current_wp_user.user_nicename,
+        email: window.mailpoet_current_wp_user.user_email,
         createdAt: window.mailpoet_settings.installed_at,
       },
     });
diff --git a/views/newsletters.html b/views/newsletters.html
index c24ab5f81b..535aa3423c 100644
--- a/views/newsletters.html
+++ b/views/newsletters.html
@@ -5,18 +5,18 @@
 
   <script type="text/javascript">
     var mailpoet_listing_per_page = <%= items_per_page %>;
-    var display_nps_poll = location.hash === '#/standard';
+    var mailpoet_display_nps_poll = location.hash === '#/standard';
     var mailpoet_listing_per_page = <%= items_per_page %>;
     var mailpoet_segments = <%= json_encode(segments) %>;
     var mailpoet_settings = <%= json_encode(settings) %>;
-    var current_wp_user = <%= json_encode(current_wp_user) %>;
+    var mailpoet_current_wp_user = <%= json_encode(current_wp_user) %>;
     var mailpoet_lists = <%= json_encode(lists) %>;
     var mailpoet_roles = <%= json_encode(roles) %>;
     var mailpoet_current_date = <%= json_encode(current_date) %>;
     var mailpoet_current_time = <%= json_encode(current_time) %>;
     var mailpoet_schedule_time_of_day = <%= json_encode(schedule_time_of_day) %>;
     var mailpoet_date_display_format = "<%= wp_date_format() %>";
-    var site_url = "<%= site_url %>";
+    var mailpoet_site_url = "<%= site_url %>";
     var mailpoet_date_storage_format = "Y-m-d";
     var mailpoet_tracking_enabled = <%= json_encode(tracking_enabled) %>;
     var mailpoet_premium_active = <%= json_encode(premium_plugin_active) %>;