civicrm-core.git
4 years agoMerge pull request #16531 from eileenmcnaughton/cn_
colemanw [Tue, 18 Feb 2020 02:57:39 +0000 (21:57 -0500)]
Merge pull request #16531 from eileenmcnaughton/cn_

dev/financial#84 Move sequential credit notes from 'deeply  embeded functions to separate structure

4 years agoMerge pull request #16528 from mattwire/removeoldflexmailer
Tim Otten [Tue, 18 Feb 2020 01:38:18 +0000 (17:38 -0800)]
Merge pull request #16528 from mattwire/removeoldflexmailer

Remove old defines for flexmailer that haven't been required since CiviCRM 5.x

4 years agoMerge pull request #16563 from eileenmcnaughton/selfsvc
Seamus Lee [Mon, 17 Feb 2020 23:32:25 +0000 (10:32 +1100)]
Merge pull request #16563 from eileenmcnaughton/selfsvc

[NFC] Minor code cleanup

4 years agoMerge pull request #16577 from civicrm/5.23
Eileen McNaughton [Mon, 17 Feb 2020 22:57:11 +0000 (11:57 +1300)]
Merge pull request #16577 from civicrm/5.23

5.23 to master

4 years agoMerge pull request #16558 from eileenmcnaughton/523dupe
Eileen McNaughton [Mon, 17 Feb 2020 22:53:15 +0000 (11:53 +1300)]
Merge pull request #16558 from eileenmcnaughton/523dupe

dev/core#1597 & dev/core#1595 fix regression when deduping on custom fields

4 years agoCRM-21541 CRM.moneyFormat can't handle values with zero or one decimals (#16445)
Sandor Semsey [Mon, 17 Feb 2020 22:11:37 +0000 (23:11 +0100)]
CRM-21541 CRM.moneyFormat can't handle values with zero or one decimals (#16445)

* CRM.formatMoney() handles zero or one decimals

* CRM.formatMoney() handles zero or one decimals

* CRM.formatMoney() handles zero or one decimals

* CRM.formatMoney() handles zero or one decimals

* CRM.formatMoney() handles zero or one decimals

* CRM.formatMoney() handles zero or one decimals

* CRM.formatMoney() handles zero or one decimals

* missing semicolon

* comment

* comment

* comment

* comment

4 years agoMerge pull request #16564 from eileenmcnaughton/test
Seamus Lee [Mon, 17 Feb 2020 21:43:07 +0000 (08:43 +1100)]
Merge pull request #16564 from eileenmcnaughton/test

dev/financial#102 Extend test to check status

4 years agodev/core#1597 & dev/core#1595 fix regression when deduping on custom fields
eileen [Sun, 16 Feb 2020 21:26:03 +0000 (10:26 +1300)]
dev/core#1597 & dev/core#1595 fix regression when deduping on custom fields

4 years agoMerge pull request #16571 from wmortada/over-ride
Eileen McNaughton [Mon, 17 Feb 2020 21:13:27 +0000 (10:13 +1300)]
Merge pull request #16571 from wmortada/over-ride

(NFC) Fix typo - no hyphen in 'override'

4 years agoMerge pull request #16095 from seamuslee001/dev_core_1450
Eileen McNaughton [Mon, 17 Feb 2020 20:58:10 +0000 (09:58 +1300)]
Merge pull request #16095 from seamuslee001/dev_core_1450

dev/core#1450 Try reducing the size of the temporary table so it only…

4 years agoMerge pull request #16574 from civicrm/5.23
Eileen McNaughton [Mon, 17 Feb 2020 20:52:44 +0000 (09:52 +1300)]
Merge pull request #16574 from civicrm/5.23

5.23

4 years agoMerge pull request #16567 from eileenmcnaughton/parti_form
Seamus Lee [Mon, 17 Feb 2020 20:50:10 +0000 (07:50 +1100)]
Merge pull request #16567 from eileenmcnaughton/parti_form

Fix theoretical regression

4 years agoMerge pull request #16572 from civicrm/5.23
Seamus Lee [Mon, 17 Feb 2020 20:06:53 +0000 (07:06 +1100)]
Merge pull request #16572 from civicrm/5.23

5.23

4 years agoFix typo - no hyphen in 'override'
William Mortada [Mon, 17 Feb 2020 18:04:18 +0000 (18:04 +0000)]
Fix typo - no hyphen in 'override'

4 years agoMerge pull request #16506 from mattwire/invoicedue_countrefunded
Matthew Wire [Mon, 17 Feb 2020 16:01:31 +0000 (16:01 +0000)]
Merge pull request #16506 from mattwire/invoicedue_countrefunded

Count refunds when calculating amount due for an invoice

4 years agoMerge pull request #16009 from jmcclelland/import-match-phone
colemanw [Mon, 17 Feb 2020 15:20:06 +0000 (10:20 -0500)]
Merge pull request #16009 from jmcclelland/import-match-phone

dev/core#1438 Enable matching on contact phone when importing contributions

4 years agoMerge pull request #16035 from demeritcowboy/ang-crmcasetype-list-boolean
Matthew Wire [Mon, 17 Feb 2020 15:16:22 +0000 (15:16 +0000)]
Merge pull request #16035 from demeritcowboy/ang-crmcasetype-list-boolean

dev/core#1451 Incorrect dropdown action choices on case type listing screen

4 years agoMerge pull request #16565 from eileenmcnaughton/contview
Matthew Wire [Mon, 17 Feb 2020 14:33:57 +0000 (14:33 +0000)]
Merge pull request #16565 from eileenmcnaughton/contview

dev/financial#118 Move source & receive date to the top on contribution view page

4 years agoMerge pull request #16568 from JGaunt/patch-4
Yashodha Chaku [Mon, 17 Feb 2020 13:25:25 +0000 (18:55 +0530)]
Merge pull request #16568 from JGaunt/patch-4

Update 5.23.0.md

4 years agoMerge pull request #16491 from mfb/undefined-index
Matthew Wire [Mon, 17 Feb 2020 13:11:28 +0000 (13:11 +0000)]
Merge pull request #16491 from mfb/undefined-index

Resolve notices if first donation amount and date columns were disabled

4 years agoMerge pull request #16455 from MegaphoneJon/core-1568
Matthew Wire [Mon, 17 Feb 2020 13:03:11 +0000 (13:03 +0000)]
Merge pull request #16455 from MegaphoneJon/core-1568

core#1568: Show recipientListing to non-admins

4 years agoUpdate 5.23.0.md
Jade Gaunt [Mon, 17 Feb 2020 11:52:39 +0000 (11:52 +0000)]
Update 5.23.0.md

Added organisation name :)

4 years agoMerge pull request #14928 from lcdservices/dev-core-1158
Matthew Wire [Mon, 17 Feb 2020 11:01:19 +0000 (11:01 +0000)]
Merge pull request #14928 from lcdservices/dev-core-1158

dev/core#1158 mailing labels: explicitly set primary flag

4 years agoMerge pull request #15856 from agileware/CIVICRM-1368
Matthew Wire [Mon, 17 Feb 2020 08:46:03 +0000 (08:46 +0000)]
Merge pull request #15856 from agileware/CIVICRM-1368

dev/financial#104 Use rounding and integers to compare monetary values…

4 years agoFix theoretical regression
eileen [Mon, 17 Feb 2020 08:04:00 +0000 (21:04 +1300)]
Fix theoretical regression

This PR https://github.com/civicrm/civicrm-core/pull/16363/commits/44237a295dc5eab4f6110fb0556b1af742364f6e
(merged to 5.23) calls self::::getDefaultRoleID() in a way that was always flawed but definitely woudl
not work now. I think it is never reached but better to put this fix into 5.23 & maybe reemove the line in master
later since it assumes participant_status_id is optional - which is not true of the backoffice form

4 years agodev/financial#118 Move source & receive date to the top on contribution view page
eileen [Mon, 17 Feb 2020 06:28:43 +0000 (19:28 +1300)]
dev/financial#118 Move source & receive date to the top on contribution view page

Per https://lab.civicrm.org/dev/financial/issues/118 this doesn't seem to be controversial - although there is a desire
to take it further & once this is merged I'll look at that

4 years agodev/financial#102 Extend test to check status
eileen [Mon, 17 Feb 2020 06:03:03 +0000 (19:03 +1300)]
dev/financial#102 Extend test to check status

It turns out the code is working fine (fixed in the meantime?) and I just needed to extend the checks
a bit, did some tangental cleanup

4 years ago[NFC] Minor code cleanup
eileen [Mon, 17 Feb 2020 04:50:04 +0000 (17:50 +1300)]
[NFC] Minor code cleanup

Declare exceptions, use single quotes & strict comparison, do not declare unused params

4 years agoMerge pull request #16557 from eileenmcnaughton/find
Eileen McNaughton [Mon, 17 Feb 2020 00:34:02 +0000 (13:34 +1300)]
Merge pull request #16557 from eileenmcnaughton/find

[NFC] Preliminary cleanup

4 years agoMerge pull request #16498 from seamuslee001/net_smtp_upgrade
Seamus Lee [Sun, 16 Feb 2020 22:50:36 +0000 (09:50 +1100)]
Merge pull request #16498 from seamuslee001/net_smtp_upgrade

Upgrade Net_SMTP Package and remove now unneded patches and mov…

4 years agoUpdate patch URL and remove patch content as per standard now
Seamus Lee [Sun, 16 Feb 2020 21:39:24 +0000 (08:39 +1100)]
Update patch URL and remove patch content as per standard now

4 years ago[REF] Upgrade Net_SMTP Package and remove now unneded patches and move to using compo...
Seamus Lee [Sat, 8 Feb 2020 03:40:42 +0000 (14:40 +1100)]
[REF] Upgrade Net_SMTP Package and remove now unneded patches and move to using composer patches rather than patching in a script file

4 years ago[NFC] Preliminary cleanup
eileen [Sun, 16 Feb 2020 21:01:51 +0000 (10:01 +1300)]
[NFC] Preliminary cleanup

Declare exceptions, params, don't declare unused variables

4 years agoMerge pull request #16552 from eileenmcnaughton/part_form
colemanw [Sun, 16 Feb 2020 19:36:56 +0000 (14:36 -0500)]
Merge pull request #16552 from eileenmcnaughton/part_form

[REF] Fix static call to non-static function.

4 years agodev/financial#84 Move sequential credit notes from 'deeply embedeed in BAO functions...
eileen [Wed, 12 Feb 2020 13:23:25 +0000 (02:23 +1300)]
dev/financial#84 Move sequential credit notes from 'deeply  embedeed in BAO functions' to usin a listener structure

https://lab.civicrm.org/dev/financial/issues/84

We have a significant problem in our code base that it is hard to cleanup our key processes and make them usable and
Form-builder ready because of all the features deeply interwoven into them. It will be important that our
Order->add payment flow works and can be utilsed by the form builder. The expectation is that adding a payment
will update all the appropriate entities. We've been working pretty hard on this for a couple of years now (I think the time
taken to clean up code is sadly greater than the time it takes to add it :-() and the Payment.create part is getting
pretty solid now.

However, we are consistently hampered by code that has been 'enmeshed' into deep BAO code. In the case of the credit note
creation something that can easily be implemented as a pre hook and kept entirely out of the  Contribution.create function
is not only embedded in there but also in updateFinancialAccountsOnContributionStatusChange - which is one of the functions
we are some dozens of hours into adding tests & 'sorting out'. We need to find a way to

1) Declutter key functions where possible and
2) Model good ways of implementing things by hook (& work through limitations in this approach) as part of cleaning
up core and pushing towards a LeXIM approach.

I originally agreed with the CiviDiet approach that we should try to move the myriad of things that are 'add ons' that someone
thought was necessary & useful to others (or less charitably  they thought that if they got it into core someone else would have
to maintain it for them) moved out of core into extensions and eventually the maintenance of them moved out of the core team too.

However, it's clear from the  discussion on moving credit notes out of core that this is too hard for the forseeable future. We can try to avoid more features being added to core but most features in core are used by at least one organization & the politics of
moving things out are too hard. On the bright side we let a lot less new features into core these days - not none - the membership status override date springs to mind and the ongoing adding of fields & filters to reports - but less.

This leaves us with the question of whether we can still achieve the goal of making add-on features less of a developer burden.
In addition to ensuring code is tested we can do this by getting it out of the 'deep functions' into a listener structure.
I was able to covert the  'spaghetti-like-tendrils' in the credit note code to a simple 'pre' hook.

So it felt like we needed to create something new. Something like .. an extension .. but not visible on the extensions screen
and in core. Something like ... an extension in a folder in the core codebase that is suppressed from the extensions UI....

So this adds it as an extension to core in a new location & ensures GUI users cannot see it. I don't know exactly where we
draw the line around packaging things this way - Partial payments is clearly part of the core architecture, but there might be
a world in which we move something like event cart to be a more distinct bundle. As we move to form builder forms we are going to
want forms being replaced to be able to be 'quarantined' for future amputation.... I would be looking to move financial type acls and
invoicing to this structure - mostly because they are the biggest 'offenders' in terms of having code all over the place causing
problems with  other code initiatives & we've struggled to come up with a way to deal with that other than putting touching that
code in the 'too hard basket'. But even things like PCPs & Premiums would be more maintainable if they were discrete & overcoming
the challenges involved in that would solve a lot of extensibility issues.

Note this approach permits an  incremental cleanup-up-to-separation  process. For example we could create an  extension for  a
feature and move some code to it and later move some other code. For example we  could move the invoicingPostProcessHook
to a  shell invoicing extension and at some later point  address other  parts of the  invoicing code (check LineItem::getLineItems
for the chunk of  code  that has been blocking  other  cleanup - moving  this to a listener would help a lot

Note this PR does not address the significant performance issues associated with the creditnotes code on larger sites, only the impact
it has on our code maintainability. If we can agree a way to start to address how to split out or code into listeners in an agreed structure then I can look at that as a follow up.

4 years agoMerge pull request #16551 from totten/master-ext-tags
Eileen McNaughton [Sat, 15 Feb 2020 22:37:43 +0000 (11:37 +1300)]
Merge pull request #16551 from totten/master-ext-tags

info.xml - Allow extensions to define a list of tags

4 years agoMerge pull request #16554 from demeritcowboy/add-tag-ewarning
colemanw [Sat, 15 Feb 2020 22:28:14 +0000 (17:28 -0500)]
Merge pull request #16554 from demeritcowboy/add-tag-ewarning

dev/core#1593 and dev/core#1536 - Remove unused code causing E_WARNING

4 years agoCount refunds when calculating amount due for an invoice
Matthew Wire [Tue, 11 Feb 2020 15:18:49 +0000 (15:18 +0000)]
Count refunds when calculating amount due for an invoice

4 years agoMerge pull request #16525 from eileenmcnaughton/validate
Matthew Wire [Sat, 15 Feb 2020 18:52:06 +0000 (18:52 +0000)]
Merge pull request #16525 from eileenmcnaughton/validate

Allow any casting done in Type::validate to bubble up to Request::retrieveValue

4 years agoremove unused code causing E_WARNING
demeritcowboy [Sat, 15 Feb 2020 02:28:46 +0000 (21:28 -0500)]
remove unused code causing E_WARNING

4 years agoMerge pull request #16468 from mattwire/tokens_activitytokenprocessortrait
Eileen McNaughton [Sat, 15 Feb 2020 03:29:36 +0000 (16:29 +1300)]
Merge pull request #16468 from mattwire/tokens_activitytokenprocessortrait

REF Refactor ActivityTokens to use a trait that can be shared with other entities

4 years ago[REF] Fix static call to non-static function.
eileen [Sat, 15 Feb 2020 02:45:13 +0000 (15:45 +1300)]
[REF] Fix static call to non-static function.

This non-static function was being called statically. On grepping I found it is only called from this
one place so  I moved it to the form

4 years agoMerge pull request #16515 from mattwire/phpnotice_noteprivacy
Eileen McNaughton [Sat, 15 Feb 2020 02:39:22 +0000 (15:39 +1300)]
Merge pull request #16515 from mattwire/phpnotice_noteprivacy

Fix a PHP notice for users with limited permissions when loading cont…

4 years agoMerge pull request #16533 from eileenmcnaughton/ex_angular
Eileen McNaughton [Sat, 15 Feb 2020 02:36:55 +0000 (15:36 +1300)]
Merge pull request #16533 from eileenmcnaughton/ex_angular

Do not fatally fail on angular pages if an extension is missing

4 years agoinfo.xml - Allow extensions to define a list of tags
Tim Otten [Sat, 15 Feb 2020 01:24:40 +0000 (17:24 -0800)]
info.xml - Allow extensions to define a list of tags

Overview
--------

This adopts a convention by which extensions may use `info.xml` to register tags, e.g.

```xml
<extension key="org.civicrm.foo" type="module">
  <tags>
    <tag>civicontribute</tag>
    <tag>payment-processor</tag>
    <tag>install-mandatory</tag>
  </tags>
</extension>
```

Before
------

To add *any* metadata to `info.xml` files, you must update the parser and providing
filtering/indexing.

After
-----

If you need to add very simple metadata (tags), you can do that without
extra parsing code.  The tag information can be accessed in the following
ways:

* Using the extension mapper
    ```php
    $mapper = CRM_Extension_System::singleton()->getMapper();
    $allTags = $mapper->getAllTags();
    $mandatoryExts = $mapper->getKeysByTag('install-mandatory');
    ```
* The `Extension.get` API will return the list of tags for each ext

4 years agoMerge pull request #16548 from civicrm/5.23
Seamus Lee [Sat, 15 Feb 2020 00:09:48 +0000 (11:09 +1100)]
Merge pull request #16548 from civicrm/5.23

5.23

4 years agoMerge pull request #16547 from seamuslee001/5.23
Seamus Lee [Sat, 15 Feb 2020 00:07:37 +0000 (11:07 +1100)]
Merge pull request #16547 from seamuslee001/5.23

[NFC] Ensure that annon permissions are correctly assigned when enabl…

4 years agoMerge pull request #16549 from seamuslee001/style_fix_property_bag
Seamus Lee [Sat, 15 Feb 2020 00:07:28 +0000 (11:07 +1100)]
Merge pull request #16549 from seamuslee001/style_fix_property_bag

[NFC] Fix style error

4 years ago[NFC] Fix style error
Seamus Lee [Fri, 14 Feb 2020 23:58:14 +0000 (10:58 +1100)]
[NFC] Fix style error

4 years agoMerge pull request #16532 from eileenmcnaughton/5.23
Seamus Lee [Fri, 14 Feb 2020 23:55:02 +0000 (10:55 +1100)]
Merge pull request #16532 from eileenmcnaughton/5.23

dev/core#1588 Fix regression where empty string is passed to PropertyBag

4 years ago[NFC] Ensure that annon permissions are correctly assigned when enabling civicrm...
Seamus Lee [Fri, 14 Feb 2020 23:05:34 +0000 (10:05 +1100)]
[NFC] Ensure that annon permissions are correctly assigned when enabling civicrm webtest module in backdrop

4 years agoMerge pull request #16544 from seamuslee001/dev_core_1594
Seamus Lee [Fri, 14 Feb 2020 21:16:31 +0000 (08:16 +1100)]
Merge pull request #16544 from seamuslee001/dev_core_1594

dev/core#1594 [TEST] Fix running of unit tests within an extension

4 years agoMerge pull request #16543 from jmcclelland/issue1589
Eileen McNaughton [Fri, 14 Feb 2020 20:20:35 +0000 (09:20 +1300)]
Merge pull request #16543 from jmcclelland/issue1589

dev/core#1589 avoid error when merging record with null create date

4 years agoMerge pull request #15998 from demeritcowboy/case-audit-skip-broken
Eileen McNaughton [Fri, 14 Feb 2020 20:19:16 +0000 (09:19 +1300)]
Merge pull request #15998 from demeritcowboy/case-audit-skip-broken

dev/core#1366 Bypass nonfunctioning case audit interactive screen and go straight to report

4 years agodev/core#1594 [TEST] Fix running of unit tests within an extension
Seamus Lee [Fri, 14 Feb 2020 19:51:51 +0000 (06:51 +1100)]
dev/core#1594 [TEST] Fix running of unit tests within an extension

4 years agoMerge pull request #16539 from eileenmcnaughton/text
Seamus Lee [Fri, 14 Feb 2020 19:36:03 +0000 (06:36 +1100)]
Merge pull request #16539 from eileenmcnaughton/text

Remove reference to mysql 5.0 & 5.1

4 years agoMerge pull request #16542 from JGaunt/patch-3
Matthew Wire [Fri, 14 Feb 2020 19:18:02 +0000 (19:18 +0000)]
Merge pull request #16542 from JGaunt/patch-3

Update CONTRIBUTORS.txt

4 years agoMerge pull request #16540 from eileenmcnaughton/part_pend
Matthew Wire [Fri, 14 Feb 2020 19:17:16 +0000 (19:17 +0000)]
Merge pull request #16540 from eileenmcnaughton/part_pend

[REF] Remove never used property

4 years agoavoid error when merging record with null create date
Jamie McClelland [Fri, 14 Feb 2020 15:57:25 +0000 (10:57 -0500)]
avoid error when merging record with null create date

https://lab.civicrm.org/dev/core/issues/1589

4 years agoUpdate CONTRIBUTORS.txt
Jade Gaunt [Fri, 14 Feb 2020 15:19:32 +0000 (15:19 +0000)]
Update CONTRIBUTORS.txt

Added in mine and my colleagues name.

4 years agoMerge pull request #16527 from alexymik/added_by
Mathieu Lu [Fri, 14 Feb 2020 14:07:45 +0000 (09:07 -0500)]
Merge pull request #16527 from alexymik/added_by

Change "Added By" to "Added by"

4 years agoRemove never used property
eileen [Fri, 14 Feb 2020 12:29:59 +0000 (01:29 +1300)]
Remove never used property

I grepped for _roleId & found it in only these 2 places - removing

4 years agoMerge pull request #15390 from kewljuice/patch-4
Eileen McNaughton [Fri, 14 Feb 2020 11:37:11 +0000 (00:37 +1300)]
Merge pull request #15390 from kewljuice/patch-4

Check email when creating a user in drupal 8

4 years agoRemove reference to mysql 5.0 & 5.1
eileen [Fri, 14 Feb 2020 11:22:54 +0000 (00:22 +1300)]
Remove reference to mysql 5.0 & 5.1

Subset of https://github.com/civicrm/civicrm-core/pull/16084

4 years agoMerge pull request #16516 from colemanw/request
Eileen McNaughton [Fri, 14 Feb 2020 11:12:28 +0000 (00:12 +1300)]
Merge pull request #16516 from colemanw/request

APIv4 - merge ActionUtil with Request::create

4 years agoMerge pull request #16523 from yashodha/header
Eileen McNaughton [Fri, 14 Feb 2020 11:10:09 +0000 (00:10 +1300)]
Merge pull request #16523 from yashodha/header

add column for report

4 years agoMerge pull request #16537 from civicrm/5.23
Eileen McNaughton [Fri, 14 Feb 2020 08:20:14 +0000 (21:20 +1300)]
Merge pull request #16537 from civicrm/5.23

5.23

4 years agoMerge pull request #15824 from mfb/email-search-speed-boost
Eileen McNaughton [Fri, 14 Feb 2020 06:23:09 +0000 (19:23 +1300)]
Merge pull request #15824 from mfb/email-search-speed-boost

Speed boost for civicrm/ajax/checkemail

4 years agoMerge pull request #16467 from ixiam/dev-1110
Eileen McNaughton [Fri, 14 Feb 2020 05:58:36 +0000 (18:58 +1300)]
Merge pull request #16467 from ixiam/dev-1110

fix contribution summary report's statistics when grouping and having

4 years agoMerge pull request #16451 from mattwire/settingreadonly
Eileen McNaughton [Fri, 14 Feb 2020 05:51:46 +0000 (18:51 +1300)]
Merge pull request #16451 from mattwire/settingreadonly

Settings Fix setting readonly attribute

4 years agoMerge pull request #16535 from eileenmcnaughton/523rel
Seamus Lee [Fri, 14 Feb 2020 05:51:17 +0000 (16:51 +1100)]
Merge pull request #16535 from eileenmcnaughton/523rel

dev/core#1592 fix regression on relation active period

4 years agoMerge pull request #15330 from mattwire/paymentprocessor_testmodelivemode
Eileen McNaughton [Fri, 14 Feb 2020 05:46:25 +0000 (18:46 +1300)]
Merge pull request #15330 from mattwire/paymentprocessor_testmodelivemode

Fix issues with retrieving supportsTestMode/supportsLiveMode for payment processors

4 years agoMerge pull request #16534 from eileenmcnaughton/523m
Seamus Lee [Fri, 14 Feb 2020 05:26:48 +0000 (16:26 +1100)]
Merge pull request #16534 from eileenmcnaughton/523m

dev/core#1551 regression fix

4 years agoMerge pull request #16526 from eileenmcnaughton/valid_calls
Seamus Lee [Fri, 14 Feb 2020 05:19:46 +0000 (16:19 +1100)]
Merge pull request #16526 from eileenmcnaughton/valid_calls

Fix calls to Request::retrieve

4 years agodev/core#1592 fix regression on relation active period
eileen [Fri, 14 Feb 2020 04:42:17 +0000 (17:42 +1300)]
dev/core#1592 fix regression on relation active period

Per https://lab.civicrm.org/dev/core/issues/1592 the custom query  for this field is being
ignored now it's using datepicker with relevant format changes. This  causes the
custom function for the field to  be called

4 years agodev/core#1551 regression fix
eileen [Fri, 14 Feb 2020 03:55:08 +0000 (16:55 +1300)]
dev/core#1551 regression fix

Now that mailing_id is defined as field metadata the form main metadata fn is trying to handle it, However
the form is casting it to the wrong array format -https://github.com/civicrm/civicrm-core/blob/86f20cc17dde028977130f84feaf3b1d760ca57d/CRM/Contact/Form/Search.php#L649

We could fix  this & rip it out of Mailing_BAO_Query::where but there is still a gap  in  that
there is no pseudoconstant recorded for the field so the qill doesn't work & there is a gap in
pre-parsing for the form 'IN'

Hence this seems like a good approach to remove the regression in the immediate term

4 years agoDo not fatally fail on angular pages if an extension is missing
eileen [Fri, 14 Feb 2020 02:07:08 +0000 (15:07 +1300)]
Do not fatally fail on angular pages if an extension is missing

If an extension is missing trying to create a new mailing will totally fail - on QF pages we just get a
not-very-clear message

4 years agodev/core#1588 Fix regression where empty string is passed to SettingsBag
eileen [Fri, 14 Feb 2020 01:50:18 +0000 (14:50 +1300)]
dev/core#1588 Fix regression where empty string is passed to SettingsBag

We have a scenario where the checkbox is presented but is optional. This is then in 'params' which is passed through to
PropertyBag. The value is equal to '' so it fails to validate when we use it to set the value on the PropertyBag.

I don't think we lose anything meaningful by not setting an empty string and it avoids this error so we should
merge & release as a regression fix IMHO. If we want to revist then we should do that in master

https://lab.civicrm.org/dev/core/issues/1588

4 years agoMerge pull request #16530 from civicrm/5.23
Seamus Lee [Thu, 13 Feb 2020 22:59:31 +0000 (09:59 +1100)]
Merge pull request #16530 from civicrm/5.23

5.23

4 years agoMerge pull request #16521 from seamuslee001/dev_core_1489_2
Eileen McNaughton [Thu, 13 Feb 2020 21:49:32 +0000 (10:49 +1300)]
Merge pull request #16521 from seamuslee001/dev_core_1489_2

dev/core#1489 Include hook_civicrm_managed into the list of upgrade f…

4 years agoMerge pull request #16477 from demeritcowboy/unit-test-env
Eileen McNaughton [Thu, 13 Feb 2020 21:05:16 +0000 (10:05 +1300)]
Merge pull request #16477 from demeritcowboy/unit-test-env

[TEST] dev/core#1572 Unit test environment not working on windows after recent CodeGen updates

4 years agoRemove old defines for flexmailer that haven't been required since CiviCRM 5.x
Matthew Wire [Thu, 13 Feb 2020 21:00:33 +0000 (21:00 +0000)]
Remove old defines for flexmailer that haven't been required since CiviCRM 5.x

4 years agoFix calls to Request::retrieve
eileen [Thu, 13 Feb 2020 20:32:54 +0000 (09:32 +1300)]
Fix calls to Request::retrieve

Do not pass in values that are set by default. Use retrieveValue  rather than passing inn the NULL object

4 years agoChange "Added By" to "Added by"
Alexy Mikhailichenko [Thu, 13 Feb 2020 20:29:43 +0000 (12:29 -0800)]
Change "Added By" to "Added by"

4 years agoAllow any casting done in Type::validate to bubble up to Request::retrieveValue
eileen [Thu, 13 Feb 2020 20:18:34 +0000 (09:18 +1300)]
Allow any casting done in Type::validate to bubble up to Request::retrieveValue

The validate function returns
- NULL if the passed in value is not valid
- THe passed in value if valid or
 - The passed in value cast to an integer if the value is valid and the type is Int or Integer

By always using the returned value we allow it to be cast, where appropriate

4 years agoAPIv3 - Handle input errors
Coleman Watts [Thu, 13 Feb 2020 00:20:53 +0000 (19:20 -0500)]
APIv3 - Handle input errors

4 years agoadd column for report
yashodha [Thu, 13 Feb 2020 08:36:17 +0000 (14:06 +0530)]
add column for report

4 years agoMerge pull request #16522 from totten/master-simplecache-patchurl
Eileen McNaughton [Thu, 13 Feb 2020 04:08:40 +0000 (17:08 +1300)]
Merge pull request #16522 from totten/master-simplecache-patchurl

dev/core#1562 - composer.json - Fix E2E tests run on D8 build (via "patches") #16427

4 years agoMerge pull request #16512 from yashodha/header
Eileen McNaughton [Thu, 13 Feb 2020 02:11:38 +0000 (15:11 +1300)]
Merge pull request #16512 from yashodha/header

Relationship report - add sort order for end date

4 years ago(dev/core#1562) composer.json - Fix E2E tests run on D8 build (w/"patches" and URLs)
Tim Otten [Thu, 13 Feb 2020 02:03:21 +0000 (18:03 -0800)]
(dev/core#1562) composer.json - Fix E2E tests run on D8 build (w/"patches" and URLs)

4 years agodev/core#1489 Include hook_civicrm_managed into the list of upgrade freindly hooks
Seamus Lee [Thu, 13 Feb 2020 01:42:47 +0000 (12:42 +1100)]
dev/core#1489 Include hook_civicrm_managed into the list of upgrade freindly hooks

4 years agoRemove patch files that are now loaded from URL
Tim Otten [Thu, 13 Feb 2020 01:14:17 +0000 (17:14 -0800)]
Remove patch files that are now loaded from URL

The `composer.json` was updated to get these patch files via URL instead of
via local/relative path.

Future maintainers who wish to revise these patches will need to post new
revisions somewhere with a durable URL *before* they can update
`civicrm-core`.

Keeping the files in here wrongly implies that you can revise the files
in-situ - their presence is misleading.

4 years agoMerge pull request #16519 from civicrm/5.23
Seamus Lee [Wed, 12 Feb 2020 21:40:30 +0000 (08:40 +1100)]
Merge pull request #16519 from civicrm/5.23

5.23

4 years agoMerge pull request #16520 from agh1/5.23.0-release-notes
Seamus Lee [Wed, 12 Feb 2020 21:40:14 +0000 (08:40 +1100)]
Merge pull request #16520 from agh1/5.23.0-release-notes

5.23.0 release notes

4 years agoMerge pull request #16517 from agh1/5.23.0-release-notes
Seamus Lee [Wed, 12 Feb 2020 21:34:55 +0000 (08:34 +1100)]
Merge pull request #16517 from agh1/5.23.0-release-notes

5.23.0 release notes: initial run

4 years agoMerge pull request #16518 from greenpeace-cee/fix-xoauth-imap
Seamus Lee [Wed, 12 Feb 2020 21:34:05 +0000 (08:34 +1100)]
Merge pull request #16518 from greenpeace-cee/fix-xoauth-imap

dev/mail#59 - Fix use of useXOAUTH2 constant instead of var

4 years agodev/mail#59 - Fix use of useXOAUTH2 constant instead of var
Patrick Figel [Wed, 12 Feb 2020 20:27:02 +0000 (21:27 +0100)]
dev/mail#59 - Fix use of useXOAUTH2 constant instead of var

This fixes an issue where a missing $ before the useXOAUTH2 variable
prevents IMAP authentication with XOAUTH2 from working.

4 years ago5.23.0 release notes: added boilerplate
Andrew Hunt [Wed, 12 Feb 2020 19:18:49 +0000 (14:18 -0500)]
5.23.0 release notes: added boilerplate

4 years agoMerge pull request #16513 from eileenmcnaughton/credit_note_setting
colemanw [Wed, 12 Feb 2020 17:43:18 +0000 (12:43 -0500)]
Merge pull request #16513 from eileenmcnaughton/credit_note_setting

Move  settings definition on contribution settings form to metadata.

4 years agoAPIv4 - merge ActionUtil with Request::create
Coleman Watts [Wed, 12 Feb 2020 16:24:13 +0000 (11:24 -0500)]
APIv4 - merge ActionUtil with Request::create

The Request::create function was broken for v4, and ActionUtil had been serving the same purpose but in a non-broken way.