Skip to content

Commit

Permalink
Version 2.9.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@tomasstark
tomasstark committed Oct 7, 2020
2 parents bf5ba40 + 06f552a commit 3ea5d17
Show file tree
Hide file tree
Showing 20 changed files with 2,942 additions and 401 deletions.
59 changes: 54 additions & 5 deletions composer.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion laterpay/README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Tags: contribution, micropayment, paywall, sell content, subscription, conversio
Requires at least: 4.6
Tested up to: 5.5
Requires PHP: 5.6
Stable tag: 2.9.6
Stable tag: 2.9.7
Author URI: https://laterpay.net
Plugin URI: https://github.com/laterpay/laterpay-wordpress-plugin
License: MIT
Expand Down Expand Up @@ -90,6 +90,10 @@ Yes!
7. The plugin provides a variety of advanced settings to customize the Laterpay plugin and adjust it to your needs.

== Changelog ==
= 2.9.7 ( October 7, 2020 ) =
* Fixed alignment and size of Laterpay logo in various buttons.
* Removed Google Analytics integration to comply with latest EU laws.

= 2.9.6 ( August 25, 2020 ) =
* Updated Laterpay logo.
* Updated 'Tested up to' tag to WordPress 5.5.
Expand Down Expand Up @@ -720,6 +724,9 @@ KNOWN BUGS:

== Upgrade notice ==

= 2.9.7 =
Fixed Laterpay logo appearance, removed GA integration.

= 2.9.6 =
Updated Laterpay logo and compatibility with WordPress 5.5.

Expand Down
36 changes: 0 additions & 36 deletions laterpay/application/Controller/Admin/Settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ public function init_laterpay_advanced_settings() {
// add sections with fields
$this->add_access_settings();
$this->add_unlimited_access_settings();
$this->add_analytics_settings();
$this->add_appearance_settings();
$this->add_technical_settings();
$this->add_contact_section();
Expand Down Expand Up @@ -239,42 +238,7 @@ public function add_analytics_settings() {
)
);

// Add LaterPay GA Section.
add_settings_field(
'laterpay_tracking_data',
__( 'Laterpay Google Analytics:', 'laterpay' ),
array( $this, 'get_ga_field_markup' ),
'laterpay',
'laterpay_analytics',
array(
array(
'name' => 'laterpay_ga_enabled_status',
'value' => 1,
'type' => 'checkbox',
'parent_name' => 'laterpay_tracking_data',
'modal' => array(
'id' => 'lp_ga_modal_id',
'message' => sprintf( '%1$s <br/><br/> %2$s',
esc_html__( 'Laterpay collects this information to improve our products and
services and also so that you can determine the effectiveness of your pricing
strategy using our Merchant Analytics dashboard.', 'laterpay' ),
esc_html__( 'Are you sure you would like to disable this feature?', 'laterpay' ) ),
'saveText' => esc_html__( 'Yes, Disable Tracking', 'laterpay' ),
'cancelText' => esc_html__( 'Cancel', 'laterpay' ),
),
),
array(
'name' => 'laterpay_ga_ua_id',
'type' => 'text',
'classes' => [ 'lp_ga-input' ],
'readonly' => true,
'parent_name' => 'laterpay_tracking_data',
)
)
);

register_setting( 'laterpay', 'laterpay_user_tracking_data' );
register_setting( 'laterpay', 'laterpay_tracking_data' );

}

Expand Down
18 changes: 0 additions & 18 deletions laterpay/application/Helper/Appearance.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,24 +132,6 @@ public static function add_overlay_styles( $handle ) {
*/
public static function is_any_ga_tracking_enabled() {

// Get current status of Google Analytics Settings.
$lp_tracking_data = get_option( 'laterpay_tracking_data' );
$lp_user_tracking_data = get_option( 'laterpay_user_tracking_data' );

// Check if LaterPay Tracking Setting is Enabled.
$is_enabled_lp_tracking = ( ! empty( $lp_tracking_data['laterpay_ga_enabled_status'] ) &&
1 === intval( $lp_tracking_data['laterpay_ga_enabled_status'] ) );

// Check if Personal Tracking Setting is Enabled.
$is_enabled_lp_user_tracking = ( ! empty( $lp_user_tracking_data['laterpay_ga_personal_enabled_status'] ) &&
1 === intval( $lp_user_tracking_data['laterpay_ga_personal_enabled_status'] ) );

$is_any_tracking_enabled = ( $is_enabled_lp_tracking || $is_enabled_lp_user_tracking );

if ( $is_any_tracking_enabled ) {
return true;
}

return false;

}
Expand Down
152 changes: 12 additions & 140 deletions laterpay/asset_sources/js/laterpay-common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,53 +68,13 @@
return matches ? decodeURIComponent(matches[1]) : undefined;
},

// Injects Google Analytics Script.
/**
* Injects Google Analytics Script.
*
* Removed in 2.9.7. Always returns false.
*/
injectGAScript = function ( injectNow ) {
if ( true === injectNow ) {
// This injector script is for GA have made minor modifications to fix linting issue.
(function(i, s, o, g, r, a, m) {
i.GoogleAnalyticsObject = r;
i[r] = i[r] || function() {
(i[r].q = i[r].q || []).push(arguments);
}; i[r].l = 1 * new Date();
a = s.createElement(o);
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m);
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'lpga');
return window[window.GoogleAnalyticsObject || 'lpga'];
}
},

// Send event to LaterPay GA.
sendParentEvent = function( injectNow, eventlabel, eventAction, eventCategory, eventValue, eventInteraction ) {
var lpga = injectGAScript( injectNow );
if (typeof lpga === 'function') {
lpga( 'create', lpCommonVar.lp_tracking_id, 'auto', 'lpParentTracker' );
lpga('lpParentTracker.send', 'event', {
eventCategory : eventCategory,
eventAction : eventAction,
eventLabel : eventlabel,
eventValue : eventValue,
nonInteraction : eventInteraction,
});
}
},

// Send event to User GA.
sendUserEvent = function( injectNow, eventlabel, eventAction, eventCategory, eventValue, eventInteraction ) {
var lpga = injectGAScript( injectNow );
if (typeof lpga === 'function') {
lpga( 'create', lpCommonVar.lp_user_tracking_id, 'auto', 'lpUserTracker' );
lpga( 'lpUserTracker.send', 'event', {
eventCategory : eventCategory,
eventAction : eventAction,
eventLabel : eventlabel,
eventValue : eventValue,
nonInteraction : eventInteraction,
});
}
return false;
},

// Read Post Purchased Cookie.
Expand All @@ -127,26 +87,6 @@
}
},

// Detect if GA is Enabled by MonsterInsights Plugin.
detectMonsterInsightsGA = function () {
if ( typeof window.mi_track_user === 'boolean' && true === window.mi_trac_user ) {
return window[window.GoogleAnalyticsObject || '__gaTracker'];
}
},

// Create a tracker and send event to GA.
createTrackerAndSendEvent = function ( gaTracker, trackingId, trackerName, eventAction, eventLabel,
eventCategory, eventValue, eventInteraction ) {
gaTracker( 'create', trackingId, 'auto', trackerName );
gaTracker( trackerName + '.send', 'event', {
eventCategory : eventCategory,
eventAction : eventAction,
eventLabel : eventLabel,
eventValue : eventValue,
nonInteraction : eventInteraction,
});
},

daysPassedSinceEvent = function( date1, date2 ) {

//Get 1 day in milliseconds
Expand Down Expand Up @@ -361,81 +301,13 @@

window.lpGlobal = {

// Send GA Event conditionally.
/**
* Send GA Event conditionally.
*
* Removed in 2.9.7, always returns false.
*/
sendLPGAEvent: function ( eventAction, eventCategory, eventLabel, eventValue, eventInteraction ) {

if ( 'undefined' === typeof eventInteraction ) {
eventInteraction = false;
}

var sentUserEvent = false;
var __gaTracker = detectMonsterInsightsGA();
var trackers = '';
var userUAID = lpCommonVar.lp_user_tracking_id;
var lpUAID = lpCommonVar.lp_tracking_id;

if( userUAID.length > 0 && lpUAID.length > 0 ) {

if (typeof __gaTracker === 'function' ) {
trackers = __gaTracker.getAll();
trackers.forEach(function(tracker) {
if ( userUAID === tracker.get('trackingId') ) {
sentUserEvent = true;
var trackerName = tracker.get('name');
__gaTracker( trackerName + '.send', 'event', {
eventCategory : eventCategory,
eventAction : eventAction,
eventLabel : eventLabel,
eventValue : eventValue,
nonInteraction : eventInteraction,
});
}
});

if ( true === sentUserEvent ) {
createTrackerAndSendEvent( lpUAID, 'lpParentTracker', eventAction, eventLabel,
eventCategory, eventValue, eventInteraction );
} else {
createTrackerAndSendEvent( __gaTracker, lpUAID, 'lpParentTracker', eventAction,
eventLabel, eventCategory, eventValue, eventInteraction );
createTrackerAndSendEvent( __gaTracker, userUAID, 'lpUserTracker', eventAction,
eventLabel, eventCategory, eventValue, eventInteraction );
}
} else {
sendParentEvent( true, eventLabel, eventAction, eventCategory, eventValue, eventInteraction );
sendUserEvent( true, eventLabel, eventAction, eventCategory, eventValue, eventInteraction );
}
} else if( userUAID.length > 0 && lpUAID.length === 0 ) {
if (typeof __gaTracker === 'function') {
trackers = __gaTracker.getAll();
trackers.forEach(function (tracker) {
if (userUAID === tracker.get('trackingId')) {
sentUserEvent = true;
var trackerName = tracker.get('name');
__gaTracker(trackerName + '.send', 'event', {
eventCategory : eventCategory,
eventAction : eventAction,
eventLabel : eventLabel,
eventValue : eventValue,
nonInteraction : eventInteraction,
});
}
});

if (true !== sentUserEvent) {
sendUserEvent(true, eventLabel, eventAction, eventCategory, eventValue,eventInteraction);
}
} else {
sendUserEvent(true, eventLabel, eventAction, eventCategory, eventValue,eventInteraction);
}
} else if( userUAID.length === 0 && lpUAID.length > 0 ) {
if (typeof __gaTracker === 'function' ) {
createTrackerAndSendEvent( __gaTracker, lpUAID, 'lpParentTracker', eventAction, eventLabel,
eventCategory, eventValue, eventInteraction );
} else{
sendParentEvent( true, eventLabel, eventAction, eventCategory, eventValue, eventInteraction );
}
}
return false;
}
};

Expand Down
8 changes: 5 additions & 3 deletions laterpay/asset_sources/scss/blocks/premium-download-box.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
padding: 4px 7px 4px 7px!important;

&:before {
font-size: round($fs * 2.5) !important;
left: -2px !important;
top: 10px !important;
position: relative !important;
top: 4px !important;
left: 0 !important;
margin-right: 0 !important;
font-size: round($fs--2) !important;
}
}
.lp_purchase-button-wrapper {
Expand Down
Loading

0 comments on commit 3ea5d17

Please sign in to comment.