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
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
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
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
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
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
Seamus Lee [Tue, 22 Dec 2020 21:44:58 +0000 (08:44 +1100)]
Merge pull request #19238 from jitendrapurohit/pledgefix
Fix pledge on contribution page when the site has a WR for "contribution"
Seamus Lee [Tue, 22 Dec 2020 21:41:26 +0000 (08:41 +1100)]
Merge pull request #19202 from eileenmcnaughton/act_cont2
Fix Contribution.create to not attempt to set contacts on activity update
Vangelis Pantazis [Tue, 22 Dec 2020 15:29:20 +0000 (15:29 +0000)]
Rework on the detection of new vs existing smartgroup
Eileen McNaughton [Tue, 22 Dec 2020 04:00:48 +0000 (17:00 +1300)]
Merge pull request #19255 from seamuslee001/concat_within_group_concat
[APIv4] Permit using other SQL functions such as CONCAT within a GROU…
Monish Deb [Tue, 22 Dec 2020 01:30:41 +0000 (07:00 +0530)]
Merge pull request #19116 from eileenmcnaughton/pay_edit
Fix Payment edit form to use Payment.cancel & payment.create api
Seamus Lee [Tue, 22 Dec 2020 01:19:38 +0000 (12:19 +1100)]
[APIv4] Permit using other SQL functions such as CONCAT within a GROUP_CONCAT
Eileen McNaughton [Mon, 21 Dec 2020 22:43:03 +0000 (11:43 +1300)]
Merge pull request #19253 from eileenmcnaughton/depp
[REF] Move another deprecated function to the class that uses it
Seamus Lee [Mon, 21 Dec 2020 20:29:27 +0000 (07:29 +1100)]
Merge pull request #19246 from eileenmcnaughton/import
[REF] Switch to using shared function to call deprecated function
eileen [Mon, 21 Dec 2020 20:16:03 +0000 (09:16 +1300)]
[REF] Move another deprecated function to the class that uses it
eileen [Mon, 21 Dec 2020 07:39:36 +0000 (20:39 +1300)]
[REF] Relocate another deprecated utils function to the only class that calls it.
I removed the tests because they didn't test much & what they did test
seemed like stuff we should alter
Seamus Lee [Mon, 21 Dec 2020 19:26:55 +0000 (06:26 +1100)]
Merge pull request #19249 from eileenmcnaughton/depit
[REF] Relocate another function from DeprecatedUtils to the calling c…
Seamus Lee [Mon, 21 Dec 2020 19:21:30 +0000 (06:21 +1100)]
Merge pull request #19252 from mattwire/contributionupdatedlogs
Improve logging when a contribution is created/updated
Seamus Lee [Mon, 21 Dec 2020 19:11:06 +0000 (06:11 +1100)]
Merge pull request #19250 from jitendrapurohit/addgroupby
Fatal error on contribution summary report (and probably others) when adding contacts to group
Matthew Wire [Mon, 21 Dec 2020 17:16:25 +0000 (17:16 +0000)]
Improve logging when a contribution is created/updated
Jitendra Purohit [Mon, 21 Dec 2020 11:00:25 +0000 (16:30 +0530)]
Fix fatal error on contribution summary report -> add to group action
Tim Otten [Sun, 20 Dec 2020 21:28:17 +0000 (13:28 -0800)]
(REF) CryptoToken - Extract method 'parse()'
Tim Otten [Mon, 21 Dec 2020 08:15:27 +0000 (00:15 -0800)]
(dev/core#2258) CryptoRegistry - Add findKeysByTag()
Tim Otten [Mon, 21 Dec 2020 08:10:24 +0000 (00:10 -0800)]
(dev/core#2258) CryptoRegistry - Allow multiple plaintext entries
This allows the plaintext entries to do have different prioritizations among
different keys.
eileen [Mon, 21 Dec 2020 07:54:20 +0000 (20:54 +1300)]
[REF] Relocate another function from DeprecatedUtils to the calling class
This is only called from one class so relocate to there
Eileen McNaughton [Mon, 21 Dec 2020 07:31:06 +0000 (20:31 +1300)]
Merge pull request #19247 from eileenmcnaughton/dep_utils
[REF] Relocate function from DeprecatedUtils to the class that actually calls it
eileen [Mon, 21 Dec 2020 05:31:22 +0000 (18:31 +1300)]
[REF] Relocate function from DeprecatedUtils to the class that actually calls it
eileen [Mon, 21 Dec 2020 05:26:15 +0000 (18:26 +1300)]
Switch to using shared function to call deprecated function
With this done all the functionality in the deprecated function can be moved into the shared function
Seamus Lee [Mon, 21 Dec 2020 04:26:21 +0000 (15:26 +1100)]
Merge pull request #19165 from eileenmcnaughton/pdf
dev/financial#162 Simplify decision as to whether to use a pdf on membership emails
Eileen McNaughton [Mon, 21 Dec 2020 04:10:09 +0000 (17:10 +1300)]
Merge pull request #19225 from colemanw/select2Tweak
Greenwich: Fix Select2 free-tagging css bug
Seamus Lee [Mon, 21 Dec 2020 03:52:46 +0000 (14:52 +1100)]
dev/core#2263 Do not try and store items in the session if the session is currently empty
Store the locale in the session even if we are in a single lingual instance
Seamus Lee [Mon, 21 Dec 2020 03:08:01 +0000 (14:08 +1100)]
Merge pull request #19244 from eileenmcnaughton/strict
dev/core#2252 remove all handling of strict mode as it has aged out of relevance
Coleman Watts [Sun, 20 Dec 2020 00:48:45 +0000 (19:48 -0500)]
Add an explicit alias for sql functions
eileen [Mon, 21 Dec 2020 00:21:26 +0000 (13:21 +1300)]
dev/core#2252 remove all handling of strict mode as it has aged out of relevance
Eileen McNaughton [Sun, 20 Dec 2020 23:23:48 +0000 (12:23 +1300)]
Merge pull request #19237 from colemanw/stripTagsFromOptionDescription
APIv4: Normalize option list descriptions as plain text
Eileen McNaughton [Sun, 20 Dec 2020 23:23:02 +0000 (12:23 +1300)]
Merge pull request #19229 from colemanw/searchKitInput
Search kit: Rewrite input widget to support IN sets, relative dates, BETWEEN groups, etc.
Eileen McNaughton [Sun, 20 Dec 2020 21:36:16 +0000 (10:36 +1300)]
Merge pull request #19209 from mattwire/daoeventid
Add a unique event ID so we can match pre/post Insert/Update
Seamus Lee [Sun, 20 Dec 2020 19:28:51 +0000 (06:28 +1100)]
Merge pull request #19235 from colemanw/flex
Add min-width to flex columns for responsive layout on small screens
demeritcowboy [Fri, 18 Dec 2020 21:06:18 +0000 (16:06 -0500)]
trim non-breaking spaces in both ascii and utf8 without breaking other utf8 characters that share the same byte
Tim Otten [Sat, 19 Dec 2020 20:24:04 +0000 (12:24 -0800)]
Merge pull request #19240 from MikeyMJCO/patch-6
(NFC) Fix issue reporting link to go to the corresponding `core` project.
Mikey O'Toole [Sat, 19 Dec 2020 19:20:02 +0000 (19:20 +0000)]
Fix issue reporting link to go to the corresponding `core` project.
Tim Otten [Sat, 19 Dec 2020 04:47:31 +0000 (20:47 -0800)]
(dev/core#2258) CryptoToken - Change notation
This is pre-merge change to the notation in the token. Two things:
* Use only one control character instead of multiple.
* Use URL-style key-value notation. It should be easier to skim and to tweak.
Tim Otten [Fri, 18 Dec 2020 21:14:17 +0000 (13:14 -0800)]
(NFC) CRM_Utils_Hook - Tweak description of crypto()
Tim Otten [Thu, 17 Dec 2020 00:53:47 +0000 (16:53 -0800)]
(dev/core#2258) CryptoRegistry - Remove fallback option based on CIVICRM_SITE_KEY.
This was included under the expectation it might make a nicer upgrade. But
I don't think it buys a whole lot:
1. You run the upgrader. The SMTP password is converted from
rj256-ecb-sitekey to aes-cbc-sitekey. All other credentials are left
unencrypted. Afterward, you set CIVICRM_CRED_KEY and run the rekey.
2. You run upgrader. The SMTP password is decrypted. All other credentials
are left unencrypted. Afterward, you set CIVICRM_CRED_KEY and run the rekey.
Additionally, I think there's a question of risk-management when we get to
encrypting more things in the Setting and API layers. If we go with path 2,
then we can ramp-up adoption progressively, e.g.
* Release 1: Add support as non-default option
* Release 2: Enable by default on new builds
* Release 3: Display alert to existing sites that don't have encryption keys
Tim Otten [Thu, 17 Dec 2020 00:26:15 +0000 (16:26 -0800)]
(dev/core#2258) CryptoToken - More defense against malformed input
Tim Otten [Wed, 16 Dec 2020 23:41:48 +0000 (15:41 -0800)]
(dev/core#2258) CryptoRegistry - Don't parse factory code unless it's being used
This moves the factory function from `Container.php` (which is loaded on all
page-views on all configurations) to `CryptoRegistry.php` (which is only
loaded if the site actually used encrypted fields).