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

Alternate fix to remove extraneous tax display #29889

Merged
merged 1 commit into from
Apr 23, 2024

Conversation

eileenmcnaughton
Copy link
Contributor

@eileenmcnaughton eileenmcnaughton commented Apr 5, 2024

Overview

@jitendrapurohit what about this as an alternative to #29859

Copy link

civibot bot commented Apr 5, 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 Apr 5, 2024
@eileenmcnaughton
Copy link
Contributor Author

test this please

Copy link
Contributor

@jitendrapurohit jitendrapurohit left a comment

Choose a reason for hiding this comment

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

Thank you for the fix @eileenmcnaughton. Confirmed this is working fine 👍

@seamuslee001
Copy link
Contributor

@eileenmcnaughton test fail seems to relate

CRM_Contribute_Form_ContributionTest::testEmailReceiptOnPayLater with data set #0 (true)
Error: Typed property CRM_Contribute_Form_Contribution::$order must not be accessed before initialization

/home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/CRM/Contribute/Form/Contribution.php:939
/home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/CRM/Contribute/Form/Contribution.php:971
/home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/CRM/Contribute/Form/Contribution.php:618
/home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/CRM/Core/Form.php:774
/home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/Civi/Test/FormWrapper.php:143
/home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CRM/Contribute/Form/ContributionTest.php:2148
/home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CRM/Contribute/Form/ContributionTest.php:625
/home/homer/buildkit/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:284
/home/homer/buildkit/extern/phpunit9/phpunit9.phar:2307

@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 yeah - I opened a couple or PRs to tackle some of those side-issues - this was one #29907

@eileenmcnaughton
Copy link
Contributor Author

& also #29903

@eileenmcnaughton
Copy link
Contributor Author

I don't think I did the last one - was kinda on hold for those others

@seamuslee001
Copy link
Contributor

Jenkins re test this please

@eileenmcnaughton
Copy link
Contributor Author

I've brought this back to the actual issue - I think it will still hit a notice - likely fixed by this #29936 & one other

@eileenmcnaughton
Copy link
Contributor Author

Just the one fail - I expect #29936 to address

CRM_Contribute_Form_ContributionTest::testEmailReceiptOnPayLater with data set #1 (false)
Undefined array key "tax_amount"

/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/CRM/Price/BAO/PriceField.php:786
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/CRM/Price/BAO/PriceField.php:497
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/CRM/Contribute/Form/Contribution.php:963
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/CRM/Contribute/Form/Contribution.php:615
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/CRM/Core/Form.php:774
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/Civi/Test/FormWrapper.php:143
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/tests/phpunit/CRM/Contribute/Form/ContributionTest.php:2148
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/tests/phpunit/CRM/Contribute/Form/ContributionTest.php:625
/home/homer/buildkit/build/build-0/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:284
/home/homer/buildkit/extern/phpunit9/phpunit9.phar:2307

@seamuslee001
Copy link
Contributor

Jenkins re test this please

@eileenmcnaughton
Copy link
Contributor Author

@seamuslee001 looks like this is mergeable now

@eileenmcnaughton
Copy link
Contributor Author

Merging based on @jitendrapurohit's review

@eileenmcnaughton eileenmcnaughton merged commit 861c41a into civicrm:master Apr 23, 2024
3 checks passed
@eileenmcnaughton eileenmcnaughton deleted the no_tax branch April 23, 2024 02:27
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.

3 participants