[REF] minor code simplification - remove over-handling of amount comp with zero #13783
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
This just removes the duplicate assign codes & simplifies the /bin/bash condition
|
(Standard links)
|
mattwire
reviewed
Mar 12, 2019
| @@ -596,20 +596,17 @@ public function buildQuickForm() { | |||
| // the is_monetary concept probably should be too as it can be calculated from | |||
| // the existence of 'amount' & seems fragile. | |||
| if ($this->_contributeMode == 'notify' || | |||
| $this->_amount < 0.0 || $this->_params['is_pay_later'] || | |||
| ($this->_separateMembershipPayment && $this->_amount <= 0.0) | |||
| $this->_amount <= 0.0 || $this->_params['is_pay_later'] | |||
There was a problem hiding this comment.
Worst case we'd end up with the wrong text on a button so this is pretty low risk! What would we need to do to get rid of _contributeMode here?
Also, looks like the is_monetary comment no longer applies and should be removed. Can the _contributeMode comment get a fixme/todo tag?
mattwire
reviewed
Mar 12, 2019
| } | ||
| $this->assign('button', $contribButton); |
|
@eileenmcnaughton This is good to merge pending my comments about the comments. |
|
@mattwire I'm gonna merge this as a simplification - I'm not quite sure what to put in the 'comments' as yet because part of my hope is that we can simplify further - ie. can we get away from having 3 different button names? |
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
Very minor code simplification
Before
Code less readable
After
Code more readable
Technical Details
This just removes the duplicate assign codes & simplifies the <=0 condition
Comments