civicrm-core.git
4 years agoConvert PaypalPro to use Guzzle - step 1 - prepare to capture
eileen [Fri, 4 Sep 2020 03:26:33 +0000 (15:26 +1200)]
Convert PaypalPro to use Guzzle - step 1 - prepare to capture

4 years agoMerge pull request #18247 from totten/master-res-coll
Seamus Lee [Fri, 4 Sep 2020 00:09:42 +0000 (10:09 +1000)]
Merge pull request #18247 from totten/master-res-coll

Add higher-level support for "bundles" and "collections" of resources

4 years agoUpdate unit tests to match content
Seamus Lee [Thu, 3 Sep 2020 22:08:09 +0000 (08:08 +1000)]
Update unit tests to match content

4 years agoMerge pull request #18264 from demeritcowboy/mysql-ssl-guess
Eileen McNaughton [Thu, 3 Sep 2020 22:07:30 +0000 (10:07 +1200)]
Merge pull request #18264 from demeritcowboy/mysql-ssl-guess

dev/core#1926 - Try to autodetect mysql ssl settings from the CMS config

4 years agoCollectionAdderInterface - Support addMarkup($html)
Tim Otten [Wed, 26 Aug 2020 00:11:34 +0000 (17:11 -0700)]
CollectionAdderInterface - Support addMarkup($html)

4 years ago(REF) CRM_Core_Resources::addBundle() - Improve readability. Add test.
Tim Otten [Tue, 25 Aug 2020 23:53:47 +0000 (16:53 -0700)]
(REF) CRM_Core_Resources::addBundle() - Improve readability. Add test.

4 years ago(NFC) CRM_Core_Resources::addBundle() - More explanatory comments.
Tim Otten [Tue, 25 Aug 2020 23:54:30 +0000 (16:54 -0700)]
(NFC) CRM_Core_Resources::addBundle() - More explanatory comments.

4 years ago(NFC) Docblock tweaks
Tim Otten [Tue, 25 Aug 2020 22:35:30 +0000 (15:35 -0700)]
(NFC) Docblock tweaks

4 years agoForward port https://github.com/civicrm/civicrm-core/pull/18141
Tim Otten [Tue, 25 Aug 2020 04:26:23 +0000 (21:26 -0700)]
Forward port https://github.com/civicrm/civicrm-core/pull/18141

4 years agoCRM_Core_Resources - Use splats, CollectionAdderTrait, CollectionAdderInterface
Tim Otten [Mon, 24 Aug 2020 10:10:33 +0000 (03:10 -0700)]
CRM_Core_Resources - Use splats, CollectionAdderTrait, CollectionAdderInterface

Before
------

`CRM_Core_Resources` directly implements a number of functions (`addFoo()`)

After
-----

`CRM_Core_Resources` re-uses the implementations from `CollectionAdderTrait`

Comment
-------

The method signatures in `CollectionAdderTrait` look different, but they are
compatible.  In particular, the use of splat (`...$options`) means that they
can accept either key-value options or positional options. The existing
test-cases in `CollectionTestTrait` assert as much.

4 years agoCollectionAdderTrait - Use secondary ordering more akin to CRM_Core_Resources
Tim Otten [Mon, 24 Aug 2020 09:47:22 +0000 (02:47 -0700)]
CollectionAdderTrait - Use secondary ordering more akin to CRM_Core_Resources

This is a very subtle behavioral change.  To understand it, we must consider
the traditional ordering in `CRM_Core_Resources::addScriptUrl()` and
`CRM_Core_Region::add()`.  Compare these two examples:

```
Civi::resources()->addScriptUrl('http://example.com/foo.js', 100, 'page-footer');
Civi::resources()->addScriptUrl('http://example.com/bar.js', 100, 'page-footer');

CRM_Core_Region::instance('page-footer')->add([
  'scriptUrl' => 'http://example.com/foo.js',
  'weight' => 100,
]);
CRM_Core_Region::instance('page-footer')->add([
  'scriptUrl' => 'http://example.com/bar.js',
  'weight' => 100,
]);
```

You might expect this to output `<SCRIPT>`s in the same order.  After all,
the examples use the same URLs, the same weights, and the same
procedural/natural order.  Moreover, `Civi::resources()` is just a wrapper
for `CRM_Core_Region`.  Surely they were the same!

They were not. The output order would differ.

The reason is that the ordering had two keys (`weight,name`), and the
secondary-key (`name`) was hidden from us:

* In `CRM_Core_Resources::addScriptUrl()`, the default `name` was the URL.
  This was handy for de-duping resources.
* In `CRM_Core_Region::add()`, the default `name` was a numeric position.
  This made it behave like procedural/natural-ordering.

Of course, the goal in this branch is to make various collections support
the same methods and the same behaviors.  But they didn't agree before, so
something has to give.  Either:

1. Standardize on the behavior of `Resources::addScriptUrl()` and change `Region::add(scriptUrl)`.
2. Standardize on the behavior of `Region::add(scriptUrl)` and change `Resources::addScriptUrl()`.
3. Embrace a split. All `CRM_Core_Resources::add*()` behave one way, and all `CRM_Core_Region::add*()` behave another.
4. Embrace a split. All rich adders (`*::addScriptUrl()`) behave one way, and all generic adders (`*::add()`) behave another.

This developmental branch has been using `#3`. The patch changes it to `#4`.

Both splits achieve backward compatibility wrt `Resources::addScriptUrl()`
and `Region::add(scriptUrl)`.  The difference is that `#4` allows us to have
the same behavior in all collections (regardless of subtype), which means
that collections can be more interoperable and share more code.  From my
POV, it's still quirkier than `#1` or `#2`, but it's not as quirky as `#3`.

4 years agoCRM_Core_Resources - Move addCoreResources to 'coreResources' bundle
Tim Otten [Sun, 23 Aug 2020 03:30:02 +0000 (20:30 -0700)]
CRM_Core_Resources - Move addCoreResources to 'coreResources' bundle

4 years agoCRM_Core_Resources - Move addCoreStyles to 'coreStyles' bundle
Tim Otten [Sun, 23 Aug 2020 01:00:20 +0000 (18:00 -0700)]
CRM_Core_Resources - Move addCoreStyles to 'coreStyles' bundle

4 years agoCRM_Core_Resources_Common - Add skeleton for bundles, 'coreStyles' and 'coreResources'
Tim Otten [Sun, 23 Aug 2020 00:54:42 +0000 (17:54 -0700)]
CRM_Core_Resources_Common - Add skeleton for bundles, 'coreStyles' and 'coreResources'

4 years agoCRM_Core_Resources::addCoreResources - Option `$region` is not meaningfully used
Tim Otten [Tue, 18 Aug 2020 05:05:02 +0000 (22:05 -0700)]
CRM_Core_Resources::addCoreResources - Option `$region` is not meaningfully used

If you grep universe for `addCoreResources` and `addCoreStyles`, all matches
fall into these buckets:

1. They use the implicit default region.
2. They explicitly use the `html-header` region.
3. (Singular case) addCoreResources($region) delegates to addCoreStyles($region);
   but given 1+2, this must still be `html-header`.

4 years agoCollectionTrait - Add corresponding unit-test coverage (via RegionTest, BundleTest)
Tim Otten [Tue, 18 Aug 2020 04:20:29 +0000 (21:20 -0700)]
CollectionTrait - Add corresponding unit-test coverage (via RegionTest, BundleTest)

4 years ago(NFC) CollectionTrait - Reconcile docblocks
Tim Otten [Mon, 24 Aug 2020 02:15:53 +0000 (19:15 -0700)]
(NFC) CollectionTrait - Reconcile docblocks

4 years agoCollectionTrait - Use "splats". Split out "adders". Define interfaces.
Tim Otten [Tue, 18 Aug 2020 03:45:29 +0000 (20:45 -0700)]
CollectionTrait - Use "splats". Split out "adders". Define interfaces.

In the prior commits, the signatures for `addScriptFile()`,
`addScriptUrl()`, etc are not strictly interoperable between
`CRM_Core_Resources` and `CollectionTrait`.  This is because they use
key-value options instead of positional options.  This makes it easier
disregard positional options that don't make sense (e.g.  when calling
`CRM_Core_Region::addScriptFile()`, it's silly to reserve a positional
argument for the `$region` option).

The signatures *can* be unified by using "splats" (ie `...$options`) to
accept either key-value options or backward-compatible positional options.
The ultimate is hope is that:

* `CRM_Core_Resources`, `CRM_Core_Region`, and `CRM_Core_Bundle` all
  implement the `CollectionAdderInterface`.
* `CRM_Core_Resources`, `CRM_Core_Region`, and `CRM_Core_Bundle` all
  accept options in either format (key-value or positional).
* The positional format will fade-away.

The methods in CollectionTrait are newer terrain, so it's safer to change
those signatures, so we do that first.

Note that CollectionTrait formally builds on CollectionAdderTrait. This
ensures that IDE navigation to (eg) `CRM_Core_Region::add()` and
`CRM_Core_Resources_Bundle::add()` works as expected.

4 years agoAdd "Bundle" support - ie an unattached, mixable list of resources
Tim Otten [Mon, 24 Aug 2020 01:49:44 +0000 (18:49 -0700)]
Add "Bundle" support - ie an unattached, mixable list of resources

4 years agoCollectionTrait - Model scriptFile and styleFile as distinct types
Tim Otten [Tue, 18 Aug 2020 02:56:43 +0000 (19:56 -0700)]
CollectionTrait - Model scriptFile and styleFile as distinct types

4 years agoCollectionTrait - Support merge()
Tim Otten [Tue, 18 Aug 2020 02:54:08 +0000 (19:54 -0700)]
CollectionTrait - Support merge()

4 years agoCollectionTrait - Support addScriptFile(), addStyleFile()
Tim Otten [Wed, 5 Aug 2020 13:57:14 +0000 (06:57 -0700)]
CollectionTrait - Support addScriptFile(), addStyleFile()

4 years agoCollectionTrait - Support addSetting(), addSettingsFactory(), ad nauseum
Tim Otten [Wed, 5 Aug 2020 11:29:59 +0000 (04:29 -0700)]
CollectionTrait - Support addSetting(), addSettingsFactory(), ad nauseum

4 years agoCollectionTrait - Support addScript(), addScriptUrl(), addStyle(), addStyleUrl()
Tim Otten [Wed, 5 Aug 2020 11:11:25 +0000 (04:11 -0700)]
CollectionTrait - Support addScript(), addScriptUrl(), addStyle(), addStyleUrl()

4 years agoCollectionTrait - Support getAll(), filter(), find(), and clear()
Tim Otten [Wed, 5 Aug 2020 11:47:34 +0000 (04:47 -0700)]
CollectionTrait - Support getAll(), filter(), find(), and clear()

4 years ago(REF) CRM_Core_Region - Extract $renderSnippet()
Tim Otten [Wed, 5 Aug 2020 12:44:00 +0000 (05:44 -0700)]
(REF) CRM_Core_Region - Extract $renderSnippet()

This makes it possible for renderSnippet to work recursively.

For example, the current `jquery` type can build on the `script` type, and
the hypothetical `scriptFile` type could build on the `scriptUrl` type.

4 years agoCollectionTrait - Create baseline trait based on CRM_Core_Region
Tim Otten [Wed, 5 Aug 2020 10:51:14 +0000 (03:51 -0700)]
CollectionTrait - Create baseline trait based on CRM_Core_Region

4 years agoCRM_Core_Resources - Convert 'settings' to a type of snippet
Tim Otten [Wed, 5 Aug 2020 09:18:21 +0000 (02:18 -0700)]
CRM_Core_Resources - Convert 'settings' to a type of snippet

4 years agoMerge pull request #18344 from civicrm/5.30
Eileen McNaughton [Thu, 3 Sep 2020 21:53:09 +0000 (09:53 +1200)]
Merge pull request #18344 from civicrm/5.30

5.30

4 years ago(REF) CRM_Core_Resources_Strings - Move instance into container
Tim Otten [Wed, 5 Aug 2020 13:49:01 +0000 (06:49 -0700)]
(REF) CRM_Core_Resources_Strings - Move instance into container

4 years agoMerge pull request #18339 from eileenmcnaughton/line
Eileen McNaughton [Thu, 3 Sep 2020 21:48:38 +0000 (09:48 +1200)]
Merge pull request #18339 from eileenmcnaughton/line

Move ACls on LineItem create to financialacls core extension

4 years agoMerge pull request #18262 from colemanw/renderSettings
Seamus Lee [Thu, 3 Sep 2020 21:14:41 +0000 (07:14 +1000)]
Merge pull request #18262 from colemanw/renderSettings

Take the guesswork out of rendering clientside CRM variables

4 years agoMerge pull request #18321 from mattwire/completeorder_filter
Eileen McNaughton [Thu, 3 Sep 2020 20:58:58 +0000 (08:58 +1200)]
Merge pull request #18321 from mattwire/completeorder_filter

REF Filter params in completetransaction

4 years agoMerge pull request #18328 from eileenmcnaughton/partial
Seamus Lee [Thu, 3 Sep 2020 20:53:09 +0000 (06:53 +1000)]
Merge pull request #18328 from eileenmcnaughton/partial

Remove unused deprecated handling for partial_amount_to_pay

4 years agoMerge pull request #18342 from agh1/5.30.0-releasenotes-initial
Seamus Lee [Thu, 3 Sep 2020 20:51:46 +0000 (06:51 +1000)]
Merge pull request #18342 from agh1/5.30.0-releasenotes-initial

5.30.0 release notes initial run

4 years agoMove ACls on LineItem create to financialacls core extension
eileen [Thu, 3 Sep 2020 08:13:01 +0000 (20:13 +1200)]
Move ACls on LineItem create to financialacls core extension

4 years agoMerge pull request #18329 from pradpnayak/userRegistration
Eileen McNaughton [Thu, 3 Sep 2020 20:07:20 +0000 (08:07 +1200)]
Merge pull request #18329 from pradpnayak/userRegistration

Do not block user incase 'Require approval' is checked

4 years ago5.30.0 release notes: added boilerplate
Andrew Hunt [Thu, 3 Sep 2020 18:53:04 +0000 (14:53 -0400)]
5.30.0 release notes: added boilerplate

4 years ago5.30.0 release notes: raw from script
Andrew Hunt [Thu, 3 Sep 2020 18:50:46 +0000 (14:50 -0400)]
5.30.0 release notes: raw from script

4 years agoMerge pull request #18337 from eileenmcnaughton/ref
Matthew Wire [Thu, 3 Sep 2020 09:59:22 +0000 (10:59 +0100)]
Merge pull request #18337 from eileenmcnaughton/ref

Remove pass-by-ref in PaypalProIPN::single

4 years agoMerge pull request #18318 from eileenmcnaughton/cancel
Matthew Wire [Thu, 3 Sep 2020 09:58:57 +0000 (10:58 +0100)]
Merge pull request #18318 from eileenmcnaughton/cancel

[REF] Add test for existing Participant batch update cancel and fix to not call BaseIPN->cancelled

4 years agoSet version to 5.31.alpha1
CiviCRM [Thu, 3 Sep 2020 09:13:24 +0000 (09:13 +0000)]
Set version to 5.31.alpha1

4 years agoSet version to 5.30.beta1
CiviCRM [Thu, 3 Sep 2020 09:05:29 +0000 (09:05 +0000)]
Set version to 5.30.beta1

4 years agoMerge pull request #18335 from eileenmcnaughton/query
Tim Otten [Thu, 3 Sep 2020 09:03:50 +0000 (02:03 -0700)]
Merge pull request #18335 from eileenmcnaughton/query

Add ability to enable query logging per process

4 years agoAdd ability to enable query logging per process
eileen [Thu, 3 Sep 2020 03:40:47 +0000 (15:40 +1200)]
Add ability to enable query logging per process

This allows us to run a command such as

env CIVICRM_DEBUG_LOG_QUERY=1 drush cvapi Contact.get

and the queries for that process (but not others) are logged.

This facilitates a cleaner record of queries as it is just one process and more flexibility
(and less risk of leaving it on by mistake)

4 years agoRemove pass-by-ref in PaypalProIPN::single
eileen [Thu, 3 Sep 2020 04:18:36 +0000 (16:18 +1200)]
Remove pass-by-ref in PaypalProIPN::single

This is called from 2 places. Neither use the values again & neither receive any pass-by-reference values
themselves

4 years agoMerge pull request #18334 from civicrm/5.29
Seamus Lee [Thu, 3 Sep 2020 02:28:21 +0000 (12:28 +1000)]
Merge pull request #18334 from civicrm/5.29

5.29

4 years agoMerge pull request #18333 from totten/5.29-rn-catchup
Seamus Lee [Thu, 3 Sep 2020 02:26:37 +0000 (12:26 +1000)]
Merge pull request #18333 from totten/5.29-rn-catchup

(NFC) 5.29.0.md - Small updates

4 years agoMerge pull request #18332 from totten/5.29-norm-basepage
Seamus Lee [Thu, 3 Sep 2020 02:25:40 +0000 (12:25 +1000)]
Merge pull request #18332 from totten/5.29-norm-basepage

dev/wordpress#73 - Be more forgiving about slash in wpBasePage

4 years ago5.29.0.md - Small copy-edits
Tim Otten [Thu, 3 Sep 2020 01:25:10 +0000 (18:25 -0700)]
5.29.0.md - Small copy-edits

4 years agoMerge pull request #17980 from eileenmcnaughton/dupe
Seamus Lee [Thu, 3 Sep 2020 01:26:48 +0000 (11:26 +1000)]
Merge pull request #17980 from eileenmcnaughton/dupe

[REF] Move function to delete merged contacts to the Merger class and include all instances of the pair

4 years ago5.29.0.md - Last minute addition
Tim Otten [Thu, 3 Sep 2020 01:20:30 +0000 (18:20 -0700)]
5.29.0.md - Last minute addition

4 years agodev/wordpress#73 - Be more forgiving about slash in wpBasePage
Tim Otten [Wed, 2 Sep 2020 23:34:27 +0000 (16:34 -0700)]
dev/wordpress#73 - Be more forgiving about slash in wpBasePage

Overview
--------

The correct functioning of `wpBasePage` depends on whether the administrator
omitted or added a trailing slash.  This is apparent on URLs with a trailing slash, eg

```
http://wpmaster.bknix:8001/civicrm/contribute/transact/?reset=1&id=1
```

Make it less sensitive.

Before
------

URL is OK with default setting `wpBasePage=civicrm`

URL fails with setting `wpBasePage=civicrm/`

After
-----

URL is OK with either setting `wpBasePage=civicrm` or `wpBasePage=civicrm/`

Technical Details
-----------------

I believe the old symptom arose because of the formula which produces the WP
rewrite rules (`'^' .  $config->wpBasePage .  '/([^?]*)?'`) expects that
there is no trailing slash. You could theoretically patch there, but this
seems like it'll provide more thorough normalization.

When testing, the results affect the WP rewrite rules, so you may need to be particularly
aggressive about clearing caches whenever you make a change in code or settings, eg

```
wp cache flush ; cv flush;  wp rewrite flush
```

4 years agoMerge pull request #18323 from demeritcowboy/reminder-groups-dropdown
Eileen McNaughton [Thu, 3 Sep 2020 00:15:25 +0000 (12:15 +1200)]
Merge pull request #18323 from demeritcowboy/reminder-groups-dropdown

dev/core#1956 - Typo in call to nestedGroup on scheduled reminders admin form

4 years agoDo not block user incase 'Require approval' is checked
Pradeep Nayak [Wed, 2 Sep 2020 23:19:19 +0000 (00:19 +0100)]
Do not block user incase 'Require approval' is checked

4 years agoMerge pull request #18327 from civicrm/5.29
Seamus Lee [Wed, 2 Sep 2020 23:22:26 +0000 (09:22 +1000)]
Merge pull request #18327 from civicrm/5.29

5.29

4 years agoMerge pull request #18325 from aydun/spec_fix
Eileen McNaughton [Wed, 2 Sep 2020 22:10:15 +0000 (10:10 +1200)]
Merge pull request #18325 from aydun/spec_fix

dev/mail#24, item 1 - Fix spec labels MailingEventSubscribe.create

4 years agoRemove deprecated handling for partial_amount_to_pay
eileen [Wed, 2 Sep 2020 22:06:24 +0000 (10:06 +1200)]
Remove deprecated handling for partial_amount_to_pay

We added deprecation notices back in Feb when we stopped using these params in core. They were never truly
supported for extensions but we deprecated in case someone was doing something odd. However, it's
7 months on so time to cleanup

4 years agoMerge pull request #18326 from agh1/5.29.0-releasenotes
Seamus Lee [Wed, 2 Sep 2020 21:23:46 +0000 (07:23 +1000)]
Merge pull request #18326 from agh1/5.29.0-releasenotes

5.29.0 release notes final

4 years agoMerge pull request #18320 from civicrm/5.29
Eileen McNaughton [Wed, 2 Sep 2020 19:59:36 +0000 (07:59 +1200)]
Merge pull request #18320 from civicrm/5.29

5.29

4 years ago5.29.0 release notes: get sections in right order
Andrew Hunt [Wed, 2 Sep 2020 19:19:00 +0000 (15:19 -0400)]
5.29.0 release notes: get sections in right order

4 years ago5.29.0 release notes: finished writing
Andrew Hunt [Wed, 2 Sep 2020 19:14:34 +0000 (15:14 -0400)]
5.29.0 release notes: finished writing

4 years agosorting and annotating
Alice Frumin [Tue, 1 Sep 2020 21:02:10 +0000 (17:02 -0400)]
sorting and annotating

4 years agocommenting and sorting
Alice Frumin [Tue, 1 Sep 2020 18:15:29 +0000 (14:15 -0400)]
commenting and sorting

4 years ago5.29 Release Notes first pass
Alice Frumin [Tue, 1 Sep 2020 17:16:51 +0000 (13:16 -0400)]
5.29 Release Notes first pass

4 years agoFix spec labels - see dev/mail#24, item 1
Aidan Saunders [Wed, 2 Sep 2020 18:54:53 +0000 (19:54 +0100)]
Fix spec labels - see dev/mail#24, item 1

4 years agotypo in call to nestedGroup
demeritcowboy [Wed, 2 Sep 2020 14:35:18 +0000 (10:35 -0400)]
typo in call to nestedGroup

4 years agoFilter params in completetransaction
Matthew Wire [Tue, 1 Sep 2020 21:55:05 +0000 (22:55 +0100)]
Filter params in completetransaction

4 years agoMerge pull request #18319 from seamuslee001/5.29
Seamus Lee [Wed, 2 Sep 2020 09:33:15 +0000 (19:33 +1000)]
Merge pull request #18319 from seamuslee001/5.29

5.28.4 release notes

4 years agoMerge pull request #18315 from eileenmcnaughton/ordergo
Matthew Wire [Wed, 2 Sep 2020 09:22:09 +0000 (10:22 +0100)]
Merge pull request #18315 from eileenmcnaughton/ordergo

[REF] Remove most interaction with $objects in completeOrder

4 years agoMerge pull request #18295 from eileenmcnaughton/linetests
Seamus Lee [Wed, 2 Sep 2020 08:46:27 +0000 (18:46 +1000)]
Merge pull request #18295 from eileenmcnaughton/linetests

Test & remove handling for max_related in renewal form

4 years agoFix anchors in release-notes/5.28.3.md
Tim Otten [Tue, 1 Sep 2020 23:19:19 +0000 (16:19 -0700)]
Fix anchors in release-notes/5.28.3.md

4 years agoAdd release-notes/5.28.4.md
Tim Otten [Tue, 1 Sep 2020 23:08:39 +0000 (16:08 -0700)]
Add release-notes/5.28.4.md

4 years ago[REF] Add test for existing Participant batch update cancel and fix to not call BaseI...
eileen [Wed, 2 Sep 2020 06:43:08 +0000 (18:43 +1200)]
[REF] Add test for existing Participant batch update cancel and fix to not call BaseIPN->cancelled

I dug into what is 'achieved' by calling BaseIPN->cancelled here and everything except the bit where the contribution
is updated to cancelled is actually bypassed so a simple api call suffices.

I also discovered the cancellation of the contribution is highly conditional and arguably illogical. I will separately
log a gitlab to discuss whether it still makes sense, but I wouldn't want that discussion to derail this
no-change cleanup

4 years agoMerge pull request #18316 from civicrm/5.29
Eileen McNaughton [Wed, 2 Sep 2020 00:11:34 +0000 (12:11 +1200)]
Merge pull request #18316 from civicrm/5.29

5.29 to master

4 years agoMerge pull request #18272 from eileenmcnaughton/custchange
Eileen McNaughton [Wed, 2 Sep 2020 00:11:08 +0000 (12:11 +1200)]
Merge pull request #18272 from eileenmcnaughton/custchange

dev/core#1974 Fix incorrect handling of serialize key when changing custom field type

4 years agoMerge pull request #18307 from agh1/5.29.0-releasenotes-initial
Eileen McNaughton [Wed, 2 Sep 2020 00:06:07 +0000 (12:06 +1200)]
Merge pull request #18307 from agh1/5.29.0-releasenotes-initial

5.29.0 release notes initial run

4 years agoMerge pull request #18310 from colemanw/revert-18005
Eileen McNaughton [Wed, 2 Sep 2020 00:05:30 +0000 (12:05 +1200)]
Merge pull request #18310 from colemanw/revert-18005

Revert #18005 Fix buggy placement of icons

4 years agoMerge pull request #18311 from mattwire/repeattrxn_unused
Eileen McNaughton [Wed, 2 Sep 2020 00:03:30 +0000 (12:03 +1200)]
Merge pull request #18311 from mattwire/repeattrxn_unused

REF Remove unused passbyreference and var from ipn_process_transaction

4 years ago[REF] Remove most interaction with
eileen [Tue, 1 Sep 2020 23:54:40 +0000 (11:54 +1200)]
[REF] Remove most interaction with

With this change we are only looking up
1) objects['paymentProcessor'] - we should probably just pass in the id
2) objects['contribution'] - we could make this a param in it's own right & remove objects
3) objects['event'] - just used to get event title - we could do a query off participant

4 years agodev/core#1974 - ChangeFieldType - "Select (w/serialize)" field should be treated...
Noah Miller [Tue, 1 Sep 2020 22:23:25 +0000 (15:23 -0700)]
dev/core#1974 - ChangeFieldType - "Select (w/serialize)" field should be treated like older "Multi-Select" fields

4 years agoRemove unused passbyreference and var from ipn_process_transaction
Matthew Wire [Tue, 1 Sep 2020 21:41:21 +0000 (22:41 +0100)]
Remove unused passbyreference and var from ipn_process_transaction

4 years agoRevert #18005 Fix buggy placement of icons
Coleman Watts [Tue, 1 Sep 2020 20:48:57 +0000 (16:48 -0400)]
Revert #18005 Fix buggy placement of icons

4 years agoMerge pull request #18304 from highfalutin/noah/dev-core-1974
Eileen McNaughton [Tue, 1 Sep 2020 19:43:56 +0000 (07:43 +1200)]
Merge pull request #18304 from highfalutin/noah/dev-core-1974

dev/core#1974: correct UI regression on custom field edit

4 years ago5.29.0 release notes: yank changes already in 5.8.x
Andrew Hunt [Tue, 1 Sep 2020 15:18:38 +0000 (11:18 -0400)]
5.29.0 release notes: yank changes already in 5.8.x

4 years ago5.29.0 release notes: added boilerplate
Andrew Hunt [Tue, 1 Sep 2020 15:18:07 +0000 (11:18 -0400)]
5.29.0 release notes: added boilerplate

4 years ago5.29.0 release notes: raw from script
Andrew Hunt [Tue, 1 Sep 2020 15:08:02 +0000 (11:08 -0400)]
5.29.0 release notes: raw from script

4 years agoMerge pull request #18303 from eileenmcnaughton/event_batch
Matthew Wire [Tue, 1 Sep 2020 11:13:37 +0000 (12:13 +0100)]
Merge pull request #18303 from eileenmcnaughton/event_batch

[REF] Clean up return variables on updateContributionStatus, updatePendingOnlineContribution

4 years agoMerge pull request #18279 from eileenmcnaughton/ordertest
Matthew Wire [Tue, 1 Sep 2020 11:11:27 +0000 (12:11 +0100)]
Merge pull request #18279 from eileenmcnaughton/ordertest

Fix test set up to call Order.create to create the correct line items

4 years agoMerge pull request #18294 from eileenmcnaughton/linecreate
Matthew Wire [Tue, 1 Sep 2020 11:10:19 +0000 (12:10 +0100)]
Merge pull request #18294 from eileenmcnaughton/linecreate

[REF] Separate and move line-item specific portion of checkTaxAmount to LineItem api

4 years agoMerge pull request #18305 from civicrm/5.29
Seamus Lee [Tue, 1 Sep 2020 10:10:00 +0000 (20:10 +1000)]
Merge pull request #18305 from civicrm/5.29

5.29

4 years agoMerge pull request #18293 from eileenmcnaughton/fin
Seamus Lee [Tue, 1 Sep 2020 09:12:06 +0000 (19:12 +1000)]
Merge pull request #18293 from eileenmcnaughton/fin

Move LineItem acl handling from v3 api to financialacls core extension

4 years agoMerge pull request #18290 from eileenmcnaughton/tax
Seamus Lee [Tue, 1 Sep 2020 09:04:48 +0000 (19:04 +1000)]
Merge pull request #18290 from eileenmcnaughton/tax

dev/core#1983 Fix to tax calculation on multi-line-item

4 years agoCustom field create/edit form: replace dysfunctional checkbox with static label in...
Noah Miller [Tue, 1 Sep 2020 06:38:30 +0000 (23:38 -0700)]
Custom field create/edit form: replace dysfunctional checkbox with static label in edit mode

4 years agoMerge pull request #17810 from seamuslee001/negative_payment_create
Seamus Lee [Tue, 1 Sep 2020 04:51:04 +0000 (14:51 +1000)]
Merge pull request #17810 from seamuslee001/negative_payment_create

[REF] Fix financial item allocation of negative payments against completed payments

4 years ago[REF] Clean up return variables on updateContributionStatus, updatePendingOnlineContr...
eileen [Tue, 1 Sep 2020 03:21:50 +0000 (15:21 +1200)]
[REF] Clean up return variables on updateContributionStatus, updatePendingOnlineContribution

The return variable from updatePendingOnlineContribution is never used - ergo don't return it. This means
the return value from updateContributionStatus is also never used - ergo - you get it. In addition don't call the function
with empty variables - I've moved the check as to whether they are empty into the calling function - although likely
in a second pass the checks will be removed or change again

4 years agoMerge pull request #18237 from mattwire/mailingsearchcolumns
Eileen McNaughton [Tue, 1 Sep 2020 01:01:07 +0000 (13:01 +1200)]
Merge pull request #18237 from mattwire/mailingsearchcolumns

Remove 'hack' that overwrites result of searchColumns hook in mailings list

4 years agoMerge pull request #18302 from civicrm/5.29
Eileen McNaughton [Tue, 1 Sep 2020 00:15:12 +0000 (12:15 +1200)]
Merge pull request #18302 from civicrm/5.29

5.29 to master

4 years agoMerge pull request #18301 from demeritcowboy/dev-core-1982-5.29
Eileen McNaughton [Tue, 1 Sep 2020 00:14:35 +0000 (12:14 +1200)]
Merge pull request #18301 from demeritcowboy/dev-core-1982-5.29

dev/core#1982 - 5.29 version of PR 18282

4 years ago[REF] permit negative payments to be made against completed payments
Seamus Lee [Mon, 13 Jul 2020 04:38:20 +0000 (14:38 +1000)]
[REF] permit negative payments to be made against completed payments

Add in unit test for adding additional refund payment to contribution already refunded and also adding a negative payment to a contribution that is negative already