Skip to content

Commit

Permalink
Merge pull request #22869 from demeritcowboy/contributionview-notices2
Browse files Browse the repository at this point in the history
php/smarty notices on contribution view part 2
  • Loading branch information
seamuslee001 authored Mar 2, 2022
2 parents 66ad639 + 07c4d84 commit d7d1dc9
Showing 1 changed file with 17 additions and 6 deletions.
23 changes: 17 additions & 6 deletions CRM/Contribute/Form/ContributionView.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ public function preProcess() {
$values = (array) $contribution;
$contributionStatus = CRM_Core_PseudoConstant::getName('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $values['contribution_status_id']);

if (!isset($this->get_template_vars()['hookDiscount'])) {
$this->assign('hookDiscount', ['message' => '']);
}
$this->addExpectedSmartyVariables([
'pricesetFieldsCount',
'pcp_id',
// currencySymbol maybe doesn't make sense but is probably old?
'currencySymbol',
]);

// @todo - it might have been better to create a new form that extends this
// for template contributions rather than overloading this form.
$force_create_template = CRM_Utils_Request::retrieve('force_create_template', 'Boolean', $this, FALSE, FALSE);
Expand All @@ -60,6 +70,7 @@ public function preProcess() {

CRM_Contribute_BAO_Contribution::resolveDefaults($values);

$values['contribution_page_title'] = '';
if (!empty($values['contribution_page_id'])) {
$contribPages = CRM_Contribute_PseudoConstant::contributionPage(NULL, TRUE);
$values['contribution_page_title'] = CRM_Utils_Array::value(CRM_Utils_Array::value('contribution_page_id', $values), $contribPages);
Expand All @@ -68,6 +79,7 @@ public function preProcess() {
// get received into i.e to_financial_account_id from last trxn
$financialTrxnId = CRM_Core_BAO_FinancialTrxn::getFinancialTrxnId($this->getID(), 'DESC');
$values['to_financial_account'] = '';
$values['payment_processor_name'] = '';
if (!empty($financialTrxnId['financialTrxnId'])) {
$values['to_financial_account_id'] = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_FinancialTrxn', $financialTrxnId['financialTrxnId'], 'to_financial_account_id');
if ($values['to_financial_account_id']) {
Expand Down Expand Up @@ -125,6 +137,7 @@ public function preProcess() {
$productID = $dao->product_id;
}

$this->assign('premium', '');
if ($premiumId) {
$productDAO = new CRM_Contribute_DAO_Product();
$productDAO->id = $productID;
Expand All @@ -149,12 +162,9 @@ public function preProcess() {

//assign soft credit record if exists.
$SCRecords = CRM_Contribute_BAO_ContributionSoft::getSoftContribution($this->getID(), TRUE);
if (!empty($SCRecords['soft_credit'])) {
$this->assign('softContributions', $SCRecords['soft_credit']);
unset($SCRecords['soft_credit']);
}

//assign pcp record if exists
$this->assign('softContributions', empty($SCRecords['soft_credit']) ? NULL : $SCRecords['soft_credit']);
// unset doesn't complain if array member missing
unset($SCRecords['soft_credit']);
foreach ($SCRecords as $name => $value) {
$this->assign($name, $value);
}
Expand All @@ -165,6 +175,7 @@ public function preProcess() {
$this->assign('displayLineItemFinancialType', TRUE);

//do check for campaigns
$values['campaign'] = '';
if ($campaignId = CRM_Utils_Array::value('campaign_id', $values)) {
$campaigns = CRM_Campaign_BAO_Campaign::getCampaigns($campaignId);
$values['campaign'] = $campaigns[$campaignId];
Expand Down

0 comments on commit d7d1dc9

Please sign in to comment.