civicrm-core.git
5 years agodev/core#704 Fix loss of links for recurrings with no payment_processor_id
eileen [Tue, 2 Apr 2019 02:05:59 +0000 (15:05 +1300)]
dev/core#704 Fix loss of links for recurrings with no payment_processor_id

In 5.8 changes were made that remove the cancel links from recurring payments where the payment processor object
doesn't load. This is appropriate for cases where there IS a processor but it's disabled. However, it is not
unknown for sites to import contribution_recur records from elsewhere as data records rather than 'functional
records' & it is appropriate to be able to edit those.

We already have a relevant patter - loading payment processor 0 loads the manual processor
(class is CRM_Core_Manual) which has functionality appropriate to non-automated flows
(also known as the paylater processor).

This PR switches to the function CRM_Contribute_BAO_ContributionRecur::getPaymentProcessorObject
which is a skinny wrapper on CRM_Contribute_BAO_ContributionRecur::getPaymentProcessor - which itself
was not actually called from core prior to this change (we didn't remove it as it was better than
functions in play & hence intended to start using it again). No processor is loaded
for an inactive processor so links do not appear there.

5 years agoMerge pull request #13930 from eileenmcnaughton/recur_cancel_reason
Eileen McNaughton [Mon, 1 Apr 2019 23:20:53 +0000 (12:20 +1300)]
Merge pull request #13930 from eileenmcnaughton/recur_cancel_reason

dev/core#830 Recur cancel reason

5 years agoAdd cancel_reason field
eileen [Mon, 1 Apr 2019 21:39:21 +0000 (10:39 +1300)]
Add cancel_reason field

5 years agoMerge pull request #12583 from omarabuhussein/dev/core#288
Eileen McNaughton [Mon, 1 Apr 2019 21:26:31 +0000 (10:26 +1300)]
Merge pull request #12583 from omarabuhussein/dev/core#288

dev/core#288 : Use the correct membership date for the notification that appear after completing the membership payment in case pre hook is used

5 years agoMerge pull request #13926 from pradpnayak/NoticeErrorProfile
Eileen McNaughton [Mon, 1 Apr 2019 20:36:10 +0000 (09:36 +1300)]
Merge pull request #13926 from pradpnayak/NoticeErrorProfile

dev/core/issues/840, fixed notice error

5 years agoMerge pull request #13854 from eileenmcnaughton/lock
Seamus Lee [Mon, 1 Apr 2019 20:27:43 +0000 (07:27 +1100)]
Merge pull request #13854 from eileenmcnaughton/lock

CRM-18011 improve lock handling for mysql 5.7.5+

5 years agodev/core/issues/840, fixed notice error
Pradeep Nayak [Mon, 1 Apr 2019 11:33:58 +0000 (12:33 +0100)]
dev/core/issues/840, fixed notice error

5 years agoMerge pull request #13924 from eileenmcnaughton/payment_test
Eileen McNaughton [Mon, 1 Apr 2019 06:06:06 +0000 (19:06 +1300)]
Merge pull request #13924 from eileenmcnaughton/payment_test

Payment test cleanup

5 years agoMerge pull request #13919 from seamuslee001/premium_fullfilled_date_conversion
Eileen McNaughton [Mon, 1 Apr 2019 06:05:37 +0000 (19:05 +1300)]
Merge pull request #13919 from seamuslee001/premium_fullfilled_date_conversion

Convert the Fullfilled Date field in preimum section on backoffice co…

5 years agoSimply test, checkPaymentResult adds no value
eileen [Mon, 1 Apr 2019 04:31:21 +0000 (17:31 +1300)]
Simply test, checkPaymentResult adds no value

calling the checkPaymentResult function is actually decreasing readability here as the
simple array comparison is being made to look complex

5 years agoConvert the Fullfilled Date field in preimum section on backoffice contribution from...
Seamus Lee [Fri, 29 Mar 2019 21:13:34 +0000 (08:13 +1100)]
Convert the Fullfilled Date field in preimum section on backoffice contribution from from jcalendar to datepicker

Fix up defaults

5 years agoMerge pull request #13918 from seamuslee001/trxn_date_conversion
Eileen McNaughton [Mon, 1 Apr 2019 01:24:03 +0000 (14:24 +1300)]
Merge pull request #13918 from seamuslee001/trxn_date_conversion

Convert trxn_date field in the Update Pending Status task option from…

5 years agoMerge pull request #13921 from pradpnayak/noticeErrorFix
Eileen McNaughton [Sun, 31 Mar 2019 20:26:54 +0000 (09:26 +1300)]
Merge pull request #13921 from pradpnayak/noticeErrorFix

dev/core/issues/837, Fixed notice error on Contribution Agrreagate custom search.

5 years agoMerge pull request #13922 from colemanw/factory
Eileen McNaughton [Sun, 31 Mar 2019 20:25:34 +0000 (09:25 +1300)]
Merge pull request #13922 from colemanw/factory

[NFC] Cleanup DAO factory classes for code standards

5 years agoMerge pull request #13920 from seamuslee001/lab_core_836
Eileen McNaughton [Sun, 31 Mar 2019 19:14:55 +0000 (08:14 +1300)]
Merge pull request #13920 from seamuslee001/lab_core_836

dev/core#836 Do not track CSS urls when added as link urls

5 years agoMerge pull request #13867 from jitendrapurohit/paypalpro
Eileen McNaughton [Sun, 31 Mar 2019 19:13:16 +0000 (08:13 +1300)]
Merge pull request #13867 from jitendrapurohit/paypalpro

Possible paypal fix to avoid sending 500 errors from ipn triggerred b…

5 years agoFix unit test
Jitendra Purohit [Sun, 31 Mar 2019 16:01:45 +0000 (21:31 +0530)]
Fix unit test

5 years ago[NFC] Cleanup DAO factory classes for code standards
Coleman Watts [Sun, 31 Mar 2019 13:29:28 +0000 (09:29 -0400)]
[NFC] Cleanup DAO factory classes for code standards

5 years agodev/core/issues/837, Fixed notice error on Contribution Agrreagate custom search.
Pradeep Nayak [Sat, 30 Mar 2019 19:14:36 +0000 (19:14 +0000)]
dev/core/issues/837, Fixed notice error on Contribution Agrreagate custom search.

5 years agodev/core#836 Do not track CSS urls when added as link urls
Seamus Lee [Sat, 30 Mar 2019 04:17:27 +0000 (15:17 +1100)]
dev/core#836 Do not track CSS urls when added as link urls

5 years agoFix label of trxn_date field and also fix post processing of trxn_date
Seamus Lee [Sat, 30 Mar 2019 02:42:30 +0000 (13:42 +1100)]
Fix label of trxn_date field and also fix post processing of trxn_date

5 years agoMerge pull request #13917 from seamuslee001/photo_fatal_to_execption
Eileen McNaughton [Fri, 29 Mar 2019 22:14:34 +0000 (11:14 +1300)]
Merge pull request #13917 from seamuslee001/photo_fatal_to_execption

Covert the CRM_Core_Error::fatal calls to exceptions when trying to a…

5 years agoConvert trxn_date field in the Update Pending Status task option from find contributi...
Seamus Lee [Fri, 29 Mar 2019 20:56:00 +0000 (07:56 +1100)]
Convert trxn_date field in the Update Pending Status task option from find contributions to datepicker from jcalendar

5 years agoCovert the CRM_Core_Error::fatal calls to exceptions when trying to access Contact...
Seamus Lee [Fri, 29 Mar 2019 20:48:06 +0000 (07:48 +1100)]
Covert the CRM_Core_Error::fatal calls to exceptions when trying to access Contact Photos

5 years agoMerge pull request #13852 from pradpnayak/RecurringMemIssue
Matthew Wire [Fri, 29 Mar 2019 20:22:53 +0000 (20:22 +0000)]
Merge pull request #13852 from pradpnayak/RecurringMemIssue

dev/core/issues/806, Fixed DB error already exist when recording recurring payment having tax

5 years agoMerge pull request #13895 from eileenmcnaughton/format
colemanw [Fri, 29 Mar 2019 18:35:47 +0000 (14:35 -0400)]
Merge pull request #13895 from eileenmcnaughton/format

Fix mis-formatting of Email greeting id, Address greeting id etc

5 years agoMerge pull request #13910 from seamuslee001/note_no_contact_id
Seamus Lee [Fri, 29 Mar 2019 09:29:25 +0000 (20:29 +1100)]
Merge pull request #13910 from seamuslee001/note_no_contact_id

Do not cause a fatal error if no contact_id field for a note is fille…

5 years agoMerge pull request #13912 from colemanw/shortAng
Seamus Lee [Fri, 29 Mar 2019 09:19:36 +0000 (20:19 +1100)]
Merge pull request #13912 from colemanw/shortAng

NFC - Short array syntax - auto-convert ang dir

5 years agoMerge pull request #13911 from colemanw/shortCivi
Eileen McNaughton [Fri, 29 Mar 2019 07:37:39 +0000 (20:37 +1300)]
Merge pull request #13911 from colemanw/shortCivi

NFC - Short array syntax - auto-convert Civi dir

5 years agoNFC - Short array syntax - auto-convert ang dir
Coleman Watts [Fri, 29 Mar 2019 01:14:10 +0000 (21:14 -0400)]
NFC - Short array syntax - auto-convert ang dir

5 years agoNFC - Short array syntax - auto-convert Civi dir
Coleman Watts [Fri, 29 Mar 2019 01:10:29 +0000 (21:10 -0400)]
NFC - Short array syntax - auto-convert Civi dir

5 years agoMerge pull request #13909 from colemanw/apiShortSyntax
Seamus Lee [Fri, 29 Mar 2019 01:04:55 +0000 (12:04 +1100)]
Merge pull request #13909 from colemanw/apiShortSyntax

[NFC] Short array syntax - auto-convert api dir

5 years agoCRM-18011 improve lock handling for mysql 5.7.5+
eileen [Mon, 26 Feb 2018 02:38:29 +0000 (15:38 +1300)]
CRM-18011 improve lock handling for mysql 5.7.5+

5.7.5+ supports multiple mysql threads in a process. We can be non-hacky once that is in play

5 years agoShort array syntax - auto-convert api dir
Coleman Watts [Thu, 28 Mar 2019 23:47:17 +0000 (19:47 -0400)]
Short array syntax - auto-convert api dir

5 years agoDo not cause a fatal error if no contact_id field for a note is filled in when viewin...
Seamus Lee [Thu, 28 Mar 2019 23:43:23 +0000 (10:43 +1100)]
Do not cause a fatal error if no contact_id field for a note is filled in when viewing contact notes

5 years agoMerge pull request #13908 from eileenmcnaughton/report_filter
Eileen McNaughton [Thu, 28 Mar 2019 23:03:22 +0000 (12:03 +1300)]
Merge pull request #13908 from eileenmcnaughton/report_filter

Add unit test for https://github.com/civicrm/civicrm-core/pull/13158

5 years agoMerge pull request #13698 from mattwire/contributionrecur_payprocid_pseudoconstant
Eileen McNaughton [Thu, 28 Mar 2019 22:49:30 +0000 (11:49 +1300)]
Merge pull request #13698 from mattwire/contributionrecur_payprocid_pseudoconstant

Add pseudoconstant support for payment_processor_id on ContributionRecur

5 years agoMerge pull request #13840 from seamuslee001/htmlpurifier_composer
Eileen McNaughton [Thu, 28 Mar 2019 22:41:55 +0000 (11:41 +1300)]
Merge pull request #13840 from seamuslee001/htmlpurifier_composer

Upgrade htmlpurifier to 4.10 to support PHP7.2 and install via composer

5 years agoMerge pull request #12457 from omarabuhussein/dev/core#253
Eileen McNaughton [Thu, 28 Mar 2019 22:07:59 +0000 (11:07 +1300)]
Merge pull request #12457 from omarabuhussein/dev/core#253

dev/core#253: Cancelling or An Error during event registration payment should cancel all additional participates

5 years agoAdd unit test for https://github.com/civicrm/civicrm-core/pull/13158
eileen [Thu, 28 Mar 2019 21:39:26 +0000 (10:39 +1300)]
Add unit test for https://github.com/civicrm/civicrm-core/pull/13158

5 years agoMerge pull request #13158 from elisseck/dev/core/544
Eileen McNaughton [Thu, 28 Mar 2019 21:38:17 +0000 (10:38 +1300)]
Merge pull request #13158 from elisseck/dev/core/544

dev/core/544 Add report support for filter on multiple contact subtypes

5 years agoAdd pseudoconstant support for payment_processor_id on CRM_Contribute_BAO_Contributio...
Matthew Wire (MJW Consulting) [Mon, 25 Feb 2019 14:41:26 +0000 (14:41 +0000)]
Add pseudoconstant support for payment_processor_id on CRM_Contribute_BAO_ContributionRecur

5 years agoMerge pull request #13873 from eileenmcnaughton/mutliple_activity_types
Eileen McNaughton [Thu, 28 Mar 2019 20:24:27 +0000 (09:24 +1300)]
Merge pull request #13873 from eileenmcnaughton/mutliple_activity_types

Mutliple activity type filters on activity tab on contact records

5 years agoMerge pull request #13819 from mfb/temp-table
Eileen McNaughton [Thu, 28 Mar 2019 20:22:00 +0000 (09:22 +1300)]
Merge pull request #13819 from mfb/temp-table

Use TempTable methods

5 years agoMerge pull request #13900 from greenpeace-cee/fix-get-custom-field
Eileen McNaughton [Thu, 28 Mar 2019 20:03:34 +0000 (09:03 +1300)]
Merge pull request #13900 from greenpeace-cee/fix-get-custom-field

dev/core#755 - CRM/Core - Fix missing group name in custom field cache

5 years ago#829 Swaziland has changed its name to Eswatini (#13902)
lordt [Thu, 28 Mar 2019 19:49:11 +0000 (20:49 +0100)]
#829 Swaziland has changed its name to Eswatini (#13902)

* #829 Swaziland has changed its name to Eswatini

* #829 Swaziland has changed its name to Eswatini

* #829 Swaziland has changed its name to Eswatini

* #829 Swaziland has changed its name to Eswatini

5 years agoSupport a multiple select for activity types to include & exclude
eileen [Thu, 21 Mar 2019 01:22:03 +0000 (14:22 +1300)]
Support a multiple select for activity types to include & exclude

5 years agoMerge pull request #13855 from eileenmcnaughton/activity_date_picker
colemanw [Thu, 28 Mar 2019 13:48:57 +0000 (09:48 -0400)]
Merge pull request #13855 from eileenmcnaughton/activity_date_picker

Convert activity tab to use datepicker

5 years agoMerge pull request #13596 from jackrabbithanna/726-address-api-states
Eileen McNaughton [Thu, 28 Mar 2019 04:53:25 +0000 (17:53 +1300)]
Merge pull request #13596 from jackrabbithanna/726-address-api-states

CiviCRM API, lookup state_province_id options based on country parame…

5 years agoMerge pull request #13904 from eileenmcnaughton/test
Eileen McNaughton [Thu, 28 Mar 2019 00:54:44 +0000 (13:54 +1300)]
Merge pull request #13904 from eileenmcnaughton/test

Add Unit test for export with incomplete data

5 years agoFix api validate of states and improve test
Coleman Watts [Wed, 27 Mar 2019 23:48:00 +0000 (19:48 -0400)]
Fix api validate of states and improve test

5 years agoUpdate test to alter to changed output based on new htmlpurifier
Seamus Lee [Wed, 27 Mar 2019 22:25:31 +0000 (09:25 +1100)]
Update test to alter to changed output based on new htmlpurifier

5 years agoUpdate Config and class loader paths
Seamus Lee [Sun, 17 Mar 2019 19:53:05 +0000 (06:53 +1100)]
Update Config and class loader paths

5 years agoUpgrade htmlpurifier to 4.10 to support PHP7.2 and install via composer
Seamus Lee [Fri, 15 Mar 2019 23:28:16 +0000 (10:28 +1100)]
Upgrade htmlpurifier to 4.10 to support PHP7.2 and install via composer

5 years agodev/core#755 - CRM/Core - Fix missing group name in custom field cache
Patrick Figel [Wed, 27 Mar 2019 20:46:50 +0000 (21:46 +0100)]
dev/core#755 - CRM/Core - Fix missing group name in custom field cache

CRM_Core_BAO_CustomField::getCustomFieldID caches custom fields based
on the field name, meaning if a custom field of the same name exists
in more than one group, the method will always return the first field
that was cached. This change adds the $groupName parameter to the
cache key.

This also adds a missing test for the $fullString parameter and
renames the $groupTitle parameter to $groupName in preparation
for future changes.

5 years agoMerge pull request #13905 from civicrm/5.12
Eileen McNaughton [Wed, 27 Mar 2019 20:13:09 +0000 (09:13 +1300)]
Merge pull request #13905 from civicrm/5.12

5.12 to master

5 years agoMerge pull request #13903 from agh1/userdashcontrib-5-12
Eileen McNaughton [Wed, 27 Mar 2019 20:12:44 +0000 (09:12 +1300)]
Merge pull request #13903 from agh1/userdashcontrib-5-12

Intra-RC regression: User dashboard: show most recent contributions, not earliest

5 years agoAdd Unit test for export with incomplete data
eileen [Wed, 27 Mar 2019 20:03:57 +0000 (09:03 +1300)]
Add Unit test for export with incomplete data

5 years agoMerge pull request #13889 from pradpnayak/ExportBug
Eileen McNaughton [Wed, 27 Mar 2019 20:07:09 +0000 (09:07 +1300)]
Merge pull request #13889 from pradpnayak/ExportBug

dev/core/issues/819, Fixed fatal error on export screen

5 years agoUser dash: adjust test to make sure contributions are chronological
Andrew Hunt [Wed, 27 Mar 2019 17:31:37 +0000 (13:31 -0400)]
User dash: adjust test to make sure contributions are chronological

5 years agoMerge pull request #13864 from eileenmcnaughton/rule_group
Eileen McNaughton [Wed, 27 Mar 2019 17:28:32 +0000 (06:28 +1300)]
Merge pull request #13864 from eileenmcnaughton/rule_group

Expose sort_name as a dedupe-matchable field

5 years agoUser dash: show most recent contributions, not earliest
Andrew Hunt [Wed, 27 Mar 2019 15:43:34 +0000 (11:43 -0400)]
User dash: show most recent contributions, not earliest

5 years agoMerge pull request #13896 from eileenmcnaughton/ar
colemanw [Wed, 27 Mar 2019 16:39:29 +0000 (12:39 -0400)]
Merge pull request #13896 from eileenmcnaughton/ar

[NFC] IDE formatting only

5 years agoMerge pull request #13898 from eileenmcnaughton/merge_summary_2
colemanw [Wed, 27 Mar 2019 14:13:00 +0000 (10:13 -0400)]
Merge pull request #13898 from eileenmcnaughton/merge_summary_2

dev/core#824 Render contact type icons in std way on merge screen

5 years agoMerge pull request #13883 from agh1/grantdetailgroupby
Eileen McNaughton [Wed, 27 Mar 2019 05:34:04 +0000 (18:34 +1300)]
Merge pull request #13883 from agh1/grantdetailgroupby

PHP Error on Grant Detail Report

5 years agoMerge pull request #13892 from aydun/pdf_refactor
Eileen McNaughton [Wed, 27 Mar 2019 05:25:40 +0000 (18:25 +1300)]
Merge pull request #13892 from aydun/pdf_refactor

Refactor CRM_Contact_Form_Task_PDFLetterCommon

5 years agoRender contact type icons in std way on merge screen
eileen [Wed, 27 Mar 2019 04:43:15 +0000 (17:43 +1300)]
Render contact type icons in std way on merge screen

The merge screen currently shows contact types as a row but that is meaningless as we don't currently
permit them to be changed when merging. Rendering as an icon is more consistent with elsewhere
and potentially the hover makes it easy to see salient information about the contact.

5 years agoRationalise summary part of the merge screen.
eileen [Wed, 27 Mar 2019 03:56:02 +0000 (16:56 +1300)]
Rationalise summary part of the merge screen.

This does 3 things
1) reduces contact get queries from 3 to 1 since the 2 in the tpl layer are removed
2) adds created date to the merge summary information
3) makes it easier for extensions to replace/ extend this data (although core makes no
commitment to the tpl remaining unchanged so extension writers need to carry that risk)

5 years agoMerge pull request #13894 from civicrm/5.12
Eileen McNaughton [Wed, 27 Mar 2019 02:23:04 +0000 (15:23 +1300)]
Merge pull request #13894 from civicrm/5.12

5.12

5 years agoArray formatting
eileen [Wed, 27 Mar 2019 02:20:35 +0000 (15:20 +1300)]
Array formatting

5 years agoFix mis-formatting of Email greeting id, Address greeting id etc
eileen [Wed, 27 Mar 2019 02:07:02 +0000 (15:07 +1300)]
Fix mis-formatting of Email greeting id, Address greeting id etc

The formatting was inappropriately relying on the field's title in the IF clause. I added the location_entity to
the row so it would no longer have to guess

5 years agoMerge pull request #13893 from colemanw/dev/core#821
Seamus Lee [Wed, 27 Mar 2019 00:42:19 +0000 (11:42 +1100)]
Merge pull request #13893 from colemanw/dev/core#821

[Regression] dev/core#821 - Fix entityRef filter value selection

5 years agodev/core#821 - Fix entityRef filter value selection
Coleman Watts [Tue, 26 Mar 2019 14:16:11 +0000 (10:16 -0400)]
dev/core#821 - Fix entityRef filter value selection

5 years agoMove some of the content from CRM_Contact_Form_Task_PDFLetterCommon
Aidan Saunders [Tue, 26 Mar 2019 09:29:03 +0000 (09:29 +0000)]
Move some of the content from CRM_Contact_Form_Task_PDFLetterCommon
into a new base class CRM_Core_Form_Task_PDFLetterCommon

Move handling of templates from processMessageTemplate() to processTemplate()

5 years agoMerge pull request #13787 from eileenmcnaughton/label_button
Mathieu Lu [Mon, 25 Mar 2019 22:05:37 +0000 (18:05 -0400)]
Merge pull request #13787 from eileenmcnaughton/label_button

Allow payment processor to determine the text around 'continue'

5 years agoExpose sort_name as a dedupe-matchable field
eileen [Wed, 20 Mar 2019 02:59:09 +0000 (15:59 +1300)]
Expose sort_name as a dedupe-matchable field

This opens up the option of us using a hook to do some standardisation - e.g getting rid of 'The'
in the sort name & it helping with both sorting and with deduping

5 years agoMerge pull request #13863 from eileenmcnaughton/pre_test
colemanw [Mon, 25 Mar 2019 21:04:01 +0000 (17:04 -0400)]
Merge pull request #13863 from eileenmcnaughton/pre_test

Fix Contact.create calls to respect passed in variables & variables set via hook for sort_name & display_name

5 years agoMerge pull request #13857 from eileenmcnaughton/line_item_assignment
Eileen McNaughton [Mon, 25 Mar 2019 20:33:25 +0000 (09:33 +1300)]
Merge pull request #13857 from eileenmcnaughton/line_item_assignment

Minor code cleanups around invoicing assignment

5 years agoMerge pull request #13567 from pradpnayak/DateFilter
Eileen McNaughton [Mon, 25 Mar 2019 19:49:44 +0000 (08:49 +1300)]
Merge pull request #13567 from pradpnayak/DateFilter

dev/core#709, fixed date filter for custom fields

5 years agoMerge pull request #13888 from pradpnayak/AdvMailin
Eileen McNaughton [Mon, 25 Mar 2019 19:33:59 +0000 (08:33 +1300)]
Merge pull request #13888 from pradpnayak/AdvMailin

Added unit test for dev/core/issues/726

5 years agodev/core/issues/819, Fixed fatal error on export screen
Pradeep Nayak [Mon, 25 Mar 2019 13:47:29 +0000 (13:47 +0000)]
dev/core/issues/819, Fixed fatal error on export screen

5 years agoAdded unit test for dev/core/issues/726
Pradeep Nayak [Mon, 25 Mar 2019 12:28:42 +0000 (12:28 +0000)]
Added unit test for dev/core/issues/726

5 years agodev/core/issues/709, fixed date filter for custom fields
Pradeep Nayak [Mon, 25 Mar 2019 10:45:32 +0000 (10:45 +0000)]
dev/core/issues/709, fixed date filter for custom fields

5 years agoMerge pull request #13886 from eileenmcnaughton/clean_fn
Eileen McNaughton [Mon, 25 Mar 2019 09:40:46 +0000 (22:40 +1300)]
Merge pull request #13886 from eileenmcnaughton/clean_fn

Remove switch statement that no longer switches

5 years agoMerge pull request #13885 from eileenmcnaughton/pp
Eileen McNaughton [Mon, 25 Mar 2019 09:31:36 +0000 (22:31 +1300)]
Merge pull request #13885 from eileenmcnaughton/pp

Use label not name for payment processor type

5 years agoRemove switch statement that no longer switches
eileen [Mon, 25 Mar 2019 08:02:48 +0000 (21:02 +1300)]
Remove switch statement that no longer switches

5 years agoMerge pull request #13884 from eileenmcnaughton/search_lastish
Eileen McNaughton [Mon, 25 Mar 2019 07:17:14 +0000 (20:17 +1300)]
Merge pull request #13884 from eileenmcnaughton/search_lastish

dev/core#502 fix bug on sorting by address fields when viewing search results by profile

5 years agoUse label not name for payment processor type
eileen [Mon, 25 Mar 2019 02:17:16 +0000 (15:17 +1300)]
Use label not name for payment processor type

5 years agodev/core#502 fix bug on sorting by address fields when viewing search results by...
eileen [Sun, 24 Mar 2019 23:00:17 +0000 (12:00 +1300)]
dev/core#502 fix bug on sorting by address fields when viewing search results by profile

Fixes a bug whereby a fatal error occurs if you attempt to export contacts after sorting by postal_code from
an search profile

5 years agoMerge pull request #13785 from demeritcowboy/devcore784
Eileen McNaughton [Sun, 24 Mar 2019 20:33:08 +0000 (09:33 +1300)]
Merge pull request #13785 from demeritcowboy/devcore784

dev/core#784 - On civicase case type editing screen creating a new relationship type on the fly inserts a blank row

5 years agoremove unneeded var
demeritcowboy [Tue, 19 Mar 2019 22:17:28 +0000 (18:17 -0400)]
remove unneeded var

5 years agodev/core#784
DemeritCowboy [Thu, 7 Mar 2019 15:36:12 +0000 (10:36 -0500)]
dev/core#784

5 years agoMerge pull request #13640 from pradpnayak/notevalidation
Eileen McNaughton [Sat, 23 Mar 2019 21:19:36 +0000 (10:19 +1300)]
Merge pull request #13640 from pradpnayak/notevalidation

dev/core/issues/740, Show form on validation error

5 years agoMerge pull request #13850 from eileenmcnaughton/bounce
Eileen McNaughton [Sat, 23 Mar 2019 20:51:11 +0000 (09:51 +1300)]
Merge pull request #13850 from eileenmcnaughton/bounce

dev/core#560 Update Cancel Billing & update billing to use status bounce rather than fatal

5 years agoMerge pull request #13068 from alifrumin/formLink
Eileen McNaughton [Sat, 23 Mar 2019 20:49:48 +0000 (09:49 +1300)]
Merge pull request #13068 from alifrumin/formLink

send action links on any page that extends CRM_Core_Page_basic thru hook_civicrm_links

5 years agoMerge pull request #12639 from aniesshsethh/issue_314
Eileen McNaughton [Sat, 23 Mar 2019 20:43:35 +0000 (09:43 +1300)]
Merge pull request #12639 from aniesshsethh/issue_314

dev/core#314 Event self-service Transfer picks up the deleted contact ID basically transferring to the wrong contact

5 years agoGrant detail report tidy up display
Andrew Hunt [Fri, 22 Mar 2019 17:26:38 +0000 (13:26 -0400)]
Grant detail report tidy up display

5 years agoGrant detail report: drop redundant where() and select()
Andrew Hunt [Fri, 22 Mar 2019 17:12:27 +0000 (13:12 -0400)]
Grant detail report: drop redundant where() and select()

5 years agoGrant detail report standardize from(), add phone, email and custom
Andrew Hunt [Fri, 22 Mar 2019 17:09:56 +0000 (13:09 -0400)]
Grant detail report standardize from(), add phone, email and custom

5 years agoGrant detail report use getColumns, allow order by
Andrew Hunt [Fri, 22 Mar 2019 16:54:13 +0000 (12:54 -0400)]
Grant detail report use getColumns, allow order by