civicrm-core.git
4 years ago[NFC] Cleanup comments, string comparision in grant search
eileen [Fri, 29 Nov 2019 07:44:23 +0000 (20:44 +1300)]
[NFC] Cleanup comments, string comparision in grant search

4 years agoMerge pull request #15931 from seamuslee001/standardise_grant_search
Eileen McNaughton [Fri, 29 Nov 2019 07:34:09 +0000 (20:34 +1300)]
Merge pull request #15931 from seamuslee001/standardise_grant_search

[REF] Standardise the Grant Search form handling

4 years agoMerge pull request #15980 from eileenmcnaughton/setting_fix
Seamus Lee [Thu, 28 Nov 2019 23:30:46 +0000 (10:30 +1100)]
Merge pull request #15980 from eileenmcnaughton/setting_fix

dev/core#1425 Replace deprecated settings fns in test suite

4 years agoMerge pull request #15979 from eileenmcnaughton/search
Seamus Lee [Thu, 28 Nov 2019 23:30:21 +0000 (10:30 +1100)]
Merge pull request #15979 from eileenmcnaughton/search

Remove CRM_Contact_Form_Search_Custom_Basic from searches added on install.

4 years agoMerge pull request #15982 from civicrm/5.20
Seamus Lee [Thu, 28 Nov 2019 23:30:13 +0000 (10:30 +1100)]
Merge pull request #15982 from civicrm/5.20

5.20

4 years agodev/core#1425 Replace deprecated settings fns in test suite
eileen [Thu, 28 Nov 2019 20:05:18 +0000 (09:05 +1300)]
dev/core#1425 Replace deprecated settings fns in test suite

4 years agoMerge pull request #15977 from seamuslee001/fix_issue_number_range_smart_group_empty_...
Seamus Lee [Thu, 28 Nov 2019 21:17:38 +0000 (08:17 +1100)]
Merge pull request #15977 from seamuslee001/fix_issue_number_range_smart_group_empty_values

Ensure that Relative key is not added for non Select Date is_search_range custom fields

4 years agoOnly add in relative key when its a custom date field
Seamus Lee [Thu, 28 Nov 2019 03:22:11 +0000 (14:22 +1100)]
Only add in relative key when its a custom date field

Ensure that we strip the _to _from _high _low from the element name first

4 years agoRegenerate sql
eileen [Thu, 28 Nov 2019 19:57:27 +0000 (08:57 +1300)]
Regenerate sql

4 years agoRemove CRM_Contact_Form_Search_Custom_Basic from searches added on install.
eileen [Thu, 28 Nov 2019 19:07:49 +0000 (08:07 +1300)]
Remove CRM_Contact_Form_Search_Custom_Basic from searches added on install.

From https://github.com/civicrm/civicrm-core/pull/15963 this search appears to do what the main basic search does but
we can see that to make it work with sort etc we have to make changes to the BAO_Query object - doing
that to support a custom search scares me & we have a big picture position that we should move these
from core to an extension. However, an easy first step is not to add on new installs. In the case of
this search it seems like an easy call as it doesn't add anything discernable

4 years agoMerge pull request #15978 from civicrm/5.20
Seamus Lee [Thu, 28 Nov 2019 08:32:49 +0000 (19:32 +1100)]
Merge pull request #15978 from civicrm/5.20

5.20

4 years agoMerge pull request #15976 from eileenmcnaughton/5.20
Seamus Lee [Thu, 28 Nov 2019 05:18:51 +0000 (16:18 +1100)]
Merge pull request #15976 from eileenmcnaughton/5.20

Fix 5.20 regression on retrieving template transaction with no logged  in user

4 years agoMerge pull request #15901 from eileenmcnaughton/matt
Matthew Wire [Thu, 28 Nov 2019 03:09:59 +0000 (16:09 +1300)]
Merge pull request #15901 from eileenmcnaughton/matt

[REF] further removal of unnecessary  params

4 years agoFix 5.20 regression on retrieving template transaction with no logged in user
eileen [Thu, 28 Nov 2019 02:26:45 +0000 (15:26 +1300)]
Fix 5.20 regression on retrieving template transaction with no logged in user

4 years agoMerge pull request #15973 from kcristiano/5.20-msg-tpl
Seamus Lee [Thu, 28 Nov 2019 01:11:32 +0000 (12:11 +1100)]
Merge pull request #15973 from kcristiano/5.20-msg-tpl

Link to docs.civicrm.org instead of wiki

4 years agoLink to docs.civicrm.org instead of wiki
Kevin Cristiano [Wed, 27 Nov 2019 20:46:53 +0000 (15:46 -0500)]
Link to docs.civicrm.org instead of wiki

4 years agoMerge pull request #15877 from demeritcowboy/casereport-unittest
Seamus Lee [Wed, 27 Nov 2019 19:34:03 +0000 (06:34 +1100)]
Merge pull request #15877 from demeritcowboy/casereport-unittest

[TEST] dev/core#1366 Unit test for case audit

4 years agoMerge pull request #15909 from eileenmcnaughton/payment
Eileen McNaughton [Wed, 27 Nov 2019 18:45:07 +0000 (07:45 +1300)]
Merge pull request #15909 from eileenmcnaughton/payment

Fix api Payment.create to support overpayments

4 years agoMerge pull request #15951 from eileenmcnaughton/export_bom
Mathieu Lu [Wed, 27 Nov 2019 14:57:43 +0000 (09:57 -0500)]
Merge pull request #15951 from eileenmcnaughton/export_bom

CSV Export: Add deprecation warning

4 years agoMerge pull request #15967 from seamuslee001/dev_core_1329
Seamus Lee [Wed, 27 Nov 2019 03:04:58 +0000 (14:04 +1100)]
Merge pull request #15967 from seamuslee001/dev_core_1329

dev/core1329 Reduce number of deceased contacts in the demo data from…

4 years agodev/core1329 Reduce number of deceased contacts in the demo data from 31 to 12
Seamus Lee [Tue, 26 Nov 2019 20:39:04 +0000 (07:39 +1100)]
dev/core1329 Reduce number of deceased contacts in the demo data from 31 to 12

Limit number of deceased contacts to 4 and add in age checks as per Justin

4 years agoMerge pull request #15882 from demeritcowboy/audit-timeline
Seamus Lee [Tue, 26 Nov 2019 21:40:32 +0000 (08:40 +1100)]
Merge pull request #15882 from demeritcowboy/audit-timeline

dev/core#1366 - Make case activity audit print report work again

4 years agoMerge pull request #15965 from colemanw/ufMatchTest
Seamus Lee [Tue, 26 Nov 2019 20:14:30 +0000 (07:14 +1100)]
Merge pull request #15965 from colemanw/ufMatchTest

Fix potential test glitch when repeatedly calling createLoggedInUser

4 years agoFix potential test glitch when repeatedly calling createLoggedInUser
Coleman Watts [Tue, 26 Nov 2019 18:58:07 +0000 (13:58 -0500)]
Fix potential test glitch when repeatedly calling createLoggedInUser

4 years agoMerge pull request #15960 from eileenmcnaughton/ex_param
Seamus Lee [Tue, 26 Nov 2019 08:25:16 +0000 (19:25 +1100)]
Merge pull request #15960 from eileenmcnaughton/ex_param

[REF] Remove unused parameter

4 years agoMerge pull request #15958 from civicrm/5.20
Eileen McNaughton [Mon, 25 Nov 2019 23:13:14 +0000 (12:13 +1300)]
Merge pull request #15958 from civicrm/5.20

5.20

4 years agoRemove unused parameter
eileen [Mon, 25 Nov 2019 03:46:59 +0000 (16:46 +1300)]
Remove unused parameter

This parameter is always TRUE so it adds no value, removing

4 years agoMerge pull request #15939 from demeritcowboy/xml-file-status-check-520
Eileen McNaughton [Mon, 25 Nov 2019 21:29:50 +0000 (10:29 +1300)]
Merge pull request #15939 from demeritcowboy/xml-file-status-check-520

dev/core#1046 Status check for external case xml files

4 years agoMerge pull request #15953 from eileenmcnaughton/export_bom2
colemanw [Mon, 25 Nov 2019 20:54:51 +0000 (15:54 -0500)]
Merge pull request #15953 from eileenmcnaughton/export_bom2

Remove unused parameter

4 years agoMerge pull request #15952 from eileenmcnaughton/ps_ex
Seamus Lee [Mon, 25 Nov 2019 20:22:14 +0000 (07:22 +1100)]
Merge pull request #15952 from eileenmcnaughton/ps_ex

Fix deprecation warning on Price Set report

4 years agoMerge pull request #15947 from eileenmcnaughton/act
Seamus Lee [Mon, 25 Nov 2019 19:55:01 +0000 (06:55 +1100)]
Merge pull request #15947 from eileenmcnaughton/act

Rename activity search field from status_id to activity_status_id

4 years agoMerge pull request #15954 from eileenmcnaughton/ex_silly
Mathieu Lu [Mon, 25 Nov 2019 19:54:42 +0000 (14:54 -0500)]
Merge pull request #15954 from eileenmcnaughton/ex_silly

[REF] CSV Export: Remove impossible checks on  var

4 years agostatus check for external case xml files
DemeritCowboy [Sat, 23 Nov 2019 20:30:02 +0000 (15:30 -0500)]
status check for external case xml files

4 years agoMerge pull request #15955 from JMAConsulting/core-1420
colemanw [Mon, 25 Nov 2019 14:51:45 +0000 (09:51 -0500)]
Merge pull request #15955 from JMAConsulting/core-1420

core#1420 Quicksearch with phone filter doesn't work with non-numeric character

4 years agoMerge pull request #15956 from colemanw/removeFn
colemanw [Mon, 25 Nov 2019 14:49:23 +0000 (09:49 -0500)]
Merge pull request #15956 from colemanw/removeFn

Remove unused functions

4 years agoMerge pull request #15861 from JMAConsulting/core-1398
colemanw [Mon, 25 Nov 2019 14:47:43 +0000 (09:47 -0500)]
Merge pull request #15861 from JMAConsulting/core-1398

core#1398: Option to open navigation item in new window (if present)

4 years agoMerge pull request #15734 from seamuslee001/remove_activity_option_join_custom_search
Yashodha Chaku [Mon, 25 Nov 2019 12:42:53 +0000 (18:12 +0530)]
Merge pull request #15734 from seamuslee001/remove_activity_option_join_custom_search

Remove join to civicrm_option_value in favour of using getLabel funct…

4 years agoRemove unused functions
Coleman Watts [Mon, 25 Nov 2019 12:36:15 +0000 (07:36 -0500)]
Remove unused functions

These functions are no longer needed now that KAM is merged into core.

4 years agocore#1398: Option to open navigation item in new window (if present)
Monish Deb [Fri, 15 Nov 2019 14:18:14 +0000 (19:48 +0530)]
core#1398: Option to open navigation item in new window (if present)

4 years agocore#1420 Quicksearch with phone filter doesn't work with non-numeric character
Monish Deb [Mon, 25 Nov 2019 09:01:23 +0000 (14:31 +0530)]
core#1420 Quicksearch with phone filter doesn't work with non-numeric character

4 years agoMerge pull request #15950 from eileenmcnaughton/export_ref
Monish Deb [Mon, 25 Nov 2019 07:03:57 +0000 (12:33 +0530)]
Merge pull request #15950 from eileenmcnaughton/export_ref

[REF] Further cleanup on address handling in merge code.

4 years agoMerge pull request #15928 from seamuslee001/case_advanced_search
Monish Deb [Mon, 25 Nov 2019 05:16:20 +0000 (10:46 +0530)]
Merge pull request #15928 from seamuslee001/case_advanced_search

Enable Case search metadata on Advanced Search Form

4 years ago[REF] Remove checks on var
eileen [Mon, 25 Nov 2019 04:30:20 +0000 (17:30 +1300)]
[REF] Remove checks on  var

This variable is hard-coded to a double quote so checks to see if it is a single quote will never be true.

I've checked this pretty thoroughly & I think the removed IFs are dead code

4 years agoMerge pull request #15941 from seamuslee001/dev_core_560_sms
Eileen McNaughton [Mon, 25 Nov 2019 03:39:16 +0000 (16:39 +1300)]
Merge pull request #15941 from seamuslee001/dev_core_560_sms

dev/core#560 Replace instances of CRM_Core_Error::fatal with Exceptio…

4 years agoRemove unused parameter
eileen [Mon, 25 Nov 2019 03:06:08 +0000 (16:06 +1300)]
Remove unused parameter

There are 3 calls to writeCSVFile - none of them pass in saveFile so it can be removed

4 years agoFix deprecation warning on Price Set report
eileen [Mon, 25 Nov 2019 02:59:12 +0000 (15:59 +1300)]
Fix deprecation warning on Price Set report

In 5.20 we added a deprecation warning on searches that are borked WRT filling the prev_next
cache & hence doing searches. The price set search falls into this camp & while it has
been broken forever the deprecation notice is new (& the fix is safe) so targettin 5.20

4 years agoAdd deprecation warning.
eileen [Mon, 25 Nov 2019 02:50:38 +0000 (15:50 +1300)]
Add deprecation warning.

On digging into this export function I cannot find any way to access these lines.

If no-one else can spot a way I propose adding a deprecation notice & later removing

4 years agoEnable Case search metadata on Advanced Search Form
Seamus Lee [Fri, 22 Nov 2019 08:54:02 +0000 (19:54 +1100)]
Enable Case search metadata on Advanced Search Form

4 years ago[REF] Further cleanup on address handling in merge code.
eileen [Mon, 25 Nov 2019 01:47:21 +0000 (14:47 +1300)]
[REF] Further cleanup on address handling in merge code.

This is a follow on from https://github.com/civicrm/civicrm-core/pull/15949

This doesn't make any change - it just improves legibility

4 years agodev/core#560 Replace instances of CRM_Core_Error::fatal with Exceptions or Status...
Seamus Lee [Sat, 23 Nov 2019 21:52:04 +0000 (08:52 +1100)]
dev/core#560 Replace instances of CRM_Core_Error::fatal with Exceptions or Status bounces in SMS processing and appropriately handle error after

4 years agoMerge pull request #15949 from eileenmcnaughton/export_ref
Eileen McNaughton [Mon, 25 Nov 2019 01:39:23 +0000 (14:39 +1300)]
Merge pull request #15949 from eileenmcnaughton/export_ref

[REF] Minor code cleanup on the setting of contact greetings.

4 years agoMerge pull request #15944 from magnolia61/Sort_CMS_tables_alphabetically
Eileen McNaughton [Mon, 25 Nov 2019 00:55:34 +0000 (13:55 +1300)]
Merge pull request #15944 from magnolia61/Sort_CMS_tables_alphabetically

Sort CMS Database Table list

4 years agoMerge pull request #15943 from seamuslee001/sort_arrow_activity_search
Eileen McNaughton [Mon, 25 Nov 2019 00:15:50 +0000 (13:15 +1300)]
Merge pull request #15943 from seamuslee001/sort_arrow_activity_search

[UI] Ensure that when sorting on columns in the find activity search …

4 years ago[REF] Minor code cleanup on the setting of contact greetings.
eileen [Sun, 24 Nov 2019 23:49:04 +0000 (12:49 +1300)]
[REF] Minor code cleanup on the setting of contact greetings.

I'm trying to review https://github.com/civicrm/civicrm-core/pull/15725 but through no fault of that PR it hits
on one of the parts of the Export code that I still find unreadable :-( This is a further readability fix & it
starts to point me to how to get past the underlying WTF about this code.

Note that I removed the IF around sharedAddress. From Monish's PR I found out that we have a
fairly long-standing regression where the sharedAddress code doesn't actually work :-( so
I'm comfortable this won't break anything :-). We also have good test cover on this chunk from
probably around when the shared address part got broken....

Looking in the UI there is no implication that the greeting for a shared address would display differently -
which is the only explanation I can think of for different handling here. Of course until we
remove the later IF the shared address would do things differently - erm if it worked.

ALl of which is a long way of saying the removal of the IF won't change anything

4 years agoRename activity search field from status_id to activity_status_id
eileen [Sun, 24 Nov 2019 22:04:09 +0000 (11:04 +1300)]
Rename activity search field from status_id to activity_status_id

Currently this is on the form as 'status_id' but as soon as it's submitted the value is renamed - I think
we might not even need to change the smart group for this one.

The other field that is being renamed is 'priority_id'. Unless we have an appetite to
add a uniqueName for this field (which I kind of feel like not doing more of for some
cycles), I think we could stop renaming it & rely on the default where handling for the
where clause. From what I can see the reason for prefixing is not about
uniqueness but rather about adding a prefix so it gets handled by
Activity_BAO_Query - but in fact Contact_BAO_Query should handle it just fine
based on metadata

4 years agoSort CMS Database Table list
magnolia61 [Sun, 24 Nov 2019 08:04:19 +0000 (09:04 +0100)]
Sort CMS Database Table list

4 years ago[UI] Ensure that when sorting on columns in the find activity search the arrow shows...
Seamus Lee [Sun, 24 Nov 2019 03:26:35 +0000 (14:26 +1100)]
[UI] Ensure that when sorting on columns in the find activity search the arrow shows which field is being sorted and direction

4 years agoStandardise the Grant Search form handling
Seamus Lee [Fri, 22 Nov 2019 20:35:34 +0000 (07:35 +1100)]
Standardise the Grant Search form handling

4 years agoMerge pull request #15930 from seamuslee001/standardise_pledge_search
Seamus Lee [Sat, 23 Nov 2019 23:37:33 +0000 (10:37 +1100)]
Merge pull request #15930 from seamuslee001/standardise_pledge_search

[REF] Standardise form handling in the Find Pledges search form

4 years agoMerge pull request #15936 from seamuslee001/advanced_search_metadata
Eileen McNaughton [Sat, 23 Nov 2019 03:27:54 +0000 (16:27 +1300)]
Merge pull request #15936 from seamuslee001/advanced_search_metadata

Include Metadata on advanced search form for membership, grant, pledg…

4 years agoMerge pull request #15938 from civicrm/5.20
Seamus Lee [Sat, 23 Nov 2019 02:36:38 +0000 (13:36 +1100)]
Merge pull request #15938 from civicrm/5.20

5.20

4 years agoMerge pull request #15935 from seamuslee001/case_id_search_field
Seamus Lee [Sat, 23 Nov 2019 00:37:18 +0000 (11:37 +1100)]
Merge pull request #15935 from seamuslee001/case_id_search_field

Reinstate Case ID search field

4 years agoReinstate Case ID search field
Seamus Lee [Fri, 22 Nov 2019 21:53:57 +0000 (08:53 +1100)]
Reinstate Case ID search field

4 years agoMerge pull request #15934 from eileenmcnaughton/part_sane
Seamus Lee [Fri, 22 Nov 2019 22:30:48 +0000 (09:30 +1100)]
Merge pull request #15934 from eileenmcnaughton/part_sane

[REF] return determination of whether to show expired fields to the calling function

4 years agoInclude Metadata on advanced search form for membership, grant, pledge, fields
Seamus Lee [Fri, 22 Nov 2019 20:41:35 +0000 (07:41 +1100)]
Include Metadata on advanced search form for membership, grant, pledge, fields

4 years agoMerge pull request #15933 from civicrm/5.20
Seamus Lee [Fri, 22 Nov 2019 22:04:36 +0000 (09:04 +1100)]
Merge pull request #15933 from civicrm/5.20

5.20

4 years ago[REF] return determination of whether to show expired fields to the calling function
eileen [Fri, 22 Nov 2019 21:01:24 +0000 (10:01 +1300)]
[REF] return determination of whether to show expired fields to the calling function

As part of my efforts to ensure we are consistency creating valid transactions I'm trying to sort out the way we calculate
amounts to be re-usable from tests but I feel stymied at every turn by spaghetti code.

This unravels a small piece

4 years agoMerge pull request #15929 from christianwach/lab-1412
Seamus Lee [Fri, 22 Nov 2019 20:40:30 +0000 (07:40 +1100)]
Merge pull request #15929 from christianwach/lab-1412

Reinstate traversal as "method of last resort" to find WordPress

4 years ago[REF] Standardise form handling in the Find Pledges search form
Seamus Lee [Fri, 22 Nov 2019 20:35:24 +0000 (07:35 +1100)]
[REF] Standardise form handling in the Find Pledges search form

4 years agoReinstate traversal as "method of last resort" to find WordPress
Christian Wach [Fri, 22 Nov 2019 18:05:49 +0000 (18:05 +0000)]
Reinstate traversal as "method of last resort" to find WordPress

4 years agoMerge pull request #15847 from artfulrobot/opaque-menu
colemanw [Fri, 22 Nov 2019 16:19:22 +0000 (11:19 -0500)]
Merge pull request #15847 from artfulrobot/opaque-menu

Remove background opacity in menus; improving accessibility/readability

4 years agodev/core#1384 Joomla: fix JPATH_BASE when using a virtual directory on Windows (...
Stephen Palmstrom [Fri, 22 Nov 2019 15:42:10 +0000 (15:42 +0000)]
dev/core#1384 Joomla: fix JPATH_BASE when using a virtual directory on Windows (#15915)

4 years agoMerge pull request #15907 from eileenmcnaughton/ex
Mathieu Lu [Fri, 22 Nov 2019 15:10:55 +0000 (10:10 -0500)]
Merge pull request #15907 from eileenmcnaughton/ex

[NFC] [Test] Minor test cleanup on CiviMailUtils

4 years agoMerge pull request #15924 from seamuslee001/dev_core_1414
Seamus Lee [Fri, 22 Nov 2019 02:42:24 +0000 (13:42 +1100)]
Merge pull request #15924 from seamuslee001/dev_core_1414

dev/core#1414 Fix E-notices on the lack of an html key in the psudo m…

4 years agoMerge pull request #15921 from civicrm/5.20
Eileen McNaughton [Fri, 22 Nov 2019 02:27:15 +0000 (15:27 +1300)]
Merge pull request #15921 from civicrm/5.20

5.20

4 years agoMerge pull request #15816 from MiyaNoctem/dev-core-1383-fix-reinstallation-of-extensi...
Eileen McNaughton [Fri, 22 Nov 2019 02:26:30 +0000 (15:26 +1300)]
Merge pull request #15816 from MiyaNoctem/dev-core-1383-fix-reinstallation-of-extensions-with-logging

dev/core#1383: Fix Re-Installation of Extensions With Logging Enabled

4 years agoMerge pull request #15920 from seamuslee001/dev_core_1410
Seamus Lee [Fri, 22 Nov 2019 01:44:29 +0000 (12:44 +1100)]
Merge pull request #15920 from seamuslee001/dev_core_1410

dev/core#1410 Fix E-notice when doin a force case search with a prede…

4 years agodev/core#1414 Fix E-notices on the lack of an html key in the psudo metadata for...
Seamus Lee [Fri, 22 Nov 2019 01:02:54 +0000 (12:02 +1100)]
dev/core#1414 Fix E-notices on the lack of an html key in the psudo metadata for these psudofields

4 years agodev/core#1410 Fix E-notice when doin a force case search with a predefined case subje...
Seamus Lee [Thu, 21 Nov 2019 20:40:39 +0000 (07:40 +1100)]
dev/core#1410 Fix E-notice when doin a force case search with a predefined case subject field

4 years agoMerge pull request #15919 from kcristiano/5.20-1412
Seamus Lee [Thu, 21 Nov 2019 23:31:40 +0000 (10:31 +1100)]
Merge pull request #15919 from kcristiano/5.20-1412

dev/core/1412  CiviMail sent via wp-cli and cron mangles mailing urls…

4 years agoMerge pull request #15922 from totten/5.20-e2e-cli
Seamus Lee [Thu, 21 Nov 2019 23:31:18 +0000 (10:31 +1100)]
Merge pull request #15922 from totten/5.20-e2e-cli

(dev/core#1412) E2E - Add test case for path+URL construction in CLI

4 years ago(dev/core#1412) E2E - Add test case for path+URL construction in CLI
Tim Otten [Thu, 21 Nov 2019 21:58:38 +0000 (13:58 -0800)]
(dev/core#1412) E2E - Add test case for path+URL construction in CLI

Overview
--------

In dev/core#1412, the regression involved CLI processes producing incorrect URLs.
This adds some test-coverage.

Before
------

No test coverage for URLs in CLI environment.

After
-----

There is some test-coverage. It's able to reveal the existence of the bug from 1412.

Comments
--------

A lot of path/URL construction is dependent on the environment/site-build.
The test does not, on its own, guarantee that all environments work.
Rather, it adds a new slice of cheese to the stack.

This slice is moderately generic - in that I've successfully tested it
localy on `drupal-demo` and `wp-demo` builds.  In theory, it should work on
other build types (as long as they set variables `CIVI_CORE`, `CMS_ROOT`,
`CMS_URL`).

4 years agoMerge pull request #15918 from MegaphoneJon/core-1411-rc
Seamus Lee [Thu, 21 Nov 2019 21:58:21 +0000 (08:58 +1100)]
Merge pull request #15918 from MegaphoneJon/core-1411-rc

core#1411: Advanced Search crashes when some form values start with 1

4 years agoMerge pull request #15905 from eileenmcnaughton/test_good
Seamus Lee [Thu, 21 Nov 2019 20:23:09 +0000 (07:23 +1100)]
Merge pull request #15905 from eileenmcnaughton/test_good

Fix CRM_Contribute_BAO_ContributionTest to no longer use unreliable legacy set up method

4 years agodev/core/1412 CiviMail sent via wp-cli and cron mangles mailing urls on WP
Kevin Cristiano [Thu, 21 Nov 2019 20:12:01 +0000 (15:12 -0500)]
dev/core/1412  CiviMail sent via wp-cli and cron mangles mailing urls on WP

4 years agocore#1411: Advanced Search crashes when some form values start with 1
Jon Goldberg [Thu, 21 Nov 2019 18:32:56 +0000 (13:32 -0500)]
core#1411: Advanced Search crashes when some form values start with 1

4 years agoMerge pull request #15916 from civicrm/5.20
Eileen McNaughton [Thu, 21 Nov 2019 19:08:59 +0000 (08:08 +1300)]
Merge pull request #15916 from civicrm/5.20

5.20 to master

4 years agoMerge pull request #15899 from greenpeace-cee/fix-ambiguous-order-column
Eileen McNaughton [Thu, 21 Nov 2019 19:08:32 +0000 (08:08 +1300)]
Merge pull request #15899 from greenpeace-cee/fix-ambiguous-order-column

Fix ambiguous column in search with ORDER BY

4 years agoMerge pull request #15906 from eileenmcnaughton/odd
Yashodha Chaku [Thu, 21 Nov 2019 13:19:26 +0000 (18:49 +0530)]
Merge pull request #15906 from eileenmcnaughton/odd

[Test] Remove hard coded it reference

4 years agodev/core#1383: Fix Re-Installation of Extensions With Logging Enabled
Camilo Rodriguez [Mon, 11 Nov 2019 16:00:30 +0000 (16:00 +0000)]
dev/core#1383: Fix Re-Installation of Extensions With Logging Enabled

When uninstalling an extension, logging tables associated to custom groups and
fields will not be deleted. On re-installation, addition of custom fields will
cause DB errors to be thrown, as columns existing on logging tables are tried
to be created again (they already exist on logging tables).

Fixed by checking if the column exists on log table before trying to create
it, treating it as a modification of the schema if it exists.

4 years agoFix api Payment.create to support overpayments
eileen [Thu, 21 Nov 2019 10:12:00 +0000 (23:12 +1300)]
Fix api Payment.create to support overpayments

We've discussed this before - it's OK to add a payment to a fully paid contribution because ... life.

When this happens there should be no financial items linked to the over payment

4 years agoFix ambiguous column in search with ORDER BY
Patrick Figel [Wed, 20 Nov 2019 23:47:18 +0000 (00:47 +0100)]
Fix ambiguous column in search with ORDER BY

This fixes an issue where columns whose names are not unique in a
search query cause a DB error when they're used as a sort column.
The issue can be observed in the contribution search when sorting
by contribution status.

The issue is resolved by using the where field of the column spec,
which holds the fully-qualified name of the column.

4 years agoMinor test cleanup on CiviMailUtils
eileen [Thu, 21 Nov 2019 09:09:54 +0000 (22:09 +1300)]
Minor test cleanup on CiviMailUtils

4 years ago[Test] Remove hard coded it reference
eileen [Thu, 21 Nov 2019 08:58:50 +0000 (21:58 +1300)]
[Test] Remove hard coded it reference

Honestly - why isn't this failing already? We only need the contributionID so this works

4 years agoMerge pull request #15904 from eileenmcnaughton/greeting
Eileen McNaughton [Thu, 21 Nov 2019 08:52:58 +0000 (21:52 +1300)]
Merge pull request #15904 from eileenmcnaughton/greeting

Move greeting handling up as it is not paymentValidation dependent

4 years agoFix CRM_Contribute_BAO_ContributionTest to no longer use unreliable legacy set up...
eileen [Thu, 21 Nov 2019 08:39:50 +0000 (21:39 +1300)]
Fix CRM_Contribute_BAO_ContributionTest to no longer use unreliable legacy set up method

The whole partial_amount_to_pay params thing works badly & was actually the cause of other fixes stalling for 6 months.

This is part of an effort to deprecate & eliminate it

4 years agoMove greeting handling up as it is not paymentValidation dependent
eileen [Mon, 29 Jul 2019 03:31:20 +0000 (15:31 +1200)]
Move greeting handling up as it is not paymentValidation dependent

4 years agoMerge pull request #15819 from seamuslee001/dev_core_183_price_set
Seamus Lee [Thu, 21 Nov 2019 07:36:07 +0000 (18:36 +1100)]
Merge pull request #15819 from seamuslee001/dev_core_183_price_set

dev/core#183 Event Price Set Custom Search to using CRM_Utils_SQL_Tem…

4 years agoMerge pull request #15793 from seamuslee001/depreacete_dao_temp_table_name
Seamus Lee [Thu, 21 Nov 2019 07:18:09 +0000 (18:18 +1100)]
Merge pull request #15793 from seamuslee001/depreacete_dao_temp_table_name

dev/core#183 Remove references to and noisly deprecated CRM_Core_DAO::createTempTableName

4 years agoMerge pull request #15792 from seamuslee001/convert_temp_table_creation_campaign_upgrade
Eileen McNaughton [Thu, 21 Nov 2019 07:14:57 +0000 (20:14 +1300)]
Merge pull request #15792 from seamuslee001/convert_temp_table_creation_campaign_upgrade

dev/core#183 Use Standard CRM_Utils_SQL_TempTable builder to create temporary tabl…