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

[#13] removed ::isSDD dependency from CiviSEPA

Browse source
This commit is contained in:
B. Endres 2019-11-22 15:04:51 +01:00
parent edebdd234d
commit 383e392ff0
4 changed files with 4 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
CRM/Twingle/Form/Profile.php
View file

@ -602,20 +602,7 @@ class CRM_Twingle_Form_Profile extends CRM_Core_Form {
// enabled. // enabled.
if ( if (
CRM_Twingle_Submission::civiSepaEnabled() CRM_Twingle_Submission::civiSepaEnabled()
&& ( && CRM_Twingle_Tools::isSDD($payment_instrument['value'])
(
method_exists('CRM_Sepa_Logic_PaymentInstruments', 'isSDD')
&& CRM_Sepa_Logic_PaymentInstruments::isSDD(array(
'payment_instrument_id' => $payment_instrument['value'],
))
)
|| (
method_exists('CRM_Sepa_Logic_Settings', 'isSDD')
&& CRM_Sepa_Logic_Settings::isSDD(array(
'payment_instrument_id' => $payment_instrument['value'],
))
)
)
) { ) {
if (!isset(self::$_paymentInstruments['sepa'])) { if (!isset(self::$_paymentInstruments['sepa'])) {
self::$_paymentInstruments['sepa'] = E::ts('CiviSEPA'); self::$_paymentInstruments['sepa'] = E::ts('CiviSEPA');

2
CRM/Twingle/Tools.php
View file

@ -55,7 +55,7 @@ class CRM_Twingle_Tools {
'id' => $recurring_contribution_id]); 'id' => $recurring_contribution_id]);
// check if this is a SEPA transaction // check if this is a SEPA transaction
//if (self::isSDD($recurring_contribution['payment_instrument_id'])) return; if (self::isSDD($recurring_contribution['payment_instrument_id'])) return;
// check if it's really a termination (i.e. current status is 2 or 5) // check if it's really a termination (i.e. current status is 2 or 5)
if (!in_array($recurring_contribution['contribution_status_id'], [2,5])) return; if (!in_array($recurring_contribution['contribution_status_id'], [2,5])) return;

2
api/v3/TwingleDonation/Cancel.php
View file

@ -97,7 +97,7 @@ function civicrm_api3_twingle_donation_Cancel($params) {
// End SEPA mandate if applicable. // End SEPA mandate if applicable.
if ( if (
CRM_Twingle_Submission::civiSepaEnabled() CRM_Twingle_Submission::civiSepaEnabled()
&& CRM_Sepa_Logic_Settings::isSDD($contribution) && 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. // Mandates can not be terminated in the past.

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

@ -80,7 +80,7 @@ function civicrm_api3_twingle_donation_endrecurring($params) {
// recurring contributions. // recurring contributions.
if ( if (
CRM_Twingle_Submission::civiSepaEnabled() CRM_Twingle_Submission::civiSepaEnabled()
&& CRM_Sepa_Logic_Settings::isSDD($contribution) && 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. // Mandates can not be terminated in the past.