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 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 [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
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 01:32:07 +0000 (14:32 +1300)]
dev/core#766 fix loss of custom fields when creating an event from template
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
Seamus Lee [Thu, 28 Feb 2019 22:35:56 +0000 (09:35 +1100)]
Merge pull request #13730 from civicrm/5.11
5.11
Matthew Wire (MJW Consulting) [Thu, 28 Feb 2019 21:25:17 +0000 (21:25 +0000)]
Move UPPER() from sql to php domain
Eileen McNaughton [Thu, 28 Feb 2019 21:24:02 +0000 (10:24 +1300)]
Merge pull request #13717 from eileenmcnaughton/extract
[REF] Extract lines to add the pseudoconstant to the select
Eileen McNaughton [Thu, 28 Feb 2019 20:59:46 +0000 (09:59 +1300)]
Merge pull request #13723 from eileenmcnaughton/5.11
financial#46 - clean money format at form layer - Fix mistreatment of event fees > 1000 when saving
Eileen McNaughton [Thu, 28 Feb 2019 19:51:13 +0000 (08:51 +1300)]
Merge pull request #13729 from colemanw/recentitems
Mark de.systopia.recentitems obsolete
Eileen McNaughton [Thu, 28 Feb 2019 19:47:11 +0000 (08:47 +1300)]
Merge pull request #13725 from JMAConsulting/CRM-21754-rc
Don't break loop if address fields not found while formatting rows in Reports
Coleman Watts [Thu, 28 Feb 2019 15:47:55 +0000 (10:47 -0500)]
Mark de.systopia.recentitems obsolete
Edsel [Thu, 28 Feb 2019 12:33:49 +0000 (18:03 +0530)]
dev/core#769 - Fix for ZipArchive->open() PHP bug
avall-llovera [Thu, 28 Feb 2019 10:03:16 +0000 (11:03 +0100)]
dev/core#767 Add 'Cancelled / Refunded Date' and 'Cancellation / Refund Reason'
Add the fields and filters 'Cancelled / Refunded Date' and 'Cancellation / Refund Reason' in the Detail Contributions Report
Monish Deb [Thu, 28 Feb 2019 09:49:29 +0000 (15:19 +0530)]
Don't break loop if address fields not found while formatting rows in Reports
eileen [Thu, 28 Feb 2019 06:01:39 +0000 (19:01 +1300)]
Fix mistreatment of event fees > 1000 when saving
Eileen McNaughton [Thu, 28 Feb 2019 05:33:35 +0000 (18:33 +1300)]
Merge pull request #13721 from MegaphoneJon/5.11
financial#46 - clean money format at form layer
Eileen McNaughton [Thu, 28 Feb 2019 05:25:15 +0000 (18:25 +1300)]
Merge pull request #13722 from civicrm/5.11
5.11 to master
Eileen McNaughton [Thu, 28 Feb 2019 05:23:20 +0000 (18:23 +1300)]
Merge pull request #13711 from greenpeace-cee/fix-multi-currency-soft-credit
dev/core#756 - CRM/Contribute - Fix multi-currency soft credit summary
Eileen McNaughton [Thu, 28 Feb 2019 05:15:56 +0000 (18:15 +1300)]
Merge pull request #13704 from colemanw/age_asof_date
dev/core#561 Upgrade age_asof_date to datepicker in search
Jon Goldberg [Thu, 28 Feb 2019 03:24:40 +0000 (22:24 -0500)]
financial#46 - clean money format at form layer
eileen [Thu, 28 Feb 2019 02:33:19 +0000 (15:33 +1300)]
Decommision getPartialPaymentTrxn function
This function is only called from one place in the code & also from a test.
It is misleading as it implies a 'get' when it actually does an update
and it groups functionality in a way that doesn't make sense from the calling code pov
In this commit the function is removed and the lines are directly copied to the calling
function, as preparation for cleaning up the calling function
eileen [Thu, 28 Feb 2019 01:19:43 +0000 (14:19 +1300)]
Spelling fix
eileen [Thu, 28 Feb 2019 01:13:23 +0000 (14:13 +1300)]
Extract lines to add the pseudoconstant to the select
Eileen McNaughton [Wed, 27 Feb 2019 20:58:30 +0000 (09:58 +1300)]
Merge pull request #13686 from seamuslee001/phpword_upgrade
Upgrade PHPWord
Patrick Figel [Tue, 26 Feb 2019 20:06:13 +0000 (21:06 +0100)]
dev/core#756 - CRM/Contribute - Fix multi-currency soft credit summary
This fixes an exception caused by multiple currencies being passed to
CRM_Utils_Money::format. It also resolves some inconsistencies in how
the summary table is rendered for soft credits.
Coleman Watts [Mon, 25 Feb 2019 23:55:44 +0000 (18:55 -0500)]
Upgrade age_asof_date to datepicker in search
Alok Patel [Wed, 27 Feb 2019 13:46:31 +0000 (19:16 +0530)]
CIVIEWAY-42: Unit test to verify the correct outcome message on ThankYou Page.
Monish Deb [Wed, 27 Feb 2019 09:15:46 +0000 (14:45 +0530)]
Merge pull request #13715 from eileenmcnaughton/order_fix
[minor cleanup] reduce params passed to searchQuery
Eileen McNaughton [Wed, 27 Feb 2019 08:04:55 +0000 (21:04 +1300)]
Merge pull request #13701 from colemanw/changeCaseTypeDate
Migrate date field to datepicker on ChangeCaseType form
eileen [Mon, 25 Feb 2019 06:35:50 +0000 (19:35 +1300)]
[REF] extract activity payment.
THis is likely not it's last resting place but it does make the functions involved a lot simpler now
Monish Deb [Wed, 27 Feb 2019 07:36:29 +0000 (13:06 +0530)]
Merge pull request #13692 from eileenmcnaughton/extract_record
[REF] Extract recordPayment portion
eileen [Wed, 27 Feb 2019 03:48:40 +0000 (16:48 +1300)]
[minor cleanup] reduce params passed to searchQuery
Where we are retrieving the sql we can call the inner function rather than passing 'true'
in other cases we are passing default values through
Eileen McNaughton [Tue, 26 Feb 2019 23:06:36 +0000 (12:06 +1300)]
Merge pull request #13710 from civicrm/5.11
Merge 5.11 to master
Eileen McNaughton [Tue, 26 Feb 2019 20:55:36 +0000 (09:55 +1300)]
Merge pull request #13696 from mattwire/entityform_13578_fix
Move assign of currency for entityForm outside of foreach so order of fields don't matter
colemanw [Tue, 26 Feb 2019 19:39:40 +0000 (14:39 -0500)]
Merge pull request #13705 from eileenmcnaughton/atest
[TEST FIX] Increase uniqueness in testSingleNowDates
colemanw [Tue, 26 Feb 2019 18:41:24 +0000 (13:41 -0500)]
Merge pull request #13638 from eileenmcnaughton/squash_products
dev/core#735 Do not include product in search results if site has none
colemanw [Tue, 26 Feb 2019 18:34:41 +0000 (13:34 -0500)]
Merge pull request #13645 from eileenmcnaughton/ft_acl_test
Code cleanup - remove extraneous permissions clause
colemanw [Tue, 26 Feb 2019 17:44:48 +0000 (12:44 -0500)]
Merge pull request #13709 from JMAConsulting/dev-core#757-rc
Viewing Contact Note comments is broken in 5.10.4.
colemanw [Tue, 26 Feb 2019 17:35:42 +0000 (12:35 -0500)]
Merge pull request #13680 from eileenmcnaughton/order_test
Fix & test searchQuery order by to be less dependent on what is selected for search
eileen [Tue, 26 Feb 2019 16:28:08 +0000 (05:28 +1300)]
Fix bug in test set up
eileen [Mon, 25 Feb 2019 05:38:53 +0000 (18:38 +1300)]
Extract recordPayment portion
Ken West [Tue, 26 Feb 2019 11:33:52 +0000 (22:33 +1100)]
Viewing Contact Note comments is broken in 5.10.4.
Update Javascript to use Note-NNNNN rather than cnote_NNNN as the ID of Note rows.
Completes change started in commit
57abcbbf5cf85b1266377e0ad9af4fb5865d5bc0.
eileen [Tue, 26 Feb 2019 06:43:11 +0000 (19:43 +1300)]
Increase uniqueness in testSingleNowDates
Reduce instances of
AuthorizeNet failed for unknown reason.E00012: You have submitted a duplicate of Subscription
5642898. A duplicate subscription will not be created
Seamus Lee [Tue, 26 Feb 2019 03:57:00 +0000 (14:57 +1100)]
Merge pull request #13702 from mattwire/contributionrecur_payprocid_pseudoconstant_schema
Add pseudoconstant for payment_processor_id to contributionrecur