colemanw [Thu, 24 Sep 2020 15:21:55 +0000 (11:21 -0400)]
Merge pull request #18562 from eileenmcnaughton/locit
[Ref] Merge code - Move determination about location type to the getDAOForLocation…
colemanw [Thu, 24 Sep 2020 15:19:01 +0000 (11:19 -0400)]
Merge pull request #18578 from eileenmcnaughton/api42
Simplify CRM_Core_BAO_Location::createLocBlock by moving eventLocation specific handling back to the class
colemanw [Thu, 24 Sep 2020 14:58:09 +0000 (10:58 -0400)]
Merge pull request #18566 from eileenmcnaughton/act_contact
dev/core#2057 ActivityContact.create Remove select query that never or almost never finds something.
colemanw [Thu, 24 Sep 2020 14:43:46 +0000 (10:43 -0400)]
Merge pull request #18579 from colemanw/select2-bootstrap
Add select2-bootstrap to greenwich theme
Tim Otten [Thu, 24 Sep 2020 12:03:07 +0000 (05:03 -0700)]
ext/greenwich - Improve portability. Consolidate tasks.
1. Using 'php-eval' instead of 'shell' should make it safer to run on Windows.
2. The two steps are very closesly related. Putting them into the same 'task'
means that it's a bit easier to understand the 'watch' behavior.
Tim Otten [Thu, 24 Sep 2020 11:57:44 +0000 (04:57 -0700)]
composer.lock - Update compile plugin
Tim Otten [Thu, 24 Sep 2020 11:57:33 +0000 (04:57 -0700)]
composer.json - Update compile plugin
colemanw [Thu, 24 Sep 2020 12:01:50 +0000 (08:01 -0400)]
Merge pull request #18573 from eileenmcnaughton/nnfc
[NFC] Minor cleanup - use strict comparison where possible
colemanw [Thu, 24 Sep 2020 11:57:10 +0000 (07:57 -0400)]
ext/greenwich - Coerce `select2-bootstrap.css` to be handled as SCSS (#9)
Co-authored-by: Tim Otten <totten@civicrm.org>
Seamus Lee [Thu, 24 Sep 2020 11:02:01 +0000 (21:02 +1000)]
Merge pull request #18568 from mattwire/membershipdeprecated
Switch to non-deprecated/cached functions for membership pricesets
Seamus Lee [Thu, 24 Sep 2020 07:19:11 +0000 (17:19 +1000)]
Merge pull request #18580 from eileenmcnaughton/matt
Unit test for https://github.com/civicrm/civicrm-core/pull/18568
eileen [Thu, 24 Sep 2020 00:49:11 +0000 (12:49 +1200)]
Simplify CRM_Core_BAO_Location::createLocBlock by moving eventLocation specific handling back to the class
On grepping universe we find entity is only passed into
CRM_Core_BAO_Location::createLocBlock from this one place in the code - ergo we can
do the handling for it on that class & not in the shared code
Test cover added in preparation for this to CRM_Event_Form_ManageEvent_LocationTest
eileen [Thu, 24 Sep 2020 03:25:38 +0000 (15:25 +1200)]
Unit test for https://github.com/civicrm/civicrm-core/pull/18568
eileen [Wed, 23 Sep 2020 02:06:46 +0000 (14:06 +1200)]
dev/core#2057 Remove select query that never or almost never finds something.
When it comes to quey efficiency it's good to do an extra select if it saves an update/insert
but not if it never does. To test the theory that this 'never does' I put
removing this select through the entire test suite. No tests failed, meaning
it was unnecessary 100% of the time. Adding the catch ensures
it will still succeed if it the row exists but we have moved our query conservation
from doing an extraneous select in 99.9% of cases to an extraneous update in .1% of cases
https://lab.civicrm.org/dev/core/-/issues/2057
Eileen McNaughton [Thu, 24 Sep 2020 01:47:40 +0000 (13:47 +1200)]
Merge pull request #18576 from eileenmcnaughton/iso
dev/core#1921 Remove handling for Civi4.2 date bug from paypalProIPN
Coleman Watts [Thu, 24 Sep 2020 01:10:51 +0000 (21:10 -0400)]
Add select2-bootstrap to greenwich theme
eileen [Thu, 24 Sep 2020 00:36:52 +0000 (12:36 +1200)]
dev/core#2043 Remove pass by reference
Eileen McNaughton [Thu, 24 Sep 2020 00:40:32 +0000 (12:40 +1200)]
Merge pull request #18575 from eileenmcnaughton/api42
dev/core#2044 Make contact_id optional on v4 api for Address, phone, email
eileen [Wed, 23 Sep 2020 23:45:23 +0000 (11:45 +1200)]
dev/core#1921 Remove handling fo Civi4.2 from paypalProIPN
All the tests in
CRM_Core_Payment_PayPalProIPNTest pass through this line
It used to be necessary to reformat dates on a DAO before resaving
- up until 2014
eileen [Wed, 23 Sep 2020 23:23:20 +0000 (11:23 +1200)]
dev/core#2044 Make contact_id optional on v4 api for Address, phone, email
It's optional in the schema for events etc
eileen [Wed, 23 Sep 2020 22:38:51 +0000 (10:38 +1200)]
[NFC] Minor cleanup - use strict comparison where possible
colemanw [Wed, 23 Sep 2020 21:34:19 +0000 (17:34 -0400)]
Merge pull request #18550 from eileenmcnaughton/search
Add bootstrap bundle to search
Eileen McNaughton [Wed, 23 Sep 2020 18:45:49 +0000 (06:45 +1200)]
Merge pull request #18528 from mattwire/inputpaymentprocessorid
Switch to passing payment_processor_id as input param to completeOrder
Matthew Wire [Sat, 19 Sep 2020 19:35:34 +0000 (20:35 +0100)]
Switch to passing payment_processor_id as input param to completeOrder
Matthew Wire [Mon, 7 Sep 2020 15:32:40 +0000 (16:32 +0100)]
Switch to non-deprecated/cached functions for membership pricesets
Seamus Lee [Wed, 23 Sep 2020 09:30:32 +0000 (19:30 +1000)]
Merge pull request #18515 from mattwire/membershipbaodeprecated
Switch membership BAO to use non-deprecated cached functions to get membershipType details
Seamus Lee [Wed, 23 Sep 2020 02:47:33 +0000 (12:47 +1000)]
Merge pull request #18558 from eileenmcnaughton/act_type
[REF] Remove wrangling on activityType param
Seamus Lee [Wed, 23 Sep 2020 02:29:25 +0000 (12:29 +1000)]
Merge pull request #18565 from eileenmcnaughton/cachekey
dev/core#2029 Extend test debug
colemanw [Wed, 23 Sep 2020 00:44:42 +0000 (20:44 -0400)]
Merge pull request #18535 from eileenmcnaughton/first
[REF] Remove unreachable lines
Eileen McNaughton [Wed, 23 Sep 2020 00:29:49 +0000 (12:29 +1200)]
Merge pull request #18504 from demeritcowboy/scrunched-cc
dev/core#2040 - Multiple email activity cc recipients get scrunched together in recorded activity details field
eileen [Tue, 22 Sep 2020 23:26:56 +0000 (11:26 +1200)]
Extend test debug
Maybe this will help us understand why the test is intermittant
Eileen McNaughton [Tue, 22 Sep 2020 22:29:40 +0000 (10:29 +1200)]
Merge pull request #18533 from seamuslee001/dev_core_2030
dev/core#2030 ensure that the Country selector is a Select 2 and ensu…
Eileen McNaughton [Tue, 22 Sep 2020 22:28:59 +0000 (10:28 +1200)]
Merge pull request #18561 from eileenmcnaughton/test_data
Minor test data fix up - ensure domain contact's email is primary
colemanw [Tue, 22 Sep 2020 22:23:38 +0000 (18:23 -0400)]
Merge pull request #18430 from eileenmcnaughton/open
dev/core#2017 Remove unused function OpenID::isAllowedToLogin
Seamus Lee [Tue, 22 Sep 2020 21:52:10 +0000 (07:52 +1000)]
Merge pull request #18560 from eileenmcnaughton/test
Minor test fix
eileen [Thu, 17 Sep 2020 04:34:10 +0000 (16:34 +1200)]
dev/core#2047 [REF] Move calculation of 'type' to copyDataToNewBlockDAO
eileen [Thu, 17 Sep 2020 03:49:12 +0000 (15:49 +1200)]
[Ref] Move determination about location type to the getDAOForLocationEntity function
This seems more legible than the metadata trick....
colemanw [Tue, 22 Sep 2020 20:05:41 +0000 (16:05 -0400)]
Merge pull request #18552 from eileenmcnaughton/ref
[REF] Move daoName generation so we don't need to pass the variable name
eileen [Tue, 22 Sep 2020 20:02:24 +0000 (08:02 +1200)]
Minor test data fix up - ensure domain contact's email is primary
eileen [Tue, 22 Sep 2020 19:40:33 +0000 (07:40 +1200)]
Minor test fix
Eileen McNaughton [Tue, 22 Sep 2020 19:22:11 +0000 (07:22 +1200)]
Merge pull request #18557 from eileenmcnaughton/dep2
[REF] Finally remove deprecated ids handling
eileen [Thu, 17 Sep 2020 03:34:30 +0000 (15:34 +1200)]
Determine name of DAO when needed rather than passing a variable around
Seamus Lee [Tue, 22 Sep 2020 05:45:37 +0000 (15:45 +1000)]
Merge pull request #18554 from civicrm/5.30
5.30
Eileen McNaughton [Tue, 22 Sep 2020 05:12:14 +0000 (17:12 +1200)]
Merge pull request #18553 from seamuslee001/master
[REF] Update composer compile plugin to latest version
eileen [Tue, 22 Sep 2020 04:59:48 +0000 (16:59 +1200)]
[REF] Remove wrangling on activityType param
There is only 1 remaining place that calls this function & does not specifiy activityType. This fixes
that place to pass in activityType and stops attempting to calculate activityType
based on in-function guess work
Eileen McNaughton [Tue, 22 Sep 2020 04:39:05 +0000 (16:39 +1200)]
Merge pull request #18551 from colemanw/dontLoadBootstrap
Remove obsolete load-bootstrap.js
eileen [Tue, 22 Sep 2020 04:16:07 +0000 (16:16 +1200)]
[REF] Finally remove deprecated ids handling
We've been pretty clear for a long time the only supported way to call crud functions is via the api.
We noisily deprecated ids about 9 months ago & it has been not-preferred for much longer
I only found one place in universe where ids IS passed in
https://github.com/lcdservices/biz.lcdservices.movecontrib/edit/master/CRM/LCD/MoveContrib/BAO/MoveContrib.php
Tim Otten [Tue, 22 Sep 2020 04:03:44 +0000 (21:03 -0700)]
Merge pull request #18471 from eileenmcnaughton/error
dev/core#2032 Add potential to vary query log files per process
Seamus Lee [Tue, 22 Sep 2020 02:35:51 +0000 (12:35 +1000)]
Merge pull request #18534 from eileenmcnaughton/5.30
Follow up fix on paypal redirect
Seamus Lee [Tue, 22 Sep 2020 02:01:44 +0000 (12:01 +1000)]
[REF] Update composer compile plugin to latest version
Seamus Lee [Tue, 22 Sep 2020 01:25:19 +0000 (11:25 +1000)]
Merge pull request #18541 from eileenmcnaughton/dep
Fix deprecation notice
Coleman Watts [Tue, 22 Sep 2020 01:16:22 +0000 (21:16 -0400)]
Remove obsolete load-bootstrap.js
eileen [Tue, 22 Sep 2020 01:04:34 +0000 (13:04 +1200)]
Add bootstrap bundle to search
Seamus Lee [Tue, 22 Sep 2020 00:46:08 +0000 (10:46 +1000)]
Merge pull request #18499 from eileenmcnaughton/merger
dev/core#2047 [REF] Minor code extraction
Seamus Lee [Tue, 22 Sep 2020 00:43:22 +0000 (10:43 +1000)]
Merge pull request #18548 from civicrm/5.30
5.30
Seamus Lee [Tue, 22 Sep 2020 00:40:33 +0000 (10:40 +1000)]
Merge pull request #18547 from totten/5.30-ml-test
api_v3_MultilingualTest - Skip Cxn entities
Eileen McNaughton [Mon, 21 Sep 2020 23:22:07 +0000 (11:22 +1200)]
Merge pull request #18545 from laryn/patch-3
Check if BACKDROP_ROOT is defined already
Tim Otten [Mon, 21 Sep 2020 22:28:45 +0000 (15:28 -0700)]
api_v3_MultilingualTest - Skip Cxn entities
Eileen McNaughton [Mon, 21 Sep 2020 20:59:54 +0000 (08:59 +1200)]
Merge pull request #18546 from colemanw/getTableNameByEntityName
Fix customGroup getTableNameByEntityName to recognize all entities
Laryn - CEDC.org [Mon, 21 Sep 2020 20:55:57 +0000 (15:55 -0500)]
Update Backdrop.php
Coleman Watts [Mon, 21 Sep 2020 18:20:10 +0000 (14:20 -0400)]
Fix customGroup getTableNameByEntityName to recognize all entities
Laryn - CEDC.org [Mon, 21 Sep 2020 17:56:11 +0000 (12:56 -0500)]
Check if BACKDROP_ROOT is defined already
Matthew Wire [Mon, 21 Sep 2020 11:10:22 +0000 (12:10 +0100)]
Merge pull request #18543 from eileenmcnaughton/line_tax
[REF] Remove now used parameter & make function protected
Matthew Wire [Mon, 21 Sep 2020 11:08:31 +0000 (12:08 +0100)]
Merge pull request #18542 from eileenmcnaughton/xml
Fix civi version for greenwich
Matthew Wire [Mon, 21 Sep 2020 11:06:48 +0000 (12:06 +0100)]
Merge pull request #18458 from eileenmcnaughton/processor
dev/core#2017 Move function only used by bin/ContributionProcessor to that class
eileen [Mon, 21 Sep 2020 07:26:01 +0000 (19:26 +1200)]
[REF] Remove now used parameter & make function protected
This function used to be called by LineItem api but we removed that when adding v4 line item api
A universe check shows it's not otherwise called so it's only called with the same class, and making
it protected makes that clear. isLineItem is not passed in that one place
eileen [Mon, 21 Sep 2020 06:57:17 +0000 (18:57 +1200)]
Fix civi version for greenwich
We are releasing this as a stable part of 5.31 - xml should reflect that
Eileen McNaughton [Mon, 21 Sep 2020 04:46:35 +0000 (16:46 +1200)]
Merge pull request #18539 from eileenmcnaughton/ppcancel
[NFC] Cleanup in test class
Seamus Lee [Mon, 21 Sep 2020 04:39:19 +0000 (14:39 +1000)]
Merge pull request #18451 from eileenmcnaughton/renew
[REF] Consolidate input params that are primarily used for the membership entity action to an array
Eileen McNaughton [Mon, 21 Sep 2020 03:41:52 +0000 (15:41 +1200)]
Merge pull request #18286 from sunilpawar/ui_30
user-interface#30 Ability to Send Invoice with modified subject and CC
Eileen McNaughton [Mon, 21 Sep 2020 03:20:17 +0000 (15:20 +1200)]
Merge pull request #18281 from sunilpawar/report_48
report#48 View Payment owned by Different contact on Membership and Participant View
eileen [Mon, 21 Sep 2020 02:36:29 +0000 (14:36 +1200)]
Fix deprecation notice
User deprecated function: Deprecated function CRM_Core_BAO_Cache::cleanKey, use CRM_Utils_Cache::cleanKey. Array ( [civi.tag] => deprecated ) in CRM_Core_Error_Log->log() (line 58 of /Users/eileenmcnaughton/buildkit/build/dmaster/sites/all/modules/civicrm/CRM/Core/Error/Log.php).
Eileen McNaughton [Mon, 21 Sep 2020 02:00:42 +0000 (14:00 +1200)]
Merge pull request #18537 from eileenmcnaughton/cancel
dev/core#1986 Alter default for send notification to contributor checkbox on cancel or edit recurring to off
eileen [Mon, 21 Sep 2020 01:53:43 +0000 (13:53 +1200)]
[NFC] Cleanup in test class
Minor cleanup to test class (single quotes, Camel case entities for calling ipn, use getsingle)
eileen [Mon, 21 Sep 2020 00:28:36 +0000 (12:28 +1200)]
dev/core#1986 Alter default for send notification to contributor checkbox on cancel or edit recurring to off
Per https://lab.civicrm.org/dev/core/-/issues/1986 this got strong support
Seamus Lee [Mon, 21 Sep 2020 00:35:17 +0000 (10:35 +1000)]
Merge pull request #18513 from eileenmcnaughton/export_extract
[REF] Extract the code to determine the DAO name into a functions
eileen [Mon, 21 Sep 2020 00:03:19 +0000 (12:03 +1200)]
[REF] Remove unreachable lines
The function recur ONLY calls single if first is TRUE. Once we remove first from the if clause
we can see it applies if recur is TRUE or if recur is FALSE (or any other variant given we are using
truthiness). So the if can go
eileen [Sun, 20 Sep 2020 23:13:50 +0000 (11:13 +1200)]
Follow up fix on paypal redirect
Turns out we did some function renaming & missed a spot before merge.
As an aside I fixed Paypal to call CRM_Core_Config::singleton()->userSystem->prePostRedirect()
directly rather than via system. I'm tempted to take the System function back out
again - I don't think it offers a better one-liner
Seamus Lee [Sun, 20 Sep 2020 22:31:35 +0000 (08:31 +1000)]
Merge pull request #18521 from eileenmcnaughton/fin_type
Improve metadata on LineItem DAO
Seamus Lee [Sun, 20 Sep 2020 22:03:30 +0000 (08:03 +1000)]
dev/core#2030 ensure that the Country selector is a Select 2 and ensure that if it is not shown on the contribution form that it doesn't prevent form submissions
Eileen McNaughton [Sun, 20 Sep 2020 20:52:37 +0000 (08:52 +1200)]
Merge pull request #18465 from totten/master-greenwich-ext
Greenwich: Add BootstrapCSS support via core extension
Eileen McNaughton [Sun, 20 Sep 2020 20:37:23 +0000 (08:37 +1200)]
Merge pull request #18529 from seamuslee001/core_afform_php74_array_string
[REF] Fix deprecated array and string offset access using curly brace…
Eileen McNaughton [Sun, 20 Sep 2020 20:34:53 +0000 (08:34 +1200)]
Merge pull request #18531 from civicrm/5.30
5.30 to master
Eileen McNaughton [Sun, 20 Sep 2020 20:34:39 +0000 (08:34 +1200)]
Merge pull request #18525 from christianwach/lab-core-1997-530
Fix PayPal Standard session loss in WordPress (5.30)
Eileen McNaughton [Sun, 20 Sep 2020 20:33:34 +0000 (08:33 +1200)]
Merge pull request #18524 from MegaphoneJon/core-2052-rc
fix datepickers to show correct minDate
Eileen McNaughton [Sun, 20 Sep 2020 20:31:26 +0000 (08:31 +1200)]
Merge pull request #18530 from seamuslee001/fix_date_relationship
[NFC] Fix dates in RelationshipTest
Seamus Lee [Sun, 20 Sep 2020 06:00:46 +0000 (16:00 +1000)]
[NFC] Fix dates in RelationshipTest
Seamus Lee [Sat, 19 Sep 2020 22:22:39 +0000 (08:22 +1000)]
[REF] Fix deprecated array and string offset access using curly braces in afform
Matthew Wire [Sat, 19 Sep 2020 18:55:01 +0000 (19:55 +0100)]
Merge pull request #18479 from eileenmcnaughton/just_pay
dev/financial#148 Simplify parameters passed to completeOrder
Christian Wach [Sat, 19 Sep 2020 11:47:26 +0000 (12:47 +0100)]
Fix PayPal Standard session loss in WordPress
Seamus Lee [Fri, 18 Sep 2020 22:50:01 +0000 (08:50 +1000)]
Merge pull request #18523 from civicrm/5.30
5.30
Jon Goldberg [Fri, 18 Sep 2020 20:21:22 +0000 (16:21 -0400)]
fix datepickers to show correct minDate
Seamus Lee [Fri, 18 Sep 2020 21:18:22 +0000 (07:18 +1000)]
Merge pull request #18520 from colemanw/searchGroupBy
Search ext: Aggregate field fixes
eileen [Fri, 18 Sep 2020 20:07:56 +0000 (08:07 +1200)]
Improve metadata on LineItem DAO
Adds pseudoconstants, labels
Coleman Watts [Fri, 18 Sep 2020 15:27:20 +0000 (11:27 -0400)]
Search ext: Ensure all non-grouped columns are aggregated if using GROUP BY
Coleman Watts [Fri, 18 Sep 2020 15:16:16 +0000 (11:16 -0400)]
Search ext: When removing a column from SELECT, also remove from ORDER BY
Coleman Watts [Fri, 18 Sep 2020 14:34:27 +0000 (10:34 -0400)]
Search ext: Fix field label for aggregate fields
Matthew Wire [Mon, 7 Sep 2020 15:30:31 +0000 (16:30 +0100)]
Switch membership BAO to use non-deprecated cached functions to get membershipType details
Matthew Wire [Fri, 18 Sep 2020 13:51:56 +0000 (14:51 +0100)]
Merge pull request #18427 from mattwire/membershipbackendcached
Switch backend membership form to use non-deprecated/cached functions to get membership types
colemanw [Fri, 18 Sep 2020 11:50:30 +0000 (07:50 -0400)]
Merge pull request #18485 from eileenmcnaughton/ref2
dev/core#2043 remove pass-by-reference