Fix campaign_id handling for batch entry #18792
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)
|
|
@jitendrapurohit is this one you could review? |
CRM/Batch/Form/Entry.php
Outdated
| @@ -838,7 +831,7 @@ private function processMembership(&$params) { | |||
| $value['contact_id'], $value['membership_type_id'], FALSE, | |||
| //$numTerms should be default to 1. | |||
| NULL, NULL, $value['custom'], 1, NULL, FALSE, | |||
| NULL, $membershipSource, $isPayLater, $campaignId, $formDates | |||
| NULL, $membershipSource, $isPayLater, ['campaign_id' => $value['campaign_id'] ?? NULL], $formDates | |||
There was a problem hiding this comment.
The element build on the batch entry form is member_campaign_id so think we should replace the key in $value with the same? The patch after being applied is still not able to update the campaign in the membership due to the above mismatch. Replacing it with
NULL, $membershipSource, $isPayLater, ['campaign_id' => $value['member_campaign_id'] ?? NULL], $formDates
works fine. @eileenmcnaughton Can you confirm pls?
There was a problem hiding this comment.
thanks @jitendrapurohit I've updated it as you suggest
Fixes a bug whereby campaign_id is not updated on batch entry if it has been added to the profile. The underlying issue appears to be an attack of copy and paste. I tidied up the variable in both the places that call the processMembership function such that it is passed in as an array of pass-through params. The function can be simplified & eventually removed.
eileenmcnaughton
force-pushed
the
status2
branch
from
f7e70bd
to
5fbbde1
Compare
|
Jenkins re test this please |
|
Have tested multiple membership renewals via batch screen. This is working fine now 👍 |
jitendrapurohit
approved these changes
Oct 26, 2020
|
@colemanw @seamuslee001 could one of you merge based on @jitendrapurohit review |
|
Merging as per review by @jitendrapurohit |
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 a bug whereby campaign_id is not updated on batch entry if it has been added to the profile.
Before
After
Campaign id saved & tested.
Technical Details
The underlying issue appears to be an attack of copy and paste. I tidied up the variable
in both the places that call the processMembership function such that it is passed in
as an array of pass-through params. Campaign id is the only param treated this way for now - but several of the params are in fact simply part of the array of 'memParams' that is passed through.
The function processMembership can be simplified & eventually removed building off this.
Comments
Pre-existing e-notice not addressed - it's in the buildForm & I'm looking at the post process. Unrelated