From 938ddf75913aad1b95a5d1ce25c19471022f97be Mon Sep 17 00:00:00 2001 From: Kcppdevelopers Date: Sat, 19 Aug 2017 22:22:05 +0530 Subject: [PATCH] PayFlow : Woo subscription issue with renewal, ref #823 --- .../wc-gateway-paypal-advanced-subscriptions-angelleye.php | 6 +++++- ...c-gateway-paypal-pro-payflow-subscriptions-angelleye.php | 6 +++++- .../wc-gateway-paypal-pro-subscriptions-angelleye.php | 6 +++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/classes/subscriptions/wc-gateway-paypal-advanced-subscriptions-angelleye.php b/classes/subscriptions/wc-gateway-paypal-advanced-subscriptions-angelleye.php index 9ff6876ec..e844f9c1e 100644 --- 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 index 5c17ff0f4..a16e5f0f7 100644 --- 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 index 9a94e5b90..d810047cb 100644 --- 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); }