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>
`
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
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
demeritcowboy [Wed, 23 Jun 2021 12:40:26 +0000 (08:40 -0400)]
backport 20641
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
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
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()
demeritcowboy [Tue, 22 Jun 2021 16:12:02 +0000 (12:12 -0400)]
dev/core#2647 - deprecated call to non-static
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
Eileen McNaughton [Tue, 22 Jun 2021 06:40:14 +0000 (18:40 +1200)]
Merge pull request #20690 from civicrm/5.39
5.39
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
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"
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
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
demeritcowboy [Mon, 21 Jun 2021 23:46:39 +0000 (19:46 -0400)]
force the right path
demeritcowboy [Mon, 21 Jun 2021 18:54:46 +0000 (14:54 -0400)]
remove old menu entry
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…
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
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
Eileen McNaughton [Mon, 21 Jun 2021 20:36:35 +0000 (08:36 +1200)]
Merge pull request #20684 from colemanw/tplVars
Fix undefined tpl vars
Coleman Watts [Mon, 21 Jun 2021 14:12:02 +0000 (10:12 -0400)]
Fix undefined tpl vars
colemanw [Mon, 21 Jun 2021 13:52:08 +0000 (09:52 -0400)]
Merge pull request #20664 from eileenmcnaughton/notice
Always assign mode to smarty
Eileen McNaughton [Mon, 21 Jun 2021 08:11:35 +0000 (20:11 +1200)]
Merge pull request #20683 from civicrm/5.39
5.39
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
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
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
Coleman Watts [Sun, 20 Jun 2021 20:16:05 +0000 (16:16 -0400)]
APIv4 - Support FK field lookups in create/update/save actions
Coleman Watts [Sun, 20 Jun 2021 20:13:25 +0000 (16:13 -0400)]
Test cleanup - use new APIv4 syntax for checkPermissions
demeritcowboy [Mon, 21 Jun 2021 00:15:13 +0000 (20:15 -0400)]
script to run regen.sh for you
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)"
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
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)"
Eileen McNaughton [Sat, 19 Jun 2021 23:14:45 +0000 (11:14 +1200)]
Start to tighten open-ended 'return' in tests
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…
Eileen McNaughton [Sat, 19 Jun 2021 23:14:29 +0000 (11:14 +1200)]
Add unit test for event copy
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
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
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
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
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
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
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
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
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
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
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
Eileen McNaughton [Sat, 19 Jun 2021 00:24:27 +0000 (12:24 +1200)]
Fix up on invalid test data
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
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…
Seamus Lee [Fri, 18 Jun 2021 23:20:04 +0000 (09:20 +1000)]
Merge pull request #20659 from colemanw/fixUndefinedTplVars
Fix undefined tpl variables on contact summary
Seamus Lee [Fri, 18 Jun 2021 22:41:58 +0000 (08:41 +1000)]
Merge pull request #20655 from seamuslee001/fix_apiv4_group_concat_php8
[php8-compact] Fix APIv4 Group Concat Test by setting dataType to be …
Eileen McNaughton [Fri, 18 Jun 2021 22:06:07 +0000 (10:06 +1200)]
Always assign mode to smarty
We should assign regardless of nullity
Eileen McNaughton [Fri, 18 Jun 2021 21:58:38 +0000 (09:58 +1200)]
Minor tpl simplificaiton, notice reduction
This registerMode stuff turns out to be just a long winded way of upper casing the variable
Seamus Lee [Fri, 18 Jun 2021 21:45:17 +0000 (21:45 +0000)]
dev/core#2604 Apply upstream patch to allow single quotes in return patch emails
Coleman Watts [Fri, 18 Jun 2021 21:31:21 +0000 (17:31 -0400)]
Fix undefined tpl variables on contact summary
colemanw [Fri, 18 Jun 2021 21:30:35 +0000 (17:30 -0400)]
Merge pull request #20652 from seamuslee001/fix_array_access_on_number
[NFC] Fixes an issue in this unit test where we are trying to do an a…
demeritcowboy [Fri, 18 Jun 2021 21:30:26 +0000 (17:30 -0400)]
Merge pull request #20472 from eileenmcnaughton/trigger_clean
Improve output triggers when logged to file
demeritcowboy [Fri, 18 Jun 2021 21:30:15 +0000 (17:30 -0400)]
Merge pull request #20471 from eileenmcnaughton/schema
Fix Schema calculation of usePrefix to cope with rpow:
Seamus Lee [Fri, 18 Jun 2021 21:15:23 +0000 (07:15 +1000)]
Merge pull request #20649 from eileenmcnaughton/mem_clean
[NFC] [Test] Cleanup on membership type test
Seamus Lee [Fri, 18 Jun 2021 06:32:59 +0000 (06:32 +0000)]
[php8-compact] Fix APIv4 Group Concat Test by setting dataType to be NULL if the first expression is a SQL Function
Eileen McNaughton [Fri, 18 Jun 2021 21:04:03 +0000 (09:04 +1200)]
Merge pull request #20657 from demeritcowboy/these-go-to-11
[NFC/Unit test] - Add a test for getCaseRoles when there's a lot of roles assigned
demeritcowboy [Fri, 18 Jun 2021 18:06:08 +0000 (14:06 -0400)]
test lots of roles on cases
Eileen McNaughton [Fri, 18 Jun 2021 01:39:42 +0000 (13:39 +1200)]
[NFC] Fix around returns, cleanup
Seamus Lee [Fri, 18 Jun 2021 06:42:21 +0000 (16:42 +1000)]
Merge pull request #20653 from eileenmcnaughton/you_have_lines
[REF] Remove always false if
Seamus Lee [Fri, 18 Jun 2021 06:31:01 +0000 (16:31 +1000)]
Merge pull request #20616 from seamuslee001/fix_custom_group_Test
[php8-compact][REF] Fix failing custom group test on php8 by better h…
Eileen McNaughton [Fri, 18 Jun 2021 05:09:39 +0000 (17:09 +1200)]
[REF] Remove always false if
We recently added code to ensure line_item is always populated
before this function is called. So line items is never empty at this point
Seamus Lee [Fri, 18 Jun 2021 04:44:56 +0000 (04:44 +0000)]
[NFC] Fixes an issue in this unit test where we are trying to do an array acess on an integer
Seamus Lee [Fri, 18 Jun 2021 04:42:44 +0000 (14:42 +1000)]
Fix bug found by Eileen on creating Custom Fields of Paritipant event type and add unit tests to lock in fix
Seamus Lee [Wed, 16 Jun 2021 02:45:23 +0000 (02:45 +0000)]
[REF] Shift special handling of extends param of the customGroup create into apiv3 and change Custom Group form to use apiv3
Seamus Lee [Wed, 16 Jun 2021 01:59:33 +0000 (01:59 +0000)]
[php8-compact][REF] Fix failing custom group test on php8 by better handling strings in 2nd key of the extends array and also validating the child and main entity work
Eileen McNaughton [Fri, 18 Jun 2021 03:57:13 +0000 (15:57 +1200)]
Merge pull request #20621 from eileenmcnaughton/mps
Add test validation for Membership & participant payments
Eileen McNaughton [Fri, 18 Jun 2021 03:15:12 +0000 (15:15 +1200)]
Merge pull request #20623 from seamuslee001/fix_event_form_test_php8
[php8-compact] Fix Event Form test for php8 by setting totalAmount in…
Eileen McNaughton [Wed, 16 Jun 2021 07:01:00 +0000 (19:01 +1200)]
Add test validation for Membership & participant payments
Eileen McNaughton [Fri, 18 Jun 2021 01:05:31 +0000 (13:05 +1200)]
Merge pull request #20639 from colemanw/getReferencesToContactTable
dev/core#2656 Fix getReferencesToContactTable to ignore non-id references
Eileen McNaughton [Fri, 18 Jun 2021 00:49:24 +0000 (12:49 +1200)]
Merge pull request #20647 from eileenmcnaughton/cl
[NFC] [Test] Remove duplicate cleanup
colemanw [Fri, 18 Jun 2021 00:23:19 +0000 (20:23 -0400)]
Merge pull request #20633 from eileenmcnaughton/ret3
[NFC] [TEST] cleanup, more use of return in ActivityTest
Seamus Lee [Fri, 18 Jun 2021 00:21:06 +0000 (10:21 +1000)]
Merge pull request #20636 from eileenmcnaughton/mm
[NFC] Cleanup on membership test
Seamus Lee [Fri, 18 Jun 2021 00:20:04 +0000 (10:20 +1000)]
Merge pull request #20637 from eileenmcnaughton/mem
[NFC] [Test] Remove duplicate cleanup
Seamus Lee [Fri, 18 Jun 2021 00:19:43 +0000 (10:19 +1000)]
Merge pull request #20638 from eileenmcnaughton/ret2
[NFC] Cleanup on contribution v3 api test
Eileen McNaughton [Thu, 17 Jun 2021 23:39:57 +0000 (11:39 +1200)]
Merge pull request #20644 from lcdservices/dev-core-2657
dev/core#2657 trigger pre hook on LineItem delete
Eileen McNaughton [Thu, 17 Jun 2021 08:41:01 +0000 (20:41 +1200)]
[NFC] [Test] Remove duplicate cleanup
Eileen McNaughton [Thu, 17 Jun 2021 22:32:19 +0000 (10:32 +1200)]
Merge pull request #20646 from civicrm/5.39
5.39
demeritcowboy [Thu, 17 Jun 2021 21:25:47 +0000 (17:25 -0400)]
Merge pull request #20554 from colemanw/noteUsedFor
Convert Notes to use option_group instead of hardcoded list
Seamus Lee [Thu, 17 Jun 2021 20:35:15 +0000 (06:35 +1000)]
Merge pull request #20645 from agh1/5.39.0-releasenotes-initial
5.39.0 release notes initial run
Coleman Watts [Thu, 17 Jun 2021 18:29:43 +0000 (14:29 -0400)]
Regenerate sql with note_used_for option group
Coleman Watts [Tue, 8 Jun 2021 12:37:38 +0000 (08:37 -0400)]
Convert Notes to use option_group instead of hardcoded list
Andrew Hunt [Thu, 17 Jun 2021 16:33:18 +0000 (12:33 -0400)]
5.39.0 release notes: added boilerplate
Andrew Hunt [Thu, 17 Jun 2021 16:30:57 +0000 (12:30 -0400)]
5.39.0 release notes: raw from script
colemanw [Thu, 17 Jun 2021 16:11:31 +0000 (12:11 -0400)]
Merge pull request #20642 from colemanw/admin
Remove unreachable code from admin page
colemanw [Thu, 17 Jun 2021 15:49:34 +0000 (11:49 -0400)]
Merge pull request #20643 from colemanw/moveUpgradeCode
Move upgrade code to correct version
Brian Shaughnessy [Thu, 17 Jun 2021 14:46:32 +0000 (10:46 -0400)]
dev/core#2657 trigger pre hook on LineItem delete
demeritcowboy [Thu, 17 Jun 2021 14:43:45 +0000 (10:43 -0400)]
Merge pull request #20641 from pradpnayak/urlfix
Fixed url
demeritcowboy [Thu, 17 Jun 2021 14:34:29 +0000 (10:34 -0400)]
Merge pull request #20640 from colemanw/smartyNotices
Show smarty E-notices when in debug mode
Coleman Watts [Thu, 17 Jun 2021 13:27:30 +0000 (09:27 -0400)]
Move upgrade code to correct version
See https://github.com/civicrm/civicrm-core/pull/20553
Coleman Watts [Thu, 17 Jun 2021 13:19:58 +0000 (09:19 -0400)]
Remove unreachable code from admin page
colemanw [Thu, 17 Jun 2021 13:14:29 +0000 (09:14 -0400)]
Merge pull request #20553 from JMAConsulting/add_product_id_fk
dev/core#2486 - Add foreign key on civicrm_contribution_product.product_id
Pradeep Nayak [Thu, 17 Jun 2021 13:07:24 +0000 (14:07 +0100)]
Fixed url
Coleman Watts [Thu, 17 Jun 2021 13:04:05 +0000 (09:04 -0400)]
Show smarty E-notices when in debug mode
Coleman Watts [Thu, 17 Jun 2021 12:10:19 +0000 (08:10 -0400)]
Fix getReferencesToContactTable to ignore non-id references
Fixes dev/core#2656
https://lab.civicrm.org/dev/core/-/issues/2656
Monish Deb [Thu, 17 Jun 2021 11:52:56 +0000 (17:22 +0530)]
Merge pull request #20635 from eileenmcnaughton/reta
[NFC] [TEST] cleanup, more use of return in AddressTest