Seamus Lee [Wed, 31 Jul 2019 04:08:59 +0000 (14:08 +1000)]
Merge pull request #14934 from civicrm/5.16
5.16
Seamus Lee [Wed, 31 Jul 2019 02:21:22 +0000 (12:21 +1000)]
Merge pull request #14932 from eileenmcnaughton/export_fn_move
[REF] [Export] Move writeToTable fn to exportProcessor
Seamus Lee [Wed, 31 Jul 2019 02:20:43 +0000 (12:20 +1000)]
Merge pull request #14931 from eileenmcnaughton/mysql516
mysqli_get_client_info() does not have a parameter - fixes https://lab.civicrm.org/dev/core/issues/1136
Seamus Lee [Wed, 31 Jul 2019 00:53:21 +0000 (10:53 +1000)]
Merge pull request #14917 from eileenmcnaughton/zero_ex
[REF][Event] Extract calculation of 'zero-ness' in form rule
Seamus Lee [Tue, 30 Jul 2019 23:09:32 +0000 (09:09 +1000)]
Merge pull request #14881 from eileenmcnaughton/cont_payment_method_import
dev/financial#36 [IMPORT] fix & test mishandling on payment_instrument labels
eileen [Sat, 20 Jul 2019 02:43:07 +0000 (14:43 +1200)]
Move write to table to exportProcessor
mark burdett [Tue, 23 Jul 2019 19:38:55 +0000 (12:38 -0700)]
mysqli_get_client_info() does not have a parameter - fixes https://lab.civicrm.org/dev/core/issues/1136
colemanw [Tue, 30 Jul 2019 22:14:37 +0000 (18:14 -0400)]
Merge pull request #14877 from eileenmcnaughton/hist_rep
dev/core#1141 remove unused deprecated sql_calc_rows
colemanw [Tue, 30 Jul 2019 22:11:36 +0000 (18:11 -0400)]
Merge pull request #14914 from eileenmcnaughton/export_test
[Export] Convert testGender Export to new test format.
colemanw [Tue, 30 Jul 2019 22:03:49 +0000 (18:03 -0400)]
Merge pull request #14913 from eileenmcnaughton/export
[REF] [Export] Stop passing header rows around
Eileen McNaughton [Tue, 30 Jul 2019 20:09:05 +0000 (08:09 +1200)]
Merge pull request #14925 from civicrm/5.16
5.16
Eileen McNaughton [Tue, 30 Jul 2019 20:08:46 +0000 (08:08 +1200)]
Merge pull request #14924 from colemanw/menubar5.16
Backport menubar fixes to 5.16
Eileen McNaughton [Tue, 30 Jul 2019 20:05:20 +0000 (08:05 +1200)]
Merge pull request #14926 from eileenmcnaughton/conf
dev/core#1084 Contribution confirmation page: Translation won't work
Detlev [Fri, 28 Jun 2019 09:35:31 +0000 (09:35 +0000)]
Update Confirm.tpl
Eileen McNaughton [Tue, 30 Jul 2019 19:54:47 +0000 (07:54 +1200)]
Merge pull request #14920 from eileenmcnaughton/url_search
Fix accidental move of sort_name field on advanced search
Eileen McNaughton [Tue, 30 Jul 2019 19:54:02 +0000 (07:54 +1200)]
Merge pull request #14904 from eileenmcnaughton/activ_516
dev/core#1042 fix duplicate activities on custom data block
Coleman Watts [Thu, 18 Jul 2019 17:29:14 +0000 (13:29 -0400)]
Menubar - get rid of hardcoded pixel values in crm.menubar.js
Coleman Watts [Thu, 18 Jul 2019 12:41:48 +0000 (08:41 -0400)]
Menubar - Use class instead of id for flexibility
eileen [Tue, 30 Jul 2019 07:13:08 +0000 (19:13 +1200)]
Fix accidental move of sort_name field on advanced search
The code that made this field url-enterable ALSO re-ordered them by accident - this fixes
Eileen McNaughton [Tue, 30 Jul 2019 08:10:49 +0000 (20:10 +1200)]
Merge pull request #14922 from civicrm/5.16
5.16 to master
Monish Deb [Tue, 30 Jul 2019 08:05:19 +0000 (13:35 +0530)]
Merge pull request #14918 from totten/5.16-prevnext
Revert "[REF] use generic loadStandardSearchOptionsFromUrl". Fix search selections.
Tim Otten [Tue, 30 Jul 2019 06:14:04 +0000 (23:14 -0700)]
Revert "[REF] use generic loadStandardSearchOptionsFromUrl". Fix search selections.
Overview
-------------------
This reverts commit
a5ca2ad8e16b145edf3a5604fab923d1e2386b37
and fixes a bug in management of the prev/next cache. The
bug is visible when following this procedure:
1. In browser, use "Quick search" to search for text "am"
2. In browser, select checkboxes next to two items
3. In MySQL CLI, run `select * from civicrm_prevnext_cache where is_selected =1;`
4. In browser, continue to next page. Observe that there are no more selection.
5. In MySQL CLI, re-run SQL query. Observe that the selections have disappeared.
Before
-------------------
Proceeding to another page of search results causes loss of selections
After
-------------------
Selections are preserved
eileen [Mon, 29 Jul 2019 03:30:15 +0000 (15:30 +1200)]
[REF] Extract calculation of 'zero-ness' in form rule
Eileen McNaughton [Tue, 30 Jul 2019 05:09:27 +0000 (17:09 +1200)]
Merge pull request #14911 from seamuslee001/ref_prev_next_cleanup_service
[REF] Add in cleanup function to prevnext service and utilise in clea…
Seamus Lee [Tue, 30 Jul 2019 05:00:12 +0000 (15:00 +1000)]
Merge pull request #14915 from eileenmcnaughton/ex_test
[REF] [Export] [Test] Update 2 more tests to use new helper
eileen [Sun, 28 Jul 2019 15:09:12 +0000 (03:09 +1200)]
Test conversion
eileen [Sun, 28 Jul 2019 12:53:17 +0000 (00:53 +1200)]
Convert testGender Export to new test format.
This includes a tangental cleanup & fix whereby the test covers a label longer than 16 char & the code for
prefix_id & suffix_id is consolidated by handling the special casing in the metadata declaration
rather than in multiple places.
Seamus Lee [Mon, 29 Jul 2019 21:55:34 +0000 (07:55 +1000)]
[REF] Add in cleanup function to prevnext service and utilise in cleanup cache situation
Set TTL on prevNextSQL Cache to be 2 days so cleanup code works as previously
Switch to using a class constant for the number of cache days
eileen [Sat, 20 Jul 2019 02:24:18 +0000 (14:24 +1200)]
Stop passing header rows around
Seamus Lee [Tue, 30 Jul 2019 00:34:06 +0000 (10:34 +1000)]
Merge pull request #14912 from eileenmcnaughton/export
[REF] [Export] Remove now redundant param
eileen [Sat, 20 Jul 2019 00:45:18 +0000 (12:45 +1200)]
Remove now redundant param
Seamus Lee [Mon, 29 Jul 2019 21:45:13 +0000 (07:45 +1000)]
Merge pull request #14784 from kirk-circle/1050-delete-repeating-activities
dev/core#1050 - Delete repeat activities that are selected for deletion
Seamus Lee [Mon, 29 Jul 2019 21:44:03 +0000 (07:44 +1000)]
Merge pull request #14907 from eileenmcnaughton/force_pay
[REF] remove never-set, mispelt parameter
Eileen McNaughton [Mon, 29 Jul 2019 20:09:56 +0000 (08:09 +1200)]
Merge pull request #14887 from mattwire/membership_deprecateids
Further deprecate use of $ids array in membership functions
Eileen McNaughton [Mon, 29 Jul 2019 20:03:37 +0000 (08:03 +1200)]
Merge pull request #14747 from mattwire/contributionapi_getsoftperformance
Improve performance on getSoftContribution details - only run one query instead of one per contribution
Eileen McNaughton [Mon, 29 Jul 2019 19:40:00 +0000 (07:40 +1200)]
Merge pull request #14909 from eileenmcnaughton/net_amount
Add unit test for net_amount when fee_amount is set
colemanw [Mon, 29 Jul 2019 14:29:18 +0000 (10:29 -0400)]
Merge pull request #14898 from eileenmcnaughton/export_rel
[REF] [Export] Move fetch Relationship details to processor
colemanw [Mon, 29 Jul 2019 13:20:39 +0000 (09:20 -0400)]
Merge pull request #14910 from JKingsnorth/core-1153
Remove unused standalone-mode code
colemanw [Mon, 29 Jul 2019 13:18:42 +0000 (09:18 -0400)]
Merge pull request #14906 from eileenmcnaughton/event
[NFC] comment fixes, function mis-casing fix
Kirk Jackson [Mon, 29 Jul 2019 10:59:32 +0000 (11:59 +0100)]
Test the activity form's deletion of single and repeating activities
Kirk Jackson [Mon, 29 Jul 2019 10:58:03 +0000 (11:58 +0100)]
Delete repeat activities that are selected for deletion
eileen [Mon, 29 Jul 2019 07:00:39 +0000 (19:00 +1200)]
Add unit test for net_amount when fee_amount is set
This just improves testing & ensures fee_amount is used to set net amount.
I got some odd results on financial_trxn & financial_item but just adding checks for
what I found atm
Matthew Wire (MJW Consulting) [Fri, 26 Jul 2019 15:32:12 +0000 (16:32 +0100)]
Remove more use of ids array on CRM_Member_BAO_Membership::create
JKingsnorth [Mon, 29 Jul 2019 08:13:47 +0000 (09:13 +0100)]
dev/core#1153 Remove unused standalone-mode code
Eileen McNaughton [Mon, 29 Jul 2019 05:03:40 +0000 (17:03 +1200)]
Merge pull request #14889 from demeritcowboy/logging-report-clarification
dev/core#1149 - Make it clearer which record the logging report is displaying
Seamus Lee [Mon, 29 Jul 2019 05:01:53 +0000 (15:01 +1000)]
Merge pull request #14902 from eileenmcnaughton/mem
Fix membership end date on confirming a pending contribution
Seamus Lee [Mon, 29 Jul 2019 05:01:06 +0000 (15:01 +1000)]
Merge pull request #14908 from seamuslee001/master
5.16
Seamus Lee [Mon, 29 Jul 2019 04:55:05 +0000 (14:55 +1000)]
Merge in 5.16
eileen [Mon, 29 Jul 2019 03:08:20 +0000 (15:08 +1200)]
[REF] remove never-set, mispelt parameter
eileen [Mon, 29 Jul 2019 02:39:44 +0000 (14:39 +1200)]
[NFC] comment fixes, function mis-casing fix
Alok Patel [Mon, 29 Jul 2019 00:06:33 +0000 (12:06 +1200)]
Fix membership end date on confirming a pending contribution
https://github.com/civicrm/civicrm-core/pull/13706
eileen [Mon, 29 Jul 2019 02:00:49 +0000 (14:00 +1200)]
dev/core#1042 fix duplicate activities on custom data block
Seamus Lee [Mon, 29 Jul 2019 02:00:47 +0000 (12:00 +1000)]
Merge pull request #14900 from eileenmcnaughton/regress
Fix unreleased regression - fatal on financial account screen
eileen [Thu, 25 Jul 2019 05:49:18 +0000 (17:49 +1200)]
Add handling & test for translated contribution status
eileen [Thu, 25 Jul 2019 01:22:29 +0000 (13:22 +1200)]
dev/financial#36 [IMPORT] fix & test mishandling on payment_instrument labels
Seamus Lee [Mon, 29 Jul 2019 00:34:01 +0000 (10:34 +1000)]
Merge pull request #14880 from eileenmcnaughton/cust_field_label
[Test] [Import] Add test to demonstrate bug that turns out not to exist
Eileen McNaughton [Mon, 29 Jul 2019 00:17:27 +0000 (12:17 +1200)]
Merge pull request #14899 from eileenmcnaughton/format
[NFC] reformat class
eileen [Sun, 28 Jul 2019 22:22:36 +0000 (10:22 +1200)]
Fix unreleased regression - fatal on financial account screen
Eileen McNaughton [Sun, 28 Jul 2019 23:06:15 +0000 (11:06 +1200)]
Merge pull request #14534 from pradpnayak/EventTypeQuery
Fixed event type id fetch
eileen [Sun, 28 Jul 2019 22:14:17 +0000 (10:14 +1200)]
[NFC] reformat class
Seamus Lee [Sun, 28 Jul 2019 22:12:17 +0000 (08:12 +1000)]
Merge pull request #14870 from eileenmcnaughton/import_except
[IMPORT] [code-quality] Remove instances of CRM_Core_Error::fatal from first import form
Seamus Lee [Sun, 28 Jul 2019 21:37:10 +0000 (07:37 +1000)]
Merge pull request #14893 from eileenmcnaughton/date
Fix support for relative dates in urls
eileen [Wed, 17 Jul 2019 07:36:35 +0000 (19:36 +1200)]
Move fetch Relationship details to processor
Seamus Lee [Sun, 28 Jul 2019 21:33:53 +0000 (07:33 +1000)]
Merge pull request #14885 from aydun/location_defaults
Add default location for API v3 creates of Address, IM, OpenID and Phone
Seamus Lee [Sun, 28 Jul 2019 21:29:44 +0000 (07:29 +1000)]
Merge pull request #14760 from eileenmcnaughton/unsub
dev/core#1108 [REF] use CRM_Core_DAO::executeQuery instead of ->query()
Eileen McNaughton [Sun, 28 Jul 2019 21:17:58 +0000 (09:17 +1200)]
Merge pull request #14886 from mattwire/membership_payment
Switch create MembershipPayment to use API
Eileen McNaughton [Sun, 28 Jul 2019 11:41:02 +0000 (23:41 +1200)]
Merge pull request #14620 from mattwire/entitypagetrait_defaultcontactid
EntityPageTrait: Set logged in contact ID as default if one is not specified - this allows permission checks etc. to work properly.
Matthew Wire (MJW Consulting) [Fri, 26 Jul 2019 15:30:47 +0000 (16:30 +0100)]
Switch create MembershipPayment to use API
Matthew Wire (MJW Consulting) [Sun, 7 Jul 2019 11:05:13 +0000 (12:05 +0100)]
Improve performance on getSoftContribution details - only run one query instead of one per contribution
Matthew Wire [Sun, 28 Jul 2019 09:37:44 +0000 (10:37 +0100)]
Merge pull request #14896 from eileenmcnaughton/event_count
Fix php7.x warning on count
colemanw [Sun, 28 Jul 2019 02:00:50 +0000 (22:00 -0400)]
Merge pull request #14874 from eileenmcnaughton/export_1
[REf] [Export] Remove deprecated componentPaymentFields function
colemanw [Sun, 28 Jul 2019 01:59:10 +0000 (21:59 -0400)]
Merge pull request #14875 from eileenmcnaughton/export_2
[Ref] [Export] Remove exportComponent function - it's not adding much here
eileen [Sun, 28 Jul 2019 01:41:43 +0000 (13:41 +1200)]
Fix php7.x warning on count
Fixes a warning when php 7.2 tries to count on a null value
colemanw [Sun, 28 Jul 2019 01:03:59 +0000 (21:03 -0400)]
Merge pull request #14854 from eileenmcnaughton/validate
Do not launch raw js alert jqueryValidation fails
Seamus Lee [Sat, 27 Jul 2019 21:37:38 +0000 (07:37 +1000)]
Merge pull request #14895 from mattwire/optiongroup_checkcrash
Don't let optiongroup check crash
Matthew Wire (MJW Consulting) [Sat, 27 Jul 2019 19:49:38 +0000 (20:49 +0100)]
Don't let optiongroup check crash
Aidan Saunders [Sat, 27 Jul 2019 06:09:38 +0000 (07:09 +0100)]
Small test fixes/standardisations.
eileen [Sat, 27 Jul 2019 05:21:27 +0000 (17:21 +1200)]
Fix support for relative dates in urls
This improves support for relative dates for fields that have been converted.
For example
http://dmaster.local/civicrm/contribute/search?reset=1&receive_date_relative=this.year&force=1
Now works to render donations 'This Calendar Year'
Aidan Saunders [Fri, 26 Jul 2019 10:14:03 +0000 (11:14 +0100)]
Add default location for API v3 creates of Address, IM, OpenID and Phone.
Has tests.
Default location was recently added for APIv3 Email.create
(https://github.com/civicrm/civicrm-core/pull/14489)
and for Address, Email, IM, OpenID and Phone in APIv4
(https://github.com/civicrm/org.civicrm.api4/pull/162)
so this brings consistency of behaviour for these entities between each other
and between APIv3 and APIv4
eileen [Thu, 25 Jul 2019 09:50:18 +0000 (21:50 +1200)]
Remove some static caches that are crashing tests
eileen [Thu, 25 Jul 2019 00:19:15 +0000 (12:19 +1200)]
[Test] Add test to demonstrate bug that turns out not to exist
I thought there was a bug in import handling in custom data so I wrote a test to try to capture it - tests pass & I'm off to re-check
my data & see if the bug was more of a pebkac error.
Anyway test is good
DemeritCowboy [Fri, 26 Jul 2019 20:00:57 +0000 (16:00 -0400)]
make it clearer what the record is
Matthew Wire [Fri, 26 Jul 2019 15:49:35 +0000 (16:49 +0100)]
Merge pull request #14879 from eileenmcnaughton/import_gender_test
[REF] [Test] Add test to cover handling of 'gender_id' on import, remove unused code.
Eileen McNaughton [Thu, 25 Jul 2019 21:00:50 +0000 (09:00 +1200)]
Merge pull request #14883 from totten/master-daotest
CRM-20455 - Allow CRM_Core_DAOTest to pass w/packages#259
Eileen McNaughton [Thu, 25 Jul 2019 21:00:13 +0000 (09:00 +1200)]
Merge pull request #14884 from mlutfy/event6
dev/event#6 Follow the 'same email' participants config setting for backend participants
Mathieu Lutfy [Thu, 25 Jul 2019 19:39:44 +0000 (15:39 -0400)]
dev/event#6 Follow the 'same email' participants config setting for backend participants
Tim Otten [Thu, 25 Jul 2019 16:53:42 +0000 (09:53 -0700)]
DAOTest - Use docblock for type
This patch is going in as part of some cleanup/refactoring in a mid-cycle
change. Using the docblock allows the type to be communicated without
breaking on mid-cycle contract change.
Tim Otten [Thu, 25 Jul 2019 05:48:47 +0000 (22:48 -0700)]
CRM-20455 - Allow CRM_Core_DAOTest w/packages#259
Eileen McNaughton [Thu, 25 Jul 2019 04:40:29 +0000 (16:40 +1200)]
Merge pull request #14672 from seamuslee001/load_smart_cache_after_deleting_group_contact_records
Invalidate smart group cache for group following deletion of group_c…
Seamus Lee [Thu, 25 Jul 2019 03:02:07 +0000 (13:02 +1000)]
Merge pull request #14882 from totten/master-query-event
CRM-20455 - Add specialized event for queries
eileen [Mon, 22 Jul 2019 07:12:18 +0000 (19:12 +1200)]
Remove the js alert message when jqueryValidation fails on frontend pages
It's really really ugly & as discussed without it
a) extensions can still opt to display the errors themselves and
b) the inline errors still appear.
Note this will have no real affect on existing code - the ugliness of this has been
a blocker to getting into front end validation & at this stage only the
omnipay extension is trying to work in this space.
https://github.com/eileenmcnaughton/nz.co.fuzion.omnipaymultiprocessor/pull/128
I think ideally with Omnipay it DOES makes sense to display messages
near the checkout button - which might be a future step
Tim Otten [Thu, 25 Jul 2019 01:02:15 +0000 (18:02 -0700)]
CRM-20455 - Add specialized event for queries
Overview
--------
The recently merged PR for CRM-20455, https://github.com/civicrm/civicrm-packages/pull/180, uses the
GenericHookEvent for modifying all SQL queries. GHE is flexible, but it
comes with a slight performance penalty (juggling a few internal arrays).
The penalty is usually too small to care if you're firing one hook. However, with CRM-20455,
we can foresee the event firing hundreds or even thousands of times within a given page-view.
This PR adds a smaller/simpler class for use with `modifyQuery`. There will be a different PR to use it.
Before
------
* Don't have `QueryEvent`
After
-----
* Do have `QueryEvent`
eileen [Wed, 24 Jul 2019 23:24:46 +0000 (11:24 +1200)]
Add test to cover handling of 'gender_id' on import, remove unused code.
I'm just venturing into import to fix a bug & wrote this test to step through the code. Committing as it's passing.
In the process I found that it's impossible to set 'gender' as an import field & only 'gender_id' is
available as a field so removing 'gender'
Seamus Lee [Wed, 24 Jul 2019 23:38:14 +0000 (09:38 +1000)]
Merge pull request #14861 from eileenmcnaughton/anet
[test] Catch A.net exception & ignore
Tim Otten [Wed, 24 Jul 2019 22:49:43 +0000 (15:49 -0700)]
Merge pull request #14833 from seamuslee001/ids_ip_logging_improvements
Ensure that if present the HTTP_X_FORWARDED_FOR IP address is used in…
Eileen McNaughton [Wed, 24 Jul 2019 22:48:43 +0000 (10:48 +1200)]
Merge pull request #14878 from civicrm/5.16
5.16 to master
Tim Otten [Wed, 24 Jul 2019 22:44:15 +0000 (15:44 -0700)]
Merge pull request #14876 from eileenmcnaughton/is_front
dev/core#378 Determine front end pages in drupal
Eileen McNaughton [Wed, 24 Jul 2019 22:34:48 +0000 (10:34 +1200)]
Merge pull request #14718 from totten/herb-private-hier
Move log and compilation dirs from "Runtime" to "Paths"
Seamus Lee [Fri, 28 Jun 2019 22:45:42 +0000 (08:45 +1000)]
Invalidate smart group cache for group following deletion of group_contact row
Add in function to invalidate smart group cache rather than building it up again when contact removal is deleted
Remove if check
eileen [Wed, 24 Jul 2019 20:11:06 +0000 (08:11 +1200)]
dev/core#1141 remove sql_calc_rows
It's gone for mysql8 & I just checked & in this case the count is never used so it can just go