civicrm-core.git
4 years agoRemove legacy_redirect_path handling
eileen [Sat, 21 Dec 2019 22:47:12 +0000 (11:47 +1300)]
Remove legacy_redirect_path handling

This has been hanging around for a long time & no-one has logged a JIRA (or pointed out that JIRA is now
defunct) so the initial analysis of it being unreachable makes sense

4 years agoMerge pull request #16125 from eileenmcnaughton/cont_sub
colemanw [Fri, 20 Dec 2019 12:10:15 +0000 (07:10 -0500)]
Merge pull request #16125 from eileenmcnaughton/cont_sub

dev/core#1482 Remove lines of code that appear to relate to legacy logic

4 years agoMerge pull request #16124 from eileenmcnaughton/acl_deadlock
Yashodha Chaku [Fri, 20 Dec 2019 09:21:26 +0000 (14:51 +0530)]
Merge pull request #16124 from eileenmcnaughton/acl_deadlock

Remove function marked as deprecated & unused by core nearly a year ago

4 years agoMerge pull request #16127 from eileenmcnaughton/mem_test
Eileen McNaughton [Fri, 20 Dec 2019 08:00:51 +0000 (21:00 +1300)]
Merge pull request #16127 from eileenmcnaughton/mem_test

Unit test for https://github.com/civicrm/civicrm-core/pull/16120

4 years agoUnit test for https://github.com/civicrm/civicrm-core/pull/16120
eileen [Fri, 20 Dec 2019 05:52:51 +0000 (18:52 +1300)]
Unit test for https://github.com/civicrm/civicrm-core/pull/16120

4 years agoMerge pull request #16126 from civicrm/5.21
Eileen McNaughton [Fri, 20 Dec 2019 05:51:56 +0000 (18:51 +1300)]
Merge pull request #16126 from civicrm/5.21

5.21 to master

4 years agoMerge pull request #16120 from seamuslee001/dev_core_1485
Eileen McNaughton [Fri, 20 Dec 2019 05:51:30 +0000 (18:51 +1300)]
Merge pull request #16120 from seamuslee001/dev_core_1485

dev/core#1485 Fix field name for join_date to be membership_join_date…

4 years agodev/core#1482 Remove lines of code that appear to relate to legacy logic
eileen [Thu, 19 Dec 2019 22:14:38 +0000 (11:14 +1300)]
dev/core#1482 Remove lines of code that appear to relate to legacy logic

As discussed in https://lab.civicrm.org/dev/core/issues/1482 the subscription history table appears to still be used for
recording group history but this business of creating a row with no attached group appears to be from a logic flow that
is long-superceded by change log & db logging

4 years agoMerge pull request #16123 from civicrm/5.21
Eileen McNaughton [Thu, 19 Dec 2019 20:28:47 +0000 (09:28 +1300)]
Merge pull request #16123 from civicrm/5.21

5.21 to master

4 years agoRemove function marked as deprecated & unused by core nearly a year ago
eileen [Thu, 19 Dec 2019 20:27:46 +0000 (09:27 +1300)]
Remove function marked as deprecated & unused by core nearly a year ago

4 years agodev/core#1485 Fix field name for join_date to be membership_join_date in line with...
Seamus Lee [Thu, 19 Dec 2019 03:32:07 +0000 (14:32 +1100)]
dev/core#1485 Fix field name for join_date to be membership_join_date in line with the DAO schema

Also include membership_join_date into the mapping as per Jamie's comments

4 years agoMerge pull request #16121 from mlutfy/core1490-rc
Eileen McNaughton [Thu, 19 Dec 2019 20:18:08 +0000 (09:18 +1300)]
Merge pull request #16121 from mlutfy/core1490-rc

dev/core#1490 Fix syntax error in Membership Receipt

4 years agoMerge pull request #16119 from eileenmcnaughton/acl_deadlock
Eileen McNaughton [Thu, 19 Dec 2019 20:16:10 +0000 (09:16 +1300)]
Merge pull request #16119 from eileenmcnaughton/acl_deadlock

[Ref] Remove php4 support from BAO_Acl class

4 years agodev/core#1490 Fix syntax error in Membership Receipt
Mathieu Lutfy [Thu, 19 Dec 2019 15:21:29 +0000 (10:21 -0500)]
dev/core#1490 Fix syntax error in Membership Receipt

4 years agoRemove php4 support from BAO_Acl class
eileen [Thu, 19 Dec 2019 02:06:22 +0000 (15:06 +1300)]
Remove php4 support from BAO_Acl class

Removes instances of php support involving & in the function signature. In each instance the function is only ever called once
(I think all are internal too) & the calling function doesn't do any weird stuff with references that might make it needed.
Also remove one instance of  unnecessarily passed by ref

4 years agoMerge pull request #15968 from eileenmcnaughton/bom
Seamus Lee [Tue, 17 Dec 2019 19:35:01 +0000 (06:35 +1100)]
Merge pull request #15968 from eileenmcnaughton/bom

dev/core#1424 Support MS Excel for diacritic characters when exporting to csv

4 years agoMerge pull request #15972 from aydun/report#24
Yashodha Chaku [Tue, 17 Dec 2019 09:14:30 +0000 (14:44 +0530)]
Merge pull request #15972 from aydun/report#24

report#24 - Case Detail report - fix 'Active role?' when no relationships

4 years agoMerge pull request #16101 from jitendrapurohit/dev-1474
Yashodha Chaku [Tue, 17 Dec 2019 09:08:46 +0000 (14:38 +0530)]
Merge pull request #16101 from jitendrapurohit/dev-1474

dev/core#1474 - (On Hold) text missing from email column when custom …

4 years agoMerge pull request #16115 from eileenmcnaughton/deprecate
Seamus Lee [Tue, 17 Dec 2019 07:19:39 +0000 (18:19 +1100)]
Merge pull request #16115 from eileenmcnaughton/deprecate

Remove vestige of apiv2

4 years agoMerge pull request #16114 from eileenmcnaughton/pear
Seamus Lee [Tue, 17 Dec 2019 07:18:48 +0000 (18:18 +1100)]
Merge pull request #16114 from eileenmcnaughton/pear

[NFC] cleanup to declared exceptions, quotes, strict mode.

4 years agodev/core#1474 - (On Hold) text missing from email column when custom search profile...
Jitendra Purohit [Fri, 13 Dec 2019 12:46:33 +0000 (18:16 +0530)]
dev/core#1474 - (On Hold) text missing from email column when custom search profile is used in Advanced Search

Add test

4 years agoRemove vestige of apiv2
eileen [Tue, 17 Dec 2019 05:07:16 +0000 (18:07 +1300)]
Remove vestige of apiv2

4 years ago[NFC] cleanup to declared exceptions, quotes, strict mode.
eileen [Tue, 17 Dec 2019 05:03:33 +0000 (18:03 +1300)]
[NFC] cleanup to declared exceptions, quotes, strict mode.

4 years agoMerge pull request #16111 from eileenmcnaughton/pf
Seamus Lee [Mon, 16 Dec 2019 19:09:43 +0000 (06:09 +1100)]
Merge pull request #16111 from eileenmcnaughton/pf

dev/core#1472 fix price field money clean

4 years agoMerge pull request #16109 from seamuslee001/utils_grant_bin_fatal_exception
Eileen McNaughton [Sun, 15 Dec 2019 07:41:03 +0000 (20:41 +1300)]
Merge pull request #16109 from seamuslee001/utils_grant_bin_fatal_exception

[REF] Switch CRM_Utils_Error::fatal calls for CRM_Core_Exception in G…

4 years agoMerge pull request #16110 from seamuslee001/api4_country_state_entities
Seamus Lee [Sat, 14 Dec 2019 23:35:38 +0000 (10:35 +1100)]
Merge pull request #16110 from seamuslee001/api4_country_state_entities

Add in Country and StateProvince APIv4 Entities

4 years agoAdd in Country and StateProvince APIv4 Entities
Seamus Lee [Sat, 14 Dec 2019 22:03:56 +0000 (09:03 +1100)]
Add in Country and StateProvince APIv4 Entities

4 years ago[REF] Switch CRM_Utils_Error::fatal calls for CRM_Core_Exception in Grant. utils...
Seamus Lee [Sat, 14 Dec 2019 21:40:07 +0000 (08:40 +1100)]
[REF] Switch CRM_Utils_Error::fatal calls for CRM_Core_Exception in Grant. utils, bin/ and Civi/Angular/ folders

4 years agoMerge pull request #16108 from civicrm/5.21
Seamus Lee [Sat, 14 Dec 2019 04:48:06 +0000 (15:48 +1100)]
Merge pull request #16108 from civicrm/5.21

5.21

4 years agoMerge pull request #16107 from demeritcowboy/freezy-5.21
Seamus Lee [Sat, 14 Dec 2019 02:37:46 +0000 (13:37 +1100)]
Merge pull request #16107 from demeritcowboy/freezy-5.21

dev/core#1477 Fix fatal error when editing reserved option group settings

4 years agofix fatal error when editing reserved option group settings
demeritcowboy [Sat, 14 Dec 2019 00:52:28 +0000 (19:52 -0500)]
fix fatal error when editing reserved option group settings

4 years agofix price field money clean
eileen [Fri, 13 Dec 2019 19:50:22 +0000 (08:50 +1300)]
fix price field money clean

4 years agoMerge pull request #16103 from civicrm/5.21
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

4 years agoMerge pull request #16052 from eileenmcnaughton/desc
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

4 years agoMerge pull request #16096 from eileenmcnaughton/pf
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

4 years agoMerge pull request #16078 from colemanw/snippets
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

4 years agohook_angularModules - Accept 'partialsCallback' for dynamic partials
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.

4 years agoE notice fix on Price set form
eileen [Thu, 12 Dec 2019 21:46:37 +0000 (10:46 +1300)]
E notice fix on Price set form

4 years agoMerge pull request #16088 from eileenmcnaughton/paypal_clean
Seamus Lee [Thu, 12 Dec 2019 20:25:52 +0000 (07:25 +1100)]
Merge pull request #16088 from eileenmcnaughton/paypal_clean

Paypal class cleanup

4 years agoMerge pull request #16094 from pradpnayak/ActivityTypeName-Case
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

4 years agodev/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

4 years agoMerge pull request #16093 from civicrm/5.21
Seamus Lee [Thu, 12 Dec 2019 04:28:54 +0000 (15:28 +1100)]
Merge pull request #16093 from civicrm/5.21

5.21

4 years agoMerge pull request #16092 from seamuslee001/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

4 years agoFix Release note header
Seamus Lee [Thu, 12 Dec 2019 04:26:28 +0000 (15:26 +1100)]
Fix Release note header

4 years agoMerge pull request #16091 from civicrm/5.21
Seamus Lee [Thu, 12 Dec 2019 04:23:21 +0000 (15:23 +1100)]
Merge pull request #16091 from civicrm/5.21

5.21

4 years agoMerge pull request #16057 from eileenmcnaughton/act_perm521
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…

4 years agoMerge pull request #16090 from seamuslee001/5.21
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

4 years agoAdd release-notes/5.20.2
Tim Otten [Thu, 12 Dec 2019 01:46:35 +0000 (17:46 -0800)]
Add release-notes/5.20.2

4 years agoMerge pull request #16080 from eileenmcnaughton/org_up
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.

4 years agoRemove unnecessary query when updating org, if no name udpate.
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

4 years agoFix unreleased regression where processors using getPaymentDescription get a fatal
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

4 years agoMerge pull request #16086 from civicrm/5.21
Eileen McNaughton [Wed, 11 Dec 2019 22:04:46 +0000 (11:04 +1300)]
Merge pull request #16086 from civicrm/5.21

5.21

4 years agoMerge pull request #16087 from seamuslee001/deb_core_1467
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…

4 years agoPaypal class cleanup
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

4 years agodev/core#1467 - Multiple participant registration sends only p1 amount to the processor
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

4 years agoMerge pull request #16072 from eileenmcnaughton/paypal_extract
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.

4 years agoMerge pull request #16081 from artfulrobot/payment-property-bag-add-getters
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

4 years agoMerge pull request #16083 from artfulrobot/advanced-search-contrib-source-search...
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

4 years agoFix 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

4 years agoUpdate Paypal invokeApi to only throw exceptions.
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

4 years agoPayment PropertyBag: Add generic getter, setter methods for convenience
Rich Lott / Artful Robot [Wed, 11 Dec 2019 10:27:56 +0000 (10:27 +0000)]
Payment PropertyBag: Add generic getter, setter methods for convenience

4 years agoAllow angular modules to provide dynamic html snippets
Coleman Watts [Wed, 11 Dec 2019 02:56:50 +0000 (21:56 -0500)]
Allow angular modules to provide dynamic html snippets

4 years agoMerge pull request #16077 from civicrm/5.21
Seamus Lee [Wed, 11 Dec 2019 01:09:43 +0000 (12:09 +1100)]
Merge pull request #16077 from civicrm/5.21

5.21

4 years agoMerge pull request #16076 from alifrumin/rn5.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

4 years agoMerge pull request #16075 from seamuslee001/sig_status_bounce
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

4 years agoRelease Notes 5.21 - Sorting and Annotating
Alice Frumin [Mon, 9 Dec 2019 17:55:42 +0000 (12:55 -0500)]
Release Notes 5.21 - Sorting and Annotating

4 years agoMerge pull request #16074 from civicrm/5.21
Eileen McNaughton [Tue, 10 Dec 2019 19:45:10 +0000 (08:45 +1300)]
Merge pull request #16074 from civicrm/5.21

5.21

4 years ago[REF] Convert more petition signature fatals to status bounce
Seamus Lee [Tue, 10 Dec 2019 18:50:23 +0000 (05:50 +1100)]
[REF] Convert more petition signature fatals to status bounce

4 years agoMerge pull request #16067 from eileenmcnaughton/fatal
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

4 years agoMerge pull request #16071 from jitendrapurohit/521rc
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

4 years agoFix record payment form errors
Jitendra Purohit [Tue, 10 Dec 2019 10:41:43 +0000 (16:11 +0530)]
Fix record payment form errors

4 years agoMerge pull request #15676 from artfulrobot/handle-exceptions-from-payment-processors
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

4 years agoSwap out fatal for statusBounce for disabled or unpermittted forms
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

4 years agoMerge pull request #16070 from civicrm/5.21
Seamus Lee [Tue, 10 Dec 2019 07:29:48 +0000 (18:29 +1100)]
Merge pull request #16070 from civicrm/5.21

5.21

4 years agoMerge pull request #16069 from seamuslee001/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

4 years agoAdd release-notes/5.20.1
Tim Otten [Tue, 10 Dec 2019 07:01:53 +0000 (23:01 -0800)]
Add release-notes/5.20.1

4 years agoMerge pull request #16063 from seamuslee001/unit_test_1460
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

4 years agoMerge pull request #16066 from civicrm/5.21
Seamus Lee [Tue, 10 Dec 2019 01:02:31 +0000 (12:02 +1100)]
Merge pull request #16066 from civicrm/5.21

5.21

4 years ago[NFC] Add in unit test for dev/core#1460
Seamus Lee [Mon, 9 Dec 2019 23:10:24 +0000 (10:10 +1100)]
[NFC] Add in unit test for dev/core#1460

4 years agoMerge pull request #16060 from artfulrobot/payment-property-bag-add-props
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

4 years agoMerge pull request #16064 from civicrm/5.21
Eileen McNaughton [Mon, 9 Dec 2019 23:18:59 +0000 (12:18 +1300)]
Merge pull request #16064 from civicrm/5.21

5.21

4 years agoMerge pull request #16061 from eileenmcnaughton/cont_hook
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

4 years agodev/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

4 years agoMerge pull request #16058 from eileenmcnaughton/mem_js
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

4 years agoMerge pull request #16056 from eileenmcnaughton/add_part
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

4 years agoAdd extra Payment PropertyBag properties
Rich Lott / Artful Robot [Mon, 9 Dec 2019 12:52:12 +0000 (12:52 +0000)]
Add extra Payment PropertyBag properties

4 years agoFix js error on choosing membership type
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

4 years agodev/core#1444 Permit activities with campaigns on contact tab for contacts without...
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

4 years agoMinor simplification on additional_participants checks
eileen [Mon, 29 Jul 2019 03:52:19 +0000 (15:52 +1200)]
Minor simplification on additional_participants checks

4 years agoMerge pull request #16054 from seamuslee001/sort_contact
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…

4 years agoMerge pull request #16053 from seamuslee001/activity_sort
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

4 years agoMerge pull request #16055 from seamuslee001/campaign_sort
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…

4 years ago[REF] Refactor Campaign Search form to use standardised getSortID function
Seamus Lee [Mon, 9 Dec 2019 03:55:23 +0000 (14:55 +1100)]
[REF] Refactor Campaign Search form to use standardised getSortID function

4 years ago[REF] Refactor Contact 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

4 years agoMerge pull request #16050 from eileenmcnaughton/qf
Seamus Lee [Mon, 9 Dec 2019 03:48:15 +0000 (14:48 +1100)]
Merge pull request #16050 from eileenmcnaughton/qf

[NFC] code cleanup

4 years ago[REF] Refactor Activity Search to use parent getSortID function
Seamus Lee [Mon, 9 Dec 2019 03:47:55 +0000 (14:47 +1100)]
[REF] Refactor Activity Search to use parent getSortID function

4 years agoMerge pull request #15942 from seamuslee001/contact_fields_metadata
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 …

4 years agoMerge pull request #16051 from civicrm/5.21
Eileen McNaughton [Mon, 9 Dec 2019 02:36:45 +0000 (15:36 +1300)]
Merge pull request #16051 from civicrm/5.21

5.21

4 years agoMerge pull request #15927 from eileenmcnaughton/event_form
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

4 years agoOnly add in the additional metadata if we are also adding them to the 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