Seamus Lee [Wed, 13 Mar 2019 21:14:43 +0000 (08:14 +1100)]
Merge pull request #13801 from eileenmcnaughton/5.12
Fix unrelased regression where activity date relative filters are ingnored in the rc
Eileen McNaughton [Wed, 13 Mar 2019 19:12:14 +0000 (08:12 +1300)]
Merge pull request #13808 from totten/5.12-wp-e2e
(ops#878) (Fast)ArrayDecorator - Emit expected exception when using WP and strict PSR-16
Tim Otten [Wed, 13 Mar 2019 05:15:20 +0000 (22:15 -0700)]
(Fast)ArrayDecorator - Emit expected exception when using WP and strict PSR-16
Suppose someone calls `ArrayDecorator::get()` or `FastArrayDecorator::get()`
with an invalid key (e.g. passing `float` or an `array` instead of a
`string`). This patch improves error-reporting for that scenario.
This is primarily about fixing multiple test failures in `E2E_Cache_ArrayDecoratorTest` reported on `wp-demo`. These
generally look like
```
1) E2E_Cache_ArrayDecoratorTest::testGetInvalidKeys with data set #1 (true)
array_key_exists(): The first argument should be either a string or an integer
/Users/totten/bknix/build/wpmaster/wp-content/plugins/civicrm/civicrm/CRM/Utils/Cache/ArrayDecorator.php:102
/Users/totten/bknix/build/wpmaster/wp-content/plugins/civicrm/civicrm/packages/Cache/IntegrationTests/LegacySimpleCacheTest.php:409
/Users/totten/bknix/civicrm-buildkit/extern/phpunit5/phpunit5.phar:598
```
Before
------
The ArrayDecorator first checks its front cache (`array_key_exists`) to see if the key is defined. In the `wp-demo`
environment, this produces a warning and causes the test to fail.
The condition *is* erroneous, but PSR-16 specifies that the error should be reported as exception.
After
-----
The condition is reported as the expected exception. The test passes on `wp-demo`.
Comment
-------
This brings the code in `(Fast)ArrayDecorator.php` into alignment with most of the other `CRM/Utils/Cache/*.php`
drivers; in most drivers, it is typical to validate the key at the start of most functions.
eileen [Tue, 12 Mar 2019 00:39:51 +0000 (13:39 +1300)]
Fix relative dates when searching on activity_date_time
In testing I found that there is an unreleased regression relating to our date conversion
on activity_date_time in activity search. This fixes and adds tests. (regression was it
was being ignored).
Note that the option value is capitalised which makes the capitalisation slightly odd but
I think accepting that is the least bad option
eileen [Tue, 12 Mar 2019 00:11:15 +0000 (13:11 +1300)]
Formatting cleanup
CiviCRM [Thu, 7 Mar 2019 01:26:52 +0000 (01:26 +0000)]
Set version to 5.12.beta1
Tim Otten [Thu, 7 Mar 2019 01:23:50 +0000 (17:23 -0800)]
Merge pull request #13777 from seamuslee001/master
Merge forward 5.11 => master
Seamus Lee [Thu, 7 Mar 2019 01:12:52 +0000 (12:12 +1100)]
Merge in 5.11
Tim Otten [Thu, 7 Mar 2019 00:23:36 +0000 (16:23 -0800)]
Merge pull request #13594 from agh1/5.11.0-releasenotes
5.11.0 release notes
Andrew Hunt [Wed, 6 Mar 2019 22:54:30 +0000 (17:54 -0500)]
5.11.0 release notes: late changes
CiviCRM [Wed, 6 Mar 2019 22:11:50 +0000 (22:11 +0000)]
Set version to 5.11.0
Seamus Lee [Wed, 6 Mar 2019 21:58:17 +0000 (08:58 +1100)]
Merge pull request #13773 from eileenmcnaughton/5.11-
dev/core#745 Further on_hold fix - it has been suggested the value might be an array like ['']
Alice Frumin [Wed, 6 Mar 2019 21:49:48 +0000 (16:49 -0500)]
5.11.0 release notes: bulk of work from Alice
* moving things to misc
* organizing prs
* linking to gitlab issues
* first stab
* more release notes
* more release notes progress
* annotating
* cleaning up
* updating contributers
Andrew Hunt [Thu, 14 Feb 2019 15:48:50 +0000 (10:48 -0500)]
5.11.0 release notes: added boilerplate
Andrew Hunt [Thu, 14 Feb 2019 15:46:36 +0000 (10:46 -0500)]
5.11.0 release notes: raw from script
colemanw [Wed, 6 Mar 2019 21:36:05 +0000 (16:36 -0500)]
Merge pull request #13770 from eileenmcnaughton/mcrypt
Remove mcrypt system status check
Eileen McNaughton [Wed, 6 Mar 2019 20:05:35 +0000 (09:05 +1300)]
Merge pull request #13766 from eileenmcnaughton/api_between
Fix api bug whereby 0 & '0' are not accepted as range parameters for BETWEEN
Seamus Lee [Wed, 6 Mar 2019 19:54:38 +0000 (06:54 +1100)]
Merge pull request #13283 from aydun/token_note_fix
Render Note field tokens correctly - they are already HTML.
Seamus Lee [Wed, 6 Mar 2019 19:53:38 +0000 (06:53 +1100)]
Merge pull request #13776 from lcdservices/dev-core-644
dev/core#644 fix from address before calling hook
Brian Shaughnessy [Wed, 6 Mar 2019 17:34:28 +0000 (12:34 -0500)]
dev/core#644 fix from address before calling hook
Monish Deb [Wed, 6 Mar 2019 09:03:16 +0000 (14:33 +0530)]
Merge pull request #13756 from eileenmcnaughton/payment_try2
[REF] separate financial handling & component transitioning in Payment.create
eileen [Wed, 6 Mar 2019 03:38:03 +0000 (16:38 +1300)]
Further on_hold fix - it has been suggested the value might be an array like ['']
This would filter that out
Seamus Lee [Wed, 6 Mar 2019 03:32:48 +0000 (14:32 +1100)]
Merge pull request #13754 from eileenmcnaughton/5.11-
dev/core#745 do not filter on 'on_hold' if it is an empty string
Eileen McNaughton [Wed, 6 Mar 2019 01:11:46 +0000 (14:11 +1300)]
Merge pull request #13771 from mattwire/typo
Fix typo in comments
Eileen McNaughton [Wed, 6 Mar 2019 01:11:12 +0000 (14:11 +1300)]
Merge pull request #13769 from eileenmcnaughton/matt
Removes redundant IF
Matthew Wire (MJW Consulting) [Tue, 5 Mar 2019 23:25:43 +0000 (23:25 +0000)]
Typo in comments
Eileen McNaughton [Tue, 5 Mar 2019 23:20:28 +0000 (12:20 +1300)]
Merge pull request #13758 from eileenmcnaughton/no_load
Do not load membership contribution as updateMembershipBasedOnCompletionOfContribution loads it within the function
eileen [Tue, 5 Mar 2019 23:18:38 +0000 (12:18 +1300)]
Remove mcrypt system status check
Php 7.2 doesn't support this & it is being deprecated so having this here causes
sites to try to install it - creating a migration problem they wouldn't otherwise have
The situation here is unresolved but this check doesn't solve more confusion than it creates
eileen [Tue, 5 Mar 2019 23:11:51 +0000 (12:11 +1300)]
Removes redundant IF
self::getRelatedMemberships already filters out empty rows. I left removing this
IF for it's own PR due to the legibility issues in the whitespace change
Eileen McNaughton [Tue, 5 Mar 2019 23:08:04 +0000 (12:08 +1300)]
Merge pull request #13759 from eileenmcnaughton/matt
[REF] towards cleanup of update membership code
Eileen McNaughton [Tue, 5 Mar 2019 22:55:22 +0000 (11:55 +1300)]
Merge pull request #13735 from eileenmcnaughton/query_extract
Extract getSearchSQLParts function
Seamus Lee [Tue, 5 Mar 2019 22:41:13 +0000 (09:41 +1100)]
Merge pull request #13746 from eileenmcnaughton/activity_search
Convert activity_date_time field to datepicker and add support for url input
eileen [Tue, 5 Mar 2019 21:30:33 +0000 (10:30 +1300)]
Add enotice handling for weird s....'
eileen [Mon, 4 Mar 2019 01:54:29 +0000 (14:54 +1300)]
Fix related search classes to have the same signature
eileen [Mon, 4 Mar 2019 00:47:35 +0000 (13:47 +1300)]
Add form rule for chronological ordeR
eileen [Sun, 3 Mar 2019 22:09:16 +0000 (11:09 +1300)]
Fix group conversion to add relative key
Old format doesn't seem to have it
eileen [Sun, 3 Mar 2019 20:09:50 +0000 (09:09 +1300)]
Add upgrade routine
eileen [Sat, 2 Mar 2019 05:48:47 +0000 (18:48 +1300)]
Convert activity_date_time field to datepicker and add support for url input
This converts the form to being a metadata defined field & a date-picker field as well
as adding standardised url support for input.
The input format is
activity_date_time_high=
20100101
I stripped out the complex and probably broken based on feedback & not used in core
existing hard-coded url support.
Note that there are some outstanding items
1) the upgrade script item needs to be added - this includes dealing with renaming of the field
since I made it more consistent
2) I stripped out the check to ensure the high date is greater than the low date
- if we still want this we should re-add as a generic thing. My guess is it's a bit optional
eileen [Tue, 5 Mar 2019 00:21:36 +0000 (13:21 +1300)]
Fix api bug whereby 0 & '0' are not accepted as range parameters for BETWEEN
In other news I'm not thrilled about the 0 casting to a string here but that is for another time
eileen [Tue, 5 Mar 2019 00:05:16 +0000 (13:05 +1300)]
Call getSearchSQLParts to get the desired part instead of sql wrangling
eileen [Thu, 28 Feb 2019 22:49:46 +0000 (11:49 +1300)]
Extract getSearchSQLParts function
Eileen McNaughton [Mon, 4 Mar 2019 23:32:29 +0000 (12:32 +1300)]
Merge pull request #13720 from eileenmcnaughton/extract_2
Speed up contribution results by removing join on civicrm_financial_type table when rendering search results.
Eileen McNaughton [Mon, 4 Mar 2019 23:31:53 +0000 (12:31 +1300)]
Merge pull request #13765 from seamuslee001/test_empty_on_hold
Try and add data set example where email_on_hold / on_hold is NULL in…
eileen [Mon, 4 Mar 2019 04:11:20 +0000 (17:11 +1300)]
[REF] towards cleanup of update membership code
This PR limits itself to siphoning off how the memberships are fetched & having that function
- return as an array of arrays rather than an array of objects
- index the array by id rather than membership type
This is a step towards the changes in https://github.com/civicrm/civicrm-core/pull/12542
& it should allow a separation of concerns relating to the LOADING of memberships from the
processing.
I note that the PR I'm looking at changes what gets loaded & that should be it's own PR
but also that there is an extraneous if() here - I didn't alter that because
it is a big white space change & doing on it's own will make that easy to review
eileen [Thu, 28 Feb 2019 03:55:21 +0000 (16:55 +1300)]
Eliminate unnecessary join to civicrm_financial_type table to improve performance
Although this join is indexed it affects index choice, often causing the right index not to
be used and slowing performance. I got subtantial speed improvement by eliminating this join
eileen [Thu, 28 Feb 2019 05:06:14 +0000 (18:06 +1300)]
Add hack for qill
This is a very minor extension of an existing hack but we should de-hack at some point.
Before this the qill is broken on payment instrument & contribution page too
eileen [Thu, 28 Feb 2019 01:21:59 +0000 (14:21 +1300)]
Use generic pseudoconstant declaration methodology to add financial_type to pseudoconstants
Getting away from the hard-hack allows us to have more consistent metadata for generic fields
Seamus Lee [Mon, 4 Mar 2019 21:35:32 +0000 (08:35 +1100)]
Merge pull request #13751 from seamuslee001/upgrade_karma
Upgrade Karma version to latest version
Seamus Lee [Mon, 4 Mar 2019 21:31:20 +0000 (08:31 +1100)]
Try and add data set eaxmple where email_on_hold / on_hold is NULL in the formValues
colemanw [Mon, 4 Mar 2019 20:38:13 +0000 (15:38 -0500)]
Merge pull request #13664 from eileenmcnaughton/activity_perms
Rationalise Activity api ACLs for consistency, to respect the hook & improve performance
Eileen McNaughton [Mon, 4 Mar 2019 20:12:01 +0000 (09:12 +1300)]
Merge pull request #13761 from yashodha/reports
report clean up - remove redundant code
Yashodha Chaku [Mon, 4 Mar 2019 13:35:04 +0000 (19:05 +0530)]
Merge pull request #13726 from avall-llovera/patch-1
dev/core#767 Add 'Cancelled / Refunded Date' and 'Cancellation / Refund Reason'
yashodha [Mon, 4 Mar 2019 11:44:29 +0000 (17:14 +0530)]
report clean up - remove redundant code
Eileen McNaughton [Mon, 4 Mar 2019 06:51:22 +0000 (19:51 +1300)]
Merge pull request #13760 from civicrm/5.11
5.11
Yashodha Chaku [Mon, 4 Mar 2019 06:33:42 +0000 (12:03 +0530)]
Merge pull request #13653 from MegaphoneJon/reporting-8
reporting#8 - add thank-you dates to Contribution Summary/Detail reports
Eileen McNaughton [Mon, 4 Mar 2019 06:12:53 +0000 (19:12 +1300)]
Merge pull request #13757 from eileenmcnaughton/payment_extract
[REF] extract getToFinancialAccount from CRM_Contribute_PseudoConstantt::contributionStatus
Seamus Lee [Mon, 4 Mar 2019 05:19:00 +0000 (16:19 +1100)]
Merge pull request #13755 from eileenmcnaughton/event_fix
dev/core#766 fix loss of custom fields when creating an event from template
eileen [Mon, 4 Mar 2019 02:31:17 +0000 (15:31 +1300)]
[REF] extract getToFinancialAccount from CRM_Contribute_PseudoConstant::contributionStatus
This makes the function much more readable. I felt that the is_payment logic should go but
resisted & just commented
eileen [Mon, 4 Mar 2019 03:42:54 +0000 (16:42 +1300)]
Do not load membership contribution as updateMembershipBasedOnCompletionOfContribution loads it within the function
Monish Deb [Mon, 4 Mar 2019 03:38:01 +0000 (09:08 +0530)]
Merge pull request #13695 from eileenmcnaughton/extract_activity
[ref] Extract activity payment creation
eileen [Mon, 4 Mar 2019 02:07:18 +0000 (15:07 +1300)]
[REF] separate financial handling & component transitioning in Payment.create
eileen [Mon, 4 Mar 2019 01:32:07 +0000 (14:32 +1300)]
dev/core#766 fix loss of custom fields when creating an event from template
eileen [Mon, 4 Mar 2019 01:11:10 +0000 (14:11 +1300)]
dev/core#745 do not filter on 'on_hold' if it is an empty string
Although I couldn't replicate this apparently in groups created in an earlier version it could
be. We only care about number (0 or 1) or arrays (from the select widget)
so add an extra check
Seamus Lee [Mon, 4 Mar 2019 01:07:49 +0000 (12:07 +1100)]
Merge pull request #13753 from seamuslee001/event_form_class_fix
Fix Custom post outer div class on event registration form
Seamus Lee [Sun, 3 Mar 2019 23:49:33 +0000 (10:49 +1100)]
Fix Custom post outer div class on event registration form
Eileen McNaughton [Sun, 3 Mar 2019 19:49:12 +0000 (08:49 +1300)]
Merge pull request #13741 from jitendrapurohit/core-770
dev/core#770 - View Case Activity page displays disabled custom fields
Monish Deb [Sun, 3 Mar 2019 08:11:07 +0000 (13:41 +0530)]
Merge pull request #13690 from eileenmcnaughton/cleanup_payment_create
Clean up Payment.create function
Seamus Lee [Sun, 3 Mar 2019 04:37:17 +0000 (15:37 +1100)]
Merge pull request #13400 from mfb/format-resource-url
fix broken logic in CRM_Utils_System_DrupalBase::formatResourceUrl()
Seamus Lee [Sun, 3 Mar 2019 01:19:18 +0000 (12:19 +1100)]
Upgrade Karma version to latest version
Seamus Lee [Sun, 3 Mar 2019 00:40:12 +0000 (11:40 +1100)]
Merge pull request #13750 from seamuslee001/master
5.11
Seamus Lee [Sun, 3 Mar 2019 00:39:19 +0000 (11:39 +1100)]
Merge in 5.11
Seamus Lee [Sun, 3 Mar 2019 00:34:12 +0000 (11:34 +1100)]
Merge pull request #13747 from eileenmcnaughton/merge_master
merge 5.11 to master
Patrick Figel [Fri, 1 Mar 2019 18:28:27 +0000 (19:28 +0100)]
CRM/Contact - Fix fatal error on tag search
This fixes a fatal error caused by the CommaSeparatedIntegers not
accepting empty strings. This can be triggered by performing a
search with "Tag(s) IS NULL" using the search builder.
eileen [Thu, 28 Feb 2019 21:44:22 +0000 (10:44 +1300)]
Add upgrade routine to convert on_hold to an array for sites with
civimail_multiple_bulk_emails set.
with that set we get a select box which needs an array rather than a checkbox.
Note from my testing there is problem loading the defaults due to the field name being
wrong - this aligns groups created before & after the 5.9 upgrade but does not resolve that.
// preferred communication method
if (Civi::settings()->get('civimail_multiple_bulk_emails')) {
->addSelect('email_on_hold',
array('entity' => 'email', 'multiple' => 'multiple', 'label' => ts('Email On Hold'), 'options' => CRM_Core_PseudoConstant::emailOnHoldOptions()));
}
else {
->add('advcheckbox', 'email_on_hold', ts('Email On Hold')
eileen [Thu, 28 Feb 2019 22:33:13 +0000 (11:33 +1300)]
dev/membership#10 fix incorrect validation error saying Start date must be the same or later than Member since
This problem is because both dates exclude time but the default setting includes it - leading to a
comparison of a datetime with a date+midnight time
Jitendra Purohit [Fri, 1 Mar 2019 07:09:41 +0000 (12:39 +0530)]
dev/core#770 - View Case Activity page displays disabled custom fields
Eileen McNaughton [Sat, 2 Mar 2019 06:20:28 +0000 (19:20 +1300)]
Merge pull request #13731 from eileenmcnaughton/5.11
dev/core#731 Add upgrade routine to convert on_hold to an array for sites with
Eileen McNaughton [Sat, 2 Mar 2019 05:06:47 +0000 (18:06 +1300)]
Merge pull request #13745 from mattwire/viewcancelledrecur
Allow viewing of cancelled recurring contributions
Eileen McNaughton [Sat, 2 Mar 2019 01:07:50 +0000 (14:07 +1300)]
Merge pull request #13743 from greenpeace-cee/fix-tag-search
CRM/Contact - Fix fatal error on tag search
Matthew Wire (MJW Consulting) [Mon, 11 Feb 2019 18:26:42 +0000 (18:26 +0000)]
Allow viewing of cancelled recurring contributions
Eileen McNaughton [Fri, 1 Mar 2019 21:19:46 +0000 (10:19 +1300)]
Merge pull request #13744 from mattwire/upgrader_fix
Upgrader: Don't abort if state_province already exists
Matthew Wire (MJW Consulting) [Fri, 1 Mar 2019 19:39:33 +0000 (19:39 +0000)]
Don't abort if state_province already exists when upgrading
Patrick Figel [Fri, 1 Mar 2019 18:28:27 +0000 (19:28 +0100)]
CRM/Contact - Fix fatal error on tag search
This fixes a fatal error caused by the CommaSeparatedIntegers not
accepting empty strings. This can be triggered by performing a
search with "Tag(s) IS NULL" using the search builder.
Monish Deb [Fri, 1 Mar 2019 13:56:38 +0000 (19:26 +0530)]
Merge pull request #13566 from pradpnayak/ModifiedBy
dev/core#708, Fix Qill for Added by and Modified By
eileen [Fri, 1 Mar 2019 07:17:50 +0000 (20:17 +1300)]
Minor Payment.create tidy up.
Rationalise methodology to decide if payment creates the contribution
Eileen McNaughton [Fri, 1 Mar 2019 07:46:20 +0000 (20:46 +1300)]
Merge pull request #13739 from seamuslee001/participant_payment_hook_correct
Fix the invocation of post hook for ParticipantPayment ensuring that …
Eileen McNaughton [Fri, 1 Mar 2019 06:50:26 +0000 (19:50 +1300)]
Merge pull request #13734 from eileenmcnaughton/mem
dev/membership#10 fix incorrect validation error saying Start date must be the same or later than Member since
Monish Deb [Fri, 1 Mar 2019 04:42:37 +0000 (10:12 +0530)]
Merge pull request #13718 from eileenmcnaughton/payment_ref
Decommision getPartialPaymentTrxn function
Eileen McNaughton [Fri, 1 Mar 2019 04:20:00 +0000 (17:20 +1300)]
Merge pull request #13740 from civicrm/5.11
5.11
Seamus Lee [Fri, 1 Mar 2019 04:03:01 +0000 (15:03 +1100)]
Merge pull request #13738 from jitendrapurohit/core-768-rc
dev/core#768 - Fix fatal error on group search
Eileen McNaughton [Fri, 1 Mar 2019 03:43:21 +0000 (16:43 +1300)]
Merge pull request #13737 from seamuslee001/pdf_receipts_fix_enotice
Fix up e-notice error when using a user from email address same issue…
Seamus Lee [Fri, 1 Mar 2019 02:46:22 +0000 (13:46 +1100)]
Fix the invocation of post hook for ParticipantPayment ensuring that an id is passed in post hook
Jitendra Purohit [Fri, 1 Mar 2019 02:39:31 +0000 (08:09 +0530)]
dev/core#768 - Fix fatal error on group search
Eileen McNaughton [Fri, 1 Mar 2019 02:27:35 +0000 (15:27 +1300)]
Merge pull request #13724 from agileware/CIVIEWAY-42
Status of test contribution is not fetched on ThankYou page.
Seamus Lee [Fri, 1 Mar 2019 00:28:00 +0000 (11:28 +1100)]
Fix up e-notice error when using a user from email address same issue as dev/core#644
eileen [Thu, 28 Feb 2019 21:44:22 +0000 (10:44 +1300)]
Add upgrade routine to convert on_hold to an array for sites with
civimail_multiple_bulk_emails set.
with that set we get a select box which needs an array rather than a checkbox.
Note from my testing there is problem loading the defaults due to the field name being
wrong - this aligns groups created before & after the 5.9 upgrade but does not resolve that.
// preferred communication method
if (Civi::settings()->get('civimail_multiple_bulk_emails')) {
->addSelect('email_on_hold',
array('entity' => 'email', 'multiple' => 'multiple', 'label' => ts('Email On Hold'), 'options' => CRM_Core_PseudoConstant::emailOnHoldOptions()));
}
else {
->add('advcheckbox', 'email_on_hold', ts('Email On Hold')
Eileen McNaughton [Fri, 1 Mar 2019 00:57:10 +0000 (13:57 +1300)]
Merge pull request #13736 from agileware/CIVICRM-1149
CiviCRM Membership Detail report, add column to display if membership is Primary or Inherited
Eileen McNaughton [Fri, 1 Mar 2019 00:14:54 +0000 (13:14 +1300)]
Merge pull request #13728 from JMAConsulting/dev/core#769
dev/core#769 - Fix for ZipArchive->open() PHP bug
Seamus Lee [Thu, 28 Feb 2019 23:43:03 +0000 (10:43 +1100)]
Merge pull request #13732 from mattwire/refactor_smartgroupquery_upper1
dev/core#748 Move UPPER() from sql to php domain
eileen [Thu, 28 Feb 2019 22:33:13 +0000 (11:33 +1300)]
dev/membership#10 fix incorrect validation error saying Start date must be the same or later than Member since
This problem is because both dates exclude time but the default setting includes it - leading to a
comparison of a datetime with a date+midnight time