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

dev/core#4974 Fix total fees over-sharing #29309

Merged
merged 2 commits into from
Feb 7, 2024
Merged

dev/core#4974 Fix total fees over-sharing #29309

merged 2 commits into from
Feb 7, 2024

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

dev/core#4974 Fix total fees over-sharing

Before

per https://lab.civicrm.org/dev/core/-/issues/4974

After

fixed

Technical Details

@demeritcowboy this includes some additional notice fixes from the info screen - I can take that out if you prefer - I'm still just working through your other issue / some more notices that I still see

Comments

@civibot civibot
Copy link

civibot bot commented Feb 7, 2024

🤖 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 Feb 7, 2024
@civibot civibot
Copy link

civibot bot commented Feb 7, 2024

The issue associated with the Pull Request can be viewed at https://lab.civicrm.org/dev/core/-/issues/4974

demeritcowboy
demeritcowboy reviewed Feb 7, 2024
View reviewed changes
templates/CRM/Event/Page/EventInfo.tpl Outdated
@@ -75,7 +75,7 @@
<div class="vevent crm-event-id-{$event.id} crm-block crm-event-info-form-block">
<div class="event-info">
{* Display top buttons only if the page is long enough to merit duplicate buttons *}
{if $event.summary or $event.description}
{if array_key_exists('summary', $event) or array_key_exists('description', $event)}
Copy link
Contributor

Choose a reason for hiding this comment

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

If event.summary and event.description exist but are both blank this would still show this section.

Most of the ones below too - it's no longer checking that there is a non-blank value.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yeah - it seems to filter them out if blank but I guess that could change in the future ? I thought it would be easier to read shorter but I can do both

@eileenmcnaughton
Copy link
Contributor Author

@demeritcowboy I put up the full set of patches I'm testing with here #29310 (cos otherwise I see red I see red I see red https://www.youtube.com/watch?v=TFIrKWg89r4

@eileenmcnaughton
Copy link
Contributor Author

@demeritcowboy OK - I think I've made the notice fixes a bit more conservative - let me know if you would rather test on this set of patches or the one that fixes all the notices - ie #29310 - cos I'm gonna work on the credit card issue now & also verify / fix some feedback from @JKingsnorth

@eileenmcnaughton
dev/core#4974 Fix total fees over-sharing
e804cda
@eileenmcnaughton
Fix notices on event info page
070ad4d 
These came up when I tried to register for a new
event created from the 'free event online' template
demeritcowboy
demeritcowboy reviewed Feb 7, 2024
View reviewed changes
templates/CRM/Event/Page/EventInfo.tpl
@@ -75,7 +75,7 @@
<div class="vevent crm-event-id-{$event.id} crm-block crm-event-info-form-block">
<div class="event-info">
{* Display top buttons only if the page is long enough to merit duplicate buttons *}
{if array_key_exists('summary', $event) or array_key_exists('description', $event)}
{if (array_key_exists('summary', $event) && $event.summary) or array_key_exists('description', $event) && $event.description}
Copy link
Contributor

Choose a reason for hiding this comment

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

Technically there should be brackets on the 2nd pair but the truth table happens to work out the same.

@demeritcowboy demeritcowboy merged commit 5b04c5d into civicrm:master Feb 7, 2024
3 checks passed
@eileenmcnaughton eileenmcnaughton deleted the suppress branch February 7, 2024 22:39
@eileenmcnaughton
Copy link
Contributor Author

thanks @demeritcowboy

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@demeritcowboy demeritcowboy demeritcowboy left review comments

Assignees
No one assigned
Labels
master
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@eileenmcnaughton @demeritcowboy