From 089c718d6aa22e8da24b1c66bc3b8884a50bb6d6 Mon Sep 17 00:00:00 2001
From: David Parker <dlparker1005@gmail.com>
Date: Fri, 21 Oct 2022 10:56:17 -0400
Subject: [PATCH 1/2] Track cancellation even if user still has levels

---
 pmpro-kissmetrics.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pmpro-kissmetrics.php b/pmpro-kissmetrics.php
index 623e3ac..d89aa1f 100755
--- a/pmpro-kissmetrics.php
+++ b/pmpro-kissmetrics.php
@@ -170,7 +170,7 @@ function pmprokm_after_change_membership_level($level_id, $user_id) {
     }
 
     //user cancelled
-    if(!empty($pmprokm_options['track_pmpro_cancel']) && pmpro_hasMembershipLevel(0, $user_id)) {
+    if(!empty($pmprokm_options['track_pmpro_cancel']) && empty($level_id)) {
         KM::record('Membership Level Cancelled');
     }
 
@@ -178,7 +178,7 @@ function pmprokm_after_change_membership_level($level_id, $user_id) {
 add_action('pmpro_after_change_membership_level', 'pmprokm_after_change_membership_level', 10, 2);
 
 //User checks out
-function pmprokm_after_checkout($user_id) {
+function pmprokm_after_checkout( $user_id, $order ) {
 
     global $current_user, $pmprokm_options, $discount_code;
 
@@ -189,7 +189,6 @@ function pmprokm_after_checkout($user_id) {
 	pmprokm_identify($user_id);
 
     $order = new MemberOrder;
-    $order->getLastMemberOrder($user_id, 'success');
     $level = pmpro_getLevel($order->membership_id);
 		
     if(!empty($pmprokm_options['track_pmpro_checkout'])) {
@@ -217,7 +216,7 @@ function pmprokm_after_checkout($user_id) {
     if($is_trial && !empty($pmprokm_options['track_pmpro_trials']))
         KM::record('Started Trial');
 }
-add_action('pmpro_after_checkout', 'pmprokm_after_checkout');
+add_action('pmpro_after_checkout', 'pmprokm_after_checkout', 10, 2);
 
 
 

From 7900f1257b37ac52251a5c4f590dce1fde050327 Mon Sep 17 00:00:00 2001
From: David Parker <dlparker1005@gmail.com>
Date: Fri, 22 Dec 2023 13:28:01 -0500
Subject: [PATCH 2/2] No longer redeclaring $order

---
 pmpro-kissmetrics.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pmpro-kissmetrics.php b/pmpro-kissmetrics.php
index d89aa1f..2132a86 100755
--- a/pmpro-kissmetrics.php
+++ b/pmpro-kissmetrics.php
@@ -188,7 +188,6 @@ function pmprokm_after_checkout( $user_id, $order ) {
 	//switch KM identity to affected user
 	pmprokm_identify($user_id);
 
-    $order = new MemberOrder;
     $level = pmpro_getLevel($order->membership_id);
 		
     if(!empty($pmprokm_options['track_pmpro_checkout'])) {