dev/core#1344 Re-work if statements and remove excess ifs #15682
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)
|
| @@ -170,8 +163,14 @@ | |||
| {$address} | |||
|
|
|||
| {$email} | |||
| {/if} {* End ! is_pay_later condition. *} | |||
| {/if} | |||
| {if $contributeMode eq 'direct' AND !$is_pay_later AND ( $amount GT 0 OR $membership_amount GT 0 ) } | |||
There was a problem hiding this comment.
Maybe after the other is merged because I forsee a conflict below
There was a problem hiding this comment.
@eileenmcnaughton it will in #15651
seamuslee001
force-pushed
the
dev_core_1344_aditional_if
branch
from
0969c6c to
d88185a
Compare
|
@eileenmcnaughton i have now rebased this after #15651 has been merged |
|
Looks good to me! |
| @@ -311,32 +311,30 @@ | |||
| </tr> | |||
| {/if} | |||
|
|
|||
| {if ! ($contributeMode eq 'notify' OR $contributeMode eq 'directIPN') and $is_monetary} | |||
| {if $is_pay_later && !$isBillingAddressRequiredForPayLater} | |||
There was a problem hiding this comment.
Dang - this template is the one that needs a test change
seamuslee001
force-pushed
the
dev_core_1344_aditional_if
branch
from
d88185a to
1a7a41e
Compare
|
@eileenmcnaughton have pulled out the changes to that template |
seamuslee001
force-pushed
the
dev_core_1344_aditional_if
branch
from
1a7a41e to
66af4b3
Compare
|
Cool getting close now - only one tpl left here & only one search jcalendar! |
|
Test fail unrelated |
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 removes some excess ifs and re-works the order of the if logic as per #156764 this is a split off from #15651
Before
If logic complicated
After
If logic simplified
ping @eileenmcnaughton