Seamus Lee [Wed, 15 Jan 2020 03:27:26 +0000 (14:27 +1100)]
Merge pull request #16290 from eileenmcnaughton/cont
[NFC] Minor code cleanup
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
eileen [Thu, 9 Jan 2020 13:25:41 +0000 (02:25 +1300)]
Basic extraction of paid event processing
Eileen McNaughton [Sun, 12 Jan 2020 23:02:07 +0000 (12:02 +1300)]
Merge pull request #16274 from colemanw/type
Api4 - Convert field values to correct data type
Seamus Lee [Sun, 12 Jan 2020 21:51:23 +0000 (08:51 +1100)]
[REF] Fix return value on deleting financial type
Extend unit test to cover deleting fin type
Seamus Lee [Sun, 12 Jan 2020 03:48:12 +0000 (14:48 +1100)]
Merge pull request #15624 from seamuslee001/payment_processor_api4
Implement PaymentProcessor and PaymentProcessorType APIv4 Entities
Seamus Lee [Sun, 27 Oct 2019 02:07:57 +0000 (13:07 +1100)]
Implement PaymentProcessor and PaymentProcessorType APIv4 Entities
Move default values to spec as per Coleman
Fix class name in tests and fix default values on tables
Mock financial_account_id field
Fix headers and remove some unnessary code
Update api v4 code following move of the handling to the BAO and update tests as per Coleman
colemanw [Sat, 11 Jan 2020 22:37:41 +0000 (17:37 -0500)]
Merge pull request #16279 from seamuslee001/ref_payment_processor_instrument
[REF] Move handling of default payment instrument for a payment proc…
Seamus Lee [Sat, 11 Jan 2020 20:53:12 +0000 (07:53 +1100)]
[REF] Move handling of default payment instruement for a payment processor into the create function from API and expand tests
Seamus Lee [Sat, 11 Jan 2020 20:33:34 +0000 (07:33 +1100)]
Merge pull request #15570 from colemanw/caseRoles
Restrict case roles by group
Coleman Watts [Sat, 11 Jan 2020 18:21:24 +0000 (13:21 -0500)]
Add caseType test
Coleman Watts [Mon, 21 Oct 2019 21:54:44 +0000 (17:54 -0400)]
Change caseType activityAsgmtGrps to store group name instead of id
Coleman Watts [Mon, 21 Oct 2019 21:45:51 +0000 (17:45 -0400)]
Option to limit case roles to certain groups
colemanw [Sat, 11 Jan 2020 17:23:52 +0000 (12:23 -0500)]
Merge pull request #16262 from eileenmcnaughton/add_payments
Remove never passed-in parameter from addPayments
colemanw [Sat, 11 Jan 2020 17:22:51 +0000 (12:22 -0500)]
Merge pull request #16244 from eileenmcnaughton/dedupe
Remove unused and largely unreachable code.
colemanw [Sat, 11 Jan 2020 17:11:59 +0000 (12:11 -0500)]
Merge pull request #16263 from eileenmcnaughton/ids_3
[REF] Reduce places where we pass ids into Mailing::create
colemanw [Sat, 11 Jan 2020 17:10:45 +0000 (12:10 -0500)]
Merge pull request #16256 from eileenmcnaughton/ids
[REF] Remove ids and fully deprecate passing it to Contribution::create
colemanw [Sat, 11 Jan 2020 17:03:01 +0000 (12:03 -0500)]
Merge pull request #16265 from seamuslee001/fix_flexmailer
Ensure that we always return a raw urlencoded url for extenal urls to…
colemanw [Sat, 11 Jan 2020 17:00:43 +0000 (12:00 -0500)]
Merge pull request #16275 from seamuslee001/nfC_payment_processor_type_field
[NFC] Explicitly specify that it is the Payment processor Type Name n…
Seamus Lee [Sat, 11 Jan 2020 02:44:56 +0000 (13:44 +1100)]
Merge pull request #16278 from civicrm/5.22
5.22
Tim Otten [Sat, 11 Jan 2020 00:56:02 +0000 (16:56 -0800)]
Merge pull request #16277 from seamuslee001/5.22
Add release notes for 5.21.1
Tim Otten [Sat, 11 Jan 2020 00:34:03 +0000 (16:34 -0800)]
Add release notes for 5.21.1
Coleman Watts [Fri, 10 Jan 2020 22:06:37 +0000 (17:06 -0500)]
Api4 - Output field values as correct data type
Seamus Lee [Fri, 10 Jan 2020 23:38:23 +0000 (10:38 +1100)]
[NFC] Explicitly specify that it is the Payment processor Type Name not Payment Procesor name field.
Seamus Lee [Fri, 10 Jan 2020 23:35:05 +0000 (10:35 +1100)]
Merge pull request #15829 from eileenmcnaughton/dedupe3
Add resolved to return array for get_conflicts
Seamus Lee [Fri, 10 Jan 2020 21:01:19 +0000 (08:01 +1100)]
Merge pull request #16269 from wmortada/fix-auto-renew-text
dev/core#1519 Fix auto renew text
Seamus Lee [Fri, 10 Jan 2020 20:53:15 +0000 (07:53 +1100)]
Merge pull request #16268 from JGaunt/patch-2
Update contributor-key.yml
Matthew Wire [Fri, 10 Jan 2020 18:34:13 +0000 (18:34 +0000)]
Merge pull request #16270 from demeritcowboy/testtest
Update failing test to match intervening changes elsewhere
William Mortada [Mon, 6 Jan 2020 16:05:36 +0000 (16:05 +0000)]
Rewrite auto-renew message to make it more accessible
demeritcowboy [Fri, 10 Jan 2020 15:17:38 +0000 (10:17 -0500)]
update test to match changes elsewhere
Jade Gaunt [Fri, 10 Jan 2020 13:59:12 +0000 (13:59 +0000)]
Update contributor-key.yml
William Mortada [Fri, 10 Jan 2020 13:44:31 +0000 (13:44 +0000)]
Fix auto renew text
Matthew Wire [Fri, 10 Jan 2020 11:37:36 +0000 (11:37 +0000)]
Merge pull request #15306 from bhahumanists/bhahumanists-mailingID
#1253 Pass mailing id to alterMailContent hook
Matthew Wire [Fri, 10 Jan 2020 11:35:35 +0000 (11:35 +0000)]
Merge pull request #16195 from demeritcowboy/activityview-recent-items
dev/core#1507 Fix recent items for viewing Email activities from contact activities tab
Seamus Lee [Fri, 10 Jan 2020 06:30:09 +0000 (17:30 +1100)]
Merge pull request #16257 from colemanw/index
Add more functionality to the api4 $index param
Seamus Lee [Fri, 10 Jan 2020 06:29:43 +0000 (17:29 +1100)]
Merge pull request #16264 from MegaphoneJon/soft-credit-hooks
Add pre/post hooks on ContributionSoft entity
Jon Goldberg [Thu, 9 Jan 2020 22:34:13 +0000 (17:34 -0500)]
Add pre/post hooks on ContributionSoft entity
Coleman Watts [Fri, 10 Jan 2020 01:14:50 +0000 (20:14 -0500)]
Add unit test for Civi\Api4\Utils\ReflectionUtils::parseDocBlock
eileen [Thu, 9 Jan 2020 13:00:33 +0000 (02:00 +1300)]
[REF] Remove ids and fully deprecate passing it to Contribution::create
ids is no longer preferrred & is functionally equivalent
Coleman Watts [Thu, 9 Jan 2020 22:35:30 +0000 (17:35 -0500)]
Test fix - legacy api4 wrapper should always return id
Seamus Lee [Thu, 9 Jan 2020 23:04:35 +0000 (10:04 +1100)]
Ensure that we always return a raw urlencoded url for extenal urls to fix Flexmailer tests
Seamus Lee [Thu, 9 Jan 2020 22:40:28 +0000 (09:40 +1100)]
Merge pull request #15318 from jitendrapurohit/dev-1263
dev/drupal#89 - Drupal 8 - Contact Report does not load any values in…
Eileen McNaughton [Thu, 9 Jan 2020 21:31:52 +0000 (10:31 +1300)]
Merge pull request #16258 from samuelsov/i18ncountriesorder
Country/State PseudoConstant not sorted according to the locale
eileen [Thu, 9 Jan 2020 21:12:42 +0000 (10:12 +1300)]
[REF] Reduce places where we pass ids into Mailing::create
In general the goal is to stop passing the ids variable. This removes a couple of places. Note
that the value in params should be id not mailing_id
eileen [Thu, 9 Jan 2020 12:24:10 +0000 (01:24 +1300)]
Remove never passed-in parameter from addPayments
Eileen McNaughton [Thu, 9 Jan 2020 20:59:31 +0000 (09:59 +1300)]
Merge pull request #16148 from mattwire/contributionpayment_fullrefund
Set contribution status to refunded when it has been refunded
Matthew Wire [Thu, 9 Jan 2020 20:45:51 +0000 (20:45 +0000)]
Merge pull request #16251 from eileenmcnaughton/line_clean
[REF] Remove never-passed param from getLineItems
Matthew Wire [Thu, 9 Jan 2020 20:41:39 +0000 (20:41 +0000)]
Merge pull request #16253 from eileenmcnaughton/mem_val2
Add tax rates to metadata
Matthew Wire [Thu, 9 Jan 2020 20:38:21 +0000 (20:38 +0000)]
Merge pull request #16247 from eileenmcnaughton/dedupe4
[REF] Extract location wrangling code.
Matthew Wire [Thu, 9 Jan 2020 20:35:31 +0000 (20:35 +0000)]
Merge pull request #16254 from eileenmcnaughton/partial_pay
[REF] rename lineItem & lineItems variable
Seamus Lee [Thu, 9 Jan 2020 20:33:01 +0000 (07:33 +1100)]
Merge pull request #16240 from MegaphoneJon/core-1512
core#1512: Address ID should be exportable
Seamus Lee [Thu, 9 Jan 2020 20:32:31 +0000 (07:32 +1100)]
Merge pull request #16208 from mattwire/activitytokensfixcaseid
Fix activity.case_id token to always display the first case ID
Matthew Wire [Thu, 9 Jan 2020 20:31:49 +0000 (20:31 +0000)]
Merge pull request #16252 from eileenmcnaughton/line_items_by
[REF] Move use of priceSetID & amount_override to where they are used
Samuel Vanhove [Thu, 9 Jan 2020 17:54:51 +0000 (12:54 -0500)]
Country/Region PseudoConstant not sorted according to the locale
Jon Goldberg [Wed, 8 Jan 2020 23:01:00 +0000 (18:01 -0500)]
core#1512: Address ID should be exportable
Coleman Watts [Thu, 9 Jan 2020 16:44:39 +0000 (11:44 -0500)]
Improve civicrm_api4 docblock and use it for help display in Explorer
eileen [Thu, 2 Jan 2020 22:03:04 +0000 (11:03 +1300)]
Add tax rates to metadata
This doesn't do anything by itself but it lays the foundation for a solid fix for
https://github.com/civicrm/civicrm-core/pull/15895 - ie by having minimum_fee_with_tax as part of our
generally available metadata we get out of all the complexity of doing this in the js layer - which is
what is driving that bug
Jitendra Purohit [Thu, 9 Jan 2020 12:38:17 +0000 (18:08 +0530)]
Unit test for #16148
Matthew Wire [Mon, 23 Dec 2019 22:59:13 +0000 (22:59 +0000)]
Set contribution status to refunded when it has previously been fully paid and now payments add up to 0
eileen [Thu, 9 Jan 2020 11:55:17 +0000 (00:55 +1300)]
[REF] rename lineItem & lineItems variable
Readability fix -
=======Before========
refers to an array of lineItems, refers to a single lineItem
=======After
refers to an array of line items, refers to the single (created) line itmem
eileen [Thu, 9 Jan 2020 07:01:04 +0000 (20:01 +1300)]
Move use of priceSetID & amount_override to where they are used
The field name is misleading since it implies it is useful in general to pass in a priceSetID - however, it has
a very specific usage & meaning & ideally we would deprecate it in favour of something more readable. For now
group the code more logically & comment it
Matthew Wire [Thu, 9 Jan 2020 11:07:33 +0000 (11:07 +0000)]
Merge pull request #16059 from eileenmcnaughton/mem_val2
[REF] Cleanup CRM_Member_BAO_Membership::buildMembershipTypeValues
Seamus Lee [Thu, 9 Jan 2020 09:13:20 +0000 (20:13 +1100)]
Merge pull request #16249 from eileenmcnaughton/ex_exclosed
[REF] Remove enclosed & escaped variables
Seamus Lee [Thu, 9 Jan 2020 09:06:48 +0000 (20:06 +1100)]
Merge pull request #16248 from eileenmcnaughton/cc
[NFC] Code comments
Seamus Lee [Thu, 9 Jan 2020 09:06:04 +0000 (20:06 +1100)]
Merge pull request #16250 from eileenmcnaughton/member
[NFC] Minor cleanup in test class
Jitendra Purohit [Wed, 18 Sep 2019 07:12:51 +0000 (12:42 +0530)]
dev/core#1263 - Drupal 8 - Contact Report does not load any values in the ACL Group/Role field
eileen [Thu, 9 Jan 2020 05:33:16 +0000 (18:33 +1300)]
[REF] Remove never-passed param from getLineItems
Parameter was added to getLineItems in https://github.com/civicrm/civicrm-core/commit/
25d0c6478ee236a4ac150e8d2b39614602ca4ae8
to support invoicing. However that function no longer calls getLineItems & has not for some time (at least a year). No other functions
pass in this parameter so we can remove it
Eileen McNaughton [Thu, 9 Jan 2020 05:16:36 +0000 (18:16 +1300)]
Merge pull request #16245 from eileenmcnaughton/dedupe1
[REF] Minor code simplification in dedupe.
eileen [Thu, 9 Jan 2020 04:54:31 +0000 (17:54 +1300)]
[NFC] Minor cleanup in test class
eileen [Mon, 25 Nov 2019 03:55:54 +0000 (16:55 +1300)]
Code comments
eileen [Mon, 25 Nov 2019 04:41:47 +0000 (17:41 +1300)]
Remove enclosed variable.
Given that it can only ever be a double quote parameterizing it is only confusing
eileen [Thu, 9 Jan 2020 04:07:23 +0000 (17:07 +1300)]
[REF] Extract location wrangling code.
Note I have deliberately kept this extraction as vanilla as possible wtih the goal being to rationalise in
later iterations
eileen [Thu, 9 Jan 2020 03:20:29 +0000 (16:20 +1300)]
Check field to carry over custom data by default when none is
in the other contact's field
This partially addresses reviewer feedback about the limitations of https://github.com/civicrm/civicrm-core/pull/15595
Coleman Watts [Thu, 9 Jan 2020 03:22:37 +0000 (22:22 -0500)]
Support index param as array in api explorer
Coleman Watts [Thu, 9 Jan 2020 03:13:57 +0000 (22:13 -0500)]
civicrm_api4 - Extend functionality of index param
Passing an array allows you to return a single result column, with automatic handling of the select clause.
eileen [Thu, 9 Jan 2020 03:08:15 +0000 (16:08 +1300)]
[REF] Minor code simplification in dedupe.
This just tweaks readability by
1) adding a variable for a value nested fairly deeply in an array
2) removing the foundField handling in favour of a ternary since
it's kinda confusing as is
Seamus Lee [Thu, 9 Jan 2020 02:21:23 +0000 (13:21 +1100)]
Merge pull request #15475 from mecachisenros/externUrl
dev/core#1100 Add externUrl method and civicrm_alterExternUrl hook
Seamus Lee [Thu, 9 Jan 2020 02:19:08 +0000 (13:19 +1100)]
Merge pull request #16231 from mfb/imap-batch-size
Remove patch hunk now that zetacomponents/Mail#73 has been merged
eileen [Thu, 9 Jan 2020 02:11:22 +0000 (15:11 +1300)]
Remove unused and largely unreachable code.
The removed lines can only be reached if
a) CMS is Joomla or
b) CMS is Drupal and NULL is not equal to NULL
This seemed a little suspicious - especially since the merge screen still does display the value that should
be but isn't calculated here. After digging I found it is duplicated here
https://github.com/civicrm/civicrm-core/blob/
bc77d7c0798081f999e6eca92d75fa874fd04e74/CRM/Contact/Form/Merge.php#L115
and that is the value used in the tpl here
https://github.com/civicrm/civicrm-core/blob/
1188c7a8512382b1cb588b6a1ea4b13aa9587bc9/templates/CRM/Contact/Form/Merge.tpl#L217
so these lines can be safely removed as redundant. I also signposted where I think the next cleanups should happen on this
with code comments
Seamus Lee [Thu, 9 Jan 2020 02:11:55 +0000 (13:11 +1100)]
Merge pull request #16241 from eileenmcnaughton/sess
[REF] move sessionStart functionality to System subclass
Eileen McNaughton [Thu, 9 Jan 2020 01:21:59 +0000 (14:21 +1300)]
Merge pull request #16242 from civicrm/5.22
5.22 to master
Eileen McNaughton [Thu, 9 Jan 2020 01:19:52 +0000 (14:19 +1300)]
Merge pull request #16239 from MegaphoneJon/mailing-60-522
mailing#60: Fix regression where `is_bulkmail` flag isn't respected
Coleman Watts [Thu, 9 Jan 2020 01:11:04 +0000 (20:11 -0500)]
civicrm_api4 - auto-adjust select query when passing an index
Tim Otten [Thu, 9 Jan 2020 00:27:11 +0000 (16:27 -0800)]
Merge pull request #15778 from agh1/reminder-do-not-email-test
dev/core#1378 Scheduled reminders: do not email if do_not_email or on_hold
eileen [Wed, 8 Jan 2020 23:07:25 +0000 (12:07 +1300)]
[REF] move sessionStart functionality to System subclass
Preparatory to https://github.com/civicrm/civicrm-core/pull/15131/files
Seamus Lee [Wed, 8 Jan 2020 22:47:27 +0000 (09:47 +1100)]
Merge pull request #16105 from seamuslee001/dev_core_522_204
dev/core#522 CRM-19767 dev/core#204 Add Case Tokens to emails
Seamus Lee [Wed, 8 Jan 2020 22:44:08 +0000 (09:44 +1100)]
Merge pull request #15969 from eileenmcnaughton/utfmb8
Add utf8 to utfmb8 conversion api command