Andrew Hunt [Thu, 28 Mar 2019 17:02:37 +0000 (13:02 -0400)]
dev/core#655 contrib detail report: validation for soft credit params
Grouping by soft credit when displaying contributions only used to just
be stupid--now it results in a DB error.
Andrew Hunt [Thu, 28 Mar 2019 16:20:33 +0000 (12:20 -0400)]
dev/core#655 contrib detail report: test total w/ multiple soft credits
Andrew Hunt [Thu, 28 Mar 2019 14:45:05 +0000 (10:45 -0400)]
dev/core#655 contrib detail report: no soft credit join if contribs only
The `contribution_or_soft_value` always has a value, so the soft credit
table was always joined.
Andrew Hunt [Thu, 28 Mar 2019 14:18:05 +0000 (10:18 -0400)]
dev/core#655 Contrib detail report: format amount now that not sum
Andrew Hunt [Wed, 27 Mar 2019 20:18:26 +0000 (16:18 -0400)]
dev/core#655 Contribution detail report: don't sum on total amount
colemanw [Wed, 27 Mar 2019 16:39:29 +0000 (12:39 -0400)]
Merge pull request #13896 from eileenmcnaughton/ar
[NFC] IDE formatting only
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
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
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
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.
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)
Eileen McNaughton [Wed, 27 Mar 2019 02:23:04 +0000 (15:23 +1300)]
Merge pull request #13894 from civicrm/5.12
5.12
eileen [Wed, 27 Mar 2019 02:20:35 +0000 (15:20 +1300)]
Array formatting
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
Coleman Watts [Tue, 26 Mar 2019 14:16:11 +0000 (10:16 -0400)]
dev/core#821 - Fix entityRef filter value selection
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()
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'
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
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
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
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
Pradeep Nayak [Mon, 25 Mar 2019 12:28:42 +0000 (12:28 +0000)]
Added unit test for dev/core/issues/726
Pradeep Nayak [Mon, 25 Mar 2019 10:45:32 +0000 (10:45 +0000)]
dev/core/issues/709, fixed date filter for custom fields
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
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
eileen [Mon, 25 Mar 2019 08:02:48 +0000 (21:02 +1300)]
Remove switch statement that no longer switches
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
eileen [Mon, 25 Mar 2019 02:17:16 +0000 (15:17 +1300)]
Use label not name for payment processor type
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
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
demeritcowboy [Tue, 19 Mar 2019 22:17:28 +0000 (18:17 -0400)]
remove unneeded var
DemeritCowboy [Thu, 7 Mar 2019 15:36:12 +0000 (10:36 -0500)]
dev/core#784
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
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
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
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
Andrew Hunt [Fri, 22 Mar 2019 17:26:38 +0000 (13:26 -0400)]
Grant detail report tidy up display
Andrew Hunt [Fri, 22 Mar 2019 17:12:27 +0000 (13:12 -0400)]
Grant detail report: drop redundant where() and select()
Andrew Hunt [Fri, 22 Mar 2019 17:09:56 +0000 (13:09 -0400)]
Grant detail report standardize from(), add phone, email and custom
Andrew Hunt [Fri, 22 Mar 2019 16:54:13 +0000 (12:54 -0400)]
Grant detail report use getColumns, allow order by
Andrew Hunt [Fri, 22 Mar 2019 16:53:04 +0000 (12:53 -0400)]
Grant detail groupBy() redundant, did ORDER BY, treated string as array
Eileen McNaughton [Fri, 22 Mar 2019 12:37:21 +0000 (01:37 +1300)]
Merge pull request #13882 from civicrm/5.12
5.12 to master
Eileen McNaughton [Fri, 22 Mar 2019 12:37:00 +0000 (01:37 +1300)]
Merge pull request #13881 from jitendrapurohit/core-812-rc
dev/core#812 - Fix null display of contribution row on …
colemanw [Fri, 22 Mar 2019 11:08:12 +0000 (07:08 -0400)]
Merge pull request #13798 from eileenmcnaughton/contribution_validate
Improve ContributionPage.validate api
Jitendra Purohit [Fri, 22 Mar 2019 09:54:47 +0000 (15:24 +0530)]
dev/core#812 - RC equivalent for null display of contribution row on contact summary page
Eileen McNaughton [Fri, 22 Mar 2019 09:29:30 +0000 (22:29 +1300)]
Merge pull request #13872 from seamuslee001/composer_2_0_compatability
Fix up composer for composer 2.0 compatibility
Eileen McNaughton [Fri, 22 Mar 2019 09:29:01 +0000 (22:29 +1300)]
Merge pull request #13880 from eileenmcnaughton/temp_repeat
Use TempTable methods.
Seamus Lee [Fri, 22 Mar 2019 08:12:01 +0000 (19:12 +1100)]
Merge pull request #13878 from eileenmcnaughton/test_fix
[nfc] Reset entire session object between tests
Eileen McNaughton [Fri, 22 Mar 2019 02:35:22 +0000 (15:35 +1300)]
Merge pull request #13877 from eileenmcnaughton/import_count
Fix php 7.2 count notice
mark burdett [Thu, 14 Mar 2019 23:42:46 +0000 (16:42 -0700)]
Use TempTable methods.
Eileen McNaughton [Fri, 22 Mar 2019 00:21:25 +0000 (13:21 +1300)]
Merge pull request #13879 from civicrm/5.12
5.12 to master
Eileen McNaughton [Fri, 22 Mar 2019 00:18:26 +0000 (13:18 +1300)]
Merge pull request #13541 from compucorp/case-activity-assigmt-restriction
dev/core#641: Case Activity Assignment Restriction
Eileen McNaughton [Fri, 22 Mar 2019 00:18:11 +0000 (13:18 +1300)]
Merge pull request #13876 from colemanw/menuRestore
dev/core#814 Fix menu restore link
eileen [Fri, 22 Mar 2019 00:04:40 +0000 (13:04 +1300)]
Reset entire session object between tests>
#13553 has been struggling with bugs that seem to be leakage of the session object between
tests - this seems like a good place to flush it
eileen [Thu, 21 Mar 2019 23:54:20 +0000 (12:54 +1300)]
Fix php 7.2 count notice
Coleman Watts [Thu, 21 Mar 2019 16:32:56 +0000 (12:32 -0400)]
Fix menu restore link
eileen [Fri, 8 Mar 2019 00:35:06 +0000 (13:35 +1300)]
Allow payment processor to determine the text around 'continue'
This text traditionally depends on the outdated payment processor 'mode' concept. Since the 'right' text depends
on what the payment processor plans to do moving it out to the processor classes makes sense
We could also do the same with 'button'
Eileen McNaughton [Thu, 21 Mar 2019 23:00:18 +0000 (12:00 +1300)]
Merge pull request #13697 from greenpeace-cee/fix-event-search
CRM/Event - Fix participant note search parameter being ignored
Eileen McNaughton [Thu, 21 Mar 2019 19:08:20 +0000 (08:08 +1300)]
Merge pull request #13865 from eileenmcnaughton/dedupe_temp
Use tempTable class in creation of dedupe table.
Eileen McNaughton [Thu, 21 Mar 2019 18:58:25 +0000 (07:58 +1300)]
Merge pull request #13875 from colemanw/BAO_Participant
BAO_Participant - Use default status if not specified for create
colemanw [Thu, 21 Mar 2019 16:53:22 +0000 (12:53 -0400)]
Merge pull request #13874 from eileenmcnaughton/cleanup
Remove now-obsolete additionalFromClause parameter from prepareOrderBy
Coleman Watts [Thu, 21 Mar 2019 15:32:02 +0000 (11:32 -0400)]
BAO_Participant - Use default status if not specified for create
eileen [Thu, 21 Mar 2019 02:09:27 +0000 (15:09 +1300)]
Remove now-obsolete additionalFromClause parameter from prepareOrderBy
Eileen McNaughton [Thu, 21 Mar 2019 02:06:19 +0000 (15:06 +1300)]
Merge pull request #13772 from mattwire/alphabetquery_groupby
dev/core#748 Switch alphabetQuery to use new getSearchSQLParts() function
Seamus Lee [Thu, 21 Mar 2019 01:22:01 +0000 (12:22 +1100)]
Fix up composer for composer2.0 compatability
Eileen McNaughton [Wed, 20 Mar 2019 23:54:58 +0000 (12:54 +1300)]
Merge pull request #13234 from mattwire/checkduplicates_hook
Add hook findDuplicates
colemanw [Wed, 20 Mar 2019 23:18:43 +0000 (19:18 -0400)]
Merge pull request #13862 from eileenmcnaughton/ContactType
Reformat test files for array format
Matthew Wire (MJW Consulting) [Tue, 5 Mar 2019 23:54:43 +0000 (23:54 +0000)]
Switch alphabetQuery to use new getSearchSQLParts() function
Eileen McNaughton [Wed, 20 Mar 2019 21:44:34 +0000 (10:44 +1300)]
Merge pull request #13870 from seamuslee001/re_add_require_once
Try Reverting commit removing require once to see if it fixes the pro…
Seamus Lee [Wed, 20 Mar 2019 21:06:29 +0000 (08:06 +1100)]
Try Reverting commit removing require once to see if it fixes the problem for api4
Eileen McNaughton [Wed, 20 Mar 2019 19:45:40 +0000 (08:45 +1300)]
Merge pull request #13869 from mattwire/paymentprocessorid
Add ID / Test ID for payment processors to list - makes setup of IPNs much easier!
colemanw [Wed, 20 Mar 2019 19:19:10 +0000 (15:19 -0400)]
Merge pull request #13861 from eileenmcnaughton/die_die
As discussed, delete webtests
Matthew Wire (MJW Consulting) [Wed, 20 Mar 2019 12:54:52 +0000 (12:54 +0000)]
Add ID / Test ID for payment processors to list - makes setup of IPNs much easier!
Seamus Lee [Wed, 20 Mar 2019 08:26:17 +0000 (19:26 +1100)]
Merge pull request #13866 from eileenmcnaughton/perm_dedup
Update test to reflect recently merged PR lower permission to access dedupecheck
eileen [Wed, 20 Mar 2019 05:45:32 +0000 (18:45 +1300)]
Update test to reflect recently merged PR lower permission to access dedupecheck
eileen [Wed, 20 Mar 2019 01:28:59 +0000 (14:28 +1300)]
Fix Contact.create calls to respect passed in variables & variables set via hook for sort_name & display_name
This has been applied to Organizations & Households, not Individuals at this stage as that is more complex.
Use case is saving organizations with The so that The is at the end of their sort_name, making it easier to
deal with data entry variations
eileen [Wed, 20 Mar 2019 03:43:08 +0000 (16:43 +1300)]
Use tempTable class in creation of dedupe table.
The is covered by unit tests ContactTest::testDuplicateTest and DedupeFinderTest::testUnsupervisedDupes
There are some others in this file but I focussed on keeping the scope to a single table replacement.
A couple of thoughts
1) I passed the indexes in as 'columns' - works, is tested so we'd know if anything broke it but it feels a bit ug
2) I think it makes sense to add a descontruct on the class to drop the temp tables
3) the longer syntax for referring to the table is a bit wordy - but harmless I guess & reformatting would
help
Eileen McNaughton [Wed, 20 Mar 2019 02:02:37 +0000 (15:02 +1300)]
Merge pull request #13398 from pradpnayak/DedupeBreak
dev/core/issues/570, Check Dedupe fails for limited permission user
Eileen McNaughton [Wed, 20 Mar 2019 01:50:54 +0000 (14:50 +1300)]
Merge pull request #13748 from eileenmcnaughton/search_sort
Fix bug whereby sorting by state province gives an error in search builder
eileen [Wed, 20 Mar 2019 00:47:03 +0000 (13:47 +1300)]
Reformat test files for array format
eileen [Wed, 20 Mar 2019 00:40:44 +0000 (13:40 +1300)]
As discussed, delete webtests
They were extremely hard to maintain when we were maintaining them, now they have been unmaitained so
long that they would take more work to get functional than starting from scratch.
They make grepping harder
Eileen McNaughton [Tue, 19 Mar 2019 23:20:42 +0000 (12:20 +1300)]
Merge pull request #13859 from colemanw/dev/core#811
dev/core#811 - Autocomplete only enabled options
eileen [Sat, 2 Mar 2019 06:41:32 +0000 (19:41 +1300)]
Fix bug whereby sorting by state province gives an error in search builder
Eileen McNaughton [Tue, 19 Mar 2019 20:14:09 +0000 (09:14 +1300)]
Merge pull request #13856 from eileenmcnaughton/test
Test fix
Eileen McNaughton [Tue, 19 Mar 2019 20:11:58 +0000 (09:11 +1300)]
Merge pull request #13860 from alifrumin/patch-2
Fixing formatting of contributors section
Alice Frumin [Tue, 19 Mar 2019 18:51:34 +0000 (14:51 -0400)]
Fixing formatting of contributors section
colemanw [Tue, 19 Mar 2019 18:17:09 +0000 (14:17 -0400)]
Merge pull request #13858 from mlutfy/dev795
dev/core#795 Fix PHP warning when updating a multiselect country field.
Coleman Watts [Tue, 19 Mar 2019 17:18:52 +0000 (13:18 -0400)]
dev/core#811 - Autocomplete only enabled options
Coleman Watts [Tue, 19 Mar 2019 16:50:23 +0000 (12:50 -0400)]
Add fieldset and help for activity assignee setting
Mathieu Lutfy [Tue, 19 Mar 2019 12:45:35 +0000 (08:45 -0400)]
dev/core#795 Fix PHP warning when updating a multiselect country field.
eileen [Tue, 19 Mar 2019 10:11:36 +0000 (23:11 +1300)]
Minor code cleanups around invoicing assignment
Eileen McNaughton [Tue, 19 Mar 2019 09:47:55 +0000 (22:47 +1300)]
Merge pull request #13843 from eileenmcnaughton/trait_online
Add FrontEndPaymentFormTrait to start to share functionality between Event and Contribution forms
eileen [Tue, 19 Mar 2019 03:55:52 +0000 (16:55 +1300)]
Reset REQUEST, GET & POST in main tearDown
I've been noticing tests failing on lines which indicate they were getting variables from these - e.g
CRM_Member_Form_MembershipTest::testSubmitUpdateMembershipFromPartiallyPaid
CiviCRM_API3_Exception: Expected one Contact but found 0
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/api/api.php:45
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/CRM/Contribute/Form/AbstractEditPayment.php:757
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/CRM/Contribute/Form/AbstractEditPayment.php:256
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/CRM/Member/Form.php:153
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/CRM/Member/Form/Membership.php:224
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/tests/phpunit/CRM/Member/Form/MembershipTest.php:832
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/tests/phpunit/CRM/Member/Form/MembershipTest.php:895
/home/jenkins/bknix-dfl/build/core-13854-7x4fu/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:196
/home/jenkins/bknix-dfl/civicrm-buildkit/extern/phpunit5/phpunit5.phar:598
colemanw [Mon, 18 Mar 2019 23:43:10 +0000 (19:43 -0400)]
Merge pull request #13846 from eileenmcnaughton/reformat
[NFC] code formatting only
colemanw [Mon, 18 Mar 2019 23:41:44 +0000 (19:41 -0400)]
Merge pull request #13849 from eileenmcnaughton/reformat_2
[NFC] Code reformatting
colemanw [Mon, 18 Mar 2019 23:40:39 +0000 (19:40 -0400)]
Merge pull request #13768 from eileenmcnaughton/activity_yay
Activity tab performance fix - switch to faster getActivities & getActivitiesCount
Eileen McNaughton [Mon, 18 Mar 2019 22:35:15 +0000 (11:35 +1300)]
Merge pull request #13259 from agh1/disabled-expired-mem
Disabling or deleting Expired status breaks membership status update
Andrew Hunt [Mon, 18 Mar 2019 21:21:06 +0000 (17:21 -0400)]
CiviMember: test renaming `expired` doesn't trip up status update
Eileen McNaughton [Mon, 18 Mar 2019 19:59:20 +0000 (08:59 +1300)]
Merge pull request #13545 from pradpnayak/ContactSubType
"Contact Sub Type" dropdown disappears when fields validation occurs
Tunbola Ogunwande [Thu, 7 Feb 2019 14:34:16 +0000 (15:34 +0100)]
dev/core#641: Implementing Case Activity Assignment Restriction functionality