eileen [Tue, 30 Mar 2021 00:25:55 +0000 (13:25 +1300)]
Fix to avoid passing non-money to money::format
Eileen McNaughton [Mon, 29 Mar 2021 19:09:20 +0000 (08:09 +1300)]
Merge pull request #19931 from eileenmcnaughton/fa
dev/core#2486 Add v4 batch api
Eileen McNaughton [Mon, 29 Mar 2021 18:08:18 +0000 (07:08 +1300)]
Merge pull request #19923 from MikeyMJCO/patch-8
Set the `Other Amount` input in a price set to not autocomplete
Eileen McNaughton [Mon, 29 Mar 2021 18:06:15 +0000 (07:06 +1300)]
Merge pull request #19873 from demeritcowboy/multiemail-activityids
dev/core#2463 - Adjust returned list of activity ids when sending emails since it changes in 5.36+
eileen [Sun, 28 Mar 2021 23:42:43 +0000 (12:42 +1300)]
Add v4 batch api
Eileen McNaughton [Mon, 29 Mar 2021 01:41:46 +0000 (14:41 +1300)]
Merge pull request #19932 from eileenmcnaughton/ft
dev/core#2486 Add entity financial trxn
eileen [Mon, 29 Mar 2021 00:11:23 +0000 (13:11 +1300)]
dev/core#2486 Add entity financial trxn
Seamus Lee [Sun, 28 Mar 2021 22:49:17 +0000 (09:49 +1100)]
Merge pull request #19930 from eileenmcnaughton/acl_setting
dev/core#2477 Add setting to allow opportunistic cache flushing for acls
Eileen McNaughton [Sun, 28 Mar 2021 22:18:15 +0000 (11:18 +1300)]
Merge pull request #19929 from demeritcowboy/fake-intl-warning
dev/financial#171 - False INTL warning when adding a price field
eileen [Sun, 28 Mar 2021 20:37:42 +0000 (09:37 +1300)]
dev/core#2477 Add setting to allow opportunistic cache flushing for acls
This adds the same mechanism as the group contact cache to reduce site contention.
A job api is also added which people can optionally configure.
It would be especially worth setting on sites that do not use ACLs at all
demeritcowboy [Sun, 28 Mar 2021 19:46:55 +0000 (15:46 -0400)]
false INTL warning
Eileen McNaughton [Sun, 28 Mar 2021 09:27:54 +0000 (22:27 +1300)]
Merge pull request #19738 from jitendrapurohit/note-date
dev/core#2243 Add created_date column to the civicrm_note table
Jitendra Purohit [Fri, 5 Mar 2021 09:27:35 +0000 (14:57 +0530)]
add created_date to civicrm_note
Seamus Lee [Sat, 27 Mar 2021 23:07:40 +0000 (10:07 +1100)]
Merge pull request #19925 from eileenmcnaughton/tear
PHPUNIT 8 - add void to setup functions
eileen [Sat, 27 Mar 2021 19:22:16 +0000 (08:22 +1300)]
PHPUNIT 8 - add void to setup functions
Mikey O'Toole [Sat, 27 Mar 2021 17:32:00 +0000 (17:32 +0000)]
Add checkstyle comma after last item in multiline array.
Mikey O'Toole [Sat, 27 Mar 2021 17:26:19 +0000 (17:26 +0000)]
Set the `Other Amount` input in a price set to not autocomplete
demeritcowboy [Sat, 27 Mar 2021 13:33:07 +0000 (09:33 -0400)]
adjust for multiple activities in 5.36+
Seamus Lee [Sat, 27 Mar 2021 04:40:17 +0000 (15:40 +1100)]
Merge pull request #19863 from eileenmcnaughton/flex
Update flexmailer default
Seamus Lee [Sat, 27 Mar 2021 04:37:51 +0000 (15:37 +1100)]
Merge pull request #19921 from eileenmcnaughton/tear
[PHPunit8] cleanup on setUp functions
eileen [Thu, 25 Mar 2021 09:58:22 +0000 (22:58 +1300)]
[PHPunit8] cleanup on tearDown functions
Tim Otten [Sat, 27 Mar 2021 02:11:54 +0000 (19:11 -0700)]
Flexmailer - Switch defintion of "auto" to "flexmailer"
Eileen McNaughton [Sat, 27 Mar 2021 00:33:26 +0000 (13:33 +1300)]
Merge pull request #19893 from eileenmcnaughton/mem_types
[REF] [Towards membership api] Simplify calculation of recurring membership parameters
Eileen McNaughton [Sat, 27 Mar 2021 00:32:55 +0000 (13:32 +1300)]
Merge pull request #19919 from eileenmcnaughton/pay2
Remove deprecated code
colemanw [Sat, 27 Mar 2021 00:11:41 +0000 (20:11 -0400)]
Merge pull request #19918 from eileenmcnaughton/payment
Add FinancialTrxn apiv4
eileen [Fri, 26 Mar 2021 21:37:36 +0000 (10:37 +1300)]
Remove deprecated code
Tim Otten [Fri, 26 Mar 2021 21:26:34 +0000 (14:26 -0700)]
Merge pull request #19806 from eileenmcnaughton/msg_compat
Align most of the tokens in the token processor handling with the legacy handling
eileen [Fri, 26 Mar 2021 21:07:18 +0000 (10:07 +1300)]
Add FinancialTrxn apiv4
colemanw [Fri, 26 Mar 2021 21:04:57 +0000 (17:04 -0400)]
Merge pull request #19912 from eileenmcnaughton/batch
[REF] [Towards membership api] Duplicate emailReceipt function rather than silly sharing
eileen [Wed, 24 Mar 2021 22:29:47 +0000 (11:29 +1300)]
[REF] Simplify calculation of recurring membership parameters
We need frequency_unit & frequency_interval for the params we pass
to the payment process & those we use to create the recurring -
this simplifies them to be calculated in a function rather than being
passed around
For the legacyProcessRecurringContribution function to be reached
auto_renew must be true
Monish Deb [Fri, 26 Mar 2021 12:32:06 +0000 (18:02 +0530)]
Merge pull request #19915 from eileenmcnaughton/mem_end
[REF] [Towards membership api] Simplify message functions
Eileen McNaughton [Fri, 26 Mar 2021 09:21:09 +0000 (22:21 +1300)]
Merge pull request #19906 from MikeyMJCO/patch-8
Rebuild the Drupal route cache.
eileen [Fri, 26 Mar 2021 06:38:23 +0000 (19:38 +1300)]
[REF] [Towards membership api] Simplify message functions
The amount of code confusion to avoid loading the end_date isn't really warranted for the
performance boost....
Monish Deb [Fri, 26 Mar 2021 05:38:58 +0000 (11:08 +0530)]
Merge pull request #19910 from eileenmcnaughton/mem_pay
[REF] [Towards membership api] Cleanup access to payment_processor_id
Eileen McNaughton [Fri, 26 Mar 2021 04:15:53 +0000 (17:15 +1300)]
Merge pull request #19905 from eileenmcnaughton/tear
[PHPunit8] cleanup on tearDown functions
eileen [Fri, 26 Mar 2021 03:06:27 +0000 (16:06 +1300)]
[REF] Duplicate emailReceipt function rather than silly sharing
eileen [Thu, 25 Mar 2021 09:58:22 +0000 (22:58 +1300)]
[PHPunit8] cleanup on tearDown functions
eileen [Thu, 25 Mar 2021 23:38:08 +0000 (12:38 +1300)]
[REF] Cleanup access to payment_processor_id
Seamus Lee [Thu, 25 Mar 2021 22:37:51 +0000 (09:37 +1100)]
Merge pull request #19909 from eileenmcnaughton/setup
[phpunit8] Add void to some setup() functions
Eileen McNaughton [Thu, 25 Mar 2021 21:19:55 +0000 (10:19 +1300)]
Merge pull request #19908 from colemanw/relationshipCacheReadonly
Schema - Add readonly to all fields in RelationshipCache entity
eileen [Thu, 25 Mar 2021 20:27:46 +0000 (09:27 +1300)]
Add void to some setup() functions
Mikey O'Toole [Thu, 25 Mar 2021 19:32:51 +0000 (19:32 +0000)]
Rebuild the Drupal route cache.
This is linked to [issue 158](https://lab.civicrm.org/dev/drupal/-/issues/158) and [issue 37](https://lab.civicrm.org/dev/drupal/-/issues/37).
It takes an alternative approach, adding a Util hook function to rebuild the route cache which we can then invoke from multiple places.
Trigger `rebuildDrupalRouteCache()` when running `triggerRebuild()`
Fix checkstyle issues
Change function from `protected` to `public`
Update Drupal8.php
Add base for `invalidateRouteCache()`
Add invalidateRouteCache function
Add call to userFramework->invalidateRouteCache
Update Base.php
Correct `userFramework` to `userSystem`
Remove stray whitespace.
Move invalidateRouteCache call to the same place as resetNavigation.
Update Invoke.php
Switch to the `router.builder' option as invalidating the cache doesn't cut it.
colemanw [Thu, 25 Mar 2021 16:16:10 +0000 (12:16 -0400)]
Merge pull request #19870 from totten/master-psr0
info.xml - Allow PSR-0 style class-loader declarations
Coleman Watts [Thu, 25 Mar 2021 15:52:33 +0000 (11:52 -0400)]
Schema - Add readonly to all fields in RelationshipCache entity
This entire entity is readonly. Fields should never be presented to the user as editable.
Seamus Lee [Thu, 25 Mar 2021 09:22:45 +0000 (20:22 +1100)]
Merge pull request #19901 from eileenmcnaughton/tte
[phpunit 8] Remove some empty tearDown functions
Seamus Lee [Thu, 25 Mar 2021 09:21:09 +0000 (20:21 +1100)]
Merge pull request #19898 from eileenmcnaughton/teardown2
More phpunit8 prep
Seamus Lee [Thu, 25 Mar 2021 09:20:48 +0000 (20:20 +1100)]
Merge pull request #19899 from eileenmcnaughton/tear
[PHPUNIT8] add void to more teardown()
Seamus Lee [Thu, 25 Mar 2021 09:20:30 +0000 (20:20 +1100)]
Merge pull request #19900 from eileenmcnaughton/tear2
[PHPUNIT 8 ] Add void to more teardowns
Monish Deb [Thu, 25 Mar 2021 05:54:16 +0000 (11:24 +0530)]
Merge pull request #19891 from eileenmcnaughton/task1
[REF] Simplify setting of softcredit form options (minor)
Eileen McNaughton [Thu, 25 Mar 2021 04:31:08 +0000 (17:31 +1300)]
Merge pull request #19897 from eileenmcnaughton/teardown
Add :void return type to tearDown on a bunch of unit tests
Monish Deb [Thu, 25 Mar 2021 04:02:09 +0000 (09:32 +0530)]
Merge pull request #19639 from eileenmcnaughton/test_test
[REF] Fix ContributionPage::recurringNotify to use apiv4, simplify params
Eileen McNaughton [Thu, 25 Mar 2021 02:59:12 +0000 (15:59 +1300)]
Merge pull request #19896 from colemanw/api4GetActionsFix
APIv4 - Fix GetActions function to work with entityNames that don't match className
Eileen McNaughton [Thu, 25 Mar 2021 02:58:39 +0000 (15:58 +1300)]
Merge pull request #19895 from eileenmcnaughton/falsefail
Skip UFField.field_name on singleValueAlter as flakey
eileen [Thu, 25 Mar 2021 02:25:11 +0000 (15:25 +1300)]
Remove some empty tearDown functions
eileen [Thu, 25 Mar 2021 02:17:49 +0000 (15:17 +1300)]
[PHPUNIT 8 ] Add void to more teardowns
eileen [Thu, 25 Mar 2021 02:12:59 +0000 (15:12 +1300)]
[PHPUNIT8] add void to more teardown()
eileen [Thu, 25 Mar 2021 02:03:58 +0000 (15:03 +1300)]
More phpunit8 prep
eileen [Thu, 25 Mar 2021 01:51:27 +0000 (14:51 +1300)]
Add :void return type to tearDown on a bunch of unit tests
Coleman Watts [Thu, 25 Mar 2021 00:13:57 +0000 (20:13 -0400)]
APIv4 - Fix GetActions function to work with entityNames that don't match className
Eileen McNaughton [Wed, 24 Mar 2021 23:54:37 +0000 (12:54 +1300)]
Merge pull request #19892 from colemanw/searchKitCreatedModified
SearchKit - Add created & modified info to SavedSearch listing
Eileen McNaughton [Wed, 24 Mar 2021 23:24:11 +0000 (12:24 +1300)]
Merge pull request #19312 from seamuslee001/dev_core_1845
dev/core#1845 Change FK on civicrm_group to delete the associated gro…
Eileen McNaughton [Wed, 24 Mar 2021 23:07:04 +0000 (12:07 +1300)]
Merge pull request #19885 from eileenmcnaughton/acl_role
[REF] Remove redundant toArray() function
Coleman Watts [Wed, 24 Mar 2021 22:15:08 +0000 (18:15 -0400)]
SearchKit - Add created & modified info to SavedSearch listing
eileen [Fri, 19 Mar 2021 21:34:42 +0000 (10:34 +1300)]
Simplify setting of softcredit form options
I checked & the empty is just an enotice fix
eileen [Wed, 24 Mar 2021 03:25:08 +0000 (16:25 +1300)]
Remove toArray function as it does the same as the parent
colemanw [Wed, 24 Mar 2021 20:19:25 +0000 (16:19 -0400)]
Merge pull request #19881 from eileenmcnaughton/task1
[REF] Store the getSearchQueryResults so it can be re-accessed
Eileen McNaughton [Wed, 24 Mar 2021 20:12:15 +0000 (09:12 +1300)]
Merge pull request #19889 from colemanw/api4EntityNameCleanup
APIv4 - Standardize generic entity name resolution
Eileen McNaughton [Wed, 24 Mar 2021 19:35:34 +0000 (08:35 +1300)]
Merge pull request #19875 from colemanw/contactSummaryCleanup
Reorganize contact summary template to support non-ajax tabs
Coleman Watts [Wed, 24 Mar 2021 18:22:36 +0000 (14:22 -0400)]
APIv4 - Standardize generic entity name resolution so that classNames do not have to equal entityNames
This will allow the addition of a CiviCase API which cannot have the className "Case" because that is a reserved php keyword
Also cleans up other entities that use `static::class` in place of entityName because it's not a good pattern to replicate.
colemanw [Wed, 24 Mar 2021 15:17:12 +0000 (11:17 -0400)]
Merge pull request #19801 from eileenmcnaughton/mem_terms
[REF] Simplify code calculating the number of membership terms
Seamus Lee [Wed, 24 Mar 2021 05:17:54 +0000 (16:17 +1100)]
Merge pull request #19884 from eileenmcnaughton/unit8less
Updates to ExportTest
Eileen McNaughton [Wed, 24 Mar 2021 03:17:03 +0000 (16:17 +1300)]
Merge pull request #19818 from eileenmcnaughton/merge_fix
Fix for dedupe error under some mysql configs
eileen [Wed, 24 Mar 2021 02:21:10 +0000 (15:21 +1300)]
Updates to ExportTest
eileen [Wed, 24 Mar 2021 02:42:52 +0000 (15:42 +1300)]
Test fix to avoid caching issue
Seamus Lee [Wed, 24 Mar 2021 01:41:15 +0000 (12:41 +1100)]
Merge pull request #19882 from eileenmcnaughton/acl_role
Fold back in getGroupACLs
Seamus Lee [Wed, 24 Mar 2021 01:35:53 +0000 (12:35 +1100)]
Merge pull request #19817 from eileenmcnaughton/merge
Tighten mysql mode in test environment
Eileen McNaughton [Wed, 24 Mar 2021 01:32:10 +0000 (14:32 +1300)]
Merge pull request #19880 from demeritcowboy/crmmoney2
dev/financial#171 - Don't pass already formatted data to crmMoney on contact summary for custom fields
eileen [Tue, 23 Mar 2021 23:30:37 +0000 (12:30 +1300)]
Fold back in getGroupACLs
Eileen McNaughton [Wed, 24 Mar 2021 00:23:17 +0000 (13:23 +1300)]
Merge pull request #19879 from eileenmcnaughton/acl_role
Remove getACLRoles
eileen [Fri, 19 Mar 2021 21:23:31 +0000 (10:23 +1300)]
[REF] Fix the getSearchQueryResults so it can be called multiple times
demeritcowboy [Tue, 23 Mar 2021 23:52:39 +0000 (19:52 -0400)]
don't pass already formatted data to crmMoney
colemanw [Tue, 23 Mar 2021 23:49:37 +0000 (19:49 -0400)]
Merge pull request #19860 from eileenmcnaughton/task1
Move setting of _includesSoftCredits out of getQuery
Eileen McNaughton [Tue, 23 Mar 2021 23:40:25 +0000 (12:40 +1300)]
Merge pull request #19868 from colemanw/searchKitFixExtraFields
SearchKit - remove extra irrelevant fields from bridge joins
eileen [Mon, 15 Mar 2021 05:55:33 +0000 (18:55 +1300)]
Fix token subscriber to format the display of the custom tokens
eileen [Mon, 15 Mar 2021 05:43:53 +0000 (18:43 +1300)]
Add fix for enotice when trying to resolve custom data of type array
eileen [Mon, 15 Mar 2021 05:34:30 +0000 (18:34 +1300)]
Add test cover to check compatsubscriber is in sync with legacy token
Seamus Lee [Tue, 23 Mar 2021 22:56:32 +0000 (09:56 +1100)]
Merge pull request #19878 from civicrm/5.36
5.36
eileen [Tue, 23 Mar 2021 22:35:04 +0000 (11:35 +1300)]
Remove getACLRoles
We have cleaned up the code to clarify that
1) it returns an empty array if contact id is set and
2) it is only called with contact_id is set
Ergo it does nada
Not called from anywhere else (I made it protected last
cleanup round)
Seamus Lee [Tue, 23 Mar 2021 22:14:49 +0000 (09:14 +1100)]
Merge pull request #19872 from eileenmcnaughton/acl_role
[REF] Fold getACLs back into the calling function
Eileen McNaughton [Tue, 23 Mar 2021 22:14:26 +0000 (11:14 +1300)]
Merge pull request #19867 from colemanw/civiCaseApi
APIv4 - Add function to get api class name
Eileen McNaughton [Tue, 23 Mar 2021 22:07:10 +0000 (11:07 +1300)]
Merge pull request #19743 from totten/master-upg
dev/release#16 - Allow omission of empty upgrade steps
Seamus Lee [Tue, 23 Mar 2021 21:25:37 +0000 (08:25 +1100)]
Merge pull request #19874 from demeritcowboy/blank-assignee
[WIP] dev/core#2473 - Don't crash when assignee left blank when creating followup on email activity
Eileen McNaughton [Tue, 23 Mar 2021 21:03:48 +0000 (10:03 +1300)]
Merge pull request #19877 from eileenmcnaughton/camp
[REF] Stdise campaign_id handling
Eileen McNaughton [Tue, 23 Mar 2021 21:03:31 +0000 (10:03 +1300)]
Merge pull request #19876 from demeritcowboy/dont
dev/financial#171 - Don't
eileen [Tue, 23 Mar 2021 19:44:34 +0000 (08:44 +1300)]
[REF] Stdise campaign_id handling
demeritcowboy [Tue, 23 Mar 2021 19:26:05 +0000 (15:26 -0400)]
don't
Coleman Watts [Tue, 23 Mar 2021 14:44:14 +0000 (10:44 -0400)]
Reorganize contact summary template to support non-ajax tabs
There was some non-functional (due to a typo) code in TabHeader.tpl to allow tabs to load from a .tpl instead of ajax.
This fixes that typo and copies the funcionality into the contact summary tabs as well.
The functionality is demonstrated here by moving the main tab into a sub-tempate.
colemanw [Tue, 23 Mar 2021 19:04:16 +0000 (15:04 -0400)]
Merge pull request #19757 from eileenmcnaughton/tax_amount
[REF] Minor simplification around assigning taxAmount to the template
colemanw [Tue, 23 Mar 2021 18:40:52 +0000 (14:40 -0400)]
Merge pull request #19800 from eileenmcnaughton/gettypes
[REF] Remove setting of unused variables
demeritcowboy [Tue, 23 Mar 2021 17:37:50 +0000 (13:37 -0400)]
crash when assignee left blank