eileen [Thu, 23 Jan 2020 21:33:54 +0000 (10:33 +1300)]
Duplicate code (for real)
This is going to seem unintuitive but I'm sure the path to cleaning up the participant form starts with
increasing code duplication.
Currently the code is sharing 2 functions with the front end form. The functions don't do a lot of actual processing
but they do do a lot of preparing parameters. The calling functions do a lot of pre-work to call them - so
we are not getting much benefit from the sharing. On the other hand having this code tied up with another form makes
it hard for us to do the 'right' sharing - ie. currently the code to create a contribution paid by credit card & participant record is totally different to another payment method & we should work to share these bits of functionality
Eileen McNaughton [Thu, 23 Jan 2020 21:15:22 +0000 (10:15 +1300)]
Merge pull request #16353 from pradpnayak/functionFix
Wrong parameter passed to executeQuery function
Eileen McNaughton [Thu, 23 Jan 2020 21:11:39 +0000 (10:11 +1300)]
Merge pull request #16311 from MegaphoneJon/event-template-reminders
event#28: Don't send scheduled reminders for event templates
Jon Goldberg [Fri, 17 Jan 2020 00:50:24 +0000 (19:50 -0500)]
Don't send scheduled reminders for event templates
Eileen McNaughton [Thu, 23 Jan 2020 19:42:28 +0000 (08:42 +1300)]
Merge pull request #16361 from yashodha/typo
fix typo's in the text
Eileen McNaughton [Thu, 23 Jan 2020 19:32:48 +0000 (08:32 +1300)]
Merge pull request #16189 from eileenmcnaughton/acl
Update BAO_Acl internal functions to protected & unused to deprecated
yashodha [Thu, 23 Jan 2020 12:56:30 +0000 (18:26 +0530)]
fix typo's in the text
Eileen McNaughton [Thu, 23 Jan 2020 04:55:13 +0000 (17:55 +1300)]
Merge pull request #16017 from mattwire/setentitysubtype
Add function to set entitySubType for entity forms
Eileen McNaughton [Thu, 23 Jan 2020 04:19:44 +0000 (17:19 +1300)]
Merge pull request #16354 from mlutfy/translation35
dev/translation#35 Display the CiviCRM Resources dashlet in the user's language
Seamus Lee [Thu, 23 Jan 2020 02:59:01 +0000 (13:59 +1100)]
Merge pull request #16334 from eileenmcnaughton/ev_tpl
[REF] Move assignment of BalanceAmount
Pradeep Nayak [Thu, 23 Jan 2020 01:41:36 +0000 (01:41 +0000)]
Wrong parameter passed to executeQuery function
Mathieu Lutfy [Wed, 22 Jan 2020 22:38:32 +0000 (17:38 -0500)]
dev/translation#35 Display the CiviCRM Resources dashlet in the user's language
Eileen McNaughton [Wed, 22 Jan 2020 18:52:10 +0000 (07:52 +1300)]
Merge pull request #16351 from colemanw/debug
Add debug info to api4 output
Eileen McNaughton [Wed, 22 Jan 2020 18:48:31 +0000 (07:48 +1300)]
Merge pull request #16260 from eileenmcnaughton/ids_2
[REF] Fix CRM_Core_BAO_UFGroup::createUFJoin to not receive by reference.
Coleman Watts [Wed, 22 Jan 2020 11:46:30 +0000 (06:46 -0500)]
Add debug info to api4 output
Yashodha Chaku [Wed, 22 Jan 2020 05:31:59 +0000 (11:01 +0530)]
Merge pull request #16349 from eileenmcnaughton/credit
Remove unreachable code lines.
Eileen McNaughton [Wed, 22 Jan 2020 03:20:09 +0000 (16:20 +1300)]
Merge pull request #16307 from seamuslee001/dev_mail_59
dev/mailing#59 Add in provider option IMAP_XOAUTH2 to assist with goo…
eileen [Wed, 22 Jan 2020 02:50:50 +0000 (15:50 +1300)]
Remove unreachable code lines.
We were very precautionary in Barcelona & deprecated rather than removing these line. However, we've had
several releases including a security release & an ESR since then with no one reporting hitting these so
they can go now
Eileen McNaughton [Wed, 22 Jan 2020 02:45:08 +0000 (15:45 +1300)]
Merge pull request #16326 from wmortada/core#1537
dev/core#1537 Don't append multiple copies of the eligible related contacts text
Eileen McNaughton [Wed, 22 Jan 2020 01:32:52 +0000 (14:32 +1300)]
Merge pull request #16286 from alifrumin/offlineContributor
Add "Contributor Name" to Offline Contribution Receipts
Eileen McNaughton [Wed, 22 Jan 2020 01:31:52 +0000 (14:31 +1300)]
Merge pull request #16343 from colemanw/abstract
Api4 - Make abstract function abstract
Eileen McNaughton [Wed, 22 Jan 2020 01:31:26 +0000 (14:31 +1300)]
Merge pull request #16346 from colemanw/entityGet
Api4 - Improve Entity::get
Eileen McNaughton [Wed, 22 Jan 2020 01:29:14 +0000 (14:29 +1300)]
Merge pull request #16347 from demeritcowboy/name-label-yet-again
dev/core#1116 Wrong linebreaks viewing Inbound Emails when activity type label is changed
Seamus Lee [Wed, 22 Jan 2020 00:23:38 +0000 (11:23 +1100)]
Merge pull request #16337 from eileenmcnaughton/ev_static
Change function buildEventFeeForm to non-static
demeritcowboy [Tue, 21 Jan 2020 22:37:41 +0000 (17:37 -0500)]
wrong linebreaks when activity type label is changed
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
Coleman Watts [Mon, 20 Jan 2020 23:26:58 +0000 (18:26 -0500)]
Api4 - Improve Entity::get
Ensure that every php file found by the scanner is_a class inheriting from AbstractEntity.
Remove the CustomValue class by virtue of its class type instead of manually remove it.
Improve performance when fetching entities by name.
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
Coleman Watts [Mon, 20 Jan 2020 19:58:07 +0000 (14:58 -0500)]
Api4 - Make abstract function abstract
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
eileen [Sun, 19 Jan 2020 17:46:28 +0000 (06:46 +1300)]
Changee buildEventFeeForm to non-static
I searched on thee full function name & also 'buildEvent' & 'feeForm' and I don't believe this is called
from outside this function. I want to call it from tests to fix some test set up issues butt
there are a bunch of undefined properties so I concluded I should set this up first.
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 22:24:07 +0000 (11:24 +1300)]
[REF] Move assignment of BalanceAmount
This moves the assignment of balanceAmount to where the partial_payment_total is determined.
Template assignments happen all over the place so it makes more sense to group this
which where the values are determined
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
William Mortada [Fri, 17 Jan 2020 21:19:56 +0000 (21:19 +0000)]
Don't append multiple copies of the eligible related contacts text
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
Seamus Lee [Thu, 16 Jan 2020 23:16:53 +0000 (10:16 +1100)]
dev/mailing#59 Add in provider option IMAP_XOAUTH2 to assist with google's changes to imap access
Apply PHP Syntax fix patch and update tests
Bump up to 1.9.1 of zetacomponents/mail to fix syntax issue
eileen [Thu, 9 Jan 2020 20:57:10 +0000 (09:57 +1300)]
[REF] Fix CRM_Core_BAO_UFGroup::createUFJoin to not receive by reference.
This function is called from one place. It gets passed a params variable that is 're-used' so this
change makes it clear what actually needs to be passed on. We have an anti-pattern in our code whereby params get
passed all sorts of places with it being confusing which ones actually need to receive what
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.