-
-
Notifications
You must be signed in to change notification settings - Fork 824
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix regression whereby membership does not submit #26170
Conversation
(Standard links)
|
I just pushed in a second commit for the renewal message part |
Preliminary testing properly shows the |
a82407a
to
c3f9fce
Compare
The automatic discount with c3f9fce applied does show up when the membership contribution is a renewal. But, it does not seem to show for an anonymous/guest user for a new membership, though the CiviDiscount automatic has both |
Just rolled back to check in It did at least show up properly for the renewal and how we use CiviDiscount. |
Thanks for the careful testing, @composerjk! Merging since this appears to fix the immediate regression and the tests pass. |
The work for civicrm#26170 concluded that membershipPriceset is always TRUE at this point. Since we were pushing out a regression fix I left the variable where it didn't seem to be causing regressions. However, I think clarifying the variable and removing the redundant if-else in the rc will set us up well as 1) if there is any further regression we haven't found in 5.61 then people will be able to check on the rc / master 2) if we need to do any further fixes / back-ports the code will be more synced if we do this in the rc Note there is some further clean up I feel should be done folloiwng what we learnt dealing with civicrm#26170 - but I want to let the dust settle so that I'm not creating a hard-to-backport situation
Note I just put up #26193 because the solution to this was understanding that |
Overview
Fix regression whereby membership does not submit
Before
Per https://lab.civicrm.org/dev/core/-/issues/4272#note_90443 on 5.61.0 it is not possible to submit a non-quick config membership form as the rule requiring the 'selectMembership' field to be set - however, it is actually never present on the form, having been superceded by the price set fields
After
The code that expects it is removed
Technical Details
I went back to 5.60 & tested with
In all these cases
$membershipPriceset
was TRUE and the lines in question were never hit - hence the fix is to remove themComments
There was a further possible issue mentioned in chat that I need to check - as a follow up. Also some follow up cleanup is implied by this patch as it implies more bits of code are unreachable