civicrm-core.git
3 years agoMerge pull request #20723 from colemanw/api4ExplorerJoins
Seamus Lee [Tue, 29 Jun 2021 05:48:38 +0000 (15:48 +1000)]
Merge pull request #20723 from colemanw/api4ExplorerJoins

APIv4 Explorer - Render joins using addJoin function in OOP

3 years agoMerge pull request #20707 from colemanw/getIdField
Eileen McNaughton [Tue, 29 Jun 2021 03:35:36 +0000 (15:35 +1200)]
Merge pull request #20707 from colemanw/getIdField

APIv4 - Don't assume the identifier field for a table is named 'id'

3 years agoMerge pull request #20452 from jaapjansma/dev_financials_6_contactsummary
Matthew Wire [Mon, 28 Jun 2021 22:35:01 +0000 (23:35 +0100)]
Merge pull request #20452 from jaapjansma/dev_financials_6_contactsummary

dev/financial#6 Template contributions on the contact summary

3 years agoMerge pull request #20451 from jaapjansma/dev_financials_6_search
Matthew Wire [Mon, 28 Jun 2021 22:33:18 +0000 (23:33 +0100)]
Merge pull request #20451 from jaapjansma/dev_financials_6_search

dev/financial#6 Added is template to search screen

3 years agoMerge pull request #20722 from demeritcowboy/sms-translate
Seamus Lee [Mon, 28 Jun 2021 21:53:44 +0000 (07:53 +1000)]
Merge pull request #20722 from demeritcowboy/sms-translate

 dev/core#1711 - small translation improvement

3 years agoMerge pull request #20721 from colemanw/apiExplorerBridge
colemanw [Mon, 28 Jun 2021 19:51:18 +0000 (15:51 -0400)]
Merge pull request #20721 from colemanw/apiExplorerBridge

APIv4 Explorer - When joining via EntityBridge, make bridge fields selectable

3 years agoAPIv4 Explorer - Render joins using addJoin function in OOP
Coleman Watts [Mon, 28 Jun 2021 19:47:53 +0000 (15:47 -0400)]
APIv4 Explorer - Render joins using addJoin function in OOP

3 years agotranslation improvement - dev/core#1711
demeritcowboy [Mon, 28 Jun 2021 18:47:55 +0000 (14:47 -0400)]
translation improvement - dev/core#1711

3 years agoAPIv4 Explorer - When joining via EntityBridge, make bridge fields selectable
Coleman Watts [Mon, 28 Jun 2021 17:52:16 +0000 (13:52 -0400)]
APIv4 Explorer - When joining via EntityBridge, make bridge fields selectable

3 years agoMerge pull request #20720 from mattwire/extensionsaddnewdescription
demeritcowboy [Mon, 28 Jun 2021 13:15:51 +0000 (09:15 -0400)]
Merge pull request #20720 from mattwire/extensionsaddnewdescription

Replace extension key with description in 'Add New' tab

3 years agoReplace extension key with description in 'Add New' tab as already done in main list
Matthew Wire [Mon, 28 Jun 2021 08:47:13 +0000 (09:47 +0100)]
Replace extension key with description in 'Add New' tab as already done in main list

3 years agoMerge pull request #20220 from johntwyman/core-1711-show-sms-segment-count
Seamus Lee [Mon, 28 Jun 2021 02:12:33 +0000 (12:12 +1000)]
Merge pull request #20220 from johntwyman/core-1711-show-sms-segment-count

dev/core#1711 - Display SMS segment count when constructing Mass SMS

3 years agoMerge pull request #20711 from demeritcowboy/dashboard-err
Eileen McNaughton [Mon, 28 Jun 2021 01:22:05 +0000 (13:22 +1200)]
Merge pull request #20711 from demeritcowboy/dashboard-err

Some php warnings on case dashboard

3 years agodev/core-1711 Show segment count for SMS construction
John Twyman [Wed, 5 May 2021 01:11:56 +0000 (11:11 +1000)]
dev/core-1711 Show segment count for SMS construction

Use Standard methods for downloading third party js package

Update composer.lock

3 years agoMerge pull request #20713 from totten/5.39-setup-url
Seamus Lee [Sun, 27 Jun 2021 23:02:08 +0000 (09:02 +1000)]
Merge pull request #20713 from totten/5.39-setup-url

dev/core#2663 - Setup - Consistently handle special characters per URL conventions

3 years agoMerge pull request #20714 from demeritcowboy/fix-time
Eileen McNaughton [Sun, 27 Jun 2021 20:52:04 +0000 (08:52 +1200)]
Merge pull request #20714 from demeritcowboy/fix-time

Hopefully fix time rollover problem in MessageTemplateTest

3 years agoMerge pull request #20697 from eileenmcnaughton/prem
demeritcowboy [Sat, 26 Jun 2021 23:34:07 +0000 (19:34 -0400)]
Merge pull request #20697 from eileenmcnaughton/prem

Remove deprecated use of format money

3 years agoMerge pull request #20712 from demeritcowboy/newcase-1
colemanw [Sat, 26 Jun 2021 00:58:48 +0000 (20:58 -0400)]
Merge pull request #20712 from demeritcowboy/newcase-1

Some php warnings on new case

3 years agodev/core#2663 - Setup - Consistently handle special characters per URL conventions
Tim Otten [Fri, 25 Jun 2021 22:12:14 +0000 (15:12 -0700)]
dev/core#2663 - Setup - Consistently handle special characters per URL conventions

Overview
--------

This addresses a problem with the setup UI when installing CiviCRM with certain database credentials.
Specifically, it handles special characters more correctly.

https://lab.civicrm.org/dev/core/-/issues/2663

Before
------

If the database password requires any special characters (e.g. "#" or "&"), then they cannot correctly
entered.

There are two ways you might try to enter a password (e.g.  plain
`mysql://myuser:top#secret...`or URL-encoded `mysql://myuser:top%23secret...`). Neither
of these work. (The plain notation might pass the validator, but it won't be written correctly to disk.
The URL-encoded notation won't pass the validator.)

After
-----

You may use special characters, as long as the URL is properly encoded, e.g. `mysql://myuser:top%23secret...`

3 years agofix time rollover
demeritcowboy [Fri, 25 Jun 2021 22:03:03 +0000 (18:03 -0400)]
fix time rollover

3 years agoAPIv4 - add test for id_field
Coleman Watts [Thu, 24 Jun 2021 20:24:34 +0000 (16:24 -0400)]
APIv4 - add test for id_field

3 years agoAPIv4 - Don't assume the identifier field for a table is named 'id'
Coleman Watts [Thu, 24 Jun 2021 19:36:23 +0000 (15:36 -0400)]
APIv4 - Don't assume the identifier field for a table is named 'id'

APIv4 getInfo() now returns the name of the "id_field" for any entity.
This modifies the selectQuery so that `get` actions rely on that metadata.

3 years agophp errors
demeritcowboy [Fri, 25 Jun 2021 17:12:43 +0000 (13:12 -0400)]
php errors

3 years agophp warnings
demeritcowboy [Fri, 25 Jun 2021 16:29:35 +0000 (12:29 -0400)]
php warnings

3 years agoMerge pull request #20694 from colemanw/validateCustomGroupName
Seamus Lee [Fri, 25 Jun 2021 07:53:54 +0000 (17:53 +1000)]
Merge pull request #20694 from colemanw/validateCustomGroupName

Ensure custom group name does not conflict with existing field

3 years agoMerge pull request #20708 from colemanw/cacheApi4Info
Seamus Lee [Fri, 25 Jun 2021 04:54:24 +0000 (14:54 +1000)]
Merge pull request #20708 from colemanw/cacheApi4Info

[REF] - Improve efficiency of APIv4 GetInfo

3 years agoMerge pull request #20696 from eileenmcnaughton/except
Seamus Lee [Fri, 25 Jun 2021 04:53:05 +0000 (14:53 +1000)]
Merge pull request #20696 from eileenmcnaughton/except

Throw exception when baoName is not found

3 years agoMerge pull request #20709 from colemanw/api4CleanupBridgeJoinable
Eileen McNaughton [Fri, 25 Jun 2021 03:30:34 +0000 (15:30 +1200)]
Merge pull request #20709 from colemanw/api4CleanupBridgeJoinable

APIv4 - Remove POC code leftover from early alpha development

3 years agoThrow exception when baoName is not found
Eileen McNaughton [Wed, 23 Jun 2021 05:31:40 +0000 (17:31 +1200)]
Throw exception when baoName is not found

It the BAO name is not found at this point we currently get a fatal error. This makes it more
recoverable. The specific case I'm hitting at the moment relates to monolog - the
caching of the symfony container means it persists between builds and is
accessed before the extension is installed. However the entity is not
yet registered. Historically I have hit this fatal in other
scenarios but I can't recall the details.

3 years agoAPIv4 - Refactor getInfo calls to use new utility function
Coleman Watts [Thu, 24 Jun 2021 20:24:58 +0000 (16:24 -0400)]
APIv4 - Refactor getInfo calls to use new utility function

3 years agoAPIv4 - Store entity info in metadata cache
Coleman Watts [Thu, 24 Jun 2021 20:09:33 +0000 (16:09 -0400)]
APIv4 - Store entity info in metadata cache

Note that this caches the info returned by the generic function in
`AbstractEntity::getInfo()` and some entities override that function.
However the overrides generally call the parent and do not perform any expensive
computations of their own, so this seems like the best spot to add caching.

3 years agoAPIv4 - Remove POC code from early alpha
Coleman Watts [Fri, 25 Jun 2021 01:38:56 +0000 (21:38 -0400)]
APIv4 - Remove POC code from early alpha

During early APIv4 development there was an idea to create a BridgeJoinable class and
connect things like activity->assignees.
It was experimentally implemented for that field one field, but never documented or tested.

3 years agoMerge pull request #20631 from eileenmcnaughton/custom_ref
Seamus Lee [Thu, 24 Jun 2021 09:29:23 +0000 (19:29 +1000)]
Merge pull request #20631 from eileenmcnaughton/custom_ref

dev/core#2656 Add test to demonstrate issue / bug

3 years agoMerge pull request #20673 from colemanw/contactTabsCleanup
Seamus Lee [Thu, 24 Jun 2021 09:27:15 +0000 (19:27 +1000)]
Merge pull request #20673 from colemanw/contactTabsCleanup

REF - Get Contact Summary tab counts after calling hook to avoid wasting time

3 years agoMerge pull request #20705 from eileenmcnaughton/prim
Seamus Lee [Thu, 24 Jun 2021 06:23:57 +0000 (16:23 +1000)]
Merge pull request #20705 from eileenmcnaughton/prim

Fix schema support for composite primary keys

3 years agoMerge pull request #20698 from colemanw/limit25ForGet
Eileen McNaughton [Thu, 24 Jun 2021 04:18:51 +0000 (16:18 +1200)]
Merge pull request #20698 from colemanw/limit25ForGet

APIv4 Explorer - Only apply default limit 25 for "get" action

3 years agoFix support for composite primary keys
Eileen McNaughton [Thu, 24 Jun 2021 03:24:46 +0000 (15:24 +1200)]
Fix support for composite primary keys

Fixes what looks like an oversight
https://github.com/civicrm/civicrm-core/commit/022785d8d5d4876aa1211b7adc0d7c31e2995fc5#diff-08ba0d294c1f2e5b9d42e4768aa3b30a10e5128809c590f155c5ac0cc9b2f69cL480-L481

An 'if' was added but the uncondition line left in

The result is that if a composite primary field IS defined
per below an entry for it is incorrectly added to the field
array with just autoincrement set.
`
    <primaryKey>
        <name>contact_timestamp_type</name>
        <field>contact_identifier</field>
        <field>recipient_action_datetime</field>
        <field>event_type</field>
    </primaryKey>
`

3 years agoMerge pull request #20700 from colemanw/removeApi4BoilerplateComment
Eileen McNaughton [Wed, 23 Jun 2021 21:48:35 +0000 (09:48 +1200)]
Merge pull request #20700 from colemanw/removeApi4BoilerplateComment

[NFC] Remove boilerplate comment block from APIv4 classes

3 years agoMerge pull request #20701 from colemanw/apiEntitySince
Eileen McNaughton [Wed, 23 Jun 2021 21:45:46 +0000 (09:45 +1200)]
Merge pull request #20701 from colemanw/apiEntitySince

APIv4 - Add `@since` annotation to each entity

3 years agoMerge pull request #20703 from civicrm/5.39
Eileen McNaughton [Wed, 23 Jun 2021 19:54:18 +0000 (07:54 +1200)]
Merge pull request #20703 from civicrm/5.39

5.39 to master

3 years agoMerge pull request #20699 from demeritcowboy/urlfix-539
Eileen McNaughton [Wed, 23 Jun 2021 19:53:45 +0000 (07:53 +1200)]
Merge pull request #20699 from demeritcowboy/urlfix-539

Backport of 20641 - url fix on payment edit form

3 years agoAPIv4 - Add `@since` annotation to each entity
Coleman Watts [Wed, 23 Jun 2021 19:05:25 +0000 (15:05 -0400)]
APIv4 - Add `@since` annotation to each entity

This will be output by `Entity:get` to show which version each entity was added

3 years agoRemove boilerplate code block from APIv4 classes
Coleman Watts [Wed, 23 Jun 2021 16:13:01 +0000 (12:13 -0400)]
Remove boilerplate code block from APIv4 classes

3 years agobackport 20641
demeritcowboy [Wed, 23 Jun 2021 12:40:26 +0000 (08:40 -0400)]
backport 20641

3 years agoMerge pull request #20693 from eileenmcnaughton/trigg
Seamus Lee [Wed, 23 Jun 2021 08:15:37 +0000 (18:15 +1000)]
Merge pull request #20693 from eileenmcnaughton/trigg

Fix sorting for drop triggers

3 years agodev/financial#6 Added is template to search screen
Jaap Jansma [Wed, 23 Jun 2021 08:04:21 +0000 (10:04 +0200)]
dev/financial#6 Added is template to search screen

3 years agoAPIv4 Explorer - Only apply default limit 25 for "get" action
Coleman Watts [Wed, 23 Jun 2021 06:21:07 +0000 (02:21 -0400)]
APIv4 Explorer - Only apply default limit 25 for "get" action

The API Explorer sets a default limit of 25 so you don't get an overwhelming result set
from a `get` action.

However, for other actions like `getFields` or `getActions`, there is no need for
a limit and the default is annoying.

3 years agoRemove deprecated use of format money
Eileen McNaughton [Wed, 23 Jun 2021 06:00:15 +0000 (18:00 +1200)]
Remove deprecated use of format money

This is logging deprecation errors. It doesn't work quite right before or after but
I suspect no-one much cares as it hasn't been raised before now

3 years agoEnsure custom group name does not conflict with existing field
Coleman Watts [Wed, 23 Jun 2021 05:05:54 +0000 (01:05 -0400)]
Ensure custom group name does not conflict with existing field

3 years agoFix sorting for drop triggers
Eileen McNaughton [Wed, 23 Jun 2021 04:18:16 +0000 (16:18 +1200)]
Fix sorting for drop triggers

I added a ksort but it should have been an asort - the createTriggers has an array like
['civicrm_acl'] => [.....]

which suits asort but in this location the array is

[0 => 'civicrm_acl', 1 =>.....

so asort is right

3 years agoMerge pull request #20691 from demeritcowboy/statlinks
Eileen McNaughton [Tue, 22 Jun 2021 19:37:47 +0000 (07:37 +1200)]
Merge pull request #20691 from demeritcowboy/statlinks

dev/core#2647 - Deprecated call to non-static CRM_Financial_Form_BatchTransaction::links()

3 years agodev/core#2647 - deprecated call to non-static
demeritcowboy [Tue, 22 Jun 2021 16:12:02 +0000 (12:12 -0400)]
dev/core#2647 - deprecated call to non-static

3 years agoMerge pull request #20677 from colemanw/resolveFKValues
Eileen McNaughton [Tue, 22 Jun 2021 08:15:31 +0000 (20:15 +1200)]
Merge pull request #20677 from colemanw/resolveFKValues

APIv4 - Allow FK dot notation in create/update/save actions

3 years agoMerge pull request #20690 from civicrm/5.39
Eileen McNaughton [Tue, 22 Jun 2021 06:40:14 +0000 (18:40 +1200)]
Merge pull request #20690 from civicrm/5.39

5.39

3 years agoMerge pull request #20689 from agileware/CIVICRM-1784
Seamus Lee [Tue, 22 Jun 2021 04:01:43 +0000 (14:01 +1000)]
Merge pull request #20689 from agileware/CIVICRM-1784

Reinstate invoiceID param to membership renewal payment

3 years agoMerge pull request #20686 from demeritcowboy/newtag
Seamus Lee [Tue, 22 Jun 2021 02:45:05 +0000 (12:45 +1000)]
Merge pull request #20686 from demeritcowboy/newtag

dev/core#2660 - Remove old menu entry for "New Tag"

3 years agoMerge pull request #20688 from demeritcowboy/coincidence
Seamus Lee [Tue, 22 Jun 2021 02:44:40 +0000 (12:44 +1000)]
Merge pull request #20688 from demeritcowboy/coincidence

Force the right path in github action script

3 years agoCIVICRM-1784 Reinstate invoiceID param to membership renewal payment
Francis Whittle [Tue, 22 Jun 2021 00:57:07 +0000 (10:57 +1000)]
CIVICRM-1784 Reinstate invoiceID param to membership renewal payment

Fixes a compatibility regresson introduced for 5.36

3 years agoforce the right path
demeritcowboy [Mon, 21 Jun 2021 23:46:39 +0000 (19:46 -0400)]
force the right path

3 years agoremove old menu entry
demeritcowboy [Mon, 21 Jun 2021 18:54:46 +0000 (14:54 -0400)]
remove old menu entry

3 years agoMerge pull request #20625 from seamuslee001/allow_civicrm_install_php8
Tim Otten [Mon, 21 Jun 2021 22:03:15 +0000 (15:03 -0700)]
Merge pull request #20625 from seamuslee001/allow_civicrm_install_php8

[php8-compact] Allow for CiviCRM to be installed by 3rd parties using…

3 years agoMerge pull request #20626 from akosgarai/issue/2645
Eileen McNaughton [Mon, 21 Jun 2021 21:03:58 +0000 (09:03 +1200)]
Merge pull request #20626 from akosgarai/issue/2645

dev/core#2645 Proposed fix for exporting preferred_mail_format field

3 years agoMerge pull request #20620 from eileenmcnaughton/539_test
Eileen McNaughton [Mon, 21 Jun 2021 20:52:18 +0000 (08:52 +1200)]
Merge pull request #20620 from eileenmcnaughton/539_test

Add file_exists check on loading services xml

3 years agoMerge pull request #20684 from colemanw/tplVars
Eileen McNaughton [Mon, 21 Jun 2021 20:36:35 +0000 (08:36 +1200)]
Merge pull request #20684 from colemanw/tplVars

Fix undefined tpl vars

3 years agodev/financial#6 exclude template contributions from the contact summary and add a...
Jaap Jansma [Mon, 21 Jun 2021 14:54:19 +0000 (16:54 +0200)]
dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab

3 years agodev/financial#6 exclude template contributions from the contact summary and add a...
Jaap Jansma [Mon, 21 Jun 2021 14:53:43 +0000 (16:53 +0200)]
dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab

3 years agodev/financial#6 exclude template contributions from the contact summary and add a...
Jaap Jansma [Mon, 21 Jun 2021 14:52:56 +0000 (16:52 +0200)]
dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab

3 years agoFix undefined tpl vars
Coleman Watts [Mon, 21 Jun 2021 14:12:02 +0000 (10:12 -0400)]
Fix undefined tpl vars

3 years agoMerge pull request #20664 from eileenmcnaughton/notice
colemanw [Mon, 21 Jun 2021 13:52:08 +0000 (09:52 -0400)]
Merge pull request #20664 from eileenmcnaughton/notice

Always assign mode to smarty

3 years agodev/financial#6 Added is template to search screen
Jaap Jansma [Mon, 21 Jun 2021 08:19:36 +0000 (10:19 +0200)]
dev/financial#6 Added is template to search screen

3 years agodev/financial#6 Added is template to search screen
Jaap Jansma [Mon, 21 Jun 2021 08:15:36 +0000 (10:15 +0200)]
dev/financial#6 Added is template to search screen

3 years agoMerge pull request #20683 from civicrm/5.39
Eileen McNaughton [Mon, 21 Jun 2021 08:11:35 +0000 (20:11 +1200)]
Merge pull request #20683 from civicrm/5.39

5.39

3 years agoMerge pull request #20675 from eileenmcnaughton/ev
Seamus Lee [Mon, 21 Jun 2021 05:54:15 +0000 (15:54 +1000)]
Merge pull request #20675 from eileenmcnaughton/ev

dev/event#58 Ensure custom data is not saved to template's row

3 years agoMerge pull request #20679 from eileenmcnaughton/smarty1
colemanw [Mon, 21 Jun 2021 05:43:42 +0000 (01:43 -0400)]
Merge pull request #20679 from eileenmcnaughton/smarty1

Extract feeBlock to it's own tpl

3 years agoMerge pull request #20680 from demeritcowboy/regen-github-action
colemanw [Mon, 21 Jun 2021 05:42:39 +0000 (01:42 -0400)]
Merge pull request #20680 from demeritcowboy/regen-github-action

[NFC] Github action script to run regen.sh for you

3 years agoAPIv4 - Support FK field lookups in create/update/save actions
Coleman Watts [Sun, 20 Jun 2021 20:16:05 +0000 (16:16 -0400)]
APIv4 - Support FK field lookups in create/update/save actions

3 years agoTest cleanup - use new APIv4 syntax for checkPermissions
Coleman Watts [Sun, 20 Jun 2021 20:13:25 +0000 (16:13 -0400)]
Test cleanup - use new APIv4 syntax for checkPermissions

3 years agoscript to run regen.sh for you
demeritcowboy [Mon, 21 Jun 2021 00:15:13 +0000 (20:15 -0400)]
script to run regen.sh for you

3 years agoMerge pull request #20268 from agileware/CIVICRM-1725
demeritcowboy [Sun, 20 Jun 2021 23:23:26 +0000 (19:23 -0400)]
Merge pull request #20268 from agileware/CIVICRM-1725

User experience improvement - Remove the confusing mixed terminology used to describe Tags: "Tags (Categories)" and "Tag (Category)"

3 years agoExtract feeBlock to it's own tpl
Eileen McNaughton [Sun, 20 Jun 2021 22:21:07 +0000 (10:21 +1200)]
Extract feeBlock to it's own tpl

This is a step towards moving the FeeBlock rendering to it's own form instead of the current 'overload'
approach

3 years agoCIVICRM-1725 User experience improvement - Remove the confusing mixed terminology...
Justin Freeman [Sun, 20 Jun 2021 21:35:51 +0000 (07:35 +1000)]
CIVICRM-1725 User experience improvement - Remove the confusing mixed terminology used to describe Tags: "Tags (Categories)" and "Tag (Category)"

3 years agoStart to tighten open-ended 'return' in tests
Eileen McNaughton [Sat, 19 Jun 2021 23:14:45 +0000 (11:14 +1200)]
Start to tighten open-ended 'return' in tests

3 years agodev/core#2656 Add test to demonstrate issue / bug
Eileen McNaughton [Thu, 17 Jun 2021 03:43:18 +0000 (15:43 +1200)]
dev/core#2656 Add test to demonstrate issue / bug

Fix enotice in test

Why didn't this cause it to fail before

3 years agoMerge pull request #20674 from seamuslee001/regen_dao
Seamus Lee [Sun, 20 Jun 2021 00:06:19 +0000 (10:06 +1000)]
Merge pull request #20674 from seamuslee001/regen_dao

[NFC] Regenerate ContributeProduct DAO and also fix search_kit instal…

3 years agoAdd unit test for event copy
Eileen McNaughton [Sat, 19 Jun 2021 23:14:29 +0000 (11:14 +1200)]
Add unit test for event copy

3 years agodev/event#58 Ensure custom data is not saved to template's row
Eileen McNaughton [Sat, 19 Jun 2021 22:43:58 +0000 (10:43 +1200)]
dev/event#58 Ensure custom data is not saved to template's row

This ensures than when we are copying (implicity a create-new-action) we do not
update an existing row in the custom data table by explicity unsetting the
id in the copy function. This has been bouncey behaviour because
the formatting for form purposes relies on form type formatting and yet
for save purposes it's not really fit for purpose. Although a bit
hacky this approach should be robust & avoids a re-write on the form

3 years agoMerge pull request #20667 from eileenmcnaughton/prt
Seamus Lee [Sat, 19 Jun 2021 22:39:32 +0000 (08:39 +1000)]
Merge pull request #20667 from eileenmcnaughton/prt

Fix up on invalid test data

3 years agoMerge pull request #20669 from eileenmcnaughton/member
Seamus Lee [Sat, 19 Jun 2021 22:39:12 +0000 (08:39 +1000)]
Merge pull request #20669 from eileenmcnaughton/member

Move determination of priceSetID to the internal order class

3 years agoMerge pull request #20668 from eileenmcnaughton/tt
Seamus Lee [Sat, 19 Jun 2021 22:38:14 +0000 (08:38 +1000)]
Merge pull request #20668 from eileenmcnaughton/tt

Fix test to use valid amounts

3 years ago[NFC] Regenerate ContributeProduct DAO and also fix search_kit install on MySQL 5...
Seamus Lee [Sat, 19 Jun 2021 22:23:58 +0000 (22:23 +0000)]
[NFC] Regenerate ContributeProduct DAO and also fix search_kit install on MySQL 5.6 on test boxes

3 years ago[php8-compact] Allow for CiviCRM to be installed by 3rd parties using composer on...
Seamus Lee [Wed, 16 Jun 2021 08:34:02 +0000 (18:34 +1000)]
[php8-compact] Allow for CiviCRM to be installed by 3rd parties using composer on php8 systems

Fix unit test

3 years agoREF - Get Contact Summary tab counts after calling hook to avoid wasting time
Coleman Watts [Sat, 19 Jun 2021 20:08:49 +0000 (16:08 -0400)]
REF - Get Contact Summary tab counts after calling hook to avoid wasting time

If a tab was removed by hook, the count isn't needed.

3 years agoMerge pull request #20671 from eileenmcnaughton/tax_null
Seamus Lee [Sat, 19 Jun 2021 09:29:16 +0000 (19:29 +1000)]
Merge pull request #20671 from eileenmcnaughton/tax_null

Deprecate passing in 'null' for tax

3 years agoMove determination of priceSetID to the internal order class
Eileen McNaughton [Sat, 19 Jun 2021 02:36:55 +0000 (14:36 +1200)]
Move determination of priceSetID to the internal order class

This moves some functionality from the form to where we can start to use if from the order api.

I also added more 'internal' commenting. This is implicitly the case but
I think it would be tempting to use this class and the comments at the top
of the class saying not to could be missed

3 years agoDeprecate passing in 'null' for tax
Eileen McNaughton [Sat, 19 Jun 2021 05:02:13 +0000 (17:02 +1200)]
Deprecate passing in 'null' for tax

This is the source of the php8 test fails -and it's wrong - it should be 0 not null

3 years agoFix test to use valid amounts
Eileen McNaughton [Sat, 19 Jun 2021 02:07:21 +0000 (14:07 +1200)]
Fix test to use valid amounts

This fixes the test so the rates match the appropriate rate for the tax

3 years agoMerge pull request #20663 from eileenmcnaughton/prt_form
Eileen McNaughton [Sat, 19 Jun 2021 01:27:28 +0000 (13:27 +1200)]
Merge pull request #20663 from eileenmcnaughton/prt_form

Minor tpl simplificaiton, notice reduction

3 years agoFix up on invalid test data
Eileen McNaughton [Sat, 19 Jun 2021 00:24:27 +0000 (12:24 +1200)]
Fix up on invalid test data

3 years agoMerge pull request #20666 from civicrm/5.39
Eileen McNaughton [Fri, 18 Jun 2021 23:58:19 +0000 (11:58 +1200)]
Merge pull request #20666 from civicrm/5.39

5.39 to master

3 years agoMerge pull request #20661 from seamuslee001/dev_core_2604
Eileen McNaughton [Fri, 18 Jun 2021 23:57:17 +0000 (11:57 +1200)]
Merge pull request #20661 from seamuslee001/dev_core_2604

dev/core#2604 Apply upstream patch to allow single quotes in return p…