ProPeace/de.systopia.twingle
6
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases Packages Wiki Activity Actions

[#13] fixed end date issues

Browse source
This commit is contained in:
B. Endres 2019-11-23 08:46:23 +01:00
parent 383e392ff0
commit 24d93ed1f1
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
api/v3/TwingleDonation/Endrecurring.php
View file

@ -83,11 +83,16 @@ function civicrm_api3_twingle_donation_endrecurring($params) {
&& CRM_Twingle_Tools::isSDD($contribution['payment_instrument_id']) && CRM_Twingle_Tools::isSDD($contribution['payment_instrument_id'])
) { ) {
$mandate_id = CRM_Sepa_Logic_Settings::getMandateFor($contribution['id']); $mandate_id = CRM_Sepa_Logic_Settings::getMandateFor($contribution['id']);
// Mandates can not be terminated in the past. $end_date = date_create_from_format('Ymd', $params['ended_at']);
$end_date = date('Ymd', max( if ($end_date) {
time(), // Mandates can not be terminated in the past:
date_create_from_format('Ymd', $params['cancelled_at'])->getTimestamp() $end_date = date('Ymd', max(
)); time(),
$end_date->getTimestamp()));
} else {
// end date couldn't be parsed, use 'now'
$end_date = date('Ymd');
}
// verify that the mandate has not been terminated in the past // verify that the mandate has not been terminated in the past
$mandate_status = civicrm_api3('SepaMandate', 'getvalue', ['return' => 'status', 'id' => $mandate_id]); $mandate_status = civicrm_api3('SepaMandate', 'getvalue', ['return' => 'status', 'id' => $mandate_id]);
@ -115,9 +120,9 @@ function civicrm_api3_twingle_donation_endrecurring($params) {
else { else {
CRM_Twingle_Tools::$protection_suspended = TRUE; CRM_Twingle_Tools::$protection_suspended = TRUE;
$contribution = civicrm_api3('ContributionRecur', 'create', array( $contribution = civicrm_api3('ContributionRecur', 'create', array(
'id' => $contribution['id'], 'id' => $contribution['id'],
'end_date' => $params['ended_at'], 'end_date' => $params['ended_at'],
'contribution_status_id' => CRM_Twingle_Submission::CONTRIBUTION_STATUS_COMPLETED, 'contribution_status_id' => CRM_Twingle_Submission::CONTRIBUTION_STATUS_COMPLETED,
)); ));
CRM_Twingle_Tools::$protection_suspended = FALSE; CRM_Twingle_Tools::$protection_suspended = FALSE;
} }