Merge pull request #27 from OWUREE/fix/incorrect-expiredOn-set

fixed the expiredOn parameter bug on subscription

Author: lukman-paystack

MeprPaystackGateway.php

@@ -383,12 +383,30 @@ public function record_create_subscription()
 
       // If no trial or trial amount is zero then we've got to make
       // sure the confirmation txn lasts through the trial
-      if (!$sub->trial || ($sub->trial && $sub->trial_amount <= 0.00)) {
-        $trial_days      = ($sub->trial) ? $sub->trial_days : $mepr_options->grace_init_days;
+      // if (!$sub->trial || ($sub->trial && $sub->trial_amount <= 0.00)) {
+      //   $trial_days      = ($sub->trial) ? $sub->trial_days : $mepr_options->grace_init_days;
+      //   $txn->status     = MeprTransaction::$confirmed_str;
+      //   $txn->txn_type   = MeprTransaction::$subscription_confirmation_str;
+      //   $txn->expires_at = MeprUtils::ts_to_mysql_date(time() + MeprUtils::days($trial_days), 'Y-m-d 23:59:59');
+      //   $txn->set_subtotal(0.00); // Just a confirmation txn
+      //   $txn->store();
+      // }
+
+      if (!$sub->trial) {
+        $txn->status     = MeprTransaction::$confirmed_str;
+        $txn->txn_type   = MeprTransaction::$subscription_confirmation_str;
+        $next_payment_date = $sdata->next_payment_date;
+        $txn->expires_at = MeprUtils::ts_to_mysql_date(strtotime($next_payment_date), 'Y-m-d 23:59:59');
+
+        $txn->store();
+      }
+
+      else if($sub->trial && $sub->trial_amount <= 0.00) {
+        $trial_days      = $sub->trial_days;
         $txn->status     = MeprTransaction::$confirmed_str;
         $txn->txn_type   = MeprTransaction::$subscription_confirmation_str;
         $txn->expires_at = MeprUtils::ts_to_mysql_date(time() + MeprUtils::days($trial_days), 'Y-m-d 23:59:59');
-        $txn->set_subtotal(0.00); // Just a confirmation txn
+
         $txn->store();
       }
 

main.php

@@ -4,7 +4,7 @@
  * Plugin Name: MemberPress Paystack
  * Plugin URI: https://wordpress.org/plugins/paystack-memberpress/
  * Description: Paystack integration for MemberPress.
- * Version: 1.3.2
+ * Version: 1.3.3
  * Author: Paystack
  * Author URI: https://paystack.com/
  * Developer: Wisdom Ebong

readme.txt

@@ -4,7 +4,7 @@ Tags: paystack, billing, subscription, payment, memberpress,
 Requires at least: 5.1
 Tested up to: 6.3
 Requires PHP: 7.2 and higher
-Stable tag: 1.3.2
+Stable tag: 1.3.3
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -83,6 +83,9 @@ Here you can browse the source, look at open issues and keep track of developmen
 
 == Changelog ==
 
+= 1.3.3 =
+*  Fixed incorrect date set on expiredOn parameter 
+
 = 1.3.2 - Septmber 26, 2023 =
 *  Compatibility with WordPress 6.3 and PHP 8.2.0
 
@@ -93,3 +96,6 @@ Here you can browse the source, look at open issues and keep track of developmen
 
 = 1.3.2 =
 *  Compatibility with WordPress 6.3 and PHP 8.2.0
+
+= 1.3.3 =
+*  Fixed incorrect date set on expiredOn parameter