}
}
+ //set defaults in create mode
+ if (!$contributionID) {
+ CRM_Core_DAO::setCreateDefaults($params, self::getDefaults());
+ }
+
//if contribution is created with cancelled or refunded status, add credit note id
if (!empty($params['contribution_status_id'])) {
$contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
if (($params['contribution_status_id'] == array_search('Refunded', $contributionStatus)
- || $params['contribution_status_id'] == array_search('Cancelled', $contributionStatus))
+ || $params['contribution_status_id'] == array_search('Cancelled', $contributionStatus))
) {
if (empty($params['creditnote_id']) || $params['creditnote_id'] == "null") {
$params['creditnote_id'] = self::createCreditNoteId();
}
}
}
-
- //set defaults in create mode
- if (!$contributionID) {
- CRM_Core_DAO::setCreateDefaults($params, self::getDefaults());
+ else {
+ // Since the fee amount is expecting this (later on) ensure it is always set.
+ // It would only not be set for an update where it is unchanged.
+ $params['contribution_status_id'] = civicrm_api3('Contribution', 'getvalue', array('id' => $contributionID, 'return' => 'contribution_status_id'));
}
+
self::calculateMissingAmountParams($params, $contributionID);
if (!empty($params['payment_instrument_id'])) {
if (self::isUpdateToRecurringContribution($params)) {
CRM_Contribute_BAO_ContributionRecur::updateOnNewPayment(
- $params['contribution_recur_id'],
+ (!empty($params['contribution_recur_id']) ? $params['contribution_recur_id'] : $params['prevContribution']->contribution_recur_id),
$contributionStatus[$params['contribution_status_id']]
);
}
return $null;
}
+ /**
+ * Get the values and resolve the most common mappings.
+ *
+ * Since contribution status is resolved in almost every function that calls getValues it makes
+ * sense to have an extra function to resolve it rather than repeat the code.
+ *
+ * Think carefully before adding more mappings to be resolved as there could be performance implications
+ * if this function starts to be called from more iterative functions.
+ *
+ * @param array $params
+ * Input parameters to find object.
+ *
+ * @return array
+ * Array of the found contribution.
+ * @throws CRM_Core_Exception
+ */
+ public static function getValuesWithMappings($params) {
+ $values = $ids = array();
+ $contribution = self::getValues($params, $values, $ids);
+ if (is_null($contribution)) {
+ throw new CRM_Core_Exception('No contribution found');
+ }
+ $values['contribution_status'] = CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $values['contribution_status_id']);
+ return $values;
+ }
+
/**
* Calculate net_amount & fee_amount if they are not set.
*
),
);
+ // CRM-17787
+ $campaignTitle = array(
+ 'contribution_campaign_title' => array(
+ 'title' => ts('Campaign Title'),
+ 'name' => 'campaign_title',
+ 'where' => 'civicrm_campaign.title',
+ 'data_type' => CRM_Utils_Type::T_STRING,
+ ),
+ );
$softCreditFields = array(
'contribution_soft_credit_name' => array(
'name' => 'contribution_soft_credit_name',
);
$fields = array_merge($impFields, $typeField, $contributionStatus, $contributionPage, $optionField, $expFieldProduct,
- $expFieldsContrib, $contributionNote, $contributionRecurId, $extraFields, $softCreditFields, $financialAccount, $premiums,
+ $expFieldsContrib, $contributionNote, $contributionRecurId, $extraFields, $softCreditFields, $financialAccount, $premiums, $campaignTitle,
CRM_Core_BAO_CustomField::getFieldsForImport('Contribution', FALSE, FALSE, FALSE, $checkPermission)
);
$entityID = $ids['membership'][0];
}
- $template->assign('cancelSubscriptionUrl', $paymentObject->subscriptionURL($entityID, $entity));
+ $template->assign('cancelSubscriptionUrl', $paymentObject->subscriptionURL($entityID, $entity, 'cancel'));
$template->assign('updateSubscriptionBillingUrl', $paymentObject->subscriptionURL($entityID, $entity, 'billing'));
$template->assign('updateSubscriptionUrl', $paymentObject->subscriptionURL($entityID, $entity, 'update'));
$template->assign('is_separate_payment', 0);
if ($recur && $paymentObject) {
- $url = $paymentObject->subscriptionURL($membership->id, 'membership');
+ $url = $paymentObject->subscriptionURL($membership->id, 'membership', 'cancel');
$template->assign('cancelSubscriptionUrl', $url);
$url = $paymentObject->subscriptionURL($membership->id, 'membership', 'billing');
$template->assign('updateSubscriptionBillingUrl', $url);
$paymentObject = CRM_Financial_BAO_PaymentProcessor::getProcessorForEntity($contributionId, 'contribute', 'obj');
if (!empty($paymentObject)) {
- $supportsCancel[$cacheKeyString] = $paymentObject->isSupported('cancelSubscription') && !$isCancelled;
+ $supportsCancel[$cacheKeyString] = $paymentObject->supports('cancelRecurring') && !$isCancelled;
}
}
return $supportsCancel[$cacheKeyString];
);
if ($contributionStatus == 'Refunded') {
$trxnParams['trxn_date'] = !empty($params['contribution']->cancel_date) ? $params['contribution']->cancel_date : date('YmdHis');
+ if (isset($params['refund_trxn_id'])) {
+ // CRM-17751 allow a separate trxn_id for the refund to be passed in via api & form.
+ $trxnParams['trxn_id'] = $params['refund_trxn_id'];
+ }
}
//CRM-16259, set is_payment flag for non pending status
- if (!in_array(CRM_Utils_Array::value('contribution_status_id', $params), $pendingStatus)) {
+ if (!in_array($contributionStatus, $pendingStatus)) {
$trxnParams['is_payment'] = 1;
}
if (!empty($params['payment_processor'])) {
$params['trxnParams'] = $trxnParams;
if (!empty($params['prevContribution'])) {
+ $updated = FALSE;
$params['trxnParams']['total_amount'] = $trxnParams['total_amount'] = $params['total_amount'] = $params['prevContribution']->total_amount;
$params['trxnParams']['fee_amount'] = $params['prevContribution']->fee_amount;
$params['trxnParams']['net_amount'] = $params['prevContribution']->net_amount;
- $params['trxnParams']['trxn_id'] = $params['prevContribution']->trxn_id;
+ if (!isset($params['trxnParams']['trxn_id'])) {
+ // Actually I have no idea why we are overwriting any values from the previous contribution.
+ // (filling makes sense to me). However, only protecting this value as I really really know we
+ // don't want this one overwritten.
+ // CRM-17751.
+ $params['trxnParams']['trxn_id'] = $params['prevContribution']->trxn_id;
+ }
$params['trxnParams']['status_id'] = $params['prevContribution']->contribution_status_id;
if (!(($params['prevContribution']->contribution_status_id == array_search('Pending', $contributionStatuses)
$params['total_amount'] = $params['trxnParams']['total_amount'] = $trxnParams['total_amount'];
self::updateFinancialAccounts($params);
$params['trxnParams']['to_financial_account_id'] = $trxnParams['to_financial_account_id'];
+ $updated = TRUE;
}
}
//Update contribution status
$params['trxnParams']['status_id'] = $params['contribution']->contribution_status_id;
- $params['trxnParams']['trxn_id'] = $params['contribution']->trxn_id;
+ if (!isset($params['refund_trxn_id'])) {
+ // CRM-17751 This has previously been deliberately set. No explanation as to why one variant
+ // gets preference over another so I am only 'protecting' a very specific tested flow
+ // and letting natural justice take care of the rest.
+ $params['trxnParams']['trxn_id'] = $params['contribution']->trxn_id;
+ }
if (!empty($params['contribution_status_id']) &&
$params['prevContribution']->contribution_status_id != $params['contribution']->contribution_status_id
) {
//Update Financial Records
self::updateFinancialAccounts($params, 'changedStatus');
+ $updated = TRUE;
}
// change Payment Instrument for a Completed contribution
self::updateFinancialAccounts($params, 'changePaymentInstrument');
$params['total_amount'] = $params['trxnParams']['total_amount'] = $trxnParams['total_amount'];
self::updateFinancialAccounts($params, 'changePaymentInstrument');
+ $updated = TRUE;
}
}
elseif ((!CRM_Utils_System::isNull($params['contribution']->payment_instrument_id) ||
self::updateFinancialAccounts($params, 'changePaymentInstrument');
$params['total_amount'] = $params['trxnParams']['total_amount'] = $trxnParams['total_amount'];
self::updateFinancialAccounts($params, 'changePaymentInstrument');
+ $updated = TRUE;
}
elseif (!CRM_Utils_System::isNull($params['contribution']->check_number) &&
$params['contribution']->check_number != $params['prevContribution']->check_number
$params['trxnParams']['check_number'] = $params['contribution']->check_number;
$params['total_amount'] = $params['trxnParams']['total_amount'] = $trxnParams['total_amount'];
self::updateFinancialAccounts($params, 'changePaymentInstrument');
+ $updated = TRUE;
}
}
//Update Financial Records
$params['trxnParams']['from_financial_account_id'] = NULL;
self::updateFinancialAccounts($params, 'changedAmount');
+ $updated = TRUE;
+ }
+
+ if (!$updated) {
+ // Looks like we might have a data correction update.
+ // This would be a case where a transaction id has been entered but it is incorrect &
+ // the person goes back in & fixes it, as opposed to a new transaction.
+ // Currently the UI doesn't support multiple refunds against a single transaction & we are only supporting
+ // the data fix scenario.
+ // CRM-17751.
+ if (isset($params['refund_trxn_id'])) {
+ $refundIDs = CRM_Core_BAO_FinancialTrxn::getRefundTransactionIDs($params['id']);
+ if ($refundIDs['trxn_id'] != $params['refund_trxn_id']) {
+ civicrm_api3('FinancialTrxn', 'create', array('id' => $refundIDs['financialTrxnId'], 'trxn_id' => $params['refund_trxn_id']));
+ }
+ }
}
}
empty($params['skipLineItem']) && !$isLineItem
) {
$taxRateParams = $taxRates[$params['financial_type_id']];
- $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount($params['total_amount'], $taxRateParams);
+ $taxAmount = CRM_Contribute_BAO_Contribution_Utils::calculateTaxAmount(CRM_Utils_Array::value('total_amount', $params), $taxRateParams);
$params['tax_amount'] = round($taxAmount['tax_amount'], 2);
// Get Line Item on update of contribution
$params['line_item'][$setID][$priceFieldID]['tax_amount'] = $params['tax_amount'];
}
}
- $params['total_amount'] = $params['total_amount'] + $params['tax_amount'];
+ $params['total_amount'] = CRM_Utils_Array::value('total_amount', $params) + $params['tax_amount'];
}
elseif (isset($params['api.line_item.create'])) {
// Update total amount of contribution using lineItem
//we might be renewing membership,
//so make status override false.
$membershipParams['is_override'] = FALSE;
+ //CRM-17723 - reset static $relatedContactIds array()
+ $var = TRUE;
+ CRM_Member_BAO_Membership::createRelatedMemberships($var, $var, TRUE);
civicrm_api3('Membership', 'create', $membershipParams);
-
- //update related Memberships.
- CRM_Member_BAO_Membership::updateRelatedMemberships($membership->id, $membershipParams);
}
}
}
return 'recurring contribution';
}
+ /**
+ * Function to add payments for contribution
+ * for Partially Paid status
+ *
+ * @param array $lineItems
+ * @param array $contributions
+ *
+ */
+ public static function addPayments($lineItems, $contributions) {
+ // get financial trxn which is a payment
+ $ftSql = "SELECT ft.id
+ FROM civicrm_financial_trxn ft
+ INNER JOIN civicrm_entity_financial_trxn eft ON eft.financial_trxn_id = ft.id AND eft.entity_table = 'civicrm_contribution'
+ WHERE eft.entity_id = %1 AND ft.is_payment = 1";
+ $sql = "SELECT fi.id, li.price_field_value_id
+ FROM civicrm_financial_item fi
+ INNER JOIN civicrm_line_item li ON li.id = fi.entity_id
+ WHERE li.contribution_id = %1";
+
+ foreach ($contributions as $k => $contribution) {
+ if ($contribution->contribution_status_id != CRM_Core_OptionGroup::getValue('contribution_status', 'Partially paid', 'name')) {
+ continue;
+ }
+ $ftId = CRM_Core_DAO::singleValueQuery($ftSql, array(1 => array($contribution->id, 'Integer')));
+ // get financial item
+ $dao = CRM_Core_DAO::executeQuery($sql, array(1 => array($contribution->id, 'Integer')));
+ while ($dao->fetch()) {
+ $ftIds[$dao->price_field_value_id] = $dao->id;
+ }
+
+ $params = array(
+ 'entity_table' => 'civicrm_financial_item',
+ 'financial_trxn_id' => $ftId,
+ );
+ foreach ($lineItems as $key => $value) {
+ $paid = $value['line_total'] * ($contribution->net_amount / $contribution->total_amount);
+ // Record Entity Financial Trxn
+ $params['amount'] = $paid;
+ $params['entity_id'] = $ftIds[$value['price_field_value_id']];
+
+ civicrm_api3('EntityFinancialTrxn', 'create', $params);
+ }
+ }
+ }
+
}
projects / civicrm-core.git / blobdiff