civicrm-core.git
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 #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 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 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 agoMerge pull request #13882 from civicrm/5.12
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

5 years agoMerge pull request #13881 from jitendrapurohit/core-812-rc
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 …

5 years agoMerge pull request #13798 from eileenmcnaughton/contribution_validate
colemanw [Fri, 22 Mar 2019 11:08:12 +0000 (07:08 -0400)]
Merge pull request #13798 from eileenmcnaughton/contribution_validate

Improve ContributionPage.validate api

5 years agodev/core#812 - RC equivalent for null display of contribution row on contact summary...
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

5 years agoMerge pull request #13872 from seamuslee001/composer_2_0_compatability
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

5 years agoMerge pull request #13880 from eileenmcnaughton/temp_repeat
Eileen McNaughton [Fri, 22 Mar 2019 09:29:01 +0000 (22:29 +1300)]
Merge pull request #13880 from eileenmcnaughton/temp_repeat

Use TempTable methods.

5 years agoMerge pull request #13878 from eileenmcnaughton/test_fix
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

5 years agoMerge pull request #13877 from eileenmcnaughton/import_count
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

5 years agoUse TempTable methods.
mark burdett [Thu, 14 Mar 2019 23:42:46 +0000 (16:42 -0700)]
Use TempTable methods.

5 years agoMerge pull request #13879 from civicrm/5.12
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

5 years agoMerge pull request #13541 from compucorp/case-activity-assigmt-restriction
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

5 years agoMerge pull request #13876 from colemanw/menuRestore
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

5 years agoReset entire session object between tests>
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

5 years agoFix php 7.2 count notice
eileen [Thu, 21 Mar 2019 23:54:20 +0000 (12:54 +1300)]
Fix php 7.2 count notice

5 years agoFix menu restore link
Coleman Watts [Thu, 21 Mar 2019 16:32:56 +0000 (12:32 -0400)]
Fix menu restore link

5 years agoAllow payment processor to determine the text around 'continue'
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'

5 years agoMerge pull request #13697 from greenpeace-cee/fix-event-search
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

5 years agoMerge pull request #13865 from eileenmcnaughton/dedupe_temp
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.

5 years agoMerge pull request #13875 from colemanw/BAO_Participant
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

5 years agoMerge pull request #13874 from eileenmcnaughton/cleanup
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

5 years agoBAO_Participant - Use default status if not specified for create
Coleman Watts [Thu, 21 Mar 2019 15:32:02 +0000 (11:32 -0400)]
BAO_Participant - Use default status if not specified for create

5 years agoRemove now-obsolete additionalFromClause parameter from prepareOrderBy
eileen [Thu, 21 Mar 2019 02:09:27 +0000 (15:09 +1300)]
Remove now-obsolete additionalFromClause parameter from prepareOrderBy

5 years agoMerge pull request #13772 from mattwire/alphabetquery_groupby
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

5 years agoFix up composer for composer2.0 compatability
Seamus Lee [Thu, 21 Mar 2019 01:22:01 +0000 (12:22 +1100)]
Fix up composer for composer2.0 compatability

5 years agoMerge pull request #13234 from mattwire/checkduplicates_hook
Eileen McNaughton [Wed, 20 Mar 2019 23:54:58 +0000 (12:54 +1300)]
Merge pull request #13234 from mattwire/checkduplicates_hook

Add hook findDuplicates

5 years agoMerge pull request #13862 from eileenmcnaughton/ContactType
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

5 years agoSwitch alphabetQuery to use new getSearchSQLParts() function
Matthew Wire (MJW Consulting) [Tue, 5 Mar 2019 23:54:43 +0000 (23:54 +0000)]
Switch alphabetQuery to use new getSearchSQLParts() function

5 years agoMerge pull request #13870 from seamuslee001/re_add_require_once
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…

5 years agoTry Reverting commit removing require once to see if it fixes the problem for api4
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

5 years agoMerge pull request #13869 from mattwire/paymentprocessorid
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!

5 years agoMerge pull request #13861 from eileenmcnaughton/die_die
colemanw [Wed, 20 Mar 2019 19:19:10 +0000 (15:19 -0400)]
Merge pull request #13861 from eileenmcnaughton/die_die

As discussed, delete webtests

5 years agoAdd ID / Test ID for payment processors to list - makes setup of IPNs much easier!
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!

5 years agoMerge pull request #13866 from eileenmcnaughton/perm_dedup
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

5 years agoUpdate 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

5 years agoFix Contact.create calls to respect passed in variables & variables set via hook...
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

5 years agoUse tempTable class in creation of dedupe table.
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

5 years agoMerge pull request #13398 from pradpnayak/DedupeBreak
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

5 years agoMerge pull request #13748 from eileenmcnaughton/search_sort
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

5 years agoReformat test files for array format
eileen [Wed, 20 Mar 2019 00:47:03 +0000 (13:47 +1300)]
Reformat test files for array format

5 years agoAs discussed, delete webtests
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

5 years agoMerge pull request #13859 from colemanw/dev/core#811
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

5 years agoFix bug whereby sorting by state province gives an error in search builder
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

5 years agoMerge pull request #13856 from eileenmcnaughton/test
Eileen McNaughton [Tue, 19 Mar 2019 20:14:09 +0000 (09:14 +1300)]
Merge pull request #13856 from eileenmcnaughton/test

Test fix

5 years agoMerge pull request #13860 from alifrumin/patch-2
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

5 years agoFixing formatting of contributors section
Alice Frumin [Tue, 19 Mar 2019 18:51:34 +0000 (14:51 -0400)]
Fixing formatting of contributors section

5 years agoMerge pull request #13858 from mlutfy/dev795
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.

5 years agodev/core#811 - Autocomplete only enabled options
Coleman Watts [Tue, 19 Mar 2019 17:18:52 +0000 (13:18 -0400)]
dev/core#811 - Autocomplete only enabled options

5 years agoAdd fieldset and help for activity assignee setting
Coleman Watts [Tue, 19 Mar 2019 16:50:23 +0000 (12:50 -0400)]
Add fieldset and help for activity assignee setting

5 years agodev/core#795 Fix PHP warning when updating a multiselect country field.
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.

5 years agoMinor code cleanups around invoicing assignment
eileen [Tue, 19 Mar 2019 10:11:36 +0000 (23:11 +1300)]
Minor code cleanups around invoicing assignment

5 years agoMerge pull request #13843 from eileenmcnaughton/trait_online
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

5 years agoReset REQUEST, GET & POST in main tearDown
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

5 years agoMerge pull request #13846 from eileenmcnaughton/reformat
colemanw [Mon, 18 Mar 2019 23:43:10 +0000 (19:43 -0400)]
Merge pull request #13846 from eileenmcnaughton/reformat

[NFC] code formatting only

5 years agoMerge pull request #13849 from eileenmcnaughton/reformat_2
colemanw [Mon, 18 Mar 2019 23:41:44 +0000 (19:41 -0400)]
Merge pull request #13849 from eileenmcnaughton/reformat_2

[NFC] Code reformatting

5 years agoMerge pull request #13768 from eileenmcnaughton/activity_yay
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

5 years agoMerge pull request #13259 from agh1/disabled-expired-mem
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

5 years agoCiviMember: test renaming `expired` doesn't trip up 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

5 years agoMerge pull request #13545 from pradpnayak/ContactSubType
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

5 years agodev/core#641: Implementing Case Activity Assignment Restriction functionality
Tunbola Ogunwande [Thu, 7 Feb 2019 14:34:16 +0000 (15:34 +0100)]
dev/core#641: Implementing Case Activity Assignment Restriction functionality

5 years agoCiviMember: excluding Expired memberships by name, not label
Andrew Hunt [Mon, 18 Mar 2019 16:03:38 +0000 (12:03 -0400)]
CiviMember: excluding Expired memberships by name, not label

5 years agoDisplay contact sub type always
Pradeep Nayak [Tue, 5 Feb 2019 20:49:28 +0000 (20:49 +0000)]
Display contact sub type always

5 years agoMerge pull request #13851 from eileenmcnaughton/opt
Eileen McNaughton [Mon, 18 Mar 2019 06:14:53 +0000 (19:14 +1300)]
Merge pull request #13851 from eileenmcnaughton/opt

Code cleanup on membership block loop

5 years agoMerge pull request #13795 from kewljuice/issue_788
Eileen McNaughton [Mon, 18 Mar 2019 04:59:28 +0000 (17:59 +1300)]
Merge pull request #13795 from kewljuice/issue_788

refs issue 788 fix Warning: A non-numeric value encountered in ...

5 years agoCode cleanup on membership block loop
Matthew Wire (MJW Consulting) [Mon, 18 Mar 2019 04:44:21 +0000 (17:44 +1300)]
Code cleanup on membership block loop

5 years agoMerge pull request #13742 from jitendrapurohit/core-771
Eileen McNaughton [Mon, 18 Mar 2019 02:46:43 +0000 (15:46 +1300)]
Merge pull request #13742 from jitendrapurohit/core-771

dev/core#771 - Smart group with uf_group_id does not load contacts wi…

5 years agoMerge pull request #13508 from spalmstr/core-688
Eileen McNaughton [Mon, 18 Mar 2019 01:40:50 +0000 (14:40 +1300)]
Merge pull request #13508 from spalmstr/core-688

Core-688 - Contacts - New Email Fix Smarty/plugins/function.crmSettin…

5 years agoUpdate Cancel Billing & update billing to use status bounce rather than fatal
eileen [Mon, 18 Mar 2019 01:21:06 +0000 (14:21 +1300)]
Update Cancel Billing & update billing to use status bounce rather than fatal

Per https://lab.civicrm.org/dev/core/issues/560 we have resolved to get rid of fatal & move
to throwing Exceptions.

However, I'm leaning towards making statusBounces the rules for when we just deem a form inaccessible.

In this case we have 3 paralel forms - cancel, update & a similar update but slightly different just cos.

One does a status bounce - 2 spit out fatals when access not available.

Just looking at Cancel these are the places that still have fatal

- The recurring contribution looks to have been cancelled already
- Required information missing

I'm not sure the value of a fatal as opposed to the gentler statusBounces in either of those cases.

Throwing an exception looks very much like a fatal except
1) it doesn't hurt tests or cli tools as much
2) IF display backtrace is enabled THEN the back trace displays.

so, it's generally better BUT I kinda feel like the only time when it's actually better than a status
bounce is when a bug has occurred (eg. an unexpectedly failed api call) - anything we anticipate
seems like a bounce to me....

5 years agoMerge pull request #13237 from MegaphoneJon/core-571
Eileen McNaughton [Mon, 18 Mar 2019 01:10:30 +0000 (14:10 +1300)]
Merge pull request #13237 from MegaphoneJon/core-571

core#571 - check logged in OR checksum user permissions to edit recur…

5 years agoMerge pull request #13554 from kewljuice/patch-3
Eileen McNaughton [Mon, 18 Mar 2019 00:54:49 +0000 (13:54 +1300)]
Merge pull request #13554 from kewljuice/patch-3

dev/core#706 Edit contribution : wrong decimal separator on total_amount for participant(s)

5 years ago[NFC] Code reformatting
eileen [Mon, 18 Mar 2019 00:03:42 +0000 (13:03 +1300)]
[NFC] Code reformatting

IDE reformat to fix array() vs []

5 years ago[NFC] code formatting only
eileen [Sun, 17 Mar 2019 21:41:41 +0000 (10:41 +1300)]
[NFC] code formatting only

IDE reformatting to fix array formats

5 years agoMerge pull request #13848 from eileenmcnaughton/report_temp2
Eileen McNaughton [Sun, 17 Mar 2019 23:52:51 +0000 (12:52 +1300)]
Merge pull request #13848 from eileenmcnaughton/report_temp2

Use TempTable methods - contribution detail

5 years agoMerge pull request #13462 from greenpeace-cee/alter-indexes
Eileen McNaughton [Sun, 17 Mar 2019 23:50:21 +0000 (12:50 +1300)]
Merge pull request #13462 from greenpeace-cee/alter-indexes

dev/core#664 - CRM/Logging - Add indexes when updating log schema

5 years agodev/core#789 - Bug fix for event reg error when skipping participants (#13800)
Martin [Sun, 17 Mar 2019 23:47:49 +0000 (19:47 -0400)]
dev/core#789 - Bug fix for event reg error when skipping participants (#13800)

5 years agoMerge pull request #13847 from eileenmcnaughton/report_temp
Eileen McNaughton [Sun, 17 Mar 2019 23:06:15 +0000 (12:06 +1300)]
Merge pull request #13847 from eileenmcnaughton/report_temp

Use TempTable methods - bookkeeping report

5 years agoMerge pull request #13603 from pradpnayak/AdvMailin
Eileen McNaughton [Sun, 17 Mar 2019 22:58:51 +0000 (11:58 +1300)]
Merge pull request #13603 from pradpnayak/AdvMailin

dev/core/issues/726, Fixed fatal error when searched using group type

5 years agoUse TempTable methods.
mark burdett [Thu, 14 Mar 2019 23:42:46 +0000 (16:42 -0700)]
Use TempTable methods.

5 years agoUse TempTable methods - bookkeeping report
mark burdett [Sun, 17 Mar 2019 21:54:07 +0000 (10:54 +1300)]
Use TempTable methods - bookkeeping report

5 years agoMerge pull request #13845 from seamuslee001/purify_html_tests
Eileen McNaughton [Sun, 17 Mar 2019 21:42:37 +0000 (10:42 +1300)]
Merge pull request #13845 from seamuslee001/purify_html_tests

Add in tests of purifying HTML output