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

Add installed_at into tracking data

Browse Source 
[MAILPOET-1815]
This commit is contained in:
Rostislav Wolny
2019-03-08 14:12:28 +01:00
committed by M. Shull
parent e3741def1d
commit 0ab7f7b1e8
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
assets/js/src/nps_poll.jsx
View File

@@ -41,10 +41,7 @@ const withNpsPoll = function withNpsPoll(Component) {
} }
displayPoll() { displayPoll() {
if ( if (!this.state.pollShown) {
!this.state.pollShown
&& window.mailpoet_installed_at_isoFormat
) {
this.setState({ pollShown: true }); this.setState({ pollShown: true });
getTrackingData().then(this.callSatismeter); getTrackingData().then(this.callSatismeter);
} }
@@ -59,9 +56,9 @@ const withNpsPoll = function withNpsPoll(Component) {
traits: { traits: {
name: window.mailpoet_current_wp_user.user_nicename, name: window.mailpoet_current_wp_user.user_nicename,
email: window.mailpoet_current_wp_user.user_email, email: window.mailpoet_current_wp_user.user_email,
createdAt: window.mailpoet_installed_at_isoFormat,
mailpoetVersion: window.mailpoet_version, mailpoetVersion: window.mailpoet_version,
mailpoetPremiumIsActive: window.mailpoet_premium_active, mailpoetPremiumIsActive: window.mailpoet_premium_active,
createdAt: trackingData.installedAtIso,
newslettersSent: trackingData.newslettersSent, newslettersSent: trackingData.newslettersSent,
welcomeEmails: trackingData.welcomeEmails, welcomeEmails: trackingData.welcomeEmails,
postnotificationEmails: trackingData.postnotificationEmails, postnotificationEmails: trackingData.postnotificationEmails,

3
lib/Analytics/Reporter.php
View File

@@ -1,6 +1,7 @@
<?php <?php
namespace MailPoet\Analytics; namespace MailPoet\Analytics;
use \DateTime;
use MailPoet\Config\ServicesChecker; use MailPoet\Config\ServicesChecker;
use MailPoet\Cron\CronTrigger; use MailPoet\Cron\CronTrigger;
use MailPoet\Models\Newsletter; use MailPoet\Models\Newsletter;
@@ -106,7 +107,9 @@ class Reporter {
$newletters = Newsletter::getAnalytics(); $newletters = Newsletter::getAnalytics();
$segments = Segment::getAnalytics(); $segments = Segment::getAnalytics();
$mta = $this->settings->get('mta', []); $mta = $this->settings->get('mta', []);
$installed_at = new DateTime($this->settings->get('installed_at'));
return [ return [
'installedAtIso' => $installed_at->format(DateTime::ISO8601),
'newslettersSent' => $newletters['sent_newsletters_count'], 'newslettersSent' => $newletters['sent_newsletters_count'],
'welcomeEmails' => $newletters['welcome_newsletters_count'], 'welcomeEmails' => $newletters['welcome_newsletters_count'],
'postnotificationEmails' => $newletters['notifications_count'], 'postnotificationEmails' => $newletters['notifications_count'],

1
views/newsletters.html
View File

@@ -8,7 +8,6 @@
var mailpoet_display_nps_poll = <%= settings.display_nps_poll ? 'true' : 'false' %>; var mailpoet_display_nps_poll = <%= settings.display_nps_poll ? 'true' : 'false' %>;
var mailpoet_segments = <%= json_encode(segments) %>; var mailpoet_segments = <%= json_encode(segments) %>;
var mailpoet_show_congratulate_after_first_newsletter = <%= show_congratulate_after_first_newsletter %>; var mailpoet_show_congratulate_after_first_newsletter = <%= show_congratulate_after_first_newsletter %>;
var mailpoet_installed_at_isoFormat = "<%= settings['installed_at'] | date('c') %>";
var mailpoet_installed_days_ago = <%= installed_days_ago %>; var mailpoet_installed_days_ago = <%= installed_days_ago %>;
var mailpoet_current_wp_user = <%= json_encode(current_wp_user) %>; var mailpoet_current_wp_user = <%= json_encode(current_wp_user) %>;
var mailpoet_current_wp_user_firstname = '<%= current_wp_user_firstname %>'; var mailpoet_current_wp_user_firstname = '<%= current_wp_user_firstname %>';