Seamus Lee [Mon, 23 Dec 2019 05:02:40 +0000 (16:02 +1100)]
Merge pull request #16136 from eileenmcnaughton/member_test
[REF] remove CRM_Core_Error check
Eileen McNaughton [Mon, 23 Dec 2019 04:41:10 +0000 (17:41 +1300)]
Merge pull request #16145 from eileenmcnaughton/index_api
Add api to check for missing indices
Seamus Lee [Mon, 23 Dec 2019 00:55:03 +0000 (11:55 +1100)]
Merge pull request #16144 from eileenmcnaughton/acl_index
dev/core#1486 Add index to civicrm_acl_cache.modified_date
Eileen McNaughton [Mon, 23 Dec 2019 00:02:16 +0000 (13:02 +1300)]
Merge pull request #16143 from eileenmcnaughton/deadlock_err2
Fix misleading error message on deadlock
eileen [Sun, 22 Dec 2019 23:08:18 +0000 (12:08 +1300)]
Add api to check for missing indices
eileen [Sun, 22 Dec 2019 22:32:14 +0000 (11:32 +1300)]
Add index to civicrm_acl.modified_date
eileen [Sun, 22 Dec 2019 20:47:10 +0000 (09:47 +1300)]
Fix misleading error message on deadlock
We were seeing error messages like
API_Exception : financial_type_id is not valid : Donation
when a deadlock was hit. The error made not sense as 'Donation' DID exist and did not help us
to identify the issue as a deadlock. It's still helpful with a deadlock to know if
a real constraint violation is hit as per https://lab.civicrm.org/dev/core/issues/1481 sometimes
a disturbing amount of queries have been rolled back.
Let's fix to handle pseudoconstants here & give a useful message.
The previously converted params did not get to this point but we can re-do that work in this low
volume function rather than do a lot of re-thinking
Eileen McNaughton [Sun, 22 Dec 2019 22:10:58 +0000 (11:10 +1300)]
Merge pull request #16142 from eileenmcnaughton/deadlock_err
[NFC] Declare exceptions, use single quotes where possible, use strict comparison
Eileen McNaughton [Sun, 22 Dec 2019 22:10:44 +0000 (11:10 +1300)]
Merge pull request #16141 from eileenmcnaughton/fatal
dev/core#560 Remove instances of fatal errors
eileen [Sun, 22 Dec 2019 20:28:35 +0000 (09:28 +1300)]
[NFC] Declare exceptions, use single quotes where possible, use strict comparison
General coding standards. If we know one side is a string we can switch comparison to strict
Seamus Lee [Sun, 22 Dec 2019 20:10:40 +0000 (07:10 +1100)]
Merge pull request #16132 from eileenmcnaughton/member
[REF] step towards wiping out $ids array in membership bao functions
eileen [Sun, 22 Dec 2019 20:07:52 +0000 (09:07 +1300)]
Remove instances of fatal errors
Seamus Lee [Sun, 22 Dec 2019 20:07:33 +0000 (07:07 +1100)]
Merge pull request #16134 from eileenmcnaughton/member_legacy
Remove legacy_redirect_path handling
Eileen McNaughton [Sun, 22 Dec 2019 20:02:37 +0000 (09:02 +1300)]
Merge pull request #16122 from demeritcowboy/always-true
[NFC] If statement is always true
Matthew Wire [Sun, 22 Dec 2019 11:48:18 +0000 (11:48 +0000)]
Merge pull request #16138 from eileenmcnaughton/static
Switch static var to using Civi::statics
Matthew Wire [Sun, 22 Dec 2019 11:45:27 +0000 (11:45 +0000)]
Merge pull request #16137 from eileenmcnaughton/less_dep
[REF] Minor cleanup - declare exceptions, use single quotes, strict comparison
eileen [Sun, 22 Dec 2019 05:40:58 +0000 (18:40 +1300)]
Switch static var to using Civi::statics
This static variable is actually problematic. Moving it to statics will allow us to stop reseting it
in the test suite & to hone in on where it is actually broken rather than the test suite
is not flushing it
eileen [Sun, 22 Dec 2019 05:20:11 +0000 (18:20 +1300)]
[REF] Minor cleanup - declare exceptions, use single quotes, strict comparison
eileen [Sun, 22 Dec 2019 05:12:22 +0000 (18:12 +1300)]
[REF] remove CRM_Core_Error check
I'm convinced there is no reason why find should return a core_error & hence if it did we wouldn't want
to keep calm & carry on - smells a lot like copy & paste. Also makes code hard to understand
eileen [Sat, 21 Dec 2019 20:50:23 +0000 (09:50 +1300)]
[REF] step towards wiping out array in membership bao functions
Seamus Lee [Sun, 22 Dec 2019 03:23:36 +0000 (14:23 +1100)]
Merge pull request #16133 from eileenmcnaughton/member_test
[NFC] Test clean up.
eileen [Sat, 21 Dec 2019 22:35:44 +0000 (11:35 +1300)]
[NFC] Test clean up.
Good test - nightmare to read. This helps.
eileen [Sat, 21 Dec 2019 22:47:12 +0000 (11:47 +1300)]
Remove legacy_redirect_path handling
This has been hanging around for a long time & no-one has logged a JIRA (or pointed out that JIRA is now
defunct) so the initial analysis of it being unreachable makes sense
Eileen McNaughton [Sat, 21 Dec 2019 19:33:58 +0000 (08:33 +1300)]
Merge pull request #16130 from colemanw/ext
Fix output display in api4 explorer
Coleman Watts [Fri, 20 Dec 2019 19:38:53 +0000 (14:38 -0500)]
Fix output display in api4 explorer
colemanw [Fri, 20 Dec 2019 12:10:15 +0000 (07:10 -0500)]
Merge pull request #16125 from eileenmcnaughton/cont_sub
dev/core#1482 Remove lines of code that appear to relate to legacy logic
Yashodha Chaku [Fri, 20 Dec 2019 09:21:26 +0000 (14:51 +0530)]
Merge pull request #16124 from eileenmcnaughton/acl_deadlock
Remove function marked as deprecated & unused by core nearly a year ago
Eileen McNaughton [Fri, 20 Dec 2019 08:00:51 +0000 (21:00 +1300)]
Merge pull request #16127 from eileenmcnaughton/mem_test
Unit test for https://github.com/civicrm/civicrm-core/pull/16120
eileen [Fri, 20 Dec 2019 05:52:51 +0000 (18:52 +1300)]
Unit test for https://github.com/civicrm/civicrm-core/pull/16120
Eileen McNaughton [Fri, 20 Dec 2019 05:51:56 +0000 (18:51 +1300)]
Merge pull request #16126 from civicrm/5.21
5.21 to master
Eileen McNaughton [Fri, 20 Dec 2019 05:51:30 +0000 (18:51 +1300)]
Merge pull request #16120 from seamuslee001/dev_core_1485
dev/core#1485 Fix field name for join_date to be membership_join_date…
eileen [Thu, 19 Dec 2019 22:14:38 +0000 (11:14 +1300)]
dev/core#1482 Remove lines of code that appear to relate to legacy logic
As discussed in https://lab.civicrm.org/dev/core/issues/1482 the subscription history table appears to still be used for
recording group history but this business of creating a row with no attached group appears to be from a logic flow that
is long-superceded by change log & db logging
Eileen McNaughton [Thu, 19 Dec 2019 20:28:47 +0000 (09:28 +1300)]
Merge pull request #16123 from civicrm/5.21
5.21 to master
eileen [Thu, 19 Dec 2019 20:27:46 +0000 (09:27 +1300)]
Remove function marked as deprecated & unused by core nearly a year ago
Seamus Lee [Thu, 19 Dec 2019 03:32:07 +0000 (14:32 +1100)]
dev/core#1485 Fix field name for join_date to be membership_join_date in line with the DAO schema
Also include membership_join_date into the mapping as per Jamie's comments
Eileen McNaughton [Thu, 19 Dec 2019 20:18:08 +0000 (09:18 +1300)]
Merge pull request #16121 from mlutfy/core1490-rc
dev/core#1490 Fix syntax error in Membership Receipt
Eileen McNaughton [Thu, 19 Dec 2019 20:16:10 +0000 (09:16 +1300)]
Merge pull request #16119 from eileenmcnaughton/acl_deadlock
[Ref] Remove php4 support from BAO_Acl class
demeritcowboy [Thu, 19 Dec 2019 17:12:28 +0000 (12:12 -0500)]
if statement is always true
Mathieu Lutfy [Thu, 19 Dec 2019 15:21:29 +0000 (10:21 -0500)]
dev/core#1490 Fix syntax error in Membership Receipt
eileen [Thu, 19 Dec 2019 02:06:22 +0000 (15:06 +1300)]
Remove php4 support from BAO_Acl class
Removes instances of php support involving & in the function signature. In each instance the function is only ever called once
(I think all are internal too) & the calling function doesn't do any weird stuff with references that might make it needed.
Also remove one instance of unnecessarily passed by ref
Seamus Lee [Tue, 17 Dec 2019 19:35:01 +0000 (06:35 +1100)]
Merge pull request #15968 from eileenmcnaughton/bom
dev/core#1424 Support MS Excel for diacritic characters when exporting to csv
Yashodha Chaku [Tue, 17 Dec 2019 09:14:30 +0000 (14:44 +0530)]
Merge pull request #15972 from aydun/report#24
report#24 - Case Detail report - fix 'Active role?' when no relationships
Yashodha Chaku [Tue, 17 Dec 2019 09:08:46 +0000 (14:38 +0530)]
Merge pull request #16101 from jitendrapurohit/dev-1474
dev/core#1474 - (On Hold) text missing from email column when custom …
Seamus Lee [Tue, 17 Dec 2019 07:19:39 +0000 (18:19 +1100)]
Merge pull request #16115 from eileenmcnaughton/deprecate
Remove vestige of apiv2
Seamus Lee [Tue, 17 Dec 2019 07:18:48 +0000 (18:18 +1100)]
Merge pull request #16114 from eileenmcnaughton/pear
[NFC] cleanup to declared exceptions, quotes, strict mode.
Jitendra Purohit [Fri, 13 Dec 2019 12:46:33 +0000 (18:16 +0530)]
dev/core#1474 - (On Hold) text missing from email column when custom search profile is used in Advanced Search
Add test
eileen [Tue, 17 Dec 2019 05:07:16 +0000 (18:07 +1300)]
Remove vestige of apiv2
eileen [Tue, 17 Dec 2019 05:03:33 +0000 (18:03 +1300)]
[NFC] cleanup to declared exceptions, quotes, strict mode.
Seamus Lee [Mon, 16 Dec 2019 19:09:43 +0000 (06:09 +1100)]
Merge pull request #16111 from eileenmcnaughton/pf
dev/core#1472 fix price field money clean
Eileen McNaughton [Sun, 15 Dec 2019 07:41:03 +0000 (20:41 +1300)]
Merge pull request #16109 from seamuslee001/utils_grant_bin_fatal_exception
[REF] Switch CRM_Utils_Error::fatal calls for CRM_Core_Exception in G…
Seamus Lee [Sat, 14 Dec 2019 23:35:38 +0000 (10:35 +1100)]
Merge pull request #16110 from seamuslee001/api4_country_state_entities
Add in Country and StateProvince APIv4 Entities
Seamus Lee [Sat, 14 Dec 2019 22:03:56 +0000 (09:03 +1100)]
Add in Country and StateProvince APIv4 Entities
Seamus Lee [Sat, 14 Dec 2019 21:40:07 +0000 (08:40 +1100)]
[REF] Switch CRM_Utils_Error::fatal calls for CRM_Core_Exception in Grant. utils, bin/ and Civi/Angular/ folders
Seamus Lee [Sat, 14 Dec 2019 04:48:06 +0000 (15:48 +1100)]
Merge pull request #16108 from civicrm/5.21
5.21
Seamus Lee [Sat, 14 Dec 2019 02:37:46 +0000 (13:37 +1100)]
Merge pull request #16107 from demeritcowboy/freezy-5.21
dev/core#1477 Fix fatal error when editing reserved option group settings
demeritcowboy [Sat, 14 Dec 2019 00:52:28 +0000 (19:52 -0500)]
fix fatal error when editing reserved option group settings
eileen [Fri, 13 Dec 2019 19:50:22 +0000 (08:50 +1300)]
fix price field money clean
Eileen McNaughton [Fri, 13 Dec 2019 19:36:41 +0000 (08:36 +1300)]
Merge pull request #16103 from civicrm/5.21
5.21 to master
Eileen McNaughton [Fri, 13 Dec 2019 19:36:09 +0000 (08:36 +1300)]
Merge pull request #16052 from eileenmcnaughton/desc
Fix unreleased regression where processors using getPaymentDescription get a fatal
Yashodha Chaku [Fri, 13 Dec 2019 12:16:49 +0000 (17:46 +0530)]
Merge pull request #16096 from eileenmcnaughton/pf
E notice fix on Price set form
colemanw [Fri, 13 Dec 2019 02:40:23 +0000 (21:40 -0500)]
Merge pull request #16078 from colemanw/snippets
Allow Angular modules to provide dynamic HTML snippets
Tim Otten [Thu, 12 Dec 2019 23:33:07 +0000 (15:33 -0800)]
hook_angularModules - Accept 'partialsCallback' for dynamic partials
This is similar to the antecedent commit which used a field 'snippets' that
contained a list of HTML files and their content. However, this
uses a callback function instead of providing the full HTML content.
This makes it safer to work with the Angular metadata without needing to
load the content of all partials into memory.
eileen [Thu, 12 Dec 2019 21:46:37 +0000 (10:46 +1300)]
E notice fix on Price set form
Seamus Lee [Thu, 12 Dec 2019 20:25:52 +0000 (07:25 +1100)]
Merge pull request #16088 from eileenmcnaughton/paypal_clean
Paypal class cleanup
Matthew Wire [Thu, 12 Dec 2019 17:28:50 +0000 (17:28 +0000)]
Merge pull request #16094 from pradpnayak/ActivityTypeName-Case
dev/core/issues/1470, show labels instead name for activity type
Pradeep Nayak [Thu, 12 Dec 2019 10:43:26 +0000 (10:43 +0000)]
dev/core/issues/1470, show labels instead name for activity type
Seamus Lee [Thu, 12 Dec 2019 04:28:54 +0000 (15:28 +1100)]
Merge pull request #16093 from civicrm/5.21
5.21
Seamus Lee [Thu, 12 Dec 2019 04:28:03 +0000 (15:28 +1100)]
Merge pull request #16092 from seamuslee001/5.21
Fix Release note header
Seamus Lee [Thu, 12 Dec 2019 04:26:28 +0000 (15:26 +1100)]
Fix Release note header
Seamus Lee [Thu, 12 Dec 2019 04:23:21 +0000 (15:23 +1100)]
Merge pull request #16091 from civicrm/5.21
5.21
Seamus Lee [Thu, 12 Dec 2019 03:35:57 +0000 (14:35 +1100)]
Merge pull request #16057 from eileenmcnaughton/act_perm521
dev/core#1444 Permit activities with campaigns on contact tab for con…
Seamus Lee [Thu, 12 Dec 2019 02:01:12 +0000 (13:01 +1100)]
Merge pull request #16090 from seamuslee001/5.21
Add release-notes/5.20.2
Tim Otten [Thu, 12 Dec 2019 01:46:35 +0000 (17:46 -0800)]
Add release-notes/5.20.2
Seamus Lee [Thu, 12 Dec 2019 01:42:32 +0000 (12:42 +1100)]
Merge pull request #16080 from eileenmcnaughton/org_up
Remove unnecessary query when updating org, if no name update.
eileen [Wed, 11 Dec 2019 09:05:08 +0000 (22:05 +1300)]
Remove unnecessary query when updating org, if no name udpate.
This removes an unnecessary query that can be locking at high volume.
The updateCurrentEmployer function sets the organization_name for any related contacts. We don't need to
do this if we are creating the organization for the first time, or updating the organization but not setting (passing in)
organization_name. We can check & avoid in php.
Also we don't need to check for an existing employer_id unless we are dealing with an Individual record. We can
skip that query for Orgs & Households.
These are cheap queries but at high volume can contribute to locks
eileen [Mon, 9 Dec 2019 03:21:35 +0000 (16:21 +1300)]
Fix unreleased regression where processors using getPaymentDescription get a fatal
We added the new property bag in https://github.com/civicrm/civicrm-core/pull/15697 but in the back & forth the
call to the function getDescription was retained but the function was removed. This would leave the
core processor that calls it (Paypal std) with a fatal. The known external processor using it (Omnipay)
also hits a notice because the signature changed ($params became optional). From the Omnipay
pov I think it makes sense just to stop overriding the function - hence I am sneaking a tiny
change into this to make that possible.
Note the doPayment function ensures that propertyBag is set. There is a small chance that an external processor
is fully overriding doPayment AND calling this - that would be the case for Omnipay except I'll remove
the override in conjunction with this - so I've added a few lines to ensure it is set.
Note the test would fail with the changes to Payment_Dummmy & not the changes to Core_Payment so it provides
test cover
Eileen McNaughton [Wed, 11 Dec 2019 22:04:46 +0000 (11:04 +1300)]
Merge pull request #16086 from civicrm/5.21
5.21
Seamus Lee [Wed, 11 Dec 2019 21:33:48 +0000 (08:33 +1100)]
Merge pull request #16087 from seamuslee001/deb_core_1467
dev/core#1467 - Multiple participant registration sends only p1 amoun…
eileen [Wed, 11 Dec 2019 11:00:16 +0000 (00:00 +1300)]
Paypal class cleanup
- remove handling for returned error - this is never returned now
- remove url parameter on invokeApi - this is never passed to it
- throw an exception rather than use a fatal if curl not installed
Seamus Lee [Wed, 11 Dec 2019 19:45:57 +0000 (06:45 +1100)]
dev/core#1467 - Multiple participant registration sends only p1 amount to the processor
Seamus Lee [Wed, 11 Dec 2019 19:20:21 +0000 (06:20 +1100)]
Merge pull request #16072 from eileenmcnaughton/paypal_extract
Code cleanup Update Paypal invokeApi to only throw exceptions.
Seamus Lee [Wed, 11 Dec 2019 19:19:34 +0000 (06:19 +1100)]
Merge pull request #16081 from artfulrobot/payment-property-bag-add-getters
Payment PropertyBag: Add generic getter, setter methods for convenience
Seamus Lee [Wed, 11 Dec 2019 19:17:35 +0000 (06:17 +1100)]
Merge pull request #16083 from artfulrobot/advanced-search-contrib-source-search-dev-core-1468
Fix searching for contribution source in advanced search
Rich Lott / Artful Robot [Wed, 11 Dec 2019 12:38:03 +0000 (12:38 +0000)]
Fix searching for contribution source in advanced search
eileen [Tue, 10 Dec 2019 11:11:41 +0000 (00:11 +1300)]
Update Paypal invokeApi to only throw exceptions.
Currently invokeAPI will return an error for a curl function and throw a processorException for an outcome other than success.
In just about every instance where it is called the Core_Error is converted into an exception anyway - this
can all be cleaned up as a follow up. The exceptions are
doQuery - called by doPayment
doDirectPayment - this is called by doPayment which converts it into an exception. Calling doDirectPayment directly was deprecated in 4.6
createRecurringPayments - called by doExpressCheckout which in already throws exceptions in other scenarios,
updateSubscriptionBillingInfo - we can update the one place that calls this in core as a follow up like https://github.com/civicrm/civicrm-core/pull/15676
However, note that an exception was already thrown in all these places in the more common error scenario of the action not succeeding as opposed
to the rare curl error scenario
Follow ons to consider
1) introduce more nuance into PaymentProcessorExceptions - extend the exception class with PaymentProcessorConfigException, PaymentProcessingException or similar to differentiate
2) remove all the handling for invokeApi to have returned an error object.
3) fix the code that calls updateSubscriptionBillingInfo
4) ensure docs reflect that doPayment should throw an exception. AFAIK we have not yet documented other 'do' functions & I'd prefer to stdise them first
Rich Lott / Artful Robot [Wed, 11 Dec 2019 10:27:56 +0000 (10:27 +0000)]
Payment PropertyBag: Add generic getter, setter methods for convenience
Coleman Watts [Wed, 11 Dec 2019 02:56:50 +0000 (21:56 -0500)]
Allow angular modules to provide dynamic html snippets
Seamus Lee [Wed, 11 Dec 2019 01:09:43 +0000 (12:09 +1100)]
Merge pull request #16077 from civicrm/5.21
5.21
Seamus Lee [Wed, 11 Dec 2019 00:07:08 +0000 (11:07 +1100)]
Merge pull request #16076 from alifrumin/rn5.21
5.21 Release notes: First Pass
Seamus Lee [Wed, 11 Dec 2019 00:07:05 +0000 (11:07 +1100)]
Merge pull request #16075 from seamuslee001/sig_status_bounce
[REF] Convert more petition signature fatals to status bounce
Alice Frumin [Mon, 9 Dec 2019 17:55:42 +0000 (12:55 -0500)]
Release Notes 5.21 - Sorting and Annotating
Eileen McNaughton [Tue, 10 Dec 2019 19:45:10 +0000 (08:45 +1300)]
Merge pull request #16074 from civicrm/5.21
5.21
Seamus Lee [Tue, 10 Dec 2019 18:50:23 +0000 (05:50 +1100)]
[REF] Convert more petition signature fatals to status bounce
Seamus Lee [Tue, 10 Dec 2019 18:42:33 +0000 (05:42 +1100)]
Merge pull request #16067 from eileenmcnaughton/fatal
Swap out fatal for statusBounce for disabled or unpermitted forms
Seamus Lee [Tue, 10 Dec 2019 18:38:34 +0000 (05:38 +1100)]
Merge pull request #16071 from jitendrapurohit/521rc
dev/core#1463 Fix record payment form errors
Jitendra Purohit [Tue, 10 Dec 2019 10:41:43 +0000 (16:11 +0530)]
Fix record payment form errors
Eileen McNaughton [Tue, 10 Dec 2019 10:17:07 +0000 (23:17 +1300)]
Merge pull request #15676 from artfulrobot/handle-exceptions-from-payment-processors
We should give user feedback in case of a Payment Processor Exception
eileen [Tue, 10 Dec 2019 01:02:32 +0000 (14:02 +1300)]
Swap out fatal for statusBounce for disabled or unpermittted forms
I have deliberately left copy editing & translate out of scope & focussed on a specific narrow pattern
Seamus Lee [Tue, 10 Dec 2019 07:29:48 +0000 (18:29 +1100)]
Merge pull request #16070 from civicrm/5.21
5.21
Tim Otten [Tue, 10 Dec 2019 07:28:38 +0000 (23:28 -0800)]
Merge pull request #16069 from seamuslee001/5.21
Add release-notes/5.20.1