civicrm-core.git
3 years agoMerge pull request #20214 from ixiam/dev#issue_2584
Eileen McNaughton [Mon, 17 May 2021 02:15:16 +0000 (14:15 +1200)]
Merge pull request #20214 from ixiam/dev#issue_2584

Separates the default language for contacts from the site language

3 years agoMerge pull request #20314 from mattwire/contactdetailacl
demeritcowboy [Sun, 16 May 2021 15:23:55 +0000 (11:23 -0400)]
Merge pull request #20314 from mattwire/contactdetailacl

Switch to non deprecated buildPermissionClause() for contact detail report

3 years agoMerge pull request #20209 from eileenmcnaughton/qfail
Matthew Wire [Sun, 16 May 2021 14:04:47 +0000 (15:04 +0100)]
Merge pull request #20209 from eileenmcnaughton/qfail

Do not error on view contribution recur if not displaying contributions

3 years agoMerge pull request #20300 from eileenmcnaughton/pp
Matthew Wire [Sun, 16 May 2021 14:03:51 +0000 (15:03 +0100)]
Merge pull request #20300 from eileenmcnaughton/pp

dev/core#2593 stop calling loadRelatedObjects / fix for bug

3 years agoMerge pull request #20294 from eileenmcnaughton/ppp
Matthew Wire [Sun, 16 May 2021 14:00:35 +0000 (15:00 +0100)]
Merge pull request #20294 from eileenmcnaughton/ppp

[REF] Provide standardised methods to get recurring contribution id & object

3 years agoMerge pull request #20211 from eileenmcnaughton/reorg
Matthew Wire [Sun, 16 May 2021 13:53:00 +0000 (14:53 +0100)]
Merge pull request #20211 from eileenmcnaughton/reorg

[REF] Reverse if statement

3 years agoMerge pull request #20205 from eileenmcnaughton/dep_pend
Matthew Wire [Sun, 16 May 2021 13:35:30 +0000 (14:35 +0100)]
Merge pull request #20205 from eileenmcnaughton/dep_pend

Remove deprecation of order-must-be-pending

3 years agoSwitch to non deprecated buildPermissionClause() for contact detail report
Matthew Wire [Sun, 16 May 2021 13:30:18 +0000 (14:30 +0100)]
Switch to non deprecated buildPermissionClause() for contact detail report

3 years agoSeparates the default language for contacts from the site language
Vangelis Pantazis [Sun, 16 May 2021 08:04:40 +0000 (09:04 +0100)]
Separates the default language for contacts from the site language

3 years agoMerge pull request #20312 from seamuslee001/improve_sample_data_trxn_id_payment_proce...
Seamus Lee [Sun, 16 May 2021 01:04:23 +0000 (11:04 +1000)]
Merge pull request #20312 from seamuslee001/improve_sample_data_trxn_id_payment_procesor_link

Improve Sample data by ensuring all Credit Card Contributions have a …

3 years agoMerge pull request #20304 from eileenmcnaughton/mem_move2
demeritcowboy [Sat, 15 May 2021 23:10:27 +0000 (19:10 -0400)]
Merge pull request #20304 from eileenmcnaughton/mem_move2

Remove never-passed parameter from now unshared function

3 years agoImprove Sample data by ensuring all Credit Card Contributions have a transaction...
Seamus Lee [Sat, 15 May 2021 22:45:32 +0000 (08:45 +1000)]
Improve Sample data by ensuring all Credit Card Contributions have a transaction id and tha they are shown to be linked to the test payment processor

3 years agoMerge pull request #20311 from demeritcowboy/dummy
Seamus Lee [Sat, 15 May 2021 21:46:15 +0000 (07:46 +1000)]
Merge pull request #20311 from demeritcowboy/dummy

dev/core#2614 - Sample payment processor is the wrong id in the generated sample data for demos

3 years agothe id keeps changing so look it up by name
demeritcowboy [Sat, 15 May 2021 19:27:00 +0000 (15:27 -0400)]
the id keeps changing so look it up by name

3 years agoMerge pull request #20082 from mattwire/paypalwarning
demeritcowboy [Sat, 15 May 2021 16:03:30 +0000 (12:03 -0400)]
Merge pull request #20082 from mattwire/paypalwarning

Add warning when url_site is not specified for paypal (it won't work if not set)

3 years agoMerge pull request #20139 from eileenmcnaughton/home_url
demeritcowboy [Sat, 15 May 2021 02:04:39 +0000 (22:04 -0400)]
Merge pull request #20139 from eileenmcnaughton/home_url

Remove defunct default return property

3 years agoMerge pull request #20216 from colemanw/afformEntityRef
Seamus Lee [Fri, 14 May 2021 10:16:09 +0000 (20:16 +1000)]
Merge pull request #20216 from colemanw/afformEntityRef

Afform Gui - Add support for entityRef fields

3 years agoRemove never-passed parameter from now unshared parameter
Eileen McNaughton [Fri, 14 May 2021 06:17:29 +0000 (18:17 +1200)]
Remove never-passed parameter from now unshared parameter

3 years agodev/core#2593 stop calling loadRelatedObjects
Eileen McNaughton [Fri, 14 May 2021 05:58:15 +0000 (17:58 +1200)]
dev/core#2593 stop calling loadRelatedObjects

We are no longer using ids after this function so we don't need to
call that function to load them.

In addition this extacts getContribution & reflects the fact the contact_id
is only being used to warn if the contribution is not a match (in
the debug log)

3 years agoMerge pull request #20299 from eileenmcnaughton/pp
Eileen McNaughton [Fri, 14 May 2021 05:50:45 +0000 (17:50 +1200)]
Merge pull request #20299 from eileenmcnaughton/pp

Remove now-unused ids parameter from signature

3 years ago[REF] Add getters for contribution id & contact id
Eileen McNaughton [Fri, 14 May 2021 03:43:50 +0000 (15:43 +1200)]
[REF] Add getters for contribution id & contact id

3 years ago[REF] Provide standardised methods to get recurring contribution id & object
Eileen McNaughton [Fri, 14 May 2021 00:22:49 +0000 (12:22 +1200)]
[REF] Provide standardised methods to get recurring contribution id & object

This adds methods to get the recurring contribution id & object that work from the paypal
express and from the paypal pro flows. In the paypal express flow it is
retrieved from a known value (and this flow is only ever hit for recurrings
as evidenced by the existing getsingle) and then set on the class. For paypal pro
it is optional and will be in the cheap-to-access POST array if relevant

3 years agoRemove now-unused ids parameter from signature
Eileen McNaughton [Fri, 14 May 2021 03:39:26 +0000 (15:39 +1200)]
Remove now-unused ids parameter from signature

3 years agoMerge pull request #20293 from eileenmcnaughton/pp
Eileen McNaughton [Fri, 14 May 2021 03:35:11 +0000 (15:35 +1200)]
Merge pull request #20293 from eileenmcnaughton/pp

[REF] Use function to getContributionRecurID

3 years agoMerge pull request #20295 from eileenmcnaughton/mem_move
Eileen McNaughton [Fri, 14 May 2021 02:57:25 +0000 (14:57 +1200)]
Merge pull request #20295 from eileenmcnaughton/mem_move

[REF] Duplicate processMembership preliminary to cleanup

3 years ago[REF] Use function to getContributionRecurID
Eileen McNaughton [Thu, 13 May 2021 23:42:29 +0000 (11:42 +1200)]
[REF] Use function to getContributionRecurID

We are simply fetching it from the POST so it's cheap to fetch & we can stop passing it around
once we are using a function, not a variable. This also changes the debug logging slightly
to pass the values more correctly to log->debug().

3 years ago[REF] Duplicate processMembership preliminary to cleanup
Eileen McNaughton [Fri, 14 May 2021 01:17:51 +0000 (13:17 +1200)]
[REF] Duplicate processMembership preliminary to cleanup

This used to be shared by 3 places. We've copied & cleaned up one. This duplicates to the
second once I've done some cleaning up I'll deprecate this & also duplicate to the 3rd

3 years agoMerge pull request #20287 from mattwire/contactreportaclduplicates
demeritcowboy [Fri, 14 May 2021 00:30:08 +0000 (20:30 -0400)]
Merge pull request #20287 from mattwire/contactreportaclduplicates

Switch to non deprecated buildPermissionClause() for contact summary report

3 years agoMerge pull request #20288 from demeritcowboy/fintypeaccount
Seamus Lee [Thu, 13 May 2021 23:03:46 +0000 (09:03 +1000)]
Merge pull request #20288 from demeritcowboy/fintypeaccount

[NFC/TEST] - Add unit test enforcing automatic chaining for financial type/account creation via api

3 years agoMerge pull request #20290 from civicrm/5.38
Seamus Lee [Thu, 13 May 2021 23:02:57 +0000 (09:02 +1000)]
Merge pull request #20290 from civicrm/5.38

5.38

3 years agoMerge pull request #20246 from eileenmcnaughton/ft
Seamus Lee [Thu, 13 May 2021 22:31:26 +0000 (08:31 +1000)]
Merge pull request #20246 from eileenmcnaughton/ft

dev/core#2593 [REF] Fix function signature to actually-used variables

3 years agoSwitch to non deprecated buildPermissionClause() for contact summary report
Matthew Wire [Thu, 13 May 2021 19:31:55 +0000 (20:31 +0100)]
Switch to non deprecated buildPermissionClause() for contact summary report

3 years agoMerge pull request #20289 from seamuslee001/5.38
Seamus Lee [Thu, 13 May 2021 21:07:41 +0000 (07:07 +1000)]
Merge pull request #20289 from seamuslee001/5.38

5.37.{1|2} release notes

3 years agoAdd release-notes/5.37.2.md
Tim Otten [Thu, 13 May 2021 01:33:27 +0000 (18:33 -0700)]
Add release-notes/5.37.2.md

3 years agofixup release-notes/5.37.1.md
Tim Otten [Tue, 11 May 2021 22:02:14 +0000 (15:02 -0700)]
fixup release-notes/5.37.1.md

3 years agoAdd release-notes/5.37.1.md
Tim Otten [Tue, 11 May 2021 21:32:40 +0000 (14:32 -0700)]
Add release-notes/5.37.1.md

3 years agoMerge pull request #20286 from agh1/5.38.0-releasenotes-initial
Seamus Lee [Thu, 13 May 2021 21:03:30 +0000 (07:03 +1000)]
Merge pull request #20286 from agh1/5.38.0-releasenotes-initial

5.38.0 release notes initial run

3 years agoadd test enforcing automatic chaining for financial type/account create
demeritcowboy [Thu, 13 May 2021 20:22:57 +0000 (16:22 -0400)]
add test enforcing automatic chaining for financial type/account create

3 years ago5.38.0 release notes: added boilerplate
Andrew Hunt [Thu, 13 May 2021 19:05:13 +0000 (15:05 -0400)]
5.38.0 release notes: added boilerplate

3 years ago5.38.0 release notes: raw from script
Andrew Hunt [Thu, 13 May 2021 19:00:30 +0000 (15:00 -0400)]
5.38.0 release notes: raw from script

3 years agoMerge pull request #20077 from eileenmcnaughton/mem_order
Monish Deb [Thu, 13 May 2021 15:20:00 +0000 (20:50 +0530)]
Merge pull request #20077 from eileenmcnaughton/mem_order

Use order api when creating a recurring membership from the Membershi…

3 years agoMerge pull request #20259 from agileware/CIVICRM-1734
demeritcowboy [Thu, 13 May 2021 13:18:03 +0000 (09:18 -0400)]
Merge pull request #20259 from agileware/CIVICRM-1734

Change the help text for Message Templates and Scheduled Reminders to include link to CiviCRM Token Documentation page

3 years agoAfform Gui - Add support for entityRef fields
Coleman Watts [Tue, 4 May 2021 20:58:51 +0000 (16:58 -0400)]
Afform Gui - Add support for entityRef fields

Adds a widget for EntityRef and allows it to be changed to Number (for entering ID)
or Select (for choosing another entity on a form).

3 years agoMerge pull request #20284 from civicrm/5.38
Seamus Lee [Thu, 13 May 2021 10:00:09 +0000 (20:00 +1000)]
Merge pull request #20284 from civicrm/5.38

5.38

3 years agoMerge pull request #20264 from colemanw/afformJoinSaveFix
Seamus Lee [Thu, 13 May 2021 08:28:05 +0000 (18:28 +1000)]
Merge pull request #20264 from colemanw/afformJoinSaveFix

Afform - Fix saving joined entities (email, address, phone, etc)

3 years agoMerge pull request #20283 from colemanw/afformEnabledEntities
Seamus Lee [Thu, 13 May 2021 08:26:27 +0000 (18:26 +1000)]
Merge pull request #20283 from colemanw/afformEnabledEntities

Afform - hide disabled contact types & entities from disabled components/extensions

3 years agoAfform - hide disabled contact types & entities from disabled components/extensions
Coleman Watts [Thu, 13 May 2021 04:07:01 +0000 (00:07 -0400)]
Afform - hide disabled contact types & entities from disabled components/extensions

3 years agoMerge pull request #20280 from civicrm/5.38
Seamus Lee [Thu, 13 May 2021 00:22:13 +0000 (10:22 +1000)]
Merge pull request #20280 from civicrm/5.38

5.38

3 years agoAfform - Fix saving joined entities (email, address, phone, etc)
Coleman Watts [Mon, 10 May 2021 15:18:16 +0000 (11:18 -0400)]
Afform - Fix saving joined entities (email, address, phone, etc)

3 years agoMerge pull request #20276 from demeritcowboy/help-pre
Seamus Lee [Thu, 13 May 2021 00:03:41 +0000 (10:03 +1000)]
Merge pull request #20276 from demeritcowboy/help-pre

Typo when retrieving help_pre textarea attributes for price field

3 years agoMerge pull request #20208 from seamuslee001/move_acl_test_trait
Eileen McNaughton [Wed, 12 May 2021 23:57:37 +0000 (11:57 +1200)]
Merge pull request #20208 from seamuslee001/move_acl_test_trait

[REF] Move ACLPermission Trait into Civi Folder so that it can be acc…

3 years agoMerge pull request #20277 from eileenmcnaughton/538
Seamus Lee [Wed, 12 May 2021 22:52:43 +0000 (08:52 +1000)]
Merge pull request #20277 from eileenmcnaughton/538

Fix money formatting opps

3 years agoMerge pull request #20275 from demeritcowboy/big-c
Eileen McNaughton [Wed, 12 May 2021 19:40:30 +0000 (07:40 +1200)]
Merge pull request #20275 from demeritcowboy/big-c

dev/core#2606 - Typo in rowCount variable in pager

3 years agoFix money formatting opps
Eileen McNaughton [Wed, 12 May 2021 19:34:44 +0000 (07:34 +1200)]
Fix money formatting opps

As Matt points out we regressed this when adding 2 decimal places

https://github.com/civicrm/civicrm-core/commit/78b338e07464becd1555a2c7d2d04ac0e4e9180c#diff-3d2a990f0b1960f0b3e6671c645e18033883e6d1eaf535b8d19d085b67dde00bR1171

3 years agoletter needs to be bigger
demeritcowboy [Wed, 12 May 2021 14:18:00 +0000 (10:18 -0400)]
letter needs to be bigger

3 years agoancient latin
demeritcowboy [Wed, 12 May 2021 14:14:51 +0000 (10:14 -0400)]
ancient latin

3 years agoMerge pull request #20270 from demeritcowboy/relative
Eileen McNaughton [Wed, 12 May 2021 04:51:27 +0000 (16:51 +1200)]
Merge pull request #20270 from demeritcowboy/relative

dev/core#2590 - Remove unused function CRM_Utils_File::relativeDirectory

3 years agoMerge pull request #20263 from colemanw/afformDragFix
Seamus Lee [Wed, 12 May 2021 03:26:50 +0000 (13:26 +1000)]
Merge pull request #20263 from colemanw/afformDragFix

Afform - Drag & drop fixes

3 years agoMerge pull request #20271 from totten/5.38ormaster-perm-cleanup
Eileen McNaughton [Wed, 12 May 2021 03:17:36 +0000 (15:17 +1200)]
Merge pull request #20271 from totten/5.38ormaster-perm-cleanup

(REF) dev/core#2601 - Cleanup stale parameter

3 years agoMerge pull request #20258 from eileenmcnaughton/tear
Eileen McNaughton [Wed, 12 May 2021 03:16:44 +0000 (15:16 +1200)]
Merge pull request #20258 from eileenmcnaughton/tear

[NFC] Test - Improve tearDown cleanup of domain contacts

3 years agoImprove tearDown cleanup of domain contacts
Eileen McNaughton [Tue, 11 May 2021 06:14:20 +0000 (18:14 +1200)]
Improve tearDown cleanup of domain contacts

    Fixes to ensure the domain contacts from addresses are re-instated

3 years agoMerge pull request #18969 from seamuslee001/dev_core_2187
Seamus Lee [Tue, 11 May 2021 23:08:01 +0000 (09:08 +1000)]
Merge pull request #18969 from seamuslee001/dev_core_2187

dev/core#2187 Allow sites to customise the default number of rows ret…

3 years ago(REF) dev/core#2601 - Cleanup stale parameter
Tim Otten [Tue, 11 May 2021 21:52:46 +0000 (14:52 -0700)]
(REF) dev/core#2601 - Cleanup stale parameter

Overview
--------

This cleans up a parameter that became unused/unnecessary in #20256.

History
-------

This revision is a little bouncy. Instead of before/after, here's a history:

* `<= v5.36`: `getAllModulePermissions($descriptions = FALSE)`
* `=  v5.37.0`: `getAllModulePermissions($descriptions = FALSE, &$permissions)`
* `>= v.37.1`: `getAllModulePermissions($descriptions = FALSE)`

I grepped `universe` to confirm that no other repos were using the intermediate signature.

3 years agodev/core#2187 Allow sites to customsie the default number of rows returned from Quick...
Seamus Lee [Fri, 13 Nov 2020 21:31:08 +0000 (08:31 +1100)]
dev/core#2187 Allow sites to customsie the default number of rows returned from QuickForm Searches

3 years agounused function
demeritcowboy [Tue, 11 May 2021 20:39:47 +0000 (16:39 -0400)]
unused function

3 years agoMerge pull request #20204 from eileenmcnaughton/freeze
colemanw [Tue, 11 May 2021 13:54:31 +0000 (09:54 -0400)]
Merge pull request #20204 from eileenmcnaughton/freeze

Freeze readonly fields

3 years agoMerge pull request #20260 from agileware/CIVICRM-1733
Seamus Lee [Tue, 11 May 2021 09:47:28 +0000 (19:47 +1000)]
Merge pull request #20260 from agileware/CIVICRM-1733

CiviCRM Scheduled Reminders, Subject field missing Token selector - users must copy Token from Body field to Subject

3 years agoCIVICRM-1734 Change the help text for Message Templates and Scheduled Reminders to...
Justin Freeman [Tue, 11 May 2021 04:52:51 +0000 (14:52 +1000)]
CIVICRM-1734 Change the help text for Message Templates and Scheduled Reminders to include link to CiviCRM Token Documentation page

3 years agoMerge pull request #20265 from mattwire/api4customgroupdelete
Seamus Lee [Tue, 11 May 2021 01:52:28 +0000 (11:52 +1000)]
Merge pull request #20265 from mattwire/api4customgroupdelete

Fix delete customgroup using API4 so it removes data table

3 years agoMerge pull request #20266 from civicrm/5.38
Seamus Lee [Mon, 10 May 2021 22:43:39 +0000 (08:43 +1000)]
Merge pull request #20266 from civicrm/5.38

5.38

3 years agoAPIv4 - Add test to ensure custom tables are deleted
Coleman Watts [Mon, 10 May 2021 21:18:58 +0000 (17:18 -0400)]
APIv4 - Add test to ensure custom tables are deleted

3 years agoMerge pull request #20256 from eileenmcnaughton/538
Seamus Lee [Mon, 10 May 2021 20:51:20 +0000 (06:51 +1000)]
Merge pull request #20256 from eileenmcnaughton/538

dev/core#2601 fix joomla permission regression

3 years agoFix delete customgroup using API4 so it removes data table
Matthew Wire [Mon, 10 May 2021 16:43:35 +0000 (17:43 +0100)]
Fix delete customgroup using API4 so it removes data table

3 years agoMerge pull request #20254 from seamuslee001/fix_d9_install
colemanw [Mon, 10 May 2021 17:44:04 +0000 (13:44 -0400)]
Merge pull request #20254 from seamuslee001/fix_d9_install

Make APIv4 Subscribers Public to fix D9 install

3 years agoMerge pull request #20261 from eileenmcnaughton/tt2
demeritcowboy [Mon, 10 May 2021 14:41:19 +0000 (10:41 -0400)]
Merge pull request #20261 from eileenmcnaughton/tt2

fix missing parent tearDown

3 years agoMerge pull request #20262 from eileenmcnaughton/tt3
demeritcowboy [Mon, 10 May 2021 14:39:38 +0000 (10:39 -0400)]
Merge pull request #20262 from eileenmcnaughton/tt3

Fix missing parent tearDown

3 years agoAfform - Drag & drop fixes
Coleman Watts [Mon, 10 May 2021 12:53:52 +0000 (08:53 -0400)]
Afform - Drag & drop fixes

The drag-drop validation broke when af-gui-field was changed from a directive to
a component, as the jQuery was looking for the wrong markup.

Additionally, this attempts to fix a hard-to-reproduce bug where the styling
gets stuck in a "dragging" state after something has been dropped.

3 years agoFix missing parent tearDown
Your Name [Mon, 10 May 2021 10:57:47 +0000 (22:57 +1200)]
Fix missing parent tearDown

3 years agofix missing parent tearDown
Your Name [Mon, 10 May 2021 09:53:08 +0000 (21:53 +1200)]
fix missing parent tearDown

3 years agoCIVICRM-1733 CiviCRM Scheduled Reminders, Subject field missing Token selector field
Justin Freeman [Mon, 10 May 2021 05:34:07 +0000 (15:34 +1000)]
CIVICRM-1733 CiviCRM Scheduled Reminders, Subject field missing Token selector field

3 years agoMerge pull request #20257 from eileenmcnaughton/v3test
Seamus Lee [Mon, 10 May 2021 02:17:45 +0000 (12:17 +1000)]
Merge pull request #20257 from eileenmcnaughton/v3test

[NFC] Test - fix to use v3 api on postAsserts

3 years agoMerge pull request #20242 from eileenmcnaughton/group
colemanw [Mon, 10 May 2021 01:35:57 +0000 (21:35 -0400)]
Merge pull request #20242 from eileenmcnaughton/group

[REF] Extract code determining list of groups requiring a refresh

3 years ago[NFC] Test - fix to use v3 api on postAsserts
Your Name [Mon, 10 May 2021 00:05:35 +0000 (12:05 +1200)]
[NFC] Test - fix to use v3 api on postAsserts

3 years agoMerge pull request #20253 from eileenmcnaughton/cont_test
Seamus Lee [Sun, 9 May 2021 23:52:44 +0000 (09:52 +1000)]
Merge pull request #20253 from eileenmcnaughton/cont_test

[Test] Improve cleanup of domain contacts

3 years agoMerge pull request #20255 from demeritcowboy/mysql-compare
Seamus Lee [Sun, 9 May 2021 23:50:51 +0000 (09:50 +1000)]
Merge pull request #20255 from demeritcowboy/mysql-compare

dev/core#2602 - Installer doesn't check mysql version properly

3 years agodev/core#2601 fix joomla permission regression
Your Name [Sun, 9 May 2021 22:48:43 +0000 (10:48 +1200)]
dev/core#2601 fix joomla permission regression

This was a change we ultimately decided to, but forgot to, revert. It gave
extensions the ability to modify already-defined-permissons but
was brought out of scope of the change as it required more
consideration that simply adding the new super duper permission

In the meantime it caused a Joomla! regression
https://lab.civicrm.org/dev/core/-/issues/2601

3 years ago[Test] Improve cleanup of domain contacts
Your Name [Sat, 8 May 2021 21:20:29 +0000 (09:20 +1200)]
[Test] Improve cleanup of domain contacts

This fixes a situation where the domain contact may not have an email (or exist) if this
test is run in combination with certain others. The last test in the suite relies on the
domain contact having an email. This test was not following the practice
of having a tearDown but the tearDown was also flawed in recreating the domain
contacts but not their emails

3 years agofix comparison
demeritcowboy [Sun, 9 May 2021 17:52:12 +0000 (13:52 -0400)]
fix comparison

3 years agoMake APIv4 Subscribers Public to fix D9 install
Seamus Lee [Sat, 8 May 2021 23:03:10 +0000 (09:03 +1000)]
Make APIv4 Subscribers Public to fix D9 install

3 years agoMerge pull request #20121 from colemanw/l10nJs
colemanw [Sat, 8 May 2021 18:39:47 +0000 (14:39 -0400)]
Merge pull request #20121 from colemanw/l10nJs

Switch l10n.js from ajax callback to assetBuilder

3 years agoMerge pull request #20250 from eileenmcnaughton/in
demeritcowboy [Sat, 8 May 2021 16:24:59 +0000 (12:24 -0400)]
Merge pull request #20250 from eileenmcnaughton/in

Test fix - assertion fails when run with other tests (sometimes)

3 years agoTest fix - assertion fails when run with other tests (sometimes)
Your Name [Sat, 8 May 2021 03:52:45 +0000 (15:52 +1200)]
Test fix - assertion fails when run with other tests (sometimes)

The assertion that invoice_number = INV_ + contribution_id is wrong. In fact
it is calculated as INV_ + (MAX(contribution_id)+1) prior to the contribution
being saved. This means that if the table has not been truncated the contribution
id might be 3 but the invoice_number would still be 0+1 - ie INV_1

- we could argue about whether the calculation method is flawed but this at least
makes the test more reliable and no-one has complained in practice about the
code behaviour

3 years agoMerge pull request #20248 from eileenmcnaughton/tes
Eileen McNaughton [Fri, 7 May 2021 16:00:17 +0000 (04:00 +1200)]
Merge pull request #20248 from eileenmcnaughton/tes

Improve cleanup on contact test

3 years agoImprove cleanup on contact test
Your Name [Fri, 7 May 2021 12:08:34 +0000 (00:08 +1200)]
Improve cleanup on contact test

We are not deleting all financial entities, when created, meaning this
test can cause other tests to fail depending on the combo

3 years agoMerge pull request #20238 from colemanw/civiCaseSave
Matthew Wire [Fri, 7 May 2021 10:02:38 +0000 (11:02 +0100)]
Merge pull request #20238 from colemanw/civiCaseSave

APIv4 - CiviCase API: Fix openening a case with current user as creator

3 years agoMerge pull request #20247 from civicrm/dependabot/npm_and_yarn/lodash-4.17.21
Eileen McNaughton [Fri, 7 May 2021 05:27:37 +0000 (17:27 +1200)]
Merge pull request #20247 from civicrm/dependabot/npm_and_yarn/lodash-4.17.21

Bump lodash from 4.17.19 to 4.17.21

3 years ago[REF] Fix function signature to actually-used variables
Your Name [Fri, 7 May 2021 02:22:12 +0000 (14:22 +1200)]
[REF] Fix function signature to actually-used variables

ids used to hold a whole lotta stuff. Now it just holds contributionRecurID.

This gets rid of ids as a param & just passes contributionRecurID

3 years agoBump lodash from 4.17.19 to 4.17.21
dependabot[bot] [Fri, 7 May 2021 03:27:37 +0000 (03:27 +0000)]
Bump lodash from 4.17.19 to 4.17.21

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.19 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.19...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
3 years agoMerge pull request #20144 from eileenmcnaughton/never
Eileen McNaughton [Fri, 7 May 2021 03:25:15 +0000 (15:25 +1200)]
Merge pull request #20144 from eileenmcnaughton/never

hook_managed - do not try to disable managed entities if is_active is not available to api3.create

3 years agoSet version to 5.39.alpha1
CiviCRM [Fri, 7 May 2021 02:35:16 +0000 (02:35 +0000)]
Set version to 5.39.alpha1