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#5079 Handle money localization before anything else in formRule #29717

Merged
merged 1 commit into from
Mar 21, 2024

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Mar 14, 2024

Overview

dev/core#5079 Handle money localization before anything else in formRule

Before

See https://lab.civicrm.org/dev/core/-/issues/5079

After

Localized & non-numeric values are handled in the Contribution Main formRule function

Technical Details

This ensures the values are passed through the de-localization functions before any more handling is done

Comments

@MegaphoneJon

Copy link

civibot bot commented Mar 14, 2024

🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this 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...

➡️ Online demo of this PR 🔗

@civibot civibot bot added the 5.72 label Mar 14, 2024
Copy link

civibot bot commented Mar 14, 2024

The issue associated with the Pull Request can be viewed at https://lab.civicrm.org/dev/core/-/issues/5079

@MegaphoneJon
Copy link
Contributor

This works if someone's put in a localized value (e.g. 5.000$) but doesn't handle alpha characters ("5 dollars"). But it got me looking at the right part of the code. I'll put up an alternate and you can tell me what you think.

@eileenmcnaughton
Copy link
Contributor Author

test this please

@eileenmcnaughton
Copy link
Contributor Author

@MegaphoneJon I pushed it in - also with a small change for https://lab.civicrm.org/dev/core/-/issues/5100 as reported by @wmortada

@eileenmcnaughton
Copy link
Contributor Author

@MegaphoneJon is this all good to merge? I see you closed the other

@wmortada
Copy link
Contributor

I've tested this and can confirm that it fixes https://lab.civicrm.org/dev/core/-/issues/5100.

It also appears to fix https://lab.civicrm.org/dev/core/-/issues/5079 as far as I understand this issue. It couldn't reproduce the issue for '5 dollars' but I could reproduce the issue with '$5.00' and can confirm that this fixes the issue.

I've created two separate PRs to backport the fix for dev/core#5100:

@demeritcowboy demeritcowboy merged commit daef867 into civicrm:5.72 Mar 21, 2024
3 checks passed
@eileenmcnaughton eileenmcnaughton deleted the 572_number branch March 21, 2024 18:06
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.

4 participants