eileen [Tue, 17 Dec 2019 05:03:33 +0000 (18:03 +1300)]
[NFC] cleanup to declared exceptions, quotes, strict mode.
Eileen McNaughton [Fri, 13 Dec 2019 19:36:41 +0000 (08:36 +1300)]
Merge pull request #16103 from civicrm/5.21
5.21 to master
Eileen McNaughton [Fri, 13 Dec 2019 19:36:09 +0000 (08:36 +1300)]
Merge pull request #16052 from eileenmcnaughton/desc
Fix unreleased regression where processors using getPaymentDescription get a fatal
Yashodha Chaku [Fri, 13 Dec 2019 12:16:49 +0000 (17:46 +0530)]
Merge pull request #16096 from eileenmcnaughton/pf
E notice fix on Price set form
colemanw [Fri, 13 Dec 2019 02:40:23 +0000 (21:40 -0500)]
Merge pull request #16078 from colemanw/snippets
Allow Angular modules to provide dynamic HTML snippets
Tim Otten [Thu, 12 Dec 2019 23:33:07 +0000 (15:33 -0800)]
hook_angularModules - Accept 'partialsCallback' for dynamic partials
This is similar to the antecedent commit which used a field 'snippets' that
contained a list of HTML files and their content. However, this
uses a callback function instead of providing the full HTML content.
This makes it safer to work with the Angular metadata without needing to
load the content of all partials into memory.
eileen [Thu, 12 Dec 2019 21:46:37 +0000 (10:46 +1300)]
E notice fix on Price set form
Seamus Lee [Thu, 12 Dec 2019 20:25:52 +0000 (07:25 +1100)]
Merge pull request #16088 from eileenmcnaughton/paypal_clean
Paypal class cleanup
Matthew Wire [Thu, 12 Dec 2019 17:28:50 +0000 (17:28 +0000)]
Merge pull request #16094 from pradpnayak/ActivityTypeName-Case
dev/core/issues/1470, show labels instead name for activity type
Pradeep Nayak [Thu, 12 Dec 2019 10:43:26 +0000 (10:43 +0000)]
dev/core/issues/1470, show labels instead name for activity type
Seamus Lee [Thu, 12 Dec 2019 04:28:54 +0000 (15:28 +1100)]
Merge pull request #16093 from civicrm/5.21
5.21
Seamus Lee [Thu, 12 Dec 2019 04:28:03 +0000 (15:28 +1100)]
Merge pull request #16092 from seamuslee001/5.21
Fix Release note header
Seamus Lee [Thu, 12 Dec 2019 04:26:28 +0000 (15:26 +1100)]
Fix Release note header
Seamus Lee [Thu, 12 Dec 2019 04:23:21 +0000 (15:23 +1100)]
Merge pull request #16091 from civicrm/5.21
5.21
Seamus Lee [Thu, 12 Dec 2019 03:35:57 +0000 (14:35 +1100)]
Merge pull request #16057 from eileenmcnaughton/act_perm521
dev/core#1444 Permit activities with campaigns on contact tab for con…
Seamus Lee [Thu, 12 Dec 2019 02:01:12 +0000 (13:01 +1100)]
Merge pull request #16090 from seamuslee001/5.21
Add release-notes/5.20.2
Tim Otten [Thu, 12 Dec 2019 01:46:35 +0000 (17:46 -0800)]
Add release-notes/5.20.2
Seamus Lee [Thu, 12 Dec 2019 01:42:32 +0000 (12:42 +1100)]
Merge pull request #16080 from eileenmcnaughton/org_up
Remove unnecessary query when updating org, if no name update.
eileen [Wed, 11 Dec 2019 09:05:08 +0000 (22:05 +1300)]
Remove unnecessary query when updating org, if no name udpate.
This removes an unnecessary query that can be locking at high volume.
The updateCurrentEmployer function sets the organization_name for any related contacts. We don't need to
do this if we are creating the organization for the first time, or updating the organization but not setting (passing in)
organization_name. We can check & avoid in php.
Also we don't need to check for an existing employer_id unless we are dealing with an Individual record. We can
skip that query for Orgs & Households.
These are cheap queries but at high volume can contribute to locks
eileen [Mon, 9 Dec 2019 03:21:35 +0000 (16:21 +1300)]
Fix unreleased regression where processors using getPaymentDescription get a fatal
We added the new property bag in https://github.com/civicrm/civicrm-core/pull/15697 but in the back & forth the
call to the function getDescription was retained but the function was removed. This would leave the
core processor that calls it (Paypal std) with a fatal. The known external processor using it (Omnipay)
also hits a notice because the signature changed ($params became optional). From the Omnipay
pov I think it makes sense just to stop overriding the function - hence I am sneaking a tiny
change into this to make that possible.
Note the doPayment function ensures that propertyBag is set. There is a small chance that an external processor
is fully overriding doPayment AND calling this - that would be the case for Omnipay except I'll remove
the override in conjunction with this - so I've added a few lines to ensure it is set.
Note the test would fail with the changes to Payment_Dummmy & not the changes to Core_Payment so it provides
test cover
Eileen McNaughton [Wed, 11 Dec 2019 22:04:46 +0000 (11:04 +1300)]
Merge pull request #16086 from civicrm/5.21
5.21
Seamus Lee [Wed, 11 Dec 2019 21:33:48 +0000 (08:33 +1100)]
Merge pull request #16087 from seamuslee001/deb_core_1467
dev/core#1467 - Multiple participant registration sends only p1 amoun…
eileen [Wed, 11 Dec 2019 11:00:16 +0000 (00:00 +1300)]
Paypal class cleanup
- remove handling for returned error - this is never returned now
- remove url parameter on invokeApi - this is never passed to it
- throw an exception rather than use a fatal if curl not installed
Seamus Lee [Wed, 11 Dec 2019 19:45:57 +0000 (06:45 +1100)]
dev/core#1467 - Multiple participant registration sends only p1 amount to the processor
Seamus Lee [Wed, 11 Dec 2019 19:20:21 +0000 (06:20 +1100)]
Merge pull request #16072 from eileenmcnaughton/paypal_extract
Code cleanup Update Paypal invokeApi to only throw exceptions.
Seamus Lee [Wed, 11 Dec 2019 19:19:34 +0000 (06:19 +1100)]
Merge pull request #16081 from artfulrobot/payment-property-bag-add-getters
Payment PropertyBag: Add generic getter, setter methods for convenience
Seamus Lee [Wed, 11 Dec 2019 19:17:35 +0000 (06:17 +1100)]
Merge pull request #16083 from artfulrobot/advanced-search-contrib-source-search-dev-core-1468
Fix searching for contribution source in advanced search
Rich Lott / Artful Robot [Wed, 11 Dec 2019 12:38:03 +0000 (12:38 +0000)]
Fix searching for contribution source in advanced search
eileen [Tue, 10 Dec 2019 11:11:41 +0000 (00:11 +1300)]
Update Paypal invokeApi to only throw exceptions.
Currently invokeAPI will return an error for a curl function and throw a processorException for an outcome other than success.
In just about every instance where it is called the Core_Error is converted into an exception anyway - this
can all be cleaned up as a follow up. The exceptions are
doQuery - called by doPayment
doDirectPayment - this is called by doPayment which converts it into an exception. Calling doDirectPayment directly was deprecated in 4.6
createRecurringPayments - called by doExpressCheckout which in already throws exceptions in other scenarios,
updateSubscriptionBillingInfo - we can update the one place that calls this in core as a follow up like https://github.com/civicrm/civicrm-core/pull/15676
However, note that an exception was already thrown in all these places in the more common error scenario of the action not succeeding as opposed
to the rare curl error scenario
Follow ons to consider
1) introduce more nuance into PaymentProcessorExceptions - extend the exception class with PaymentProcessorConfigException, PaymentProcessingException or similar to differentiate
2) remove all the handling for invokeApi to have returned an error object.
3) fix the code that calls updateSubscriptionBillingInfo
4) ensure docs reflect that doPayment should throw an exception. AFAIK we have not yet documented other 'do' functions & I'd prefer to stdise them first
Rich Lott / Artful Robot [Wed, 11 Dec 2019 10:27:56 +0000 (10:27 +0000)]
Payment PropertyBag: Add generic getter, setter methods for convenience
Coleman Watts [Wed, 11 Dec 2019 02:56:50 +0000 (21:56 -0500)]
Allow angular modules to provide dynamic html snippets
Seamus Lee [Wed, 11 Dec 2019 01:09:43 +0000 (12:09 +1100)]
Merge pull request #16077 from civicrm/5.21
5.21
Seamus Lee [Wed, 11 Dec 2019 00:07:08 +0000 (11:07 +1100)]
Merge pull request #16076 from alifrumin/rn5.21
5.21 Release notes: First Pass
Seamus Lee [Wed, 11 Dec 2019 00:07:05 +0000 (11:07 +1100)]
Merge pull request #16075 from seamuslee001/sig_status_bounce
[REF] Convert more petition signature fatals to status bounce
Alice Frumin [Mon, 9 Dec 2019 17:55:42 +0000 (12:55 -0500)]
Release Notes 5.21 - Sorting and Annotating
Eileen McNaughton [Tue, 10 Dec 2019 19:45:10 +0000 (08:45 +1300)]
Merge pull request #16074 from civicrm/5.21
5.21
Seamus Lee [Tue, 10 Dec 2019 18:50:23 +0000 (05:50 +1100)]
[REF] Convert more petition signature fatals to status bounce
Seamus Lee [Tue, 10 Dec 2019 18:42:33 +0000 (05:42 +1100)]
Merge pull request #16067 from eileenmcnaughton/fatal
Swap out fatal for statusBounce for disabled or unpermitted forms
Seamus Lee [Tue, 10 Dec 2019 18:38:34 +0000 (05:38 +1100)]
Merge pull request #16071 from jitendrapurohit/521rc
dev/core#1463 Fix record payment form errors
Jitendra Purohit [Tue, 10 Dec 2019 10:41:43 +0000 (16:11 +0530)]
Fix record payment form errors
Eileen McNaughton [Tue, 10 Dec 2019 10:17:07 +0000 (23:17 +1300)]
Merge pull request #15676 from artfulrobot/handle-exceptions-from-payment-processors
We should give user feedback in case of a Payment Processor Exception
eileen [Tue, 10 Dec 2019 01:02:32 +0000 (14:02 +1300)]
Swap out fatal for statusBounce for disabled or unpermittted forms
I have deliberately left copy editing & translate out of scope & focussed on a specific narrow pattern
Seamus Lee [Tue, 10 Dec 2019 07:29:48 +0000 (18:29 +1100)]
Merge pull request #16070 from civicrm/5.21
5.21
Tim Otten [Tue, 10 Dec 2019 07:28:38 +0000 (23:28 -0800)]
Merge pull request #16069 from seamuslee001/5.21
Add release-notes/5.20.1
Tim Otten [Tue, 10 Dec 2019 07:01:53 +0000 (23:01 -0800)]
Add release-notes/5.20.1
Seamus Lee [Tue, 10 Dec 2019 05:09:30 +0000 (16:09 +1100)]
Merge pull request #16063 from seamuslee001/unit_test_1460
[NFC] Add in unit test for dev/core#1460
Seamus Lee [Tue, 10 Dec 2019 01:02:31 +0000 (12:02 +1100)]
Merge pull request #16066 from civicrm/5.21
5.21
Seamus Lee [Mon, 9 Dec 2019 23:10:24 +0000 (10:10 +1100)]
[NFC] Add in unit test for dev/core#1460
Eileen McNaughton [Mon, 9 Dec 2019 23:19:14 +0000 (12:19 +1300)]
Merge pull request #16060 from artfulrobot/payment-property-bag-add-props
Add extra Payment PropertyBag properties
Eileen McNaughton [Mon, 9 Dec 2019 23:18:59 +0000 (12:18 +1300)]
Merge pull request #16064 from civicrm/5.21
5.21
Seamus Lee [Mon, 9 Dec 2019 23:14:19 +0000 (10:14 +1100)]
Merge pull request #16061 from eileenmcnaughton/cont_hook
dev/core#1460 move post hook to avoid errors with custom fields created in the hook
eileen [Mon, 9 Dec 2019 20:54:15 +0000 (09:54 +1300)]
dev/core#1460 move post hook to avoid errors with custom fields created in the hook
Per dev/core#1460 a fatal error can occur if custom data is created in the post hook. In addition I note it makes sense to
include custom data before the rollback
Seamus Lee [Mon, 9 Dec 2019 20:37:32 +0000 (07:37 +1100)]
Merge pull request #16058 from eileenmcnaughton/mem_js
Fix js error on choosing membership type
Seamus Lee [Mon, 9 Dec 2019 20:27:46 +0000 (07:27 +1100)]
Merge pull request #16056 from eileenmcnaughton/add_part
[REF] Minor simplification on additional_participants checks
Rich Lott / Artful Robot [Mon, 9 Dec 2019 12:52:12 +0000 (12:52 +0000)]
Add extra Payment PropertyBag properties
eileen [Mon, 9 Dec 2019 10:10:37 +0000 (23:10 +1300)]
Fix js error on choosing membership type
I'm seeing a js error when I select a membership type in the back end form. It seems I have recurProcessors assigned
& they have an onChange that calls
buildAutoRenew - which is non existant if the action is not 2. It seems to me that the code is simplest when functions
can be relied on to exist and aree called conditionally - this makes that change, also ensuring 'something' is
assigned for recurProcessors to prevent the error when it's not defined that probably let to the fn being encased in an if
I can't spot any obvious regression cause & perhaps there is something in my config but this might be a regression
eileen [Thu, 5 Dec 2019 02:57:42 +0000 (15:57 +1300)]
dev/core#1444 Permit activities with campaigns on contact tab for contacts without 'administer CiviCampaign'
It seems that if an activity has a campaign it is suppressed from the activity table unless the user has 'administer CiviCampaign'.
This is inconsistent with the code to view the activity - which permits the activity to be viewed but the campaign cannot be edited
It is also inconsistent with activity search behaviour
eileen [Mon, 29 Jul 2019 03:52:19 +0000 (15:52 +1200)]
Minor simplification on additional_participants checks
Eileen McNaughton [Mon, 9 Dec 2019 06:04:28 +0000 (19:04 +1300)]
Merge pull request #16054 from seamuslee001/sort_contact
[REF] Refactor Contact Search form to use standardised getSortID func…
Eileen McNaughton [Mon, 9 Dec 2019 05:20:55 +0000 (18:20 +1300)]
Merge pull request #16053 from seamuslee001/activity_sort
[REF] Refactor Activity Search to use parent getSortID function
Eileen McNaughton [Mon, 9 Dec 2019 05:20:40 +0000 (18:20 +1300)]
Merge pull request #16055 from seamuslee001/campaign_sort
[REF] Refactor Campaign Search form to use standardised getSortID fun…
Seamus Lee [Mon, 9 Dec 2019 03:55:23 +0000 (14:55 +1100)]
[REF] Refactor Campaign Search form to use standardised getSortID function
Seamus Lee [Mon, 9 Dec 2019 03:55:17 +0000 (14:55 +1100)]
[REF] Refactor Contact Search form to use standardised getSortID function
Seamus Lee [Mon, 9 Dec 2019 03:48:15 +0000 (14:48 +1100)]
Merge pull request #16050 from eileenmcnaughton/qf
[NFC] code cleanup
Seamus Lee [Mon, 9 Dec 2019 03:47:55 +0000 (14:47 +1100)]
[REF] Refactor Activity Search to use parent getSortID function
Seamus Lee [Mon, 9 Dec 2019 03:34:38 +0000 (14:34 +1100)]
Merge pull request #15942 from seamuslee001/contact_fields_metadata
Add in searchFieldMetadata for contact_tags, contact_type, group and …
Eileen McNaughton [Mon, 9 Dec 2019 02:36:45 +0000 (15:36 +1300)]
Merge pull request #16051 from civicrm/5.21
5.21
Seamus Lee [Mon, 9 Dec 2019 02:31:38 +0000 (13:31 +1100)]
Merge pull request #15927 from eileenmcnaughton/event_form
[REF] Move wrangling of Front end form contribution param for autoRenew back to form
Seamus Lee [Tue, 26 Nov 2019 19:57:43 +0000 (06:57 +1100)]
Only add in the additional metadata if we are also adding them to the form
Seamus Lee [Sun, 24 Nov 2019 03:20:24 +0000 (14:20 +1100)]
Add in searchFieldMetadata for contact_tags, contact_type, group and deleted_contacts fields for contribute, pledge searches
Seamus Lee [Mon, 9 Dec 2019 02:25:50 +0000 (13:25 +1100)]
Merge pull request #16047 from eileenmcnaughton/521
dev/membership#21 Fix regression causing transfer of membership to another contact if they paid
eileen [Mon, 9 Dec 2019 02:11:04 +0000 (15:11 +1300)]
[NFC] code cleanup
Add some throws statements, fix some double quotes to single, fix some comparisons to strict
Eileen McNaughton [Mon, 9 Dec 2019 01:42:58 +0000 (14:42 +1300)]
Merge pull request #16049 from civicrm/5.21
5.21
Eileen McNaughton [Mon, 9 Dec 2019 01:42:20 +0000 (14:42 +1300)]
Merge pull request #16038 from seamuslee001/proper_event_badge_fix
Proper Fix for dev/core#1422
Seamus Lee [Sun, 8 Dec 2019 23:22:51 +0000 (10:22 +1100)]
Merge pull request #16034 from seamuslee001/dev_core_1449
dev/core#1449 Do not dispatch pre/post hooks during upgrade
Eileen McNaughton [Sun, 8 Dec 2019 22:57:59 +0000 (11:57 +1300)]
Merge pull request #16045 from seamuslee001/nfc_settings_array
[NFC] Add in a unit test of passing an array into the Civi::settings …
eileen [Sun, 8 Dec 2019 22:13:49 +0000 (11:13 +1300)]
dev/membership#21 Fix regression on transferring member to another contact if they paid
Seamus Lee [Fri, 6 Dec 2019 01:34:27 +0000 (12:34 +1100)]
dev/core#1449 Do not dispatch pre and post hooks whilst we are in an upgrade process
Add in code comments to point to new gitlab and reasoning for the change
Seamus Lee [Sun, 8 Dec 2019 21:38:44 +0000 (08:38 +1100)]
Merge pull request #16044 from seamuslee001/remove_deprecated_function
[REF] Replace Deprecated function CRM_Core_BAO_Setting::setItem with …
Seamus Lee [Sun, 8 Dec 2019 20:42:30 +0000 (07:42 +1100)]
[NFC] Add in a unit test of passing an array into the Civi::settings set facade and getting it back
Seamus Lee [Sun, 8 Dec 2019 20:30:28 +0000 (07:30 +1100)]
Merge pull request #16042 from agileware/CIVICRM-1392
Update Smart Group form uses different labels for Group Title and Group Description
Seamus Lee [Sun, 8 Dec 2019 20:29:37 +0000 (07:29 +1100)]
Merge pull request #16043 from agileware/CIVICRM-1391
Update Smart Group form unsets the existing Group Types
Seamus Lee [Sun, 8 Dec 2019 19:46:24 +0000 (06:46 +1100)]
[REF] Replace Deprecated function CRM_Core_BAO_Setting::setItem with the relevant Civi::contactSettings function
Justin Freeman [Sun, 8 Dec 2019 05:28:36 +0000 (16:28 +1100)]
CIVICRM-1391 Update Smart Group form unsets the existing Group Types for the Group
Justin Freeman [Sun, 8 Dec 2019 04:45:52 +0000 (15:45 +1100)]
CIVICRM-1392 - Group, Update Smart Group uses different labels for Group Title and Group Description
Seamus Lee [Sat, 7 Dec 2019 22:05:29 +0000 (09:05 +1100)]
Merge pull request #16040 from civicrm/5.21
5.21
Mathieu Lu [Sat, 7 Dec 2019 17:47:09 +0000 (12:47 -0500)]
Merge pull request #16033 from seamuslee001/dev_core_1447
dev/core#1447 Fix hard fail on upgrade due to duplicate names in the …
Seamus Lee [Fri, 6 Dec 2019 22:25:34 +0000 (09:25 +1100)]
Add in unit test locking in the fix
Seamus Lee [Fri, 6 Dec 2019 21:58:32 +0000 (08:58 +1100)]
Proper Fix for dev/core#1422
Seamus Lee [Fri, 6 Dec 2019 20:40:33 +0000 (07:40 +1100)]
Merge pull request #15975 from eileenmcnaughton/setting
dev/core#1425 More aggressively deprecate old setItem & setOptionValue functions on BAO_Setting
Seamus Lee [Fri, 6 Dec 2019 20:26:04 +0000 (07:26 +1100)]
Merge pull request #16037 from civicrm/5.21
5.21
Seamus Lee [Fri, 6 Dec 2019 20:16:08 +0000 (07:16 +1100)]
Merge pull request #16036 from agh1/5.21.0-releasenotes
5.21.0 release notes: initial run
Andrew Hunt [Fri, 6 Dec 2019 19:33:24 +0000 (14:33 -0500)]
5.20.0 release notes: added boilerplate
Andrew Hunt [Fri, 6 Dec 2019 19:30:35 +0000 (14:30 -0500)]
5.20.0 release notes: raw from script
Rich Lott / Artful Robot [Fri, 6 Dec 2019 16:42:25 +0000 (16:42 +0000)]
Throw and catch PaymentProcessorExceptions and give user feedback
Seamus Lee [Thu, 5 Dec 2019 22:14:56 +0000 (09:14 +1100)]
dev/core#1447 Fix hard fail on upgrade due to duplicate names in the database when trying to fix the option group name
Matthew Wire [Thu, 5 Dec 2019 12:05:09 +0000 (12:05 +0000)]
Merge pull request #16031 from agileware/CIVICRM-1389
Fix typo, Mailign should be Mailing
Justin Freeman [Thu, 5 Dec 2019 10:14:08 +0000 (21:14 +1100)]
CIVICRM-1389 Fix typo, Mailign should be Mailing
colemanw [Wed, 4 Dec 2019 23:38:52 +0000 (18:38 -0500)]
Merge pull request #16006 from demeritcowboy/case-role-manager-api
dev/core#1426 Return correct manager role info during Case api get
CiviCRM [Wed, 4 Dec 2019 22:52:56 +0000 (22:52 +0000)]
Set version to 5.22.alpha1