Seamus Lee [Tue, 5 Jan 2021 21:39:21 +0000 (08:39 +1100)]
Merge pull request #19302 from eileenmcnaughton/act_map
[REF] extract and share code to determine if required contact fields are present
Seamus Lee [Tue, 5 Jan 2021 21:08:47 +0000 (08:08 +1100)]
Merge pull request #19315 from mattwire/smtpsettingsignoreexception
Remove use of ignoreException from SMTP settings form
colemanw [Tue, 5 Jan 2021 13:31:52 +0000 (08:31 -0500)]
Merge pull request #19296 from eileenmcnaughton/fbool
Removes default for is_active & is_reserved since they now have DB defaults
Matthew Wire [Mon, 4 Jan 2021 13:14:11 +0000 (13:14 +0000)]
Remove use of ignoreException() from SMTP settings form.
Seamus Lee [Tue, 5 Jan 2021 02:58:16 +0000 (13:58 +1100)]
Merge pull request #19251 from totten/master-crypt-rekey
(dev/core#2258) Add API+hook to rotate keys for encrypted fields
Seamus Lee [Tue, 5 Jan 2021 02:54:56 +0000 (13:54 +1100)]
Merge pull request #19301 from eileenmcnaughton/act_construct
[REF] Fix import signature on activity parser, add preliminary test
eileen [Thu, 31 Dec 2020 19:42:41 +0000 (08:42 +1300)]
Removes default for is_active & is_reserved since they now have DB defaults
Is deductible already had a default but it has been fixed so we can rely on it.
eileen [Tue, 5 Jan 2021 01:55:04 +0000 (14:55 +1300)]
FinancialType Schema: make is_deductible db default 0, make bool fields required
Eileen McNaughton [Mon, 4 Jan 2021 22:53:17 +0000 (11:53 +1300)]
Merge pull request #19318 from colemanw/apiJoinTest
[tests] Fix join syntax conversion for APIv4 in v3 unit tests
Eileen McNaughton [Mon, 4 Jan 2021 21:11:58 +0000 (10:11 +1300)]
Merge pull request #19314 from mattwire/importnoignoreexception
Remove use of ignoreException on import form
Coleman Watts [Mon, 4 Jan 2021 21:08:14 +0000 (16:08 -0500)]
Fix join syntax conversion for APIv4 in v3 unit tests
colemanw [Mon, 4 Jan 2021 20:37:46 +0000 (15:37 -0500)]
Merge pull request #19309 from eileenmcnaughton/pledge_req
Pledge: mark needed fields as required in schema
Eileen McNaughton [Mon, 4 Jan 2021 19:44:29 +0000 (08:44 +1300)]
Merge pull request #19316 from ahed-compucorp/dev/core#2282
dev/core#2282 Use the proper content type for ICalendar link
Matthew Wire [Mon, 4 Jan 2021 13:06:45 +0000 (13:06 +0000)]
Don't check for create temporary table permissions on import form. CiviCRM in general requires support for temporary tables
Ahed [Sun, 3 Jan 2021 17:20:19 +0000 (19:20 +0200)]
dev/core#2282 Use the proper content type for ICalendar link
Seamus Lee [Mon, 4 Jan 2021 05:21:09 +0000 (16:21 +1100)]
Merge pull request #19307 from eileenmcnaughton/534
dev/core#2251 provide default receive_date
Seamus Lee [Sun, 3 Jan 2021 21:54:30 +0000 (08:54 +1100)]
Merge pull request #19313 from civicrm/5.33
5.33
Seamus Lee [Sun, 3 Jan 2021 21:54:08 +0000 (08:54 +1100)]
Merge pull request #19310 from seamuslee001/port_poc_c_533
(POC) MembershipRenewalTest - Address assertions that started failing…
Seamus Lee [Sun, 3 Jan 2021 20:30:11 +0000 (07:30 +1100)]
Merge pull request #19291 from eileenmcnaughton/prof
dev/core#527 use public title for on behalf profile and confirm/thankyou pages
Eileen McNaughton [Sun, 3 Jan 2021 20:25:25 +0000 (09:25 +1300)]
Merge pull request #19277 from yashodha/dev-2273
(dev/core#2273) Contact type incorrectly set to Contribution due to '…
Tim Otten [Sat, 2 Jan 2021 06:13:51 +0000 (22:13 -0800)]
(POC) MembershipRenewalTest - Address assertions that started failing circa Jan 1, 2021
Eileen McNaughton [Sun, 3 Jan 2021 20:18:45 +0000 (09:18 +1300)]
Merge pull request #19294 from totten/master-invasive
(REF) Civi\Test\Invasive - Add helper for checking protected/private members
Seamus Lee [Sun, 3 Jan 2021 19:18:35 +0000 (06:18 +1100)]
Merge pull request #19300 from eileenmcnaughton/import
[REF] Move another deprecated function back to the only class that calls it
eileen [Sun, 3 Jan 2021 01:02:22 +0000 (14:02 +1300)]
Pledge: mark needed fields as required in schema
This marks all the fields that are not optional as required. I've been having a bit of a battle adding
a v4 api & I hope this will help - but if not, it's correct for them to be marked required anyway
eileen [Thu, 31 Dec 2020 20:53:39 +0000 (09:53 +1300)]
[REF] Move another deprecated function back to the only class that calls it
eileen [Sat, 2 Jan 2021 20:52:51 +0000 (09:52 +1300)]
dev/core#2251 provide default receive_date
Eileen McNaughton [Sat, 2 Jan 2021 20:34:49 +0000 (09:34 +1300)]
Merge pull request #19305 from totten/master-renewtest-c
(POC#C) MembershipRenewalTest - Address assertions that started failing circa Jan 1, 2021
Tim Otten [Sat, 2 Jan 2021 06:13:51 +0000 (22:13 -0800)]
(POC) MembershipRenewalTest - Address assertions that started failing circa Jan 1, 2021
eileen [Fri, 1 Jan 2021 22:21:10 +0000 (11:21 +1300)]
[REF] extract and share code to determine if required contact fields are present
eileen [Fri, 1 Jan 2021 21:28:46 +0000 (10:28 +1300)]
[REF] Fix import signature on activity parser, add preliminary test
The construct class does not need to receive mapperKeys as a reference - this
was removed for Membership Parser here https://github.com/civicrm/civicrm-core/commit/
14b9e069607c6cbcbbaf21a209f647ba422b8e04#diff-36f5db3555445d26df2de015a18598fd5d5682b76c62aee4f14dde95b7948274L65
In addition 2 places that instantiate this class pass in unused params (go copy & paste) so
that is removed. The test tests very little so far....
Matthew Wire [Thu, 31 Dec 2020 13:12:57 +0000 (13:12 +0000)]
Merge pull request #19285 from eileenmcnaughton/money_defaults
Use specific function when formatting money for a default
Matthew Wire [Thu, 31 Dec 2020 13:10:54 +0000 (13:10 +0000)]
Merge pull request #19283 from eileenmcnaughton/facl
Move financial acl warning from FinancialType BAO to extension.
Matthew Wire [Thu, 31 Dec 2020 13:08:57 +0000 (13:08 +0000)]
Merge pull request #19281 from eileenmcnaughton/bool
Add default for boolean fields on financial_type
Tim Otten [Thu, 31 Dec 2020 09:30:29 +0000 (01:30 -0800)]
(REF) versionCheckTest - Use "Invasive" helper
It's shorter/prettier.
Tim Otten [Thu, 31 Dec 2020 09:29:58 +0000 (01:29 -0800)]
(REF) CiviReport TestCaseTest - Use "Invasive" helper
It's shorter/prettier
Tim Otten [Thu, 31 Dec 2020 09:29:43 +0000 (01:29 -0800)]
(REF) PaymentTest - Use "Invasive" helper
It's shorter/prettier.
Tim Otten [Thu, 31 Dec 2020 09:29:20 +0000 (01:29 -0800)]
(REF) MailingJobTest - Use "Invasive" helper
It's shorter/prettier.
Tim Otten [Thu, 31 Dec 2020 09:28:52 +0000 (01:28 -0800)]
(REF) ActivityTest - Use "Invasive" helper
It's shorter/prettier.
Tim Otten [Thu, 31 Dec 2020 08:43:39 +0000 (00:43 -0800)]
Civi\Test\Invasive - Add helper for checking protected/private members
Eileen McNaughton [Wed, 30 Dec 2020 23:51:25 +0000 (12:51 +1300)]
Merge pull request #19292 from eileenmcnaughton/camp_index
[REF] Minor cleanup, remove variable variables
Tim Otten [Mon, 21 Dec 2020 08:20:07 +0000 (00:20 -0800)]
(dev/core#2258) Add System.rotateKey API
Tim Otten [Mon, 21 Dec 2020 05:55:58 +0000 (21:55 -0800)]
(dev/core#2258) CryptoToken - Add rekey method
Seamus Lee [Wed, 30 Dec 2020 21:37:25 +0000 (08:37 +1100)]
Merge pull request #19290 from ahed-compucorp/dev/core#2269
dev/core#2269 Use contribution's currency instead of the default
eileen [Wed, 30 Dec 2020 21:11:11 +0000 (10:11 +1300)]
[REF] Minor cleanup, remove variable variables
Eileen McNaughton [Wed, 30 Dec 2020 20:53:38 +0000 (09:53 +1300)]
Merge pull request #19272 from seamuslee001/more_add_radio
REF use centralised addRadio function more
eileen [Wed, 30 Dec 2020 20:50:22 +0000 (09:50 +1300)]
dev/core#527 use public title for on behalf profile and confirm/thank you pages
This is a partial reviewer's commit of https://github.com/civicrm/civicrm-core/pull/19144
That PR is stale. I tested one flow & added in the 2 changes from there that I could see in my test
& which I was comfortable would not affect anything else. The flow I tested was a contribution
page flow with an on behalf profile. I did not check the email as that would need
a test anyway
Ahed [Wed, 30 Dec 2020 10:04:38 +0000 (12:04 +0200)]
dev/core#2269 Use contribution's currency instead of the default
Eileen McNaughton [Wed, 30 Dec 2020 06:54:48 +0000 (19:54 +1300)]
Merge pull request #19057 from ixiam/dev/core#2173
Adapt filters with empty and null values in alphanumeric custom fields
Seamus Lee [Wed, 23 Dec 2020 22:22:09 +0000 (09:22 +1100)]
REF use centralised addRadio function more
eileen [Wed, 30 Dec 2020 02:00:32 +0000 (15:00 +1300)]
Use specific function when formatting money for a default
It seems that there are really only 2 ways money::format is called
1) for presenting money - with symbols - in this case only 2 params are passed in
2) for prefilling the form value - in which case some combination of the last 3 are passed in
We have an alternate function that works in the latter case - at which point we could deprecate all
3 in the former case (after a bit more grepping).
The function name is formatLocaleNumericRoundedForDefaultCurrency
I have to admit I'm tempted to remove 'locale' from that name - although
I guess it denotes the swapping of thousand separators
Seamus Lee [Tue, 29 Dec 2020 18:57:18 +0000 (05:57 +1100)]
Merge pull request #19241 from demeritcowboy/dev-core-2127
dev/core#2127 - Don't accidentally trim à characters when importing files
Yashodha Chaku [Tue, 29 Dec 2020 14:26:29 +0000 (19:56 +0530)]
Merge pull request #19279 from eileenmcnaughton/go_mem
[REF] Remove unreachable code
eileen [Tue, 29 Dec 2020 02:10:48 +0000 (15:10 +1300)]
Move financial acl warning from FinancialType BAO to extension.
It turns out this is not currently triggered by the api as the api passes in the key FinancialType in
ids and it is looking for financialType. Regardless I think this makes sense in the extension
and setting in the session as currently sometimes works makes sense (at least enough to
move rather than remove)
eileen [Tue, 29 Dec 2020 00:37:03 +0000 (13:37 +1300)]
Add default for boolean fiels on financial_type
eileen [Mon, 28 Dec 2020 23:13:41 +0000 (12:13 +1300)]
[REF] Remove unreachable code
This code was copied from the previously shared function & supports some really weird stuff for the contribution form.
I tested & was unable to reach this from the back office membership form - note it is only reachable
when processing recurring which in turn relies on the membership type being configured and the
processor. It seems that recurring is not available with price sets
Eileen McNaughton [Mon, 28 Dec 2020 21:58:35 +0000 (10:58 +1300)]
Merge pull request #19266 from demeritcowboy/is-development-2
dev/core#2240 - Convert remaining two deprecatedWarning calls
Eileen McNaughton [Mon, 28 Dec 2020 21:57:53 +0000 (10:57 +1300)]
Merge pull request #19275 from colemanw/apiJoinConditions
APIv4 - Smarter check for adding default ON clause to explicit joins
Coleman Watts [Thu, 24 Dec 2020 03:04:39 +0000 (22:04 -0500)]
dev/core#2271 - APIv4 - Smarter check for adding default ON clause to explicit joins
When adding explicit joins in APIv4, the API will automacially add an ON clause linking it
to the base entity unless it detects some other link already present in the ON clause supplied.
Previously it would determine this by checking for the join entity ID;
now it looks for the join entity ID OR any other field in the join entity with an FK.
This gives more leeway for people to add creative joins without the defaults getting in the way.
Matthew Wire [Thu, 24 Dec 2020 11:50:04 +0000 (11:50 +0000)]
Merge pull request #19274 from eileenmcnaughton/tax
[REF] Fix tax_amount to be consistent & load from the templateContribution
yashodha [Thu, 24 Dec 2020 11:11:04 +0000 (16:41 +0530)]
style fix
yashodha [Thu, 24 Dec 2020 11:06:07 +0000 (16:36 +0530)]
(dev/core#2273) Contact type incorrectly set to Contribution due to 'Honoree Profile'
Seamus Lee [Thu, 24 Dec 2020 08:09:42 +0000 (19:09 +1100)]
Merge pull request #19269 from eileenmcnaughton/mem_form
[REF] Unshared another function back onto Membership_Form
Seamus Lee [Thu, 24 Dec 2020 08:09:19 +0000 (19:09 +1100)]
Merge pull request #19276 from civicrm/5.33
5.33
Seamus Lee [Thu, 24 Dec 2020 05:35:53 +0000 (16:35 +1100)]
Merge pull request #19267 from alifrumin/rn-5.33
[NFC] Release notes 5.33 - First Pass
eileen [Wed, 23 Dec 2020 20:36:10 +0000 (09:36 +1300)]
[REF] Unshared another function back onto Membership_Form
As with the other functions there is more not in common than in common & subsequent cleanup can remove
much of the copied function
Remove code unrelated to membership form
eileen [Thu, 24 Dec 2020 01:47:29 +0000 (14:47 +1300)]
[REF] Fix tax_amount to be consistent & load from the templateContribution
This leverages the work done in https://github.com/civicrm/civicrm-core/pull/15517/files (the test in particular)
but alters it to be more consistent. The original fix relied on the tax_amount on the contribution object
passed in - this fixes it to get the amount from the templateContribution (which is more consistent
now than when the patch was likely written
Eileen McNaughton [Thu, 24 Dec 2020 01:19:57 +0000 (14:19 +1300)]
Merge pull request #19271 from eileenmcnaughton/mem_form2
[REF] Unshare code to build an array of params for the recurring contribution
Seamus Lee [Thu, 24 Dec 2020 00:13:27 +0000 (11:13 +1100)]
Merge pull request #19236 from totten/master-crypt-svc
dev/core#2258 - Add services to support encryption
Seamus Lee [Thu, 24 Dec 2020 00:05:19 +0000 (11:05 +1100)]
Merge pull request #19270 from eileenmcnaughton/import
Fold deprecated function into the only function that calls it
Seamus Lee [Wed, 23 Dec 2020 23:06:15 +0000 (10:06 +1100)]
Merge pull request #19268 from seamuslee001/dev_core_2272
dev/core#2272 Fix a DB error when merging contacts into the same hous…
Seamus Lee [Wed, 23 Dec 2020 22:30:14 +0000 (09:30 +1100)]
Merge pull request #19200 from eileenmcnaughton/act_contact
Fix preferred repeattransaction flow to correctly create the activity contacts for the contribution
Seamus Lee [Wed, 23 Dec 2020 22:04:31 +0000 (09:04 +1100)]
Merge pull request #19265 from seamuslee001/use_add_radio
REF use addRadio function to add in the radio fields to these forms
Alice Frumin [Wed, 23 Dec 2020 16:38:43 +0000 (11:38 -0500)]
Release Notes 5.33
eileen [Wed, 23 Dec 2020 21:38:03 +0000 (10:38 +1300)]
[REF] Unshare code to build an array of params for the recurring contribution
demeritcowboy [Wed, 23 Dec 2020 00:14:14 +0000 (19:14 -0500)]
convert remaining calls, and php errors/exceptions don't support
placeholders
Seamus Lee [Wed, 23 Dec 2020 21:27:34 +0000 (08:27 +1100)]
Merge pull request #19262 from eileenmcnaughton/recur_test
Remove code to retrieve premium data
eileen [Wed, 23 Dec 2020 21:12:08 +0000 (10:12 +1300)]
Fold deprecated function into the only function that calls it
Seamus Lee [Wed, 23 Dec 2020 20:52:09 +0000 (07:52 +1100)]
Merge pull request #19248 from eileenmcnaughton/dep_utils
[REF] Relocate another deprecated utils function to the only class that calls it.
Seamus Lee [Wed, 23 Dec 2020 20:47:33 +0000 (07:47 +1100)]
Add in unit test to lock in the fix for dev_core_2272
Seamus Lee [Wed, 23 Dec 2020 20:26:49 +0000 (07:26 +1100)]
dev/core#2272 Fix a DB error when merging contacts into the same household on contact export and only exporting selected contact fields
eileen [Mon, 14 Dec 2020 01:28:25 +0000 (14:28 +1300)]
Fix creating of activity for repeat transactions to respect those form the template contribution, if on behalf
eileen [Mon, 14 Dec 2020 01:24:22 +0000 (14:24 +1300)]
Add test to ensure correct assignment of activities for on-behalf repeattransactions
Seamus Lee [Wed, 23 Dec 2020 08:56:11 +0000 (19:56 +1100)]
REF use addRadio function to add in the radio fields to these forms
Fixes following review by Dave D
Seamus Lee [Wed, 23 Dec 2020 20:00:37 +0000 (07:00 +1100)]
Merge pull request #19257 from ixiam/dev#2270
dev/core#2270 - Editing a smartgroup created through the search builder renders the new block by force
Matthew Wire [Wed, 23 Dec 2020 11:01:57 +0000 (11:01 +0000)]
Merge pull request #19174 from eileenmcnaughton/conttype
dev/financial#163 Removal of contributionTypeID
Eileen McNaughton [Wed, 23 Dec 2020 07:35:17 +0000 (20:35 +1300)]
Merge pull request #19263 from civicrm/5.33
5.33
Eileen McNaughton [Wed, 23 Dec 2020 07:34:59 +0000 (20:34 +1300)]
Merge pull request #19264 from agh1/5.33.0-releasenotes-initial
5.33.0 release notes initial run
Andrew Hunt [Wed, 23 Dec 2020 04:38:44 +0000 (23:38 -0500)]
5.33.0 release notes: added boilerplate
Andrew Hunt [Wed, 23 Dec 2020 04:35:19 +0000 (23:35 -0500)]
5.33.0 release notes: raw from script
Seamus Lee [Wed, 23 Dec 2020 04:09:13 +0000 (15:09 +1100)]
Merge pull request #19259 from eileenmcnaughton/confirm
Convert contributionSoft to an array
Seamus Lee [Wed, 23 Dec 2020 04:08:31 +0000 (15:08 +1100)]
Merge pull request #19260 from colemanw/searchKitInput
Search kit: Improve token support
Seamus Lee [Wed, 23 Dec 2020 04:05:36 +0000 (15:05 +1100)]
Merge pull request #19261 from colemanw/searchKitFix
Search kit - fix bugs introduced during refactoring
eileen [Wed, 23 Dec 2020 02:59:17 +0000 (15:59 +1300)]
Remove code to retrieve premium data
After a bit of digging I can't see an evidence we ever have premiums on the backoffice membership forms
colemanw [Wed, 23 Dec 2020 02:44:14 +0000 (21:44 -0500)]
Merge pull request #19245 from seamuslee001/dev_core_2263
dev/core#2263 Do not try and store items in the session if the sessio…
colemanw [Wed, 23 Dec 2020 02:41:12 +0000 (21:41 -0500)]
Merge pull request #19258 from eileenmcnaughton/recur_test
[REF] Convert previously shared function to non-static, remove unrelated code
Coleman Watts [Wed, 23 Dec 2020 02:24:07 +0000 (21:24 -0500)]
Search kit - fix bugs introduced during refactoring
Coleman Watts [Tue, 22 Dec 2020 02:45:45 +0000 (21:45 -0500)]
Search kit: Add token selector in display admin UI, allow tokens in tooltips
Also includes some cleanup of the crmSearchAdminLinkSelect component, making it more self-contained
eileen [Wed, 23 Dec 2020 01:35:28 +0000 (14:35 +1300)]
Convert contributionSoft to an array
This is a partial of #19096 which requires contributionSoft to be an array & just simplifies that commit (which
is still failing tests
eileen [Wed, 23 Dec 2020 01:06:38 +0000 (14:06 +1300)]
[REF] Convert previously shared function to non-static, remove unrelated code
There is no facility for creating on_behalf on back office membership forms
so this code, copied from the shared function, does not relate.
The activity IS created by Contribution.create - the extra code was
just to hack it around to doing on_behalf
Likewise, the back office membership form does not collect
data on contribution custom fields or notes so removing these
also makes sense here.
Seamus Lee [Tue, 22 Dec 2020 23:03:21 +0000 (10:03 +1100)]
Merge pull request #19227 from eileenmcnaughton/mem_form
Remove or hard-code variables from previously shared function