Rebased!

JMAConsulting · Oct 27, 2020 · e786bd4 · e786bd4
1 parent f6056f1
commit e786bd4
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/CRM/Core/Payment/iATSService.php b/CRM/Core/Payment/iATSService.php
@@ -565,6 +565,13 @@ protected function updateRecurring($params, $update) {
       // By default, it's empty, unless we've got a future start date.
       if (empty($update['receive_date'])) {
         $next = strtotime('+' . $params['frequency_interval'] . ' ' . $params['frequency_unit']);
+        // handle the special case of monthly contributions made after the 28th
+        if ('month' == $params['frequency_unit']) {
+          $now = getdate();
+          if ($now['mday'] > 28) { // pull it back to the 28th
+            $next = $next - (($now['mday'] - 28) * 24 * 60 * 60);
+          }
+        }
         $recur_update['next_sched_contribution_date'] = date('Ymd', $next) . '030000';
       }
       else {