-
-
Notifications
You must be signed in to change notification settings - Fork 824
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Swap {$displayName} smarty for {contact.display_name} token #20867
Conversation
(Standard links)
|
@@ -234,9 +234,9 @@ | |||
</tr> | |||
<tr> | |||
{if $organization_name} | |||
<td style="padding-left:17px;"><font size="1" align="center">{$display_name} ({$organization_name})</font></td> | |||
<td style="padding-left:17px;"><font size="1" align="center">{contact.display_name} ({$organization_name})</font></td> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't do organization name because in my testing it was only showing up for organizations not individuals which meant it was repeated - but I'll test that further
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Tangential, but since you mention it - I use invoicing a lot, and never found why the organization name was repeated. if an invoice is "care of Some Person", then it would be in the address fields.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hmm - good point
Jenkins re test this please |
In conjunction with civicrm#20867
In conjunction with civicrm#20867
In conjunction with civicrm#20867
In conjunction with civicrm#20867
In conjunction with civicrm#20867
In conjunction with civicrm#20867
In conjunction with civicrm#20867
a4afddf
to
0edbe07
Compare
In conjunction with civicrm#20867
In conjunction with civicrm#20867
0edbe07
to
f007829
Compare
This swaps over the smartyToken for the token token on the template added on new installs, and adds a test. Separately I will look at an upgrade script and other templates To test make sure you enable invoicing & then generate an invoice from search results. use the demo site due to aforementioned lack of upgrade and check the display name is still on the left hand side
f007829
to
24dac2a
Compare
In conjunction with civicrm#20867
Tested on the demo & works for me. The extra test is nice. Just curious: what motivated you to change it? |
@mlutfy it's really a preliminary to removing smarty tokens from other places where contact tokens would work - mostly because the code works pretty hard to get those tokens onto the form. In the case of this form it is one of very few places in the code that call the dreaded 'loadRelatedContributions' function and it is getting those contact fields from that function Also loaded via that awful function is organization_name - as you mention it might be a bit odd how it is used and first_name & last name in the online contribution receipt function - although I think those were removed already from the template |
@eileenmcnaughton Makes sense. Thank you! |
In conjunction with civicrm#20867
Overview
Swap displayName smarty for {contact.display_name token}
This swaps over the smartyToken for the token token on the template added on new installs, and adds a test.
To test make sure you enable invoicing & then generate an invoice from search results.
use the demo site due to aforementioned lack of upgrade and check the display name is still on
the left hand side. There should be no change
Before
{$displayName}
used in invoice templateAfter
{contact.display_name}
used on new installsTechnical Details
Separately I will look at an upgrade script and other templates
Comments