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
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: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
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
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.
Seamus Lee [Fri, 18 Dec 2020 06:51:00 +0000 (17:51 +1100)]
Merge pull request #19214 from eileenmcnaughton/dep2
Remove functions from EmailCommon that were moved to the trait
Seamus Lee [Fri, 18 Dec 2020 06:43:32 +0000 (17:43 +1100)]
Merge pull request #19228 from eileenmcnaughton/inv_assign
Remove duplicated tax assignments from copied code
Jitendra Purohit [Fri, 18 Dec 2020 04:43:03 +0000 (10:13 +0530)]
Fix pledge on contribution page
Coleman Watts [Thu, 17 Dec 2020 21:15:11 +0000 (16:15 -0500)]
APIv4: Normalize option list descriptions as plain text
Our schema is inconsistent about whether `description` fields allow html,
but it's usually assumed to be plain text, so we strip_tags() to standardize it.
Seamus Lee [Thu, 17 Dec 2020 19:44:28 +0000 (06:44 +1100)]
Merge pull request #19224 from artfulrobot/artfulrobot-fix-bulkmail
Fix lab issue 2254 is_bulkmail cannot be set through UI
Coleman Watts [Wed, 16 Dec 2020 22:27:58 +0000 (17:27 -0500)]
Add min-width to flex columns for responsive layout on small screens
The .crm-flex-box class is new and only used in 2 places: Search Kit & the Dashboard.
This sets a min-width on those layouts so the 2 columns collapse to 1 on small screens.
Coleman Watts [Wed, 16 Dec 2020 00:37:31 +0000 (19:37 -0500)]
Search kit: Rewrite input widget to support IN sets, relative dates, BETWEEN groups, etc.
This deletes the crmSearchValue widget (and the now-empty crmSearchKit module),
which had originally been copied from the API Explorer, and replaces it with a more flexible
set of components with separate templates for each data type.
Seamus Lee [Wed, 16 Dec 2020 21:43:19 +0000 (08:43 +1100)]
Merge pull request #19231 from eileenmcnaughton/processConfirm
Convert previously shared function from static to non-static
Seamus Lee [Wed, 16 Dec 2020 21:42:33 +0000 (08:42 +1100)]
Merge pull request #19234 from eileenmcnaughton/cms
Only do cms account create from the one relevant place
colemanw [Wed, 16 Dec 2020 12:00:49 +0000 (07:00 -0500)]
Merge pull request #19226 from eileenmcnaughton/odd
Remove unused tpl assigns
Seamus Lee [Wed, 16 Dec 2020 07:46:15 +0000 (18:46 +1100)]
Merge pull request #19233 from civicrm/5.33
5.33
eileen [Wed, 16 Dec 2020 05:38:37 +0000 (18:38 +1300)]
Only do cms account create from the one relevant place
This function is called from 3 places - create CMS user is not applicable
to the back office form and the other place actually blocks it...
eileen [Wed, 16 Dec 2020 04:03:40 +0000 (17:03 +1300)]
Convert previously shared function from static to non-static
This no longer needs to be static as it is no longer shared with other forms
(although it needs to be public to support the test class
Eileen McNaughton [Wed, 16 Dec 2020 05:24:36 +0000 (18:24 +1300)]
Merge pull request #19230 from totten/master-phpseclib-cxnrpc
composer.json - Update civicrm-cxn-rpc and phpseclib
Tim Otten [Wed, 16 Dec 2020 03:15:55 +0000 (19:15 -0800)]
composer.json - Update civicrm-cxn-rpc and phpseclib
Before
------
Require `civicrm-cxn-rpc` v0.19 (with `phpseclib` v1.x)
After
-----
Require either of:
* `civicrm-cxn-rpc` v0.20 (with `phpseclib` v2.x)
* `civicrm-cxn-rpc` v0.19 (with `phpseclib` v1.x)
Technical Details
-----------------
* The public interfaces from civicrm-cxn-rpc are the same in 0.19+0.20.
They only differ in which verison of `phpseclib` is used.
* As pointed out in https://github.com/civicrm/civicrm-cxn-rpc/issues/9, we're not
the only folks using phpseclib, so some flexibility on that seems good.
* The primary change in phpseclib 2.x is the use of PHP namespaces
(e.g. `Crypt_AES` => `\phpseclib\Crypt\AES`).
* There are newer versions of both v0.19 and v0.20 which bundle an updated certificate.
eileen [Wed, 16 Dec 2020 01:03:12 +0000 (14:03 +1300)]
Remove or hard-code variables from previously shared function
This function was separated from the shared function for cleanup.
This removes 3 variables
- isRecur (always true)
- billingId - this is elsewhere handled on the form
- online (always false)
For billing id this is handled through back office form
shared functions. The handling might be slightly different but it seems
more important that the form is internally consistent with how
it creates billing addresses (between recur & non-recur) than with other forms
eileen [Wed, 16 Dec 2020 01:10:48 +0000 (14:10 +1300)]
Remove duplicated tax assignments from copied code
The assignment of tax data is happening twice on the form - once in generic
code and once in code only reached for recurring contributions that
was in previously-shared code. We can be fairly comfortable that
in this latter case we don't need it as this is a marginal flow
on this form whereas the main flow is being used 90% of the time
& is doing the assignment
eileen [Tue, 15 Dec 2020 02:25:56 +0000 (15:25 +1300)]
Remove always true parameter
Rich Lott / Artful Robot [Tue, 15 Dec 2020 21:06:00 +0000 (21:06 +0000)]
Fix lab issue 2254: cannot set is_bulkmail from UI
eileen [Tue, 15 Dec 2020 20:48:11 +0000 (09:48 +1300)]
Remove legacy tpl assigns
These really look like they were copied over from participant forms -
they are not used in the membership tpl receipts
Seamus Lee [Tue, 15 Dec 2020 19:08:36 +0000 (06:08 +1100)]
Merge pull request #19216 from laryn/patch-3
dev/core#2211 Make sure addressee field fits column
Laryn - CEDC.org [Mon, 14 Dec 2020 21:36:10 +0000 (15:36 -0600)]
dev/core#2211 Make sure addressee field fits column
Truncate if addressee field goes beyond the available 255 characters in an export that merges contacts by shared address.
Coleman Watts [Tue, 15 Dec 2020 15:02:26 +0000 (10:02 -0500)]
Greenwich: Fix Select2 free-tagging css bug
Seamus Lee [Tue, 15 Dec 2020 07:21:48 +0000 (18:21 +1100)]
Merge pull request #19223 from civicrm/5.33
5.33
Seamus Lee [Tue, 15 Dec 2020 05:25:39 +0000 (16:25 +1100)]
Merge pull request #19220 from eileenmcnaughton/nfc
Minor code cleanup
Seamus Lee [Tue, 15 Dec 2020 05:25:10 +0000 (16:25 +1100)]
Merge pull request #19222 from eileenmcnaughton/mem_form
Remove all handling related to pledge, cms user from newly separated function
Seamus Lee [Tue, 15 Dec 2020 05:24:37 +0000 (16:24 +1100)]
Merge pull request #19219 from colemanw/targetTableFix
Fix Invalid argument PHP warning
Eileen McNaughton [Tue, 15 Dec 2020 03:52:37 +0000 (16:52 +1300)]
Merge pull request #19221 from civicrm/5.33
5.33
eileen [Fri, 11 Dec 2020 02:35:46 +0000 (15:35 +1300)]
dev/financial#163 Comment all the places where removal of contributionTypeID proposed
eileen [Tue, 15 Dec 2020 02:21:34 +0000 (15:21 +1300)]
Remove all handling related to pledge, cms user from newly separated function
Seamus Lee [Tue, 15 Dec 2020 01:58:15 +0000 (12:58 +1100)]
Merge pull request #19217 from totten/master-assert-perm
DispatchPolicy - Actively report any upgrade problems with hook_civicrm_permission
Seamus Lee [Tue, 15 Dec 2020 00:59:45 +0000 (11:59 +1100)]
Merge pull request #19211 from eileenmcnaughton/form_move
Duplicate processFormContribution only Membership form
eileen [Tue, 15 Dec 2020 00:54:17 +0000 (13:54 +1300)]
Minor code cleanup
Coleman Watts [Tue, 15 Dec 2020 00:37:41 +0000 (19:37 -0500)]
Fix Invalid argument PHP warning
Tim Otten [Mon, 14 Dec 2020 21:13:21 +0000 (13:13 -0800)]
DispatchPolicy - Actively report any upgrade problems with hook_civicrm_permission
Overview
--------
This is a preventive/diagnostic revision which would bring to light potential
problems with firing `cleanupPermissions()`/`hook_civicrm_permission` at the
wrong moment during an upgrade.
Before
------
If `cleanupPermissions()` (and its `hook_civicrm_permission`) are fired too
early during an upgrade, then the cleanup runs quietly but omits important
results (because the hook is dropped). On several UF's, the
`cleanupPermissions()` **revokes access** for any omitted permissions. The
sysadmin would have manually re-grant access.
After
-----
If `cleanupPermissions()` (and its `hook_civicrm_permission`) are fired too
early during an upgrade, then it raises an error during the upgrade.
Surely, it's better to report the error rather than silently drop the data.
Comments
--------
* This revision is preventive/diagnostic/speculative. It's based on rumor that
somebody had a problem with permissions in an upgrade. I don't actually have
steps to reproduce a probelmatic case.
* To see this preventive mechanism in action, I provoked a trivial violation:
* Setup a DB with 5.32
* Checkout the code for 5.34.
* Add a local hack https://gist.github.com/totten/
e1448b343f94ff9c3d971402a1b3db3d
which has the effect of running `cleanupPermissions()` prematurely.
* Observe: `cv upgrade:db` fails (cv v0.3.5+)
* It's tempting to think of `hook_civicrm_permission` as returning a static list of
strings -- in which case, there's no real harm to firing during the defensive
phase. The problem is that `hook_civicrm_permission` can also be used for
dynamic scenarios. (The power of hooks!) That's useful for any site-building
extension (e.g. bespoke forms/views/APIs/dashlets) where you generate new
permissions based on site configuration. That will depend on the
correct-functioning of the extension+configuration... which cannot be
ensured during the defensive upgrade-phase... and which creates a parallel
choice between incorrect-results (data-loss) or fatal-error. This is the
real reason why one shouldn't run `cleanupPermissions()` during the defensive
phase. (Of course, we should run it... during the liberal phase...)
eileen [Mon, 14 Dec 2020 19:40:50 +0000 (08:40 +1300)]
Remove functions from EmailCommon that were moved to the trait
Seamus Lee [Mon, 14 Dec 2020 23:31:53 +0000 (10:31 +1100)]
Merge pull request #19019 from eileenmcnaughton/total_fail
dev/core#927 Fully remove cancel & fail from Contribution BAO
Seamus Lee [Mon, 14 Dec 2020 23:28:29 +0000 (10:28 +1100)]
Merge pull request #19207 from eileenmcnaughton/member_ids
[REF] Clean up on $ids['contribution']
eileen [Mon, 14 Dec 2020 19:11:12 +0000 (08:11 +1300)]
Duplicate processFormContribution only Membership form
Seamus Lee [Mon, 14 Dec 2020 22:48:45 +0000 (09:48 +1100)]
Merge pull request #19212 from eileenmcnaughton/form_move2
Move processConfirm function from Utils file back to form class
Tim Otten [Mon, 14 Dec 2020 22:36:49 +0000 (14:36 -0800)]
Merge pull request #19215 from totten/master-dispatch-doc
(NFC) DispatchPolicy - Add comments to docblock
Seamus Lee [Mon, 14 Dec 2020 22:04:49 +0000 (09:04 +1100)]
Merge pull request #19213 from eileenmcnaughton/dep
Remove deprecated function
Tim Otten [Mon, 14 Dec 2020 21:06:24 +0000 (13:06 -0800)]
(NFC) DispatchPolicy - Add comments to docblock
This updates some of the docblocks to reflect https://github.com/civicrm/civicrm-core/pull/17126
eileen [Mon, 14 Dec 2020 19:31:25 +0000 (08:31 +1300)]
Remove deprecated function
eileen [Mon, 14 Dec 2020 19:26:42 +0000 (08:26 +1300)]
Move processConfirm function from Utils file back to only form still using it
This function is really part of the Confirm form. People thought sharing it would
be good once. They were wrong. More specifically sharing large blocks of
code that attempt to service many diferent needs is not helpful
Seamus Lee [Mon, 14 Dec 2020 19:17:30 +0000 (06:17 +1100)]
Merge pull request #19208 from eileenmcnaughton/mem_deb
Remove some more variable variables + some test cleanup
Eileen McNaughton [Mon, 14 Dec 2020 19:00:11 +0000 (08:00 +1300)]
Merge pull request #19181 from colemanw/api4DateRange
APIv4: Support relative date range input
Matthew Wire [Mon, 14 Dec 2020 11:13:54 +0000 (11:13 +0000)]
Add an eventID to the pre/post Insert/Update events so they can be matched together
Seamus Lee [Mon, 14 Dec 2020 08:14:06 +0000 (19:14 +1100)]
Merge pull request #19206 from seamuslee001/migrate_print_array
#REF Migrate the print_array smarty plugin from in packages into core…