Changing error message when setting pricing rules #2069
Merged
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
thomasmaas
reviewed
Jul 21, 2020
Martouta
suggested changes
Jul 22, 2020
app/models/pricing_rule.rb
Outdated
| end | ||
|
|
||
| if max && max < min | ||
| errors.add(:max, "'To' value cannot be less than your 'From' value.") | ||
| errors.add(:max, :to_value_cannot_be_less_that_from_value) |
There was a problem hiding this comment.
Suggested change
| errors.add(:max, :to_value_cannot_be_less_that_from_value) | |
| errors.add(:max, :min_max_mismatch) |
config/locales/en.yml
Outdated
| min: | ||
| overlap_message: "The 'From' value must be greater than the 'To' values of other existing rules" | ||
| max: | ||
| to_value_cannot_be_less_that_from_value: "'To' value cannot be less than your 'From' value." |
There was a problem hiding this comment.
Suggested change
| to_value_cannot_be_less_that_from_value: "'To' value cannot be less than your 'From' value." | |
| min_max_mismatch: "'To' value cannot be less than your 'From' value." |
app/models/pricing_rule.rb
Outdated
| @@ -88,11 +88,11 @@ def range_overlap | |||
| end | |||
|
|
|||
| if overlap #rules.count > 0 | |||
| errors.add(:min, "'From' value cannot be less than 'To' values of current rules.") | |||
| errors.add(:min, :overlap_message) | |||
There was a problem hiding this comment.
Suggested change
| errors.add(:min, :overlap_message) | |
| errors.add(:min, :overlap) |
config/locales/en.yml
Outdated
| pricing_rule: | ||
| attributes: | ||
| min: | ||
| overlap_message: "The 'From' value must be greater than the 'To' values of other existing rules" |
There was a problem hiding this comment.
Suggested change
| overlap_message: "The 'From' value must be greater than the 'To' values of other existing rules" | |
| overlap: "The 'From' value must be greater than the 'To' values of other existing rules" |
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.
What this PR does / why we need it:
changing the error message when setting pricing rules
Which issue(s) this PR fixes
https://issues.redhat.com/browse/THREESCALE-5565
Verification steps
