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.

Sign up for GitHub

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

Jump to bottom

Move assigning customGroup to offline participant template out of the form layer #27596

Merged
merged 1 commit into from
Oct 14, 2023
Merged

Move assigning customGroup to offline participant template out of the form layer #27596

merged 1 commit into from
Oct 14, 2023

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

Move assigning customGroup to offline participant template out of the form layer

Builds on #27552 & moves the determination of the custom fields out of the form onto the workflow template
Unit test for this functionality added in
https://github.com/civicrm/civicrm-core/pull/27552/files#diff-a22240af3e1461ef0bd11694690c6c356c26a09a025e6b9b0a0b64fcd0d47fa9R61

Before

the form determines the customGroups variable that is assigned to the offline_event workflow template

After

The workflow template does - with a good deal more commentary

Technical Details

Screenshots of the array from the form

image

from the trait

image

Comments

@civibot
Copy link

civibot bot commented Sep 23, 2023

🤖 Thank you for contributing to CiviCRM! ❤️ We will need to test and review this 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...

➡️ Online demo of this PR 🔗

@civibot civibot bot added the master label Sep 23, 2023
@eileenmcnaughton
Copy link
Contributor Author

@larssandergreen I think this is the PR that has the fix for the e-notice you hit

@larssandergreen
Copy link
Contributor

@eileenmcnaughton I had this one in the mix, still had those warnings.

@eileenmcnaughton
Copy link
Contributor Author

@larssandergreen hmm - ok will check - does that mean this one is tested?

@larssandergreen
Copy link
Contributor

@eileenmcnaughton Not tested, but will do.

@eileenmcnaughton
Copy link
Contributor Author

@larssandergreen thanks - just checking the self transfer one on the other PR now

@eileenmcnaughton eileenmcnaughton mentioned this pull request Oct 6, 2023
Closed
@eileenmcnaughton
Copy link
Contributor Author

I've just realised that without this change data would leak between participants - although I guess register participants only allows them to have all the same custom data values anyway

eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Oct 6, 2023
@eileenmcnaughton
Add push upgrade for event offline receipt
455e68f 
This follows our historical practice of doing push receipts by
- adding the relevant receipt to the array of template in the upgrade
notification and
- (optionally) noting deprecated params on CRM_Utils_Token::getDeprecatedTokens

I didn't add lineItem to the deprecated array as it is pretty legit
to assign that within a foreach loop.

I also removed the assigns for the variables which are no longer relevant -
this can be followed up with more tidy up (some of which resolves php8.x issues)

Note that the template still uses
$billingName & $address - resolved in
civicrm#27692
$customGroup - resolved in civicrm#27596
(actually the variable remains but becomes non-leaky)
$credit_card_date,$credit_card_type (I propose moving to a paymet token)
$credit_card_expiry (I propose removing)
$event.confirm_text - addressed in civicrm#27162
@eileenmcnaughton eileenmcnaughton mentioned this pull request Oct 6, 2023
Merged
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Oct 6, 2023
@eileenmcnaughton
Add push upgrade for event offline receipt
5034901 
This follows our historical practice of doing push receipts by
- adding the relevant receipt to the array of template in the upgrade
notification and
- (optionally) noting deprecated params on CRM_Utils_Token::getDeprecatedTokens

I didn't add lineItem to the deprecated array as it is pretty legit
to assign that within a foreach loop.

I also removed the assigns for the variables which are no longer relevant -
this can be followed up with more tidy up (some of which resolves php8.x issues)

Note that the template still uses
$billingName & $address - resolved in
civicrm#27692
$customGroup - resolved in civicrm#27596
(actually the variable remains but becomes non-leaky)
$credit_card_date,$credit_card_type (I propose moving to a paymet token)
$credit_card_expiry (I propose removing)
$event.confirm_text - addressed in civicrm#27162
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Oct 6, 2023
@eileenmcnaughton
Add push upgrade for event offline receipt
363addb 
This follows our historical practice of doing push receipts by
- adding the relevant receipt to the array of template in the upgrade
notification and
- (optionally) noting deprecated params on CRM_Utils_Token::getDeprecatedTokens

I didn't add lineItem to the deprecated array as it is pretty legit
to assign that within a foreach loop.

I also removed the assigns for the variables which are no longer relevant -
this can be followed up with more tidy up (some of which resolves php8.x issues)

Note that the template still uses
$billingName & $address - resolved in
civicrm#27692
$customGroup - resolved in civicrm#27596
(actually the variable remains but becomes non-leaky)
$credit_card_date,$credit_card_type (I propose moving to a paymet token)
$credit_card_expiry (I propose removing)
$event.confirm_text - addressed in civicrm#27162
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Oct 7, 2023
@eileenmcnaughton
Add push upgrade for event offline receipt
d549d64 
This follows our historical practice of doing push receipts by
- adding the relevant receipt to the array of template in the upgrade
notification and
- (optionally) noting deprecated params on CRM_Utils_Token::getDeprecatedTokens

I didn't add lineItem to the deprecated array as it is pretty legit
to assign that within a foreach loop.

I also removed the assigns for the variables which are no longer relevant -
this can be followed up with more tidy up (some of which resolves php8.x issues)

Note that the template still uses
$billingName & $address - resolved in
civicrm#27692
$customGroup - resolved in civicrm#27596
(actually the variable remains but becomes non-leaky)
$credit_card_date,$credit_card_type (I propose moving to a paymet token)
$credit_card_expiry (I propose removing)
$event.confirm_text - addressed in civicrm#27162
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Oct 9, 2023
@eileenmcnaughton
Add push upgrade for event offline receipt
acab0b4 
This follows our historical practice of doing push receipts by
- adding the relevant receipt to the array of template in the upgrade
notification and
- (optionally) noting deprecated params on CRM_Utils_Token::getDeprecatedTokens

I didn't add lineItem to the deprecated array as it is pretty legit
to assign that within a foreach loop.

I also removed the assigns for the variables which are no longer relevant -
this can be followed up with more tidy up (some of which resolves php8.x issues)

Note that the template still uses
$billingName & $address - resolved in
civicrm#27692
$customGroup - resolved in civicrm#27596
(actually the variable remains but becomes non-leaky)
$credit_card_date,$credit_card_type (I propose moving to a paymet token)
$credit_card_expiry (I propose removing)
$event.confirm_text - addressed in civicrm#27162
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Oct 11, 2023
@eileenmcnaughton
Add push upgrade for event offline receipt
96eb11a 
This follows our historical practice of doing push receipts by
- adding the relevant receipt to the array of template in the upgrade
notification and
- (optionally) noting deprecated params on CRM_Utils_Token::getDeprecatedTokens

I didn't add lineItem to the deprecated array as it is pretty legit
to assign that within a foreach loop.

I also removed the assigns for the variables which are no longer relevant -
this can be followed up with more tidy up (some of which resolves php8.x issues)

Note that the template still uses
$billingName & $address - resolved in
civicrm#27692
$customGroup - resolved in civicrm#27596
(actually the variable remains but becomes non-leaky)
$credit_card_date,$credit_card_type (I propose moving to a paymet token)
$credit_card_expiry (I propose removing)
$event.confirm_text - addressed in civicrm#27162
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Oct 11, 2023
@eileenmcnaughton
Add push upgrade for event offline receipt
d5d242f 
This follows our historical practice of doing push receipts by
- adding the relevant receipt to the array of template in the upgrade
notification and
- (optionally) noting deprecated params on CRM_Utils_Token::getDeprecatedTokens

I didn't add lineItem to the deprecated array as it is pretty legit
to assign that within a foreach loop.

I also removed the assigns for the variables which are no longer relevant -
this can be followed up with more tidy up (some of which resolves php8.x issues)

Note that the template still uses
$billingName & $address - resolved in
civicrm#27692
$customGroup - resolved in civicrm#27596
(actually the variable remains but becomes non-leaky)
$credit_card_date,$credit_card_type (I propose moving to a paymet token)
$credit_card_expiry (I propose removing)
$event.confirm_text - addressed in civicrm#27162
eileenmcnaughton added a commit to eileenmcnaughton/civicrm-core that referenced this pull request Oct 11, 2023
@eileenmcnaughton
Add push upgrade for event offline receipt
cc83e27 
This follows our historical practice of doing push receipts by
- adding the relevant receipt to the array of template in the upgrade
notification and
- (optionally) noting deprecated params on CRM_Utils_Token::getDeprecatedTokens

I didn't add lineItem to the deprecated array as it is pretty legit
to assign that within a foreach loop.

I also removed the assigns for the variables which are no longer relevant -
this can be followed up with more tidy up (some of which resolves php8.x issues)

Note that the template still uses
$billingName & $address - resolved in
civicrm#27692
$customGroup - resolved in civicrm#27596
(actually the variable remains but becomes non-leaky)
$credit_card_date,$credit_card_type (I propose moving to a paymet token)
$credit_card_expiry (I propose removing)
$event.confirm_text - addressed in civicrm#27162
@colemanw
Copy link
Member

@larssandergreen have you had a chance to test this one? Seems like a blocker to other work.

@eileenmcnaughton
Copy link
Contributor Author

@colemanw this does actually have specific test cover - I added it when I refactored the custom group stuff - this just moves it

@colemanw
Copy link
Member

Ok well tests seem happy at least.

@colemanw colemanw merged commit 1cabf11 into civicrm:master Oct 14, 2023
@colemanw colemanw deleted the participant_custom_assign branch October 14, 2023 19:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@eileenmcnaughton @larssandergreen @colemanw