}
/**
- * Get list of contribution In Honor of contact Ids.
+ * Get list of contributions which credit the passed in contact ID.
+ *
+ * The returned array provides details about the original contribution & donor.
+ *
+ * @todo - this is a confusing function called from one place. It has a test. It would be
+ * nice to deprecate it.
*
* @param int $honorId
* In Honor of Contact ID.
$membership_status = CRM_Member_PseudoConstant::membershipStatus($membership->status_id, NULL, 'label');
$template->assign('mem_status', $membership_status);
if ($membership_status == 'Pending' && $membership->is_pay_later == 1) {
- $template->assign('is_pay_later', 1);
+ $values['is_pay_later'] = 1;
}
// if separate payment there are two contributions recorded and the
$addressParams = array('id' => $this->address_id);
$addressDetails = CRM_Core_BAO_Address::getValues($addressParams, FALSE, 'id');
$addressDetails = array_values($addressDetails);
- $values['address'] = $addressDetails[0]['display'];
}
// Else we assign the billing address of the contribution contact.
else {
$addressParams = array('contact_id' => $this->contact_id, 'is_billing' => 1);
- $addressDetails = CRM_Core_BAO_Address::getValues($addressParams);
- if (!is_null($addressDetails)) {
- $addressDetails = array_values($addressDetails);
- $values['address'] = $addressDetails[0]['display'];
- }
+ $addressDetails = (array) CRM_Core_BAO_Address::getValues($addressParams);
+ $addressDetails = array_values($addressDetails);
+ }
+
+ if (!empty($addressDetails[0]['display'])) {
+ $values['address'] = $addressDetails[0]['display'];
}
+
if ($this->_component == 'contribute') {
//get soft contributions
$softContributions = CRM_Contribute_BAO_ContributionSoft::getSoftContribution($this->id, TRUE);
$values['softContributions'] = $softContributions['soft_credit'];
}
if (isset($this->contribution_page_id)) {
- CRM_Contribute_BAO_ContributionPage::setValues(
- $this->contribution_page_id,
- $values
- );
+ $values = $this->addContributionPageValuesToValuesHeavyHandedly($values);
if ($this->contribution_page_id) {
// CRM-8254 - override default currency if applicable
$config = CRM_Core_Config::singleton();
if (!empty($lineItem)) {
$itemId = key($lineItem);
foreach ($lineItem as &$eachItem) {
- if (is_array($this->_relatedObjects['membership']) && array_key_exists($eachItem['membership_type_id'], $this->_relatedObjects['membership'])) {
+ if (isset($this->_relatedObjects['membership'])
+ && is_array($this->_relatedObjects['membership'])
+ && array_key_exists($eachItem['membership_type_id'], $this->_relatedObjects['membership'])) {
$eachItem['join_date'] = CRM_Utils_Date::customFormat($this->_relatedObjects['membership'][$eachItem['membership_type_id']]->join_date);
$eachItem['start_date'] = CRM_Utils_Date::customFormat($this->_relatedObjects['membership'][$eachItem['membership_type_id']]->start_date);
$eachItem['end_date'] = CRM_Utils_Date::customFormat($this->_relatedObjects['membership'][$eachItem['membership_type_id']]->end_date);
$template->assign('receive_date',
CRM_Utils_Date::processDate($this->receive_date)
);
+ $values['receipt_date'] = (empty($this->receipt_date) ? NULL : $this->receipt_date);
$template->assign('contributeMode', 'notify');
$template->assign('action', $this->is_test ? 1024 : 1);
$template->assign('receipt_text',
SELECT GROUP_CONCAT(fa.`name`) as financial_account,
ft.total_amount,
ft.payment_instrument_id,
- ft.trxn_date, ft.trxn_id, ft.status_id, ft.check_number
+ ft.trxn_date, ft.trxn_id, ft.status_id, ft.check_number, con.currency
FROM civicrm_contribution con
LEFT JOIN civicrm_entity_financial_trxn eft ON (eft.entity_id = con.id AND eft.entity_table = 'civicrm_contribution')
'receive_date' => $resultDAO->trxn_date,
'trxn_id' => $resultDAO->trxn_id,
'status' => $statuses[$resultDAO->status_id],
+ 'currency' => $resultDAO->currency,
);
if ($paidByName == 'Check') {
$val['check_number'] = $resultDAO->check_number;
$values['receipt_from_name'] = CRM_Utils_Array::value('receipt_from_name', $input, $userName);
}
}
+
+ $return = $contribution->composeMessageArray($input, $ids, $values, $recur, $returnMessageText);
// Contribution ID should really always be set. But ?
- if (!$returnMessageText && (!isset($input['receipt_update']) || $input['receipt_update'])) {
+ if (!$returnMessageText && (!isset($input['receipt_update']) || $input['receipt_update']) && empty($contribution->receipt_date)) {
civicrm_api3('Contribution', 'create', array('receipt_date' => 'now', 'id' => $contribution->id));
- $values['receipt_date'] = date('Y-m-d H:i:s');
}
- return $contribution->composeMessageArray($input, $ids, $values, $recur, $returnMessageText);
+ return $return;
}
/**
return $prevFinancialItem->financial_account_id;
}
+ /**
+ * ContributionPage values were being imposed onto values.
+ *
+ * I have made this explicit and removed the couple (is_recur, is_pay_later) we
+ * REALLY didn't want superimposed. The rest are left there in their overkill out
+ * of cautiousness.
+ *
+ * The rationale for making this explicit is that it was a case of carefully set values being
+ * seemingly randonly overwritten without much care. In general I think array randomly setting
+ * variables en mass is risky.
+ *
+ * @param array $values
+ *
+ * @return array
+ */
+ protected function addContributionPageValuesToValuesHeavyHandedly(&$values) {
+ $contributionPageValues = array();
+ CRM_Contribute_BAO_ContributionPage::setValues(
+ $this->contribution_page_id,
+ $contributionPageValues
+ );
+ $valuesToCopy = array(
+ // These are the values that I believe to be useful.
+ 'title',
+ 'is_email_receipt',
+ 'pay_later_receipt',
+ 'pay_later_text',
+ 'receipt_from_email',
+ 'receipt_from_name',
+ 'receipt_text',
+ 'custom_pre_id',
+ 'custom_post_id',
+ 'honoree_profile_id',
+ 'onbehalf_profile_id',
+ 'honor_block_is_active',
+ // Kinda might be - but would be on the contribution...
+ 'campaign_id',
+ 'currency',
+ // Included for 'fear of regression' but can't justify any use for these....
+ 'intro_text',
+ 'payment_processor',
+ 'financial_type_id',
+ 'amount_block_is_active',
+ 'bcc_receipt',
+ 'cc_receipt',
+ 'created_date',
+ 'created_id',
+ 'default_amount_id',
+ 'end_date',
+ 'footer_text',
+ 'goal_amount',
+ 'initial_amount_help_text',
+ 'initial_amount_label',
+ 'intro_text',
+ 'is_allow_other_amount',
+ 'is_billing_required',
+ 'is_confirm_enabled',
+ 'is_credit_card_only',
+ 'is_monetary',
+ 'is_partial_payment',
+ 'is_recur_installments',
+ 'is_recur_interval',
+ 'is_share',
+ 'max_amount',
+ 'min_amount',
+ 'min_initial_amount',
+ 'recur_frequency_unit',
+ 'start_date',
+ 'thankyou_footer',
+ 'thankyou_text',
+ 'thankyou_title',
+
+ );
+ foreach ($valuesToCopy as $valueToCopy) {
+ if (isset($contributionPageValues[$valueToCopy])) {
+ $values[$valueToCopy] = $contributionPageValues[$valueToCopy];
+ }
+ }
+ return $values;
+ }
+
}
projects / civicrm-core.git / blobdiff