[REF] Consolidate code in processMembership #17611
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
|
(Standard links)
|
| @@ -787,54 +785,29 @@ public function processMembership($contactID, $membershipTypeID, $is_test, $chan | |||
| // Check and fix the membership if it is STALE | |||
| CRM_Member_BAO_Membership::fixMembershipStatusBeforeRenew($currentMembership, $changeToday); | |||
|
|
|||
| // CRM-7297 Membership Upsell - calculate dates based on new membership type | |||
There was a problem hiding this comment.
All of these have been moved outside the if below as they are the same in both places
| //set the log start date. | ||
| $memParams['log_start_date'] = CRM_Utils_Date::customFormat($dates['log_start_date'], $format); | ||
|
|
||
| if (empty($membership->source)) { |
There was a problem hiding this comment.
gone - tests show unneeded
| $memParams['membership_type_id'] = $membershipTypeID; | ||
|
|
||
| //set the log start date. | ||
| $memParams['log_start_date'] = CRM_Utils_Date::customFormat($dates['log_start_date'], $format); |
There was a problem hiding this comment.
gone - tests show unneeded
|
|
||
| // Insert renewed dates for CURRENT membership | ||
| $memParams = []; | ||
| $memParams['join_date'] = $membership->join_date; |
There was a problem hiding this comment.
gone - tests show unneeded
| $currentMembership[$dateType] = $dates[$dateType] ?? NULL; | ||
| } | ||
| $currentMembership['is_test'] = $is_test; | ||
| $memParams = $currentMembership; |
There was a problem hiding this comment.
gone - tests show unneeded
| @@ -847,12 +820,6 @@ public function processMembership($contactID, $membershipTypeID, $is_test, $chan | |||
| $memParams['contribution_recur_id'] = $contributionRecurID; | |||
| } | |||
|
|
|||
| //since we are renewing, | |||
| //make status override false. | |||
| $memParams['is_override'] = FALSE; | |||
|
Test fail related |
|
@eileenmcnaughton |
eileenmcnaughton
force-pushed
the
renew
branch
2 times, most recently
from
768a753
to
97f49c9
Compare
Now we have test cover from civicrm#17605 and other recents we can consolidate this code & be comfortable the test cover will pick up issues.
|
Seems good:
|
mlutfy
added
the
merge ready
|
This has been merge ready for a couple of days now, no one has objected merging |
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
Code cleanup
Now we have test cover from #17605 and other
recents we can consolidate this code & be comfortable the test cover will pick up issues.
Before
Duplicated & unnecessary code
After
33 less lines of it!
Technical Details
I added test cover here before touching it!
Comments