Skip to content
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

Use APIv4 to check if a PriceSet extends CiviMember (lab.civicrm issue 4486) #27079

Merged
merged 1 commit into from
Aug 17, 2023

Conversation

brienneK
Copy link
Contributor

Overview

(This is a new PR derived from #27076 to be made against 5.65)

This patch resolves the issue reported on lab.civicrm regarding the inability to change membership price set on contribution pages/

Before

A user cannot switch the options for the Membership Price Set field, and instead get the follow error, despite that the Amounts tab is configured correctly:

You cannot enable both Membership Signup and a Contribution Price Set on the same online contribution page.

After

A user should be able to switch the options for the Membership Price Set without error.

@civibot
Copy link

civibot bot commented Aug 16, 2023

Thank you for contributing to CiviCRM! ❤️ We will need to test and review the PR. 👷

Introduction for new contributors
  • If this is your first PR, an admin will greenlight automated testing with the command ok to test or add to whitelist.
  • A series of tests will automatically run. You can see the results at the bottom of this page (if there are any problems, it will include a link to see what went wrong).
  • A demo site will be built where anyone can try out a version of CiviCRM that includes your changes.
  • If this process needs to be repeated, an admin will issue the command test this please to rerun tests and build a new demo site.
  • Before this PR can be merged, it needs to be reviewed. Please keep in mind that reviewers are volunteers, and their response time can vary from a few hours to a few weeks depending on their availability and their knowledge of this particular part of CiviCRM.
  • A great way to speed up this process is to "trade reviews" with someone - find an open PR that you feel able to review, and leave a comment like "I'm reviewing this now, could you please review mine?" (include a link to yours). You don't have to wait for a response to get started (and you don't have to stop at one!) the more you review, the faster this process goes for everyone 😄
  • To ensure that you are credited properly in the final release notes, please add yourself to contributor-key.yml
  • For more information about contributing, see CONTRIBUTING.md.
Quick links for reviewers

@civibot civibot bot added the 5.65 label Aug 16, 2023
@brienneK brienneK changed the title Price set extends api Use an API to check if a PriceSet extends CiviMember (lab.civicrm issue 4486) Aug 16, 2023
@brienneK brienneK changed the title Use an API to check if a PriceSet extends CiviMember (lab.civicrm issue 4486) Use APIv4 to check if a PriceSet extends CiviMember (lab.civicrm issue 4486) Aug 16, 2023
->addJoin('PriceSet AS price_set', 'LEFT', ['price_set_id', '=', 'price_set.id'])
->addWhere('entity_table', '=', 'civicrm_contribution_page')
->addWhere('entity_id', '=', $contributionPageId)
->addWhere('price_set.extends:name', 'CONTAINS', 'CiviMember')
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@briennekordis can you add in addWhere('price_set.is_quick_config', '=', 0) to match the original function https://github.com/civicrm/civicrm-core/blob/master/CRM/Price/BAO/PriceSet.php#L273

seamuslee001 added a commit to seamuslee001/civicrm-core that referenced this pull request Aug 16, 2023
…this time on the Amounts tab of the contribution page config
seamuslee001 added a commit to seamuslee001/civicrm-core that referenced this pull request Aug 16, 2023
…this time on the Amounts tab of the contribution page config
@seamuslee001
Copy link
Contributor

I'm going to merge this and do a follow up PR

@seamuslee001 seamuslee001 merged commit bf7d79a into civicrm:5.65 Aug 17, 2023
eileenmcnaughton added a commit that referenced this pull request Aug 17, 2023
[REF] Fix poor checking of extends field as per PR #27079 but this ti…
seamuslee001 added a commit to seamuslee001/civicrm-core that referenced this pull request Aug 17, 2023
…this time on the Amounts tab of the contribution page config
seamuslee001 added a commit that referenced this pull request Aug 17, 2023
->addWhere('price_set.extends:name', 'CONTAINS', 'CiviMember')
->execute()
->first();
if (!$priceSetExtendsMembership) {
Copy link
Contributor

@pradpnayak pradpnayak Aug 22, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will be always empty when creating a new one.

@larssandergreen
Copy link
Contributor

@briennekordis Thanks for doing this with the API, sorry I wasn't able to come back and review before it got merged. I've fixed the regression @pradpnayak found in #27120.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants