Ensure that the frontend title is used for contribution page details … #15497
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
(Standard links)
|
a9d400a to
7627243
Compare
CRM/Contribute/BAO/Contribution.php
Outdated
| @@ -5045,7 +5045,12 @@ protected function addContributionPageValuesToValuesHeavyHandedly(&$values) { | |||
| ]; | |||
| foreach ($valuesToCopy as $valueToCopy) { | |||
| if (isset($contributionPageValues[$valueToCopy])) { | |||
| $values[$valueToCopy] = $contributionPageValues[$valueToCopy]; | |||
| if ($valueToCopy == 'title') { | |||
There was a problem hiding this comment.
can we do === as better practice?
| @@ -652,4 +652,17 @@ public static function overrideDefaultCurrency($params) { | |||
| $config->defaultCurrency = CRM_Utils_Array::value('currency', $params, $config->defaultCurrency); | |||
| } | |||
|
|
|||
| /** | |||
| * Get either the public title if set or the title of a contribution page for use in workflow message template | |||
There was a problem hiding this comment.
Jenkins doesn't enforce this but there is supposed to be a full stop & empty line according to the full standard
| @@ -356,7 +356,11 @@ public static function sendMail($contactID, $values, $isTest = FALSE, $returnMes | |||
| ); | |||
| } | |||
|
|
|||
| $title = isset($values['title']) ? $values['title'] : CRM_Contribute_PseudoConstant::contributionPage($values['contribution_page_id']); | |||
| $contribution_page_title = ''; | |||
There was a problem hiding this comment.
The line above doesn't assume contribution_page_id could be empty - & not assuming it tidies up this block a little. ie. you just need one line then
|
Looks OK - I made some minor comments |
…in receipts if avaliable Add in strict checking and simplify code block in contribution page and fix comment style as per EIleen's comments
7627243 to
f56ef33
Compare
|
ok @eileenmcnaughton have made those changes now |
|
My guess is that some more work might still be to come on this but it seems correct in the places it fixes |
|
yeh i figure this at least covers most of the bases |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
…in receipts if avaliable
Overview
This is a follow on from adding the frontend title to contribution pages to ensuring that it is used by receipts
Before
Title field always used in receipts
After
Public title used if avaliable otherwise uses title field
ping @eileenmcnaughton @mattwire