[REF] Cleanup CRM_Member_BAO_Membership::buildMembershipTypeValues #16059
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)
|
eileenmcnaughton
changed the title
eileenmcnaughton
force-pushed
the
mem_val2
branch
2 times, most recently
from
17e8ef5 to
fc694f0
Compare
eileenmcnaughton
commented
Dec 9, 2019
| list($MembershipRenew) = CRM_Member_BAO_Membership::processMembership( | ||
| $contactId, | ||
| $this->_membershipTypeID, | ||
| FALSE, | ||
| $membershipRenewal, |
There was a problem hiding this comment.
This param is a bool!
eileenmcnaughton
commented
Dec 9, 2019
| @@ -811,7 +808,7 @@ public function testMembershipPaymentForSingleContributionMultipleMembership() { | |||
| $parentContactId = $this->individualCreate(); | |||
There was a problem hiding this comment.
This test actually didn't pass in isolation for set-up related reasons
eileenmcnaughton
commented
Dec 9, 2019
| * | ||
| * @throws \CiviCRM_API3_Exception | ||
| */ | ||
| public function testBuildMembershipTypeValues() { |
There was a problem hiding this comment.
here is the new testt
eileenmcnaughton
force-pushed
the
mem_val2
branch
2 times, most recently
from
e62e12a to
f04b9c2
Compare
|
@eileenmcnaughton 2 of the test failure look like they relate |
eileenmcnaughton
force-pushed
the
mem_val2
branch
from
f04b9c2 to
7d9b0df
Compare
This simplifies this function & switches it to use a cached function to get the MembershipTypes. In general I would argue that we should be caching metadata entities (membership types, statues, price fields, etc) and accessing the cached versions & ideally the v4 api would be able to access cached versions filter-dependent. In order to keep the test passing I worked a little on standardisation
eileenmcnaughton
force-pushed
the
mem_val2
branch
from
7d9b0df to
322b59f
Compare
|
@seamuslee001 this has passed now |
|
Useful step in the right direction |
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
Fixes function to be more readable, use caching & return more data
Before
After
Technical Details
This is towards a fix for #15895 - I hit #16058 in the process. It doesn't fix #15895 but it points towards the solution which, to my mind, is assigning more useful values to the template & doing less in javascript. The next step is to use the correct tax_rate rather than have to use 2 arrays just to get the tax_rate - ie
eileenmcnaughton@458a559#diff-fa0276456bc05f4629f775e6846f62ed
However, following that we can have the js use the figure which includes the tax, rather than having to calculate that in js with unknowns to deal with
Comments
Anything else you would like the reviewer to note