Eileen McNaughton [Tue, 21 Jan 2020 18:54:48 +0000 (07:54 +1300)]
Merge pull request #16344 from eileenmcnaughton/ev_test
Fix unit test so price set params are valid
Eileen McNaughton [Tue, 21 Jan 2020 05:13:43 +0000 (18:13 +1300)]
Merge pull request #16340 from jitendrapurohit/dev-1540
Add user friendly error message on merge error
eileen [Mon, 20 Jan 2020 21:15:49 +0000 (10:15 +1300)]
Fix unit test so price set params are valid
Jitendra Purohit [Mon, 20 Jan 2020 05:56:47 +0000 (11:26 +0530)]
Add user friendly error message on merge error
Seamus Lee [Tue, 21 Jan 2020 01:42:38 +0000 (12:42 +1100)]
Merge pull request #16345 from eileenmcnaughton/ev_title
Simplify event title retrieval, use cache, add test
Seamus Lee [Tue, 21 Jan 2020 01:40:18 +0000 (12:40 +1100)]
Merge pull request #16342 from JKingsnorth/patch-13
[NFC] Remove unused local variables from CRM_Contribute_Form_AdditionalPayment::processCreditCard
eileen [Mon, 20 Jan 2020 21:33:52 +0000 (10:33 +1300)]
Simplify event title retrieval, use cache, add test
Eileen McNaughton [Mon, 20 Jan 2020 20:00:29 +0000 (09:00 +1300)]
Merge pull request #16341 from mattwire/membership_overridden
When viewing a membership show if the status is overridden
John Kingsnorth [Mon, 20 Jan 2020 17:10:45 +0000 (17:10 +0000)]
Remove unused variable $now
Matthew Wire [Mon, 20 Jan 2020 15:18:15 +0000 (15:18 +0000)]
When viewing a membership show if the status is overridden
John Kingsnorth [Mon, 20 Jan 2020 16:53:32 +0000 (16:53 +0000)]
Remove unused local variable $fields
colemanw [Mon, 20 Jan 2020 15:13:30 +0000 (10:13 -0500)]
Merge pull request #14591 from JKingsnorth/dev/core#1064
dev/core#1064 Allow personalised 'view in browser' links for mass emails
colemanw [Sun, 19 Jan 2020 02:38:34 +0000 (21:38 -0500)]
Merge pull request #16315 from eileenmcnaughton/var
[REF] Remove setting of unused function.
Seamus Lee [Sun, 19 Jan 2020 00:36:07 +0000 (11:36 +1100)]
Merge pull request #16331 from eileenmcnaughton/cont_soft
[NFC] Code formatting
Eileen McNaughton [Sat, 18 Jan 2020 23:25:20 +0000 (12:25 +1300)]
Merge pull request #16329 from eileenmcnaughton/ev_one
Start to use function rather than multiple queries for event details add test
Eileen McNaughton [Sat, 18 Jan 2020 23:25:03 +0000 (12:25 +1300)]
Merge pull request #16333 from eileenmcnaughton/bounce
[REF] Move the bounce to the start of the form submit
Eileen McNaughton [Sat, 18 Jan 2020 22:32:07 +0000 (11:32 +1300)]
Merge pull request #16332 from seamuslee001/event_confirm_text_extend
[NFC] Extend unit test to cover for recent refactor by eileen to ensure sup…
eileen [Sat, 18 Jan 2020 07:30:01 +0000 (20:30 +1300)]
Move the bounce to the start of the form submit
eileen [Fri, 17 Jan 2020 22:15:21 +0000 (11:15 +1300)]
Start to use function rather than multiple queries for event details, add test
eileen [Sat, 18 Jan 2020 07:04:52 +0000 (20:04 +1300)]
[NFC] Code formatting
Seamus Lee [Sat, 18 Jan 2020 20:48:06 +0000 (07:48 +1100)]
Extend unit test to cover for recent refactor by eileen to ensure support for CRM-4196 remains
Seamus Lee [Sat, 18 Jan 2020 20:46:26 +0000 (07:46 +1100)]
Merge pull request #16330 from eileenmcnaughton/process_event
[REF] Eliminate silly parameter from function signature.
Seamus Lee [Sat, 18 Jan 2020 20:33:25 +0000 (07:33 +1100)]
Merge pull request #16018 from mattwire/manualcontributionstatus
Fix retrieving contribution_status_id for manual payment processor
Coleman Watts [Sat, 18 Jan 2020 18:46:29 +0000 (13:46 -0500)]
Add code docs to Api4/CustomValue
Matthew Wire (MJW Consulting) [Wed, 13 Nov 2019 05:47:58 +0000 (18:47 +1300)]
Fix retrieving contribution_status_id for manual payment processor
eileen [Sat, 18 Jan 2020 06:46:23 +0000 (19:46 +1300)]
Eliminate silly parameter from function signature.
Removes the isAdditionalAmount parameter which is only used to adjust the amount key on the value variable.
Value is reset each participant so we don't need to worry about it being 'cumulative'
Seamus Lee [Sat, 18 Jan 2020 05:27:23 +0000 (16:27 +1100)]
Merge pull request #16316 from eileenmcnaughton/parent
Remove function that exactly matches parent class.
Seamus Lee [Sat, 18 Jan 2020 02:56:04 +0000 (13:56 +1100)]
Merge pull request #16327 from eileenmcnaughton/pp
Extract code for isPaymentOnExistingContribution.
eileen [Fri, 17 Jan 2020 21:37:01 +0000 (10:37 +1300)]
Extract code for isPaymentOnExistingContribution.
This allows us to make the meaning of the IF clause clearer
Eileen McNaughton [Sat, 18 Jan 2020 00:42:58 +0000 (13:42 +1300)]
Merge pull request #16325 from eileenmcnaughton/ev
[REF] Extract code that assigns event variables to the tpl
Seamus Lee [Fri, 17 Jan 2020 21:41:25 +0000 (08:41 +1100)]
Merge pull request #16314 from eileenmcnaughton/nfc
[NFC] Code cleanup
eileen [Fri, 17 Jan 2020 21:14:44 +0000 (10:14 +1300)]
Extract code that assigns event variables to the tpl
Matthew Wire [Fri, 17 Jan 2020 21:04:02 +0000 (21:04 +0000)]
Merge pull request #15992 from eileenmcnaughton/utf_temp
Update temp table handler to support utf8mb4 if that is the db collation
eileen [Fri, 17 Jan 2020 01:29:18 +0000 (14:29 +1300)]
Remove function that exactly matches parent class.
I copied it over the parent class fn & apart from minor comment block differences it matches
Seamus Lee [Fri, 17 Jan 2020 19:34:43 +0000 (06:34 +1100)]
Merge pull request #15383 from michaelmcandrew/lab-1286
also skip report instance header and footer (lab-1286)
Seamus Lee [Fri, 17 Jan 2020 19:06:48 +0000 (06:06 +1100)]
Merge pull request #16320 from mattwire/pcp_pagecleanup
NFC Convert Manage PCP page to short array syntax
eileen [Fri, 17 Jan 2020 03:47:34 +0000 (16:47 +1300)]
[NFC] Fix some missing exceptions etc
eileen [Fri, 17 Jan 2020 00:45:34 +0000 (13:45 +1300)]
[NFC] Minor code tidy up
Declare Exceptions, use strict comparison
Seamus Lee [Fri, 17 Jan 2020 19:03:01 +0000 (06:03 +1100)]
Merge pull request #16321 from colemanw/CheckBox
dev/core#1535 - Fix missing address is_primary field
Coleman Watts [Fri, 17 Jan 2020 14:05:44 +0000 (09:05 -0500)]
dev/core#1535 - Fix missing address is_primary field
colemanw [Fri, 17 Jan 2020 12:44:52 +0000 (07:44 -0500)]
Merge pull request #16317 from eileenmcnaughton/duplicate
Remove duplicate line of code
Michael McAndrew [Fri, 17 Jan 2020 12:19:19 +0000 (12:19 +0000)]
lab-1286 - skip report instance header and footer in CRM_Utils_API_HTMLInputCoder
Matthew Wire [Fri, 17 Jan 2020 10:09:25 +0000 (10:09 +0000)]
Convert Manage PCP page to short array syntax
Seamus Lee [Fri, 17 Jan 2020 07:22:25 +0000 (18:22 +1100)]
Merge pull request #16319 from civicrm/5.22
5.22
Seamus Lee [Fri, 17 Jan 2020 06:20:12 +0000 (17:20 +1100)]
Merge pull request #16313 from eileenmcnaughton/522
dev/core#1217 Fix for failure to respect event_id (or any?) criteria in smart groups
eileen [Fri, 17 Jan 2020 03:47:55 +0000 (16:47 +1300)]
Remove duplicate line of code
eileen [Fri, 17 Jan 2020 01:25:08 +0000 (14:25 +1300)]
Remove setting of unused function.
The called function ONLY returns the query so nothing gained by getting a throw-away variable
Eileen McNaughton [Fri, 17 Jan 2020 06:07:37 +0000 (19:07 +1300)]
Merge pull request #16310 from eileenmcnaughton/mem
[NFC] code cleanup
Eileen McNaughton [Fri, 17 Jan 2020 06:06:59 +0000 (19:06 +1300)]
Merge pull request #16309 from eileenmcnaughton/gn
[NFC] Code cleanup
eileen [Fri, 17 Jan 2020 03:52:11 +0000 (16:52 +1300)]
dev/core#1217 Fix for failure to respect event_id (or any?) criteria in smart groups
From what I can tell it's possible to create smart groups from Advanced search & other contact searchs & Membership Search & Event search.
Membership search actually just leverages advanced search but Event Search smart group has it's own code & reloads into Event search.
This has been flawed for months but the current iteration is the criteria are not respected. On digging I found the decision was made in
contact search to store the parsed QueryParams (in [field_name, 'IN', [1,2]] format not the formValues. I think this was probably a mistake.
However, by adjusting the event code to do the same & ensuring the defaults are set it starts working again
Eileen McNaughton [Fri, 17 Jan 2020 02:18:36 +0000 (15:18 +1300)]
Merge pull request #16308 from eileenmcnaughton/search_ref
[REF] Remove apparent copy & paste code.
Eileen McNaughton [Fri, 17 Jan 2020 02:18:19 +0000 (15:18 +1300)]
Merge pull request #16302 from colemanw/wildcards
Api4 - Support wildcard * in select clause
Eileen McNaughton [Fri, 17 Jan 2020 02:17:48 +0000 (15:17 +1300)]
Merge pull request #16305 from colemanw/formatOutput
Api4 - format output consistently across get/create/update.
eileen [Fri, 17 Jan 2020 01:27:32 +0000 (14:27 +1300)]
[NFC] code cleanup
Declare Exceptions, use strict, use single quotes
eileen [Fri, 17 Jan 2020 01:35:43 +0000 (14:35 +1300)]
[NFC] Code cleanup
Throw exception rather than fatal
- declare exceptions
- single quotes
- strict comparisons
eileen [Fri, 17 Jan 2020 00:34:44 +0000 (13:34 +1300)]
[REF] Remove apparent copy & paste code.
In code familiarisation to tackle dev#core/1217 I looked at this var & concluded that the var is set in 9
places but in 8 of those it is never used. In the last place (CRM_Contact_Form_Search) it is used to
determine whether to build the pre-next cache. I swapped it over to just doing a getButton without any
change - I stepped through in advanced search, search builder, custom search, basic search it still enters the cache lines of code. In Contribution, event search it doesn't (before & after).
Part of just makingg code semi-readable
Seamus Lee [Thu, 16 Jan 2020 22:46:10 +0000 (09:46 +1100)]
Merge pull request #16306 from seamuslee001/dev_mail_59
dev/mailing#59 Update the version of zetacomponents/mail package to b…
Seamus Lee [Thu, 16 Jan 2020 19:23:55 +0000 (06:23 +1100)]
dev/mailing#59 Update the version of zetacomponents/mail package to 1.9.0 to be one that potentially will support XAUTH2 for google purposes
colemanw [Thu, 16 Jan 2020 18:56:59 +0000 (13:56 -0500)]
Merge pull request #16304 from mattwire/case_removeunusedcustom
Remove unused code in Case/Form/Activity postProcess
Coleman Watts [Thu, 16 Jan 2020 16:58:22 +0000 (11:58 -0500)]
Api4 - format output consistently across get/create/update.
Previously output from a DAO-based Get would be run through an unserializer/type-converter.
This applies that same conversion to DAO-based create/update ops.
colemanw [Thu, 16 Jan 2020 17:15:06 +0000 (12:15 -0500)]
Merge pull request #16299 from mattwire/scheduledjobs_doc
Update docs link for edit scheduled job parameters
Matthew Wire [Thu, 16 Jan 2020 16:56:21 +0000 (16:56 +0000)]
Remove unused code in Case/Form/Activity postProcess
Coleman Watts [Thu, 16 Jan 2020 01:59:59 +0000 (20:59 -0500)]
Api4 - Support wildcard * in select clause
colemanw [Thu, 16 Jan 2020 14:55:52 +0000 (09:55 -0500)]
Merge pull request #16300 from colemanw/contactTypeFields
Api4 - Filter returned fields by contact type
colemanw [Thu, 16 Jan 2020 12:44:03 +0000 (07:44 -0500)]
Merge pull request #16303 from MikeyMJCO/patch-3
Fix minor typo in help text.
Coleman Watts [Sat, 11 Jan 2020 17:33:45 +0000 (12:33 -0500)]
Api4 - Filter returned fields by contact type
colemanw [Thu, 16 Jan 2020 12:37:14 +0000 (07:37 -0500)]
Merge pull request #15857 from demeritcowboy/clear-dyn-folder
dev/core#1395 - Clear the asset builder cache when clearing cache
Mikey O'Toole [Thu, 16 Jan 2020 11:09:13 +0000 (11:09 +0000)]
Fix minor typo in help text.
Seamus Lee [Thu, 16 Jan 2020 07:16:35 +0000 (18:16 +1100)]
Merge pull request #16230 from aydun/1511_event_show_location
dev/core#1511 Expose option to show event location on configuration tab
Seamus Lee [Thu, 16 Jan 2020 07:12:35 +0000 (18:12 +1100)]
Merge pull request #16301 from eileenmcnaughton/cust_clean
[NFC] code cleanup
Eileen McNaughton [Thu, 16 Jan 2020 03:12:28 +0000 (16:12 +1300)]
Merge pull request #16113 from colemanw/meta
Add metadata to is_primary fields
Eileen McNaughton [Thu, 16 Jan 2020 01:00:37 +0000 (14:00 +1300)]
Merge pull request #15891 from mecachisenros/order-create-isskiplineitem
Enforce isSkipLineItem for membership payment entity in Order.create
Eileen McNaughton [Thu, 16 Jan 2020 00:58:56 +0000 (13:58 +1300)]
Merge pull request #16266 from jitendrapurohit/core-1517
dev/core#1517 - Permission error on event info page for anonymous users
eileen [Wed, 15 Jan 2020 23:40:05 +0000 (12:40 +1300)]
[NFC] code cleanup
Swap out some fatals for exceptions, use single quotes, strict comparison
Eileen McNaughton [Wed, 15 Jan 2020 23:29:41 +0000 (12:29 +1300)]
Merge pull request #15759 from tunbola/active-option-values-for-custom-group
Fetch Only Active Custom Group Extend Values
eileen [Fri, 29 Nov 2019 21:26:37 +0000 (10:26 +1300)]
Update temp table handler to support utf8mb4 if that is the db collation
Matthew Wire [Wed, 15 Jan 2020 15:35:14 +0000 (15:35 +0000)]
Update docs link for edit scheduled job parameters
Aidan Saunders [Mon, 13 Jan 2020 18:42:07 +0000 (18:42 +0000)]
Add help text for Show Location option
Eileen McNaughton [Wed, 15 Jan 2020 05:19:10 +0000 (18:19 +1300)]
Merge pull request #16296 from seamuslee001/master
5.22
Seamus Lee [Wed, 15 Jan 2020 05:05:00 +0000 (16:05 +1100)]
Merge pull request #16273 from demeritcowboy/d8-check-group-roles
dev/drupal#89 Drupal 8 version of checkGroupRole
Seamus Lee [Wed, 15 Jan 2020 04:50:42 +0000 (15:50 +1100)]
Merge in 5.22
Seamus Lee [Wed, 15 Jan 2020 04:48:16 +0000 (15:48 +1100)]
Merge pull request #16292 from eileenmcnaughton/522
dev/user-interface#13 fix regression where option to email is not longer displayed
Seamus Lee [Wed, 15 Jan 2020 03:28:08 +0000 (14:28 +1100)]
Merge pull request #16293 from eileenmcnaughton/part_search
Enotice fix
Seamus Lee [Wed, 15 Jan 2020 03:27:26 +0000 (14:27 +1100)]
Merge pull request #16290 from eileenmcnaughton/cont
[NFC] Minor code cleanup
eileen [Tue, 14 Jan 2020 21:31:47 +0000 (10:31 +1300)]
Enotice fix
eileen [Tue, 14 Jan 2020 20:57:49 +0000 (09:57 +1300)]
dev/user-interface#13 fix regression where option to email is not longer displayed.
The api parameter here was removed, seemingly unintentionally. It is picked up on by the script when it checks for email so
needs re-instating
Seamus Lee [Tue, 14 Jan 2020 20:31:33 +0000 (07:31 +1100)]
Merge pull request #15314 from jitendrapurohit/dev-1255
dev/core#1255 - fix display of email address on pay later contribution
eileen [Tue, 14 Jan 2020 20:26:05 +0000 (09:26 +1300)]
[NFC] Minor code cleanup
Seamus Lee [Tue, 14 Jan 2020 06:32:07 +0000 (17:32 +1100)]
Merge pull request #16246 from eileenmcnaughton/dedupe2
Check field to carry over custom data by default when the other contact has none
Eileen McNaughton [Tue, 14 Jan 2020 04:37:40 +0000 (17:37 +1300)]
Merge pull request #16288 from civicrm/5.22
5.22 to master
Eileen McNaughton [Tue, 14 Jan 2020 04:37:16 +0000 (17:37 +1300)]
Merge pull request #16287 from MegaphoneJon/core-1524-rc
fix created_date/modified_date relative date filter searches
Seamus Lee [Tue, 14 Jan 2020 04:16:19 +0000 (15:16 +1100)]
Merge pull request #16216 from demeritcowboy/unicode-mailing-labels
dev/core#1502 Make unicode font dejavusans the default for mailing labels
Seamus Lee [Tue, 14 Jan 2020 03:24:21 +0000 (14:24 +1100)]
Merge pull request #16281 from eileenmcnaughton/part_pay_wip
Basic extraction of paid event processing
Jon Goldberg [Mon, 13 Jan 2020 22:52:22 +0000 (17:52 -0500)]
fix created_date/modified_date relative date filter searches
Eileen McNaughton [Mon, 13 Jan 2020 22:48:00 +0000 (11:48 +1300)]
Merge pull request #16284 from kcristiano/cleanurls-setting
Update civicrm.settings.php.template to default to CLEANURL for WP
Eileen McNaughton [Mon, 13 Jan 2020 20:33:42 +0000 (09:33 +1300)]
Merge pull request #16272 from wmortada/improve-accessibility-of-auto-renew-message
dev/core#1520 Improve accessibility of membership edit form
Kevin Cristiano [Mon, 13 Jan 2020 14:14:35 +0000 (09:14 -0500)]
Update civicrm.settings.php.template to default to CLEANURL for WP
Signed-off-by: Kevin Cristiano <kcristiano@kcristiano.com>
Matthew Wire [Mon, 13 Jan 2020 11:59:18 +0000 (11:59 +0000)]
Merge pull request #16282 from agileware/CIVICRM-1417
Force reCaptcha is not working when pay later enabled
Pengyi Zhang [Mon, 13 Jan 2020 05:51:33 +0000 (16:51 +1100)]
CIVICRM-1417 enable reCaptcha with pay later option
Seamus Lee [Mon, 13 Jan 2020 00:29:02 +0000 (11:29 +1100)]
Merge pull request #16280 from seamuslee001/fintype_delete
[REF] Fix return value on deleting financial type