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

[#1] (wip) Differing financial type for recurring contributions

Browse source
This commit is contained in:
Jens Schuppe 2019-05-15 10:45:16 +02:00
parent cd6b5ad458
commit 7fec0d32e9
8 changed files with 607 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -446,7 +446,6 @@ function civicrm_api3_twingle_donation_Submit($params) {
'contact_id' => (isset($organisation_id) ? $organisation_id : $contact_id),
'currency' => $params['currency'],
'trxn_id' => $params['trx_id'],
'financial_type_id' => $profile->getAttribute('financial_type_id'),
'payment_instrument_id' => $params['payment_instrument_id'],
'amount' => $params['amount'] / 100,
'total_amount' => $params['amount'] / 100,
@ -509,6 +508,10 @@ function civicrm_api3_twingle_donation_Submit($params) {
// Add cycle day for recurring contributions.
if ($params['donation_rhythm'] != 'one_time') {
$mandate_data['cycle_day'] = CRM_Twingle_Submission::getSEPACycleDay($params['confirmed_at'], $creditor_id);
$mandate_data['financial_type_id'] = $profile->getAttribute('financial_type_id_recur');
}
else {
$mandate_data['financial_type_id'] = $profile->getAttribute('financial_type_id');
}
// Let CiviSEPA set the correct payment instrument depending on the
@ -529,6 +532,7 @@ function civicrm_api3_twingle_donation_Submit($params) {
+ array(
'contribution_status_id' => 'Pending',
'start_date' => $params['confirmed_at'],
'financial_type_id' => $profile->getAttribute('financial_type_id_recur'),
)
+ CRM_Twingle_Submission::getFrequencyMapping($params['donation_rhythm']);
$contribution_recur = civicrm_api3('contributionRecur', 'create', $contribution_recur_data);
@ -540,6 +544,9 @@ function civicrm_api3_twingle_donation_Submit($params) {
}
$contribution_data['contribution_recur_id'] = $contribution_recur['id'];
}
else {
$contribution_data['financial_type_id'] = $profile->getAttribute('financial_type_id');
}
// Create contribution.
$contribution_data += array(