civicrm-core.git
3 years agoMerge pull request #19336 from eileenmcnaughton/nfc
Matthew Wire [Thu, 7 Jan 2021 10:29:47 +0000 (10:29 +0000)]
Merge pull request #19336 from eileenmcnaughton/nfc

[NFC] Code reformat pledge class

3 years agoMerge pull request #19298 from eileenmcnaughton/pp_mult
Seamus Lee [Thu, 7 Jan 2021 09:55:07 +0000 (20:55 +1100)]
Merge pull request #19298 from eileenmcnaughton/pp_mult

Rename PledgePayment create function

3 years agoMerge pull request #19335 from eileenmcnaughton/up
Seamus Lee [Thu, 7 Jan 2021 09:43:10 +0000 (20:43 +1100)]
Merge pull request #19335 from eileenmcnaughton/up

DB changes for already-made schema changes

3 years agoMerge pull request #19338 from seamuslee001/master
Seamus Lee [Thu, 7 Jan 2021 09:42:38 +0000 (20:42 +1100)]
Merge pull request #19338 from seamuslee001/master

release-notes/5.33.0.md - Last few PRs

3 years agorelease-notes/5.33.0.md - Last few PRs
Tim Otten [Thu, 7 Jan 2021 08:24:13 +0000 (00:24 -0800)]
release-notes/5.33.0.md - Last few PRs

3 years ago[NFC] Code reformat
eileen [Thu, 7 Jan 2021 07:16:37 +0000 (20:16 +1300)]
[NFC] Code reformat

IDE code reformat

3 years agoDB changes for already-made schema changes
eileen [Thu, 7 Jan 2021 04:47:14 +0000 (17:47 +1300)]
DB changes for already-made schema changes

Alters financial type schema by making the following boolean fields required:
is_reserved (default 0)
is_deductible (default 0)
is_active (default 1)

And pledge schema
installments (default 1)
status (no default)
is_test (default 0)
frequency_unit (default 'month')

3 years agoMerge pull request #19334 from civicrm/5.33
Seamus Lee [Thu, 7 Jan 2021 01:37:03 +0000 (12:37 +1100)]
Merge pull request #19334 from civicrm/5.33

5.33

3 years agoMerge pull request #19333 from mlutfy/fixTs533
Seamus Lee [Thu, 7 Jan 2021 01:33:08 +0000 (12:33 +1100)]
Merge pull request #19333 from mlutfy/fixTs533

Fix ts usage for CiviCRM 5.33

3 years agoMerge pull request #19319 from mlutfy/wpMailingSettingsUrl
Seamus Lee [Wed, 6 Jan 2021 23:28:17 +0000 (10:28 +1100)]
Merge pull request #19319 from mlutfy/wpMailingSettingsUrl

Mailing default domain error: force a backend URL for WP

3 years agoMerge pull request #19331 from demeritcowboy/php74-squiggly-bracket
Seamus Lee [Wed, 6 Jan 2021 23:27:24 +0000 (10:27 +1100)]
Merge pull request #19331 from demeritcowboy/php74-squiggly-bracket

php 7.4 compatibility - Array and string offset access syntax with curly braces is deprecated

3 years agoFix ts usage for CiviCRM 5.33
Mathieu Lutfy [Wed, 6 Jan 2021 23:13:09 +0000 (18:13 -0500)]
Fix ts usage for CiviCRM 5.33

3 years agophp 74 compat
demeritcowboy [Wed, 6 Jan 2021 21:51:18 +0000 (16:51 -0500)]
php 74 compat

3 years agoMerge pull request #19329 from civicrm/5.33
Seamus Lee [Wed, 6 Jan 2021 21:37:53 +0000 (08:37 +1100)]
Merge pull request #19329 from civicrm/5.33

5.33

3 years agoMerge pull request #19288 from eileenmcnaughton/group3
Seamus Lee [Wed, 6 Jan 2021 21:36:24 +0000 (08:36 +1100)]
Merge pull request #19288 from eileenmcnaughton/group3

Add index on civicrm_group.cache_date

3 years agoMerge pull request #19328 from colemanw/duplicateButtonFix
Seamus Lee [Wed, 6 Jan 2021 21:33:53 +0000 (08:33 +1100)]
Merge pull request #19328 from colemanw/duplicateButtonFix

Correctly check button to allow duplicate contact saving from profiles

3 years agoMerge pull request #19256 from demeritcowboy/is-development
Seamus Lee [Wed, 6 Jan 2021 20:33:01 +0000 (07:33 +1100)]
Merge pull request #19256 from demeritcowboy/is-development

dev/core#2240 and dev/core#2241 - Move non-compliant trigger_error out of logging

3 years agoFix dev/core#2287 correctly check button to allow duplicate contact saving from profiles
Coleman Watts [Wed, 6 Jan 2021 18:54:33 +0000 (13:54 -0500)]
Fix dev/core#2287 correctly check button to allow duplicate contact saving from profiles

3 years agoMerge pull request #19327 from agh1/5.33.0-releasenotes-final
Seamus Lee [Wed, 6 Jan 2021 20:06:03 +0000 (07:06 +1100)]
Merge pull request #19327 from agh1/5.33.0-releasenotes-final

5.33.0 release notes: final edits

3 years agoMerge pull request #19321 from colemanw/profileGetFieldsFix
Eileen McNaughton [Wed, 6 Jan 2021 18:18:04 +0000 (07:18 +1300)]
Merge pull request #19321 from colemanw/profileGetFieldsFix

Fix APIv3 profile.getfields to return correctly keyed phone field

3 years ago5.33.0 release notes: final edits
Andrew Hunt [Wed, 6 Jan 2021 18:17:31 +0000 (13:17 -0500)]
5.33.0 release notes: final edits

3 years ago5.33.0 release notes: added late changes
Andrew Hunt [Wed, 6 Jan 2021 17:38:31 +0000 (12:38 -0500)]
5.33.0 release notes: added late changes

3 years agoMerge pull request #19324 from demeritcowboy/no-port
colemanw [Wed, 6 Jan 2021 16:14:47 +0000 (11:14 -0500)]
Merge pull request #19324 from demeritcowboy/no-port

dev/core#2286 - Avoid notice on missing db port during install

3 years agohandle missing port
demeritcowboy [Wed, 6 Jan 2021 05:20:29 +0000 (00:20 -0500)]
handle missing port

3 years agoMerge pull request #19311 from seamuslee001/dev_core_2028
Seamus Lee [Wed, 6 Jan 2021 00:34:35 +0000 (11:34 +1100)]
Merge pull request #19311 from seamuslee001/dev_core_2028

dev/core#2028 Add in a status check for checking if the wkhtmltopdf p…

3 years agodev/core#2028 Add in a status check for checking if the wkhtmltopdf package is instal...
Seamus Lee [Sun, 3 Jan 2021 21:04:53 +0000 (08:04 +1100)]
dev/core#2028 Add in a status check for checking if the wkhtmltopdf package is installed in the expected location, Also ensure if it isn't then the pdf generation falls back on the current default which is DOMPDF

3 years agoMerge pull request #19322 from eileenmcnaughton/nfc
Seamus Lee [Tue, 5 Jan 2021 21:41:05 +0000 (08:41 +1100)]
Merge pull request #19322 from eileenmcnaughton/nfc

[NFC] Cleanup in test class

3 years agoMerge pull request #19302 from eileenmcnaughton/act_map
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

3 years agoMerge pull request #19315 from mattwire/smtpsettingsignoreexception
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

3 years agoMerge pull request #19296 from eileenmcnaughton/fbool
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

3 years agoFix APIv3 profile.getfields to return correctly keyed phone field
Coleman Watts [Tue, 5 Jan 2021 00:18:25 +0000 (19:18 -0500)]
Fix APIv3 profile.getfields to return correctly keyed phone field

This fixes the phone profile field to have the correct field key to match profile forms.
Fixes https://github.com/civicrm/org.civicrm.contactlayout/issues/91

3 years agoRemove use of ignoreException() from SMTP settings form.
Matthew Wire [Mon, 4 Jan 2021 13:14:11 +0000 (13:14 +0000)]
Remove use of ignoreException() from SMTP settings form.

3 years agoMerge pull request #19251 from totten/master-crypt-rekey
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

3 years agoMerge pull request #19301 from eileenmcnaughton/act_construct
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

3 years ago[NFC] Cleanup in test class
eileen [Tue, 5 Jan 2021 02:50:53 +0000 (15:50 +1300)]
[NFC] Cleanup in test class

3 years agoRemoves default for is_active & is_reserved since they now have DB defaults
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.

3 years agoFinancialType Schema: make is_deductible db default 0, make bool fields required
eileen [Tue, 5 Jan 2021 01:55:04 +0000 (14:55 +1300)]
FinancialType Schema: make is_deductible db default 0, make bool fields required

3 years agoMerge pull request #19318 from colemanw/apiJoinTest
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

3 years agoMailing default domain error: force a backend URL for WP
Mathieu Lutfy [Mon, 4 Jan 2021 21:12:30 +0000 (16:12 -0500)]
Mailing default domain error: force a backend URL for WP

3 years agoMerge pull request #19314 from mattwire/importnoignoreexception
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

3 years agoFix join syntax conversion for APIv4 in v3 unit tests
Coleman Watts [Mon, 4 Jan 2021 21:08:14 +0000 (16:08 -0500)]
Fix join syntax conversion for APIv4 in v3 unit tests

3 years agoMerge pull request #19309 from eileenmcnaughton/pledge_req
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

3 years agoMerge pull request #19316 from ahed-compucorp/dev/core#2282
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

3 years agoDon't check for create temporary table permissions on import form. CiviCRM in general...
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

3 years agodev/core#2282 Use the proper content type for ICalendar link
Ahed [Sun, 3 Jan 2021 17:20:19 +0000 (19:20 +0200)]
dev/core#2282 Use the proper content type for ICalendar link

3 years agoMerge pull request #19307 from eileenmcnaughton/534
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

3 years agoMerge pull request #19313 from civicrm/5.33
Seamus Lee [Sun, 3 Jan 2021 21:54:30 +0000 (08:54 +1100)]
Merge pull request #19313 from civicrm/5.33

5.33

3 years agoMerge pull request #19310 from seamuslee001/port_poc_c_533
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…

3 years agoMerge pull request #19291 from eileenmcnaughton/prof
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

3 years agoMerge pull request #19277 from yashodha/dev-2273
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 '…

3 years ago(POC) MembershipRenewalTest - Address assertions that started failing circa Jan 1...
Tim Otten [Sat, 2 Jan 2021 06:13:51 +0000 (22:13 -0800)]
(POC) MembershipRenewalTest - Address assertions that started failing circa Jan 1, 2021

3 years agoMerge pull request #19294 from totten/master-invasive
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

3 years agoMerge pull request #19300 from eileenmcnaughton/import
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

3 years agoPledge: mark needed fields as required in schema
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

3 years ago[REF] Move another deprecated function back to the only class that calls it
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

3 years agodev/core#2251 provide default receive_date
eileen [Sat, 2 Jan 2021 20:52:51 +0000 (09:52 +1300)]
dev/core#2251 provide default receive_date

3 years agoMerge pull request #19305 from totten/master-renewtest-c
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

3 years ago(POC) MembershipRenewalTest - Address assertions that started failing circa Jan 1...
Tim Otten [Sat, 2 Jan 2021 06:13:51 +0000 (22:13 -0800)]
(POC) MembershipRenewalTest - Address assertions that started failing circa Jan 1, 2021

3 years ago[REF] extract and share code to determine if required contact fields are present
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

3 years ago[REF] Fix import signature on activity parser, add preliminary test
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....

3 years agoRename PledgePayment create function
eileen [Thu, 31 Dec 2020 20:18:26 +0000 (09:18 +1300)]
Rename PledgePayment create function

Plege payment has a non-standard create function. It is only called from one place in universe. This updates that
1 place to use a new name and puts in the create function in a more correct way.

3 years agoMerge pull request #19285 from eileenmcnaughton/money_defaults
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

3 years agoMerge pull request #19283 from eileenmcnaughton/facl
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.

3 years agoMerge pull request #19281 from eileenmcnaughton/bool
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

3 years ago(REF) versionCheckTest - Use "Invasive" helper
Tim Otten [Thu, 31 Dec 2020 09:30:29 +0000 (01:30 -0800)]
(REF) versionCheckTest - Use "Invasive" helper

It's shorter/prettier.

3 years ago(REF) CiviReport TestCaseTest - Use "Invasive" helper
Tim Otten [Thu, 31 Dec 2020 09:29:58 +0000 (01:29 -0800)]
(REF) CiviReport TestCaseTest - Use "Invasive"  helper

It's shorter/prettier

3 years ago(REF) PaymentTest - Use "Invasive" helper
Tim Otten [Thu, 31 Dec 2020 09:29:43 +0000 (01:29 -0800)]
(REF) PaymentTest - Use "Invasive" helper

It's shorter/prettier.

3 years ago(REF) MailingJobTest - Use "Invasive" helper
Tim Otten [Thu, 31 Dec 2020 09:29:20 +0000 (01:29 -0800)]
(REF) MailingJobTest - Use "Invasive" helper

It's shorter/prettier.

3 years ago(REF) ActivityTest - Use "Invasive" helper
Tim Otten [Thu, 31 Dec 2020 09:28:52 +0000 (01:28 -0800)]
(REF) ActivityTest - Use "Invasive" helper

It's shorter/prettier.

3 years agoCivi\Test\Invasive - Add helper for checking protected/private members
Tim Otten [Thu, 31 Dec 2020 08:43:39 +0000 (00:43 -0800)]
Civi\Test\Invasive - Add helper for checking protected/private members

3 years agoMerge pull request #19292 from eileenmcnaughton/camp_index
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

3 years ago(dev/core#2258) Add System.rotateKey API
Tim Otten [Mon, 21 Dec 2020 08:20:07 +0000 (00:20 -0800)]
(dev/core#2258) Add System.rotateKey API

3 years ago(dev/core#2258) CryptoToken - Add rekey method
Tim Otten [Mon, 21 Dec 2020 05:55:58 +0000 (21:55 -0800)]
(dev/core#2258) CryptoToken - Add rekey method

3 years agoMerge pull request #19290 from ahed-compucorp/dev/core#2269
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

3 years ago[REF] Minor cleanup, remove variable variables
eileen [Wed, 30 Dec 2020 21:11:11 +0000 (10:11 +1300)]
[REF] Minor cleanup, remove variable variables

3 years agoMerge pull request #19272 from seamuslee001/more_add_radio
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

3 years agodev/core#527 use public title for on behalf profile and confirm/thank you pages
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

3 years agodev/core#2269 Use contribution's currency instead of the default
Ahed [Wed, 30 Dec 2020 10:04:38 +0000 (12:04 +0200)]
dev/core#2269 Use contribution's currency instead of the default

3 years agoMerge pull request #19057 from ixiam/dev/core#2173
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

3 years agoREF use centralised addRadio function more
Seamus Lee [Wed, 23 Dec 2020 22:22:09 +0000 (09:22 +1100)]
REF use centralised addRadio function more

3 years agoAdd index on civicrm_group.cache_date
eileen [Wed, 30 Dec 2020 03:22:37 +0000 (16:22 +1300)]
Add index on civicrm_group.cache_date

Per https://github.com/civicrm/civicrm-core/pull/19287 I also considered an index on refresh_date but
I couldn't see any evidence the field is useful

3 years agoUse specific function when formatting money for a default
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

3 years agoMerge pull request #19241 from demeritcowboy/dev-core-2127
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

3 years agoMerge pull request #19279 from eileenmcnaughton/go_mem
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

3 years agoMove financial acl warning from FinancialType BAO to extension.
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)

3 years agoAdd default for boolean fiels on financial_type
eileen [Tue, 29 Dec 2020 00:37:03 +0000 (13:37 +1300)]
Add default for boolean fiels on financial_type

3 years ago[REF] Remove unreachable code
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

3 years agoMerge pull request #19266 from demeritcowboy/is-development-2
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

3 years agoMerge pull request #19275 from colemanw/apiJoinConditions
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

3 years agodev/core#2271 - 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.

3 years agoMerge pull request #19274 from eileenmcnaughton/tax
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

3 years agostyle fix
yashodha [Thu, 24 Dec 2020 11:11:04 +0000 (16:41 +0530)]
style fix

3 years ago(dev/core#2273) Contact type incorrectly set to Contribution due to 'Honoree Profile'
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'

3 years agoMerge pull request #19269 from eileenmcnaughton/mem_form
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

3 years agoMerge pull request #19276 from civicrm/5.33
Seamus Lee [Thu, 24 Dec 2020 08:09:19 +0000 (19:09 +1100)]
Merge pull request #19276 from civicrm/5.33

5.33

3 years agoMerge pull request #19267 from alifrumin/rn-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

3 years ago[REF] Unshared another function back onto Membership_Form
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

3 years ago[REF] Fix tax_amount to be consistent & load from the templateContribution
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

3 years agoMerge pull request #19271 from eileenmcnaughton/mem_form2
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

3 years agoMerge pull request #19236 from totten/master-crypt-svc
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