PayFlow : Woo subscription issue with renewal, ref #823

angelleye · Aug 19, 2017 · 938ddf7 · 938ddf7
1 parent 75cccf0
commit 938ddf7
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/classes/subscriptions/wc-gateway-paypal-advanced-subscriptions-angelleye.php b/classes/subscriptions/wc-gateway-paypal-advanced-subscriptions-angelleye.php
@@ -33,7 +33,11 @@ public function process_payment($order_id) {
     }
 
     public function scheduled_subscription_payment($amount_to_charge, $renewal_order) {
-        $this->angelleye_scheduled_subscription_payment_retry_compability($renewal_order);
+        $renewal_order_id = $this->wc_pre_30 ? $renewal_order->id : $renewal_order->get_id();
+        $payment_tokens_id = get_post_meta($renewal_order_id, '_payment_tokens_id', true);
+        if (empty($payment_tokens_id) || $payment_tokens_id == false) {
+            $this->angelleye_scheduled_subscription_payment_retry_compability($renewal_order);
+        }
         parent::process_payment($renewal_order);
     }
 

diff --git a/classes/subscriptions/wc-gateway-paypal-pro-payflow-subscriptions-angelleye.php b/classes/subscriptions/wc-gateway-paypal-pro-payflow-subscriptions-angelleye.php
@@ -33,7 +33,11 @@ public function process_payment($order_id) {
     }
 
     public function scheduled_subscription_payment($amount_to_charge, $renewal_order) {
-        $this->angelleye_scheduled_subscription_payment_retry_compability($renewal_order);
+        $renewal_order_id = $this->wc_pre_30 ? $renewal_order->id : $renewal_order->get_id();
+        $payment_tokens_id = get_post_meta($renewal_order_id, '_payment_tokens_id', true);
+        if (empty($payment_tokens_id) || $payment_tokens_id == false) {
+            $this->angelleye_scheduled_subscription_payment_retry_compability($renewal_order);
+        }
         parent::process_subscription_payment($renewal_order, $amount_to_charge);
     }
 

diff --git a/classes/subscriptions/wc-gateway-paypal-pro-subscriptions-angelleye.php b/classes/subscriptions/wc-gateway-paypal-pro-subscriptions-angelleye.php
@@ -37,7 +37,11 @@ public function process_payment($order_id) {
     }
 
     public function scheduled_subscription_payment($amount_to_charge, $renewal_order) {
-        $this->angelleye_scheduled_subscription_payment_retry_compability($renewal_order);
+        $renewal_order_id = $this->wc_pre_30 ? $renewal_order->id : $renewal_order->get_id();
+        $payment_tokens_id = get_post_meta($renewal_order_id, '_payment_tokens_id', true);
+        if (empty($payment_tokens_id) || $payment_tokens_id == false) {
+            $this->angelleye_scheduled_subscription_payment_retry_compability($renewal_order);
+        }
         parent::process_subscription_payment($renewal_order, $amount_to_charge);
     }