From 35492321e1b7c23260aa01d953daa33c55e36859 Mon Sep 17 00:00:00 2001 From: Edsel Date: Fri, 2 Sep 2016 15:26:07 +0530 Subject: [PATCH] CRM-19153 Reverted changes to pledge base start date calculation for week ---------------------------------------- * CRM-19153: Future pledge start date causes improper future pledge payment dates https://issues.civicrm.org/jira/browse/CRM-19153 --- CRM/Pledge/BAO/PledgePayment.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CRM/Pledge/BAO/PledgePayment.php b/CRM/Pledge/BAO/PledgePayment.php index 5f5043aa8b..6c9e037f17 100644 --- a/CRM/Pledge/BAO/PledgePayment.php +++ b/CRM/Pledge/BAO/PledgePayment.php @@ -528,8 +528,13 @@ WHERE civicrm_pledge.id = %2 } } elseif ($params['frequency_unit'] == 'week') { + + // for week calculate day of week ie. Sunday,Monday etc. as next payment date + $dayOfWeek = date('w', mktime(0, 0, 0, $date['month'], $date['day'], $date['year'])); + $frequencyDay = $params['frequency_day'] - $dayOfWeek; + $scheduleDate = explode("-", date('n-j-Y', mktime(0, 0, 0, $date['month'], - $date['day'], $date['year'] + $date['day'] + $frequencyDay, $date['year'] ))); $date['month'] = $scheduleDate[0]; $date['day'] = $scheduleDate[1]; -- 2.25.1