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

[Import] Cleanup Contribution flow - esp with regards to soft credits #23588

Merged
merged 2 commits into from
Jun 1, 2022

Conversation

eileenmcnaughton
Copy link
Contributor

Overview

[Import] Cleanup Contribution flow - esp with regards to soft credits

This builds on #23586 and does significant clean up on handling for soft credit imports

Before

  • multiple arrays need to be constructed to construct CRM_Contribute_Import_Parser_Contribution
  • When importing a soft credit it says you can match on email - however this ONLY works if your dedupe rule is configured to match on email along

After

  • most of the arrays are removed (working on the last one) - in favour of user_job_id
  • since we are saying the email is used to match & we don't have any other fields it now does a simple lookup on email

Technical Details

Comments

@civibot
Copy link

civibot bot commented May 26, 2022

(Standard links)

@civibot civibot bot added the master label May 26, 2022
@eileenmcnaughton eileenmcnaughton force-pushed the import_soft branch 10 times, most recently from 131cf04 to 1825acd Compare May 26, 2022 23:06
@eileenmcnaughton
Copy link
Contributor Author

Closing this for now - I want to check something & also need the other one merged first

@eileenmcnaughton
Copy link
Contributor Author

Actually I was wrong - the thing I was thinking about was fine

@eileenmcnaughton eileenmcnaughton force-pushed the import_soft branch 3 times, most recently from 97fae47 to 6fcfc1e Compare May 31, 2022 21:37
@eileenmcnaughton
Copy link
Contributor Author

test this please

@seamuslee001
Copy link
Contributor

@eileenmcnaughton Fatal error: Cannot redeclare CRM_Contribute_Import_Parser_Contribution::getMappedRow() in CRM/Contribute/Import/Parser/Contribution.php on line 458

@eileenmcnaughton
Copy link
Contributor Author

argh - lost in the rebasing - I will do again - it would be good to get this one merged first though - #23637 (it adds functions not yet called to help with conflicts like this)

@eileenmcnaughton
Copy link
Contributor Author

argh - that one has a lock file snuck in - re-doing all the prs

@eileenmcnaughton
Copy link
Contributor Author

It will also need rebasing once #23636 is merged - but the sooner the better for that one as I can rebase this & a couple of other PRs

@eileenmcnaughton
Copy link
Contributor Author

@monishdeb - Coleman merged a bunch - if you get to it it would be great to see this merged & the membership one - as time allows

@monishdeb
Copy link
Member

  • General standards

    • (r-explain) PASS
    • (r-user) PASS
    • (r-doc) PASS : I think PR description explains in detail
    • (r-run) PASS: I have tested the patch in the test-build generated. Verified the with contribution match with existing contact email. And then with external identifier. Works fine
  • Developer standards

@monishdeb monishdeb merged commit 9a8fe2d into civicrm:master Jun 1, 2022
@eileenmcnaughton eileenmcnaughton deleted the import_soft branch June 1, 2022 07:50
@eileenmcnaughton
Copy link
Contributor Author

Yay - thanks @monishdeb

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