SearchKit - Respect currency when formatting monetary fields #24524
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)
|
| @@ -773,7 +774,8 @@ protected function formatViewValue($key, $rawValue) { | |||
| break; | |||
|
|
|||
| case 'Money': | |||
| $formatted = \CRM_Utils_Money::format($rawValue); | |||
| $currencyField = $this->getCurrencyField($key); | |||
| $formatted = \CRM_Utils_Money::format($rawValue, $data[$currencyField] ?? NULL); | |||
There was a problem hiding this comment.
We should switch this to \Civi::format()->money()
There was a problem hiding this comment.
Ok @eileenmcnaughton I've made that change - it altered the formatting but all improvements I think... I've updated the screenshot. Adding CA in front of the canadian dollar sign is a good touch. I'm not sure why it removed the trailing .00 from Japanese currency but seems fine.
There was a problem hiding this comment.
I don't think Japanese currency has trailing bits....
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.
Overview
This fixes SearchKit to correctly format a monetary amount when it's different than the site default currency.
Fixes: https://lab.civicrm.org/dev/core/-/issues/3428
Before
All amounts were shown in the site default (e.g. USD) instead of the correct currency.
After
Technical Details
This supports entities who have their own
currencycolumn.This excludes line_itemI've fixedLineItemso it now works by pulling in a join from the associatedContributionrecord to look up the currency.