Skip to content
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

(dev/core#4485) Replace Event Total by Total Amount #27024

Merged
merged 1 commit into from
Aug 10, 2023

Conversation

yashodha
Copy link
Contributor

@yashodha yashodha commented Aug 9, 2023

Overview

Replace Event Total by Total Amount

Before

Event Total doesn't sound right.

After

Keep the verbiage standardized.

@civibot
Copy link

civibot bot commented Aug 9, 2023

Thank you for contributing to CiviCRM! ❤️ We will need to test and review the PR. 👷

Introduction for new contributors
  • If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
  • A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
  • A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
  • If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
  • Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
  • A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
  • To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
  • For more information about contributing, see CONTRIBUTING.md.
Quick links for reviewers

@civibot civibot bot added the master label Aug 9, 2023
@@ -108,7 +108,7 @@
{if $context EQ "Contribution"}
{ts}Contribution Total{/ts}:
{elseif $context EQ "Event"}
{ts}Event Total{/ts}:
{ts}Total Amount{/ts}:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could just let this use the else below

@larssandergreen
Copy link
Contributor

This makes sense to me.

@larssandergreen
Copy link
Contributor

Actually, thinking about this for a minute, why do we say Total Amount instead of just Total, like every receipt ever does?

@mlutfy
Copy link
Member

mlutfy commented Aug 10, 2023

"Actually, thinking about this for a minute, why do we say Total Amount instead of just Total, like every receipt ever does?"

It's just under "Tax Total", so it would normally make sense, except that CiviCRM doesn't display- multiple taxes, or rarely, and even if it did, there are rarely more than two taxes, so nobody cares about a tax total, just a total for the payment.

We tend to do stuff like this, using the taxcalculator ext:

image

So I would also strongly support:

  • Rename "Tax Total" to "Taxes"
  • Rename "Total Amount" to "Total"

@yashodha
Copy link
Contributor Author

@mlutfy

Should we merge this PR?
And have another PR for the following if we have consensus since these will affect Contribution/Membership/Event registration (a lot more occurrences for Total Amount)

  • Rename "Tax Total" to "Taxes"
    
  • Rename "Total Amount" to "Total"
    

We also have other strings like Contribution Total, etc that need renaming as well. We might to take this opportunity to look at all other strings as well. Thanks!

@mlutfy mlutfy merged commit c8736b2 into civicrm:master Aug 10, 2023
@mlutfy
Copy link
Member

mlutfy commented Aug 10, 2023

@yashodha yep ok, I guess the renaming is a larger conversation, and this is a quickfix. Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants