Fixed recurring payments issue

JMAConsulting · Aug 1, 2019 · 6d97dcb · 6d97dcb
1 parent b50226c
commit 6d97dcb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 298 deletions.
diff --git a/CRM/Core/Payment/#Moneris.php# b/CRM/Core/Payment/#Moneris.php#
diff --git a/CRM/Core/Payment/Moneris.php b/CRM/Core/Payment/Moneris.php
@@ -90,6 +90,9 @@ function doDirectPayment(&$params) {
     if ($params['currencyID'] != 'CAD') {
       return CRM_Moneris_Utils::error('Invalid currency selection, must be $CAD');
     }
+    if (CRM_Utils_Array::value('is_recur', $params) && empty($params['contributionRecurID']) && !empty($params['contributionID'])) {
+      $params['contributionRecurID'] = CRM_Core_DAO::singleValueQuery("SELECT contribution_recur_id FROM civicrm_contribution WHERE id = " . $params['contributionID']);
+    }
     $isRecur =  CRM_Utils_Array::value('is_recur', $params) && $params['contributionRecurID'];
     // require moneris supplied api library
     require_once 'CRM/Moneris/mpgClasses.php';
@@ -267,14 +270,14 @@ function doDirectPayment(&$params) {
       // fix next date to take allow days into account
       // days at which we want to make the recurring payment
       // FIXME: should be a setting
-      $allow_days = array(15);
+      /* $allow_days = array(15);
       if (!empty($next_sched_contribution_date)) {
         if (max($allow_days) > 0) {
           $init_time = strtotime($next_sched_contribution_date);
           $from_time = _moneris_contributionrecur_next($init_time,$allow_days);
           $next_sched_contribution_date = date('Ymd', $from_time) . '030000';
         }
-      }
+      } */
 
       // FIXME: it is not saved anywhere...
       $params['payment_token_id'] = $token_id;

diff --git a/api/v3/Job/Monerisvaultrecurringcontributions.php b/api/v3/Job/Monerisvaultrecurringcontributions.php
@@ -131,7 +131,7 @@ function civicrm_api3_job_Monerisvaultrecurringcontributions($params) {
   $sql .= ' AND (DATE(cr.next_sched_contribution_date) <= CURDATE()
                  OR (cr.next_sched_contribution_date IS NULL AND DATE(cr.start_date) <= CURDATE()))';
   // testing before mass processing
-  $sql .= " LIMIT 1";
+  // $sql .= " LIMIT 1";
 
   $paymentProcessor = CRM_Financial_BAO_PaymentProcessor::getPayment($params['payment_processor_id'], $params['payment_processor_mode']);
   $counter = 0;