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

[#20] fixes for mandate ref / postprocessing

Browse source
This commit is contained in:
B. Endres 2020-05-24 20:39:47 +02:00
parent db9c53bd10
commit 30a0b81c8b
1 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
api/v3/TwingleDonation/Submit.php
View file

@ -707,16 +707,8 @@ function civicrm_api3_twingle_donation_Submit($params) {
$recurring_contribution_id = $contribution_id = ''; $recurring_contribution_id = $contribution_id = '';
if (isset($contribution_recur['id'])) { if (isset($contribution_recur['id'])) {
$recurring_contribution_id = $contribution_recur['id']; $recurring_contribution_id = $contribution_recur['id'];
} elseif (!empty($mandate['id'])) { } elseif (!empty($result_values['sepa_mandate']['entity_id'])) {
// load mandate and see... $recurring_contribution_id = (int) $result_values['sepa_mandate']['entity_id'];
try {
$mandate_created = civicrm_api3('SepaMandate', 'getsingle', ['id' => $mandate['id']]);
if ($mandate_created['entity_table'] == 'civicrm_contribution_recur') {
$recurring_contribution_id = $mandate['entity_id'];
}
} catch(CiviCRM_API3_Exception $ex) {
Civi::log()->warning("Couldn't load SepaMandate with id '{$mandate['id']}'.");
}
} }
if (isset($contribution['id'])) { if (isset($contribution['id'])) {
$contribution_id = $contribution['id']; $contribution_id = $contribution['id'];
@ -734,7 +726,7 @@ function civicrm_api3_twingle_donation_Submit($params) {
// refresh membership data // refresh membership data
$result_values['membership'] = civicrm_api3('Membership', 'getsingle', ['id' => $membership['id']]); $result_values['membership'] = civicrm_api3('Membership', 'getsingle', ['id' => $membership['id']]);
} catch (Exception $ex) { } catch (CiviCRM_API3_Exception $ex) {
// TODO: more error handling? // TODO: more error handling?
Civi::log()->debug("Twingle membership postprocessing call {$pp_entity}.{$pp_action} has failed: " . $ex->getMessage()); Civi::log()->debug("Twingle membership postprocessing call {$pp_entity}.{$pp_action} has failed: " . $ex->getMessage());
throw new Exception( throw new Exception(