civicrm-core.git
2 years agoDeprecate guess work in processPriceSet
Eileen McNaughton [Sun, 20 Jun 2021 21:16:08 +0000 (09:16 +1200)]
Deprecate guess work in processPriceSet

Testing to see how much of this we can deprecate - line items should
be 'complete' before reaching the processing function

2 years agoMerge pull request #20784 from eileenmcnaughton/pay_fix
Monish Deb [Tue, 13 Jul 2021 03:31:18 +0000 (09:01 +0530)]
Merge pull request #20784 from eileenmcnaughton/pay_fix

Fixes getTemplateContribution to use a more reliable way to load line items

2 years agoMerge pull request #20838 from civicrm/5.40
Seamus Lee [Tue, 13 Jul 2021 01:42:41 +0000 (11:42 +1000)]
Merge pull request #20838 from civicrm/5.40

5.40

2 years agoMerge pull request #20836 from seamuslee001/dev_rc_13
Eileen McNaughton [Mon, 12 Jul 2021 23:50:25 +0000 (11:50 +1200)]
Merge pull request #20836 from seamuslee001/dev_rc_13

Resolve dev/rc#13 by permitting civi.setupui events to be dispatched …

2 years agoResolve dev/rc#13 by permitting civi.setupui events to be dispatched during install
Seamus Lee [Mon, 12 Jul 2021 21:58:25 +0000 (07:58 +1000)]
Resolve dev/rc#13 by permitting civi.setupui events to be dispatched during install

2 years agoMerge pull request #20587 from eileenmcnaughton/rr
Seamus Lee [Mon, 12 Jul 2021 21:52:57 +0000 (07:52 +1000)]
Merge pull request #20587 from eileenmcnaughton/rr

dev/core#2648 update redis class off deprecated functions

2 years agoMerge pull request #20830 from eileenmcnaughton/ttp
Eileen McNaughton [Mon, 12 Jul 2021 10:18:13 +0000 (22:18 +1200)]
Merge pull request #20830 from eileenmcnaughton/ttp

E-notice fix

2 years agoMerge pull request #20650 from eileenmcnaughton/partorder
Eileen McNaughton [Mon, 12 Jul 2021 10:17:48 +0000 (22:17 +1200)]
Merge pull request #20650 from eileenmcnaughton/partorder

Enable check on created participant payment rows

2 years agoMerge pull request #20799 from colemanw/filterByPrefix
Seamus Lee [Mon, 12 Jul 2021 09:05:50 +0000 (19:05 +1000)]
Merge pull request #20799 from colemanw/filterByPrefix

APIv4 - Fix pseudoconstant matching reliability across joins

2 years agoMerge pull request #20828 from colemanw/tplFix
Eileen McNaughton [Mon, 12 Jul 2021 08:30:48 +0000 (20:30 +1200)]
Merge pull request #20828 from colemanw/tplFix

Fix undefined tpl vars

2 years agoE-notice fix
Eileen McNaughton [Mon, 12 Jul 2021 08:11:31 +0000 (20:11 +1200)]
E-notice fix

2 years agoEnable check on created participant payment rows
Eileen McNaughton [Fri, 18 Jun 2021 04:10:35 +0000 (16:10 +1200)]
Enable check on created participant payment rows

Extend participant check

2 years agoMerge pull request #20670 from eileenmcnaughton/reg
Monish Deb [Mon, 12 Jul 2021 05:45:48 +0000 (11:15 +0530)]
Merge pull request #20670 from eileenmcnaughton/reg

Fix transfer registration to transfer participant_payment row

2 years agoFixes getTemplateContribution to use a more reliable way to load line items
Eileen McNaughton [Tue, 6 Jul 2021 18:54:32 +0000 (06:54 +1200)]
Fixes getTemplateContribution to use a more reliable way to load line items

My efforts to add testing a 'deprecate weird stuff' have identified an odd and fragile
flow for the line items in getTemplateContribution. It calls
getLineItemsByContributionID which, as it turns out, substitues the
actual entity table with 'civicrm_contribution'.

Then this line of weird handling swoops in and saves the day.

https://github.com/civicrm/civicrm-core/pull/20775/files#diff-a16d4d7449cf5f3a0616d1d282a32f27ab6d3f7d2726d076c02ad1d4d655af41R393

This switches us to something cleaner than just loads the line items (with v4 LineItem.get) and
no weird handling

2 years agoMerge pull request #20826 from civicrm/5.40
Seamus Lee [Mon, 12 Jul 2021 02:30:53 +0000 (12:30 +1000)]
Merge pull request #20826 from civicrm/5.40

Merge 5.40 to master

2 years agoFix undefined tpl vars
Coleman Watts [Mon, 12 Jul 2021 01:17:20 +0000 (21:17 -0400)]
Fix undefined tpl vars

2 years agoMerge pull request #20827 from eileenmcnaughton/tpl3
colemanw [Mon, 12 Jul 2021 01:09:16 +0000 (21:09 -0400)]
Merge pull request #20827 from eileenmcnaughton/tpl3

tpl enotice fix

2 years agotpl enotice fix
Eileen McNaughton [Sun, 11 Jul 2021 23:02:05 +0000 (11:02 +1200)]
tpl enotice fix

2 years agoFix transfer registration to transfer participant_payment row
Eileen McNaughton [Sat, 19 Jun 2021 03:22:55 +0000 (15:22 +1200)]
Fix transfer registration to transfer participant_payment row

2 years agoMerge pull request #20818 from sadashivdalvi/crm-2685
colemanw [Sun, 11 Jul 2021 21:49:41 +0000 (17:49 -0400)]
Merge pull request #20818 from sadashivdalvi/crm-2685

Fix for issue 2685

2 years agoMerge pull request #20824 from colemanw/fixUpdateOperators
colemanw [Sun, 11 Jul 2021 21:47:07 +0000 (17:47 -0400)]
Merge pull request #20824 from colemanw/fixUpdateOperators

SearchKit - Fix reloading a search with an OR group in the WHERE clause

2 years agoSearchKit - Fix reloading a search with an OR group in the WHERE clause
Coleman Watts [Sun, 11 Jul 2021 19:43:20 +0000 (15:43 -0400)]
SearchKit - Fix reloading a search with an OR group in the WHERE clause

Fixes dev/report#71

2 years agoMerge pull request #20315 from mattwire/recaptchahelpers
Eileen McNaughton [Sun, 11 Jul 2021 02:34:20 +0000 (14:34 +1200)]
Merge pull request #20315 from mattwire/recaptchahelpers

(REF) dev/core#2571 - Add helper functions for reCAPTCHA extension

2 years agoAdd helper functions for reCAPTCHA extension
Matthew Wire [Sun, 16 May 2021 19:07:21 +0000 (20:07 +0100)]
Add helper functions for reCAPTCHA extension

2 years agoMerge pull request #20817 from colemanw/fixBasicGetColor
colemanw [Fri, 9 Jul 2021 15:08:51 +0000 (11:08 -0400)]
Merge pull request #20817 from colemanw/fixBasicGetColor

APIv4 - Fix dumb typo breaking color lookup

2 years agoMerge pull request #20816 from colemanw/optionsPageFixes
colemanw [Fri, 9 Jul 2021 15:08:35 +0000 (11:08 -0400)]
Merge pull request #20816 from colemanw/optionsPageFixes

PHP notice fixes on options page

2 years agoMerge pull request #20399 from jaapjansma/dev_2624_2
Matthew Wire [Fri, 9 Jul 2021 10:32:21 +0000 (11:32 +0100)]
Merge pull request #20399 from jaapjansma/dev_2624_2

dev/core#2624  display line items from the template contribution at the view recurring contribution screen.

2 years agoFix for issue 2685
sadashiv [Fri, 9 Jul 2021 03:38:55 +0000 (09:08 +0530)]
Fix for issue 2685

2 years agoMerge pull request #20819 from seamuslee001/fix_apiv4_syntaxtests
Seamus Lee [Fri, 9 Jul 2021 08:19:28 +0000 (18:19 +1000)]
Merge pull request #20819 from seamuslee001/fix_apiv4_syntaxtests

[REF] Add in APIv4 Product Entity and Fix APIv4 Syntax Conformance te…

2 years ago[REF] Add in APIv4 Product Entity and Fix APIv4 Syntax Conformance test failures...
Seamus Lee [Fri, 9 Jul 2021 04:13:05 +0000 (14:13 +1000)]
[REF] Add in APIv4 Product Entity and Fix APIv4 Syntax Conformance test failures on ContributionProduct and EntityBatch APIs

update version

2 years agoFix dumb typo breaking color lookup
Coleman Watts [Fri, 9 Jul 2021 00:38:51 +0000 (20:38 -0400)]
Fix dumb typo breaking color lookup

2 years agoPHP notice fixes on options page
Coleman Watts [Fri, 9 Jul 2021 00:04:19 +0000 (20:04 -0400)]
PHP notice fixes on options page

2 years agoMerge pull request #20815 from civicrm/5.40
Eileen McNaughton [Thu, 8 Jul 2021 23:00:05 +0000 (11:00 +1200)]
Merge pull request #20815 from civicrm/5.40

5.40 to master

2 years agoMerge pull request #20814 from seamuslee001/dev_core_2680
Eileen McNaughton [Thu, 8 Jul 2021 22:59:34 +0000 (10:59 +1200)]
Merge pull request #20814 from seamuslee001/dev_core_2680

dev/core#2680 Remove rows in the civicrm_contribution_product table t…

2 years agoMerge pull request #20813 from colemanw/tplFixes
Eileen McNaughton [Thu, 8 Jul 2021 22:51:53 +0000 (10:51 +1200)]
Merge pull request #20813 from colemanw/tplFixes

Fix undefined tpl variables

2 years agoMerge pull request #20505 from JMAConsulting/contribution_product_api4
Eileen McNaughton [Thu, 8 Jul 2021 22:28:46 +0000 (10:28 +1200)]
Merge pull request #20505 from JMAConsulting/contribution_product_api4

Add ContributionProduct and EntityBatch APIv4 Entity

2 years agodev/core#2680 Remove rows in the civicrm_contribution_product table that have bad...
Seamus Lee [Thu, 8 Jul 2021 21:13:41 +0000 (07:13 +1000)]
dev/core#2680 Remove rows in the civicrm_contribution_product table that have bad product_ids in them

2 years agoMerge pull request #20782 from mlutfy/forwardMail
Tim Otten [Thu, 8 Jul 2021 20:39:46 +0000 (13:39 -0700)]
Merge pull request #20782 from mlutfy/forwardMail

Forward Mailing: remove duplicate buttons, cancel button

2 years agoFix undefined tpl variables
Coleman Watts [Thu, 8 Jul 2021 20:34:47 +0000 (16:34 -0400)]
Fix undefined tpl variables

2 years agoMerge pull request #20812 from nirodaonline/patch-1
demeritcowboy [Thu, 8 Jul 2021 17:34:24 +0000 (13:34 -0400)]
Merge pull request #20812 from nirodaonline/patch-1

Update contributor-key.yml

2 years agoUpdate contributor-key.yml
nirodaonline [Thu, 8 Jul 2021 16:35:17 +0000 (17:35 +0100)]
Update contributor-key.yml

2 years agoMerge pull request #20805 from eileenmcnaughton/log_date
demeritcowboy [Thu, 8 Jul 2021 16:26:24 +0000 (12:26 -0400)]
Merge pull request #20805 from eileenmcnaughton/log_date

Add deprecation warning for modifiedDates

2 years agoMerge pull request #20794 from nirodaonline/feature/core-2652
demeritcowboy [Thu, 8 Jul 2021 15:11:58 +0000 (11:11 -0400)]
Merge pull request #20794 from nirodaonline/feature/core-2652

dev/core#2652 - Civi\Report - Add is null / is not null to OP_MULTISE…

2 years agoAPIv4 - Fix pseudoconstant matching function to pass params correctly across joins
Coleman Watts [Wed, 7 Jul 2021 19:54:57 +0000 (15:54 -0400)]
APIv4 - Fix pseudoconstant matching function to pass params correctly across joins

The getPseudoconstantList() function passes an array of params to core BAO::buildOptions,
that list needs to be transformed to match the prefix on the field, in case that field
belongs to a joined entity rather than the main entity.

2 years agoFix for dev/core#2624
Jaap Jansma [Thu, 27 May 2021 08:33:09 +0000 (10:33 +0200)]
Fix for dev/core#2624

Fix for dev/core#2624

2 years agoMerge pull request #20758 from colemanw/addSearchAfformTest
Seamus Lee [Thu, 8 Jul 2021 09:55:53 +0000 (19:55 +1000)]
Merge pull request #20758 from colemanw/addSearchAfformTest

SearchKit - Auto-apply filters passed in from Afform markup

2 years agoMerge pull request #20786 from totten/master-monaco
Seamus Lee [Thu, 8 Jul 2021 09:44:43 +0000 (19:44 +1000)]
Merge pull request #20786 from totten/master-monaco

crmMonaco - Multiple updates. Toward message-template editing.

2 years agoMerge pull request #20806 from eileenmcnaughton/lines
Eileen McNaughton [Thu, 8 Jul 2021 09:35:26 +0000 (21:35 +1200)]
Merge pull request #20806 from eileenmcnaughton/lines

Fix test to use order api & setup valid financials

2 years agoFix test to use order api & setup valid financials
Eileen McNaughton [Thu, 8 Jul 2021 00:59:33 +0000 (12:59 +1200)]
Fix test to use order api & setup valid financials

Updates a test from 'weird setup' to using the order api

2 years agoSet version to 5.41.alpha1
CiviCRM [Thu, 8 Jul 2021 03:51:15 +0000 (03:51 +0000)]
Set version to 5.41.alpha1

2 years agoSet version to 5.40.beta1
CiviCRM [Thu, 8 Jul 2021 03:42:16 +0000 (03:42 +0000)]
Set version to 5.40.beta1

2 years agoMerge pull request #20810 from totten/master-e2e-timeout
Tim Otten [Thu, 8 Jul 2021 03:39:40 +0000 (20:39 -0700)]
Merge pull request #20810 from totten/master-e2e-timeout

AssetBuilderTest - Raise threshold for timeout

2 years agoAssetBuilderTest - Raise threshold for timeout
Tim Otten [Thu, 8 Jul 2021 03:21:57 +0000 (20:21 -0700)]
AssetBuilderTest - Raise threshold for timeout

Overview
--------

Raise the threshold beforer abandoning execution of this E2E test.

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

This aims to mitigate flaky failures like the following:

Example failure: https://test.civicrm.org/job/CiviCRM-Core-Matrix/BKPROF=max,CIVIVER=5.39,SUITES=phpunit-e2e,label=bknix-tmp/9766/testReport/junit/E2E.Core/AssetBuilderTest/testInvalid/

```
E2E\Core\AssetBuilderTest::testInvalid
GuzzleHttp\Exception\ConnectException: cURL error 28: Operation timed out after 1001 milliseconds with 0 bytes received (see https://curl.haxx.se/libcurl/c/libcurl-errors.html)

/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php:200
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php:155
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/CurlFactory.php:105
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/CurlHandler.php:43
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php:28
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Handler/Proxy.php:51
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/PrepareBodyMiddleware.php:37
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Middleware.php:29
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/RedirectMiddleware.php:70
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Middleware.php:59
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/HandlerStack.php:71
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Client.php:351
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Client.php:162
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/vendor/guzzlehttp/guzzle/src/Client.php:182
/home/jenkins/bknix-max/build/build-0/web/sites/all/modules/civicrm/tests/phpunit/E2E/Core/AssetBuilderTest.php:167
/home/jenkins/bknix-max/extern/phpunit8/phpunit8.phar:671
```

2 years agoMerge pull request #20809 from totten/master-fwd
Tim Otten [Thu, 8 Jul 2021 02:48:25 +0000 (19:48 -0700)]
Merge pull request #20809 from totten/master-fwd

Merge forward 5.39 => master

2 years agoset-version.php - Fix autocommit for 'info.xml'
Tim Otten [Thu, 8 Jul 2021 01:48:21 +0000 (18:48 -0700)]
set-version.php - Fix autocommit for 'info.xml'

The 'set-version.php' script has an option `--commit` which should commit any updated files.

Before: Fails to commit changes to `ext/*/info.xml`

After: Does ocmmit changes to `ext/*/info.xml`

2 years agorelease-notes/5.39.0.md - Add recent PR
Tim Otten [Thu, 8 Jul 2021 01:44:21 +0000 (18:44 -0700)]
release-notes/5.39.0.md - Add recent PR

2 years agorelease-notes/5.39.0.md - Random tiny edits
Tim Otten [Thu, 8 Jul 2021 01:37:23 +0000 (18:37 -0700)]
release-notes/5.39.0.md - Random tiny edits

2 years agodev/core#2659 Move group cleanup to latest release
Eileen McNaughton [Sat, 3 Jul 2021 01:16:43 +0000 (13:16 +1200)]
dev/core#2659 Move group cleanup to latest release

2 years agoMerge pull request #20803 from colemanw/addressSearchFilter
Eileen McNaughton [Thu, 8 Jul 2021 02:06:34 +0000 (14:06 +1200)]
Merge pull request #20803 from colemanw/addressSearchFilter

SearchKit - Remove automatic filter from address

2 years agoMerge pull request #20600 from ixiam/dev#SettingsTraitCheckboxes
Eileen McNaughton [Thu, 8 Jul 2021 00:29:05 +0000 (12:29 +1200)]
Merge pull request #20600 from ixiam/dev#SettingsTraitCheckboxes

Force cleanup of setting value type "checkboxes" when is empty

2 years agoAdd deprecation warning for modifiedDates
Eileen McNaughton [Wed, 7 Jul 2021 23:48:25 +0000 (11:48 +1200)]
Add deprecation warning for modifiedDates

This is only accessed from log_date

2 years agoMerge pull request #20764 from colemanw/multiContactRefJoins
colemanw [Wed, 7 Jul 2021 23:29:54 +0000 (19:29 -0400)]
Merge pull request #20764 from colemanw/multiContactRefJoins

SearchKit - Add ability to join on multi-select ContactRef fields

2 years agoMerge pull request #20785 from eileenmcnaughton/baseipn
colemanw [Wed, 7 Jul 2021 23:22:52 +0000 (19:22 -0400)]
Merge pull request #20785 from eileenmcnaughton/baseipn

Fix BaseIPN test to (mostly) pass invalid financials checks

2 years agoMerge pull request #20746 from colemanw/locBlockFixes
Eileen McNaughton [Wed, 7 Jul 2021 23:04:22 +0000 (11:04 +1200)]
Merge pull request #20746 from colemanw/locBlockFixes

dev/core#2676 SearchKit - Add LocBlock entity to display Event location data

2 years agoSearchKit - Remove automatic filter from address
Coleman Watts [Wed, 7 Jul 2021 22:34:57 +0000 (18:34 -0400)]
SearchKit - Remove automatic filter from address

2 years agoMerge pull request #20780 from eileenmcnaughton/pay_order
Eileen McNaughton [Wed, 7 Jul 2021 22:22:28 +0000 (10:22 +1200)]
Merge pull request #20780 from eileenmcnaughton/pay_order

Fix test set up to user Order api

2 years agoMerge pull request #20802 from civicrm/5.39
Eileen McNaughton [Wed, 7 Jul 2021 22:09:07 +0000 (10:09 +1200)]
Merge pull request #20802 from civicrm/5.39

5.39 to master

2 years agoMerge pull request #20798 from agh1/5.39.0-releasenotes-final
Eileen McNaughton [Wed, 7 Jul 2021 22:08:31 +0000 (10:08 +1200)]
Merge pull request #20798 from agh1/5.39.0-releasenotes-final

5.39.0 release notes: added late changes

2 years agoMerge pull request #20765 from colemanw/apiDeprecatePassingIdField
Eileen McNaughton [Wed, 7 Jul 2021 21:45:18 +0000 (09:45 +1200)]
Merge pull request #20765 from colemanw/apiDeprecatePassingIdField

APIv4 - Deprecate passing 'id' to basic actions

2 years agoMerge pull request #20719 from mattwire/deprecatedwarningcaller
Eileen McNaughton [Wed, 7 Jul 2021 20:44:57 +0000 (08:44 +1200)]
Merge pull request #20719 from mattwire/deprecatedwarningcaller

Add calling function to deprecatedWarning log message

2 years agoFix test set up to user Order api
Eileen McNaughton [Tue, 6 Jul 2021 07:32:32 +0000 (19:32 +1200)]
Fix test set up to user Order api

Note this includes the order api ensuring that the contribution_recur_id is passed through to
any created memberships

2 years agoMerge pull request #20797 from colemanw/reportTplFixes
Eileen McNaughton [Wed, 7 Jul 2021 20:38:13 +0000 (08:38 +1200)]
Merge pull request #20797 from colemanw/reportTplFixes

Fix undefined tpl vars in CiviReport

2 years agoCRM_Utils_JS::stripComments() - Mitigation for string which includes newline and...
Tim Otten [Wed, 7 Jul 2021 20:36:06 +0000 (13:36 -0700)]
CRM_Utils_JS::stripComments() - Mitigation for string which includes newline and comment

2 years ago5.39.0 release notes: added late changes
Andrew Hunt [Wed, 7 Jul 2021 19:36:55 +0000 (15:36 -0400)]
5.39.0 release notes: added late changes

2 years agoAdd deprecated flag to functions
Matthew Wire [Wed, 7 Jul 2021 18:39:14 +0000 (19:39 +0100)]
Add deprecated flag to functions

2 years agoAdd calling function to deprecatedWarning log message
Matthew Wire [Mon, 28 Jun 2021 08:43:02 +0000 (09:43 +0100)]
Add calling function to deprecatedWarning log message

2 years agoFix undefined tpl vars in CiviReport
Coleman Watts [Wed, 7 Jul 2021 13:44:22 +0000 (09:44 -0400)]
Fix undefined tpl vars in CiviReport

2 years agoMerge pull request #20796 from demeritcowboy/smartactlinks
colemanw [Wed, 7 Jul 2021 15:01:55 +0000 (11:01 -0400)]
Merge pull request #20796 from demeritcowboy/smartactlinks

Unused smarty variable

2 years agoMerge pull request #20795 from demeritcowboy/smartycasehlp
colemanw [Wed, 7 Jul 2021 14:00:31 +0000 (10:00 -0400)]
Merge pull request #20795 from demeritcowboy/smartycasehlp

smarty notices - New case screen - Case.hlp

2 years agoMerge pull request #20793 from eileenmcnaughton/order2
colemanw [Wed, 7 Jul 2021 13:56:25 +0000 (09:56 -0400)]
Merge pull request #20793 from eileenmcnaughton/order2

[Ref] Remove (more) unreachable code from order api

2 years agounused
demeritcowboy [Wed, 7 Jul 2021 13:12:28 +0000 (09:12 -0400)]
unused

2 years agosometimes legitimately missing
demeritcowboy [Wed, 7 Jul 2021 13:02:33 +0000 (09:02 -0400)]
sometimes legitimately missing

2 years agoFurther cleanup on order
Eileen McNaughton [Wed, 7 Jul 2021 05:49:52 +0000 (17:49 +1200)]
Further cleanup on order

Follow up to https://github.com/civicrm/civicrm-core/pull/20792
- although that can be closed if this is merged

2 years ago[REF] Remove unreachable code from order api
Eileen McNaughton [Wed, 7 Jul 2021 05:41:37 +0000 (17:41 +1200)]
[REF] Remove unreachable code from order api

2 years agodev/core#2652 - Civi\Report - Add is null / is not null to OP_MULTISELECT_SEPARATOR
malmeida [Wed, 7 Jul 2021 09:00:47 +0000 (10:00 +0100)]
dev/core#2652 - Civi\Report - Add is null / is not null to OP_MULTISELECT_SEPARATOR

2 years agoMerge pull request #18517 from JMAConsulting/financial-issue-150
Matthew Wire [Wed, 7 Jul 2021 08:30:39 +0000 (09:30 +0100)]
Merge pull request #18517 from JMAConsulting/financial-issue-150

dev/financial#150: civicrm/payment/form url got empty currency argument in backoffice live CC form

2 years agoMerge pull request #20392 from seamuslee001/ckeditor4
Eileen McNaughton [Wed, 7 Jul 2021 06:31:07 +0000 (18:31 +1200)]
Merge pull request #20392 from seamuslee001/ckeditor4

[REF] Extract CKEditor into its own core extension

2 years agoMerge pull request #20790 from eileenmcnaughton/partor
Eileen McNaughton [Wed, 7 Jul 2021 05:24:21 +0000 (17:24 +1200)]
Merge pull request #20790 from eileenmcnaughton/partor

Handle participant payment create in line item

2 years agoMerge pull request #20789 from totten/master-crmui-selecting
colemanw [Wed, 7 Jul 2021 04:48:18 +0000 (00:48 -0400)]
Merge pull request #20789 from totten/master-crmui-selecting

(REF) crmUi - Support onCrmUiSelect for using select2 as a picklist

2 years agoExtract CKEditor into its own core extension
Seamus Lee [Sat, 22 May 2021 23:03:03 +0000 (09:03 +1000)]
Extract CKEditor into its own core extension

Update civicrm_generated and shift js files into the new extension

Update to use E::path and E::url as appropriate

Add in Upgrade step to update option label to be consistant

Make changes for CKeditor 4 label now

Add in upgrade step to enable extension on upgrade

2 years agoHandle participant payment create in line item
Eileen McNaughton [Fri, 18 Jun 2021 07:02:17 +0000 (19:02 +1200)]
Handle participant payment create in line item

Remove participant payment create from order api

This is now done in the line item create & we went through to 'prove' that it works with
extra validation

2 years agoMerge pull request #20783 from JMAConsulting/issue_2681
Eileen McNaughton [Wed, 7 Jul 2021 03:13:49 +0000 (15:13 +1200)]
Merge pull request #20783 from JMAConsulting/issue_2681

dev#2861: Prevent duplicate names in mailing labels

2 years agoMerge pull request #20788 from totten/master-array-rotate
colemanw [Wed, 7 Jul 2021 01:42:29 +0000 (21:42 -0400)]
Merge pull request #20788 from totten/master-array-rotate

CRM_Utils_Array::asColumns() - Add helper to rotate a matrix (from rows to columns)

2 years agoMerge pull request #20787 from totten/master-path-unset
Eileen McNaughton [Wed, 7 Jul 2021 00:47:14 +0000 (12:47 +1200)]
Merge pull request #20787 from totten/master-path-unset

CRM_Utils_Array - Implement pathUnset() method

2 years agocrmUi - Add onCrmUiSelect for using select2 as a picklist
Tim Otten [Tue, 22 Jun 2021 02:53:34 +0000 (19:53 -0700)]
crmUi - Add onCrmUiSelect for using select2 as a picklist

2 years agoFix BaseIPN test to (mostly) pass invalid financials
Eileen McNaughton [Tue, 6 Jul 2021 22:04:27 +0000 (10:04 +1200)]
Fix BaseIPN test to (mostly) pass invalid financials

2 years agoMerge pull request #20779 from eileenmcnaughton/batch2
colemanw [Tue, 6 Jul 2021 23:25:02 +0000 (19:25 -0400)]
Merge pull request #20779 from eileenmcnaughton/batch2

 Clean up code to determine line items for membership batch entry

2 years agoCRM_Utils_Array - Add helper to rotate an array (from rows to columns)
Tim Otten [Wed, 23 Jun 2021 02:53:07 +0000 (19:53 -0700)]
CRM_Utils_Array - Add helper to rotate an array (from rows to columns)

2 years agoCRM_Utils_Array - Implement pathUnset() method
Tim Otten [Wed, 30 Jun 2021 03:12:28 +0000 (20:12 -0700)]
CRM_Utils_Array - Implement pathUnset() method

2 years agocomposer.json - Update Monaco
Tim Otten [Mon, 21 Jun 2021 22:44:19 +0000 (15:44 -0700)]
composer.json - Update Monaco