civicrm-core.git
3 years agoMerge pull request #19690 from colemanw/api3Operators
colemanw [Mon, 1 Mar 2021 02:27:02 +0000 (21:27 -0500)]
Merge pull request #19690 from colemanw/api3Operators

APIv3 - Improve array-based apis to support sorting and operators

3 years agoMerge pull request #19629 from MegaphoneJon/core-2386
Eileen McNaughton [Mon, 1 Mar 2021 01:56:53 +0000 (14:56 +1300)]
Merge pull request #19629 from MegaphoneJon/core-2386

core#2386 - metadata-driven chain-select fields

3 years agoAPIv3 - Improve array-based apis to support sorting and multiple operators
Coleman Watts [Sun, 28 Feb 2021 04:18:41 +0000 (23:18 -0500)]
APIv3 - Improve array-based apis to support sorting and multiple operators

This backports some APIv4 code to v3, for the purpose of supporting
entityRef widgets for Afform.

3 years agoMerge pull request #19668 from eileenmcnaughton/empty_rows
colemanw [Mon, 1 Mar 2021 01:06:27 +0000 (20:06 -0500)]
Merge pull request #19668 from eileenmcnaughton/empty_rows

dev/core#2420 Add text to report template saying no results found if that is the case

3 years agoMerge pull request #19693 from eileenmcnaughton/if
colemanw [Mon, 1 Mar 2021 00:42:15 +0000 (19:42 -0500)]
Merge pull request #19693 from eileenmcnaughton/if

[REF] clean up if

3 years agoMerge pull request #19689 from demeritcowboy/my-cases-listtype
Eileen McNaughton [Sun, 28 Feb 2021 23:34:57 +0000 (12:34 +1300)]
Merge pull request #19689 from demeritcowboy/my-cases-listtype

dev/core#1207 - My Cases dashlet shouldn't crash for users with only my cases access

3 years ago[REF] clean up if
eileen [Sun, 28 Feb 2021 20:22:33 +0000 (09:22 +1300)]
[REF] clean up if

This just makes 2 lines simpler. The issue is that if checks the same thing
twice - presumably the if empty check got added for the e-notice but
the other was not removed

3 years agoMerge pull request #19688 from demeritcowboy/lottery-win
Tim Otten [Sun, 28 Feb 2021 04:23:39 +0000 (20:23 -0800)]
Merge pull request #19688 from demeritcowboy/lottery-win

Fix for missing function CodeGen_Util::removeDir

3 years agodon't crash for users with only my cases access
demeritcowboy [Sun, 28 Feb 2021 03:15:47 +0000 (22:15 -0500)]
don't crash for users with only my cases access

3 years agomissing function
demeritcowboy [Sat, 27 Feb 2021 17:22:34 +0000 (12:22 -0500)]
missing function

3 years agoMerge pull request #19686 from colemanw/searchKitClearSelection
Eileen McNaughton [Sat, 27 Feb 2021 04:40:45 +0000 (17:40 +1300)]
Merge pull request #19686 from colemanw/searchKitClearSelection

SearchKit - Fix clearing selection behavior

3 years agoSearchKit - Fix clearing selection behavior
Coleman Watts [Sat, 27 Feb 2021 01:50:57 +0000 (20:50 -0500)]
SearchKit - Fix clearing selection behavior

The variables `allRowsSelected` and `selectedRows` were sometimes getting out-of-sync.
This adds a function to help ensure they both get updated at the same time when the selection needs to be cleared.

3 years agoMerge pull request #19674 from demeritcowboy/caseclosed
Eileen McNaughton [Sat, 27 Feb 2021 01:10:31 +0000 (14:10 +1300)]
Merge pull request #19674 from demeritcowboy/caseclosed

dev/core#1400 - Failing test showing that My Cases users can't view their own closed cases

3 years agoMerge pull request #19682 from colemanw/dashlet-spacing
Seamus Lee [Fri, 26 Feb 2021 22:13:32 +0000 (09:13 +1100)]
Merge pull request #19682 from colemanw/dashlet-spacing

Reduce wasted space in civicrm dashboard margins

3 years agoMerge pull request #19666 from kainuk/dev_core_1400
Eileen McNaughton [Fri, 26 Feb 2021 19:57:52 +0000 (08:57 +1300)]
Merge pull request #19666 from kainuk/dev_core_1400

dev/core#1400 Users with 'view own cases' permission can't open resolved cases

3 years agoMerge pull request #19673 from colemanw/searchKitLinks
Eileen McNaughton [Fri, 26 Feb 2021 19:57:01 +0000 (08:57 +1300)]
Merge pull request #19673 from colemanw/searchKitLinks

SearchKit - Add links/menus/buttons to search displays

3 years agoReduce wasted space in civicrm dashboard margins
colemanw [Fri, 26 Feb 2021 19:03:51 +0000 (14:03 -0500)]
Reduce wasted space in civicrm dashboard margins

This removes the extra margins to the top and sides of the home dashboard page, only placing margins between the dashlets.

3 years agoMerge pull request #19641 from eileenmcnaughton/no_part
Matthew Wire [Fri, 26 Feb 2021 10:37:48 +0000 (10:37 +0000)]
Merge pull request #19641 from eileenmcnaughton/no_part

[REF] Load participant id within completeOrder rather than passing it in

3 years agoMerge pull request #19658 from eileenmcnaughton/member
Matthew Wire [Fri, 26 Feb 2021 10:36:13 +0000 (10:36 +0000)]
Merge pull request #19658 from eileenmcnaughton/member

[REF] Move code that relates to receipts when paying by credit card out of the shared function

3 years agoMerge pull request #19677 from totten/master-joomla-syncuser
Eileen McNaughton [Fri, 26 Feb 2021 05:38:29 +0000 (18:38 +1300)]
Merge pull request #19677 from totten/master-joomla-syncuser

Joomla::synchronizeUsers - Fix notice due to old style reference

3 years agoMerge pull request #19679 from civicrm/5.35
Eileen McNaughton [Fri, 26 Feb 2021 04:51:37 +0000 (17:51 +1300)]
Merge pull request #19679 from civicrm/5.35

5.35 to master

3 years agoMerge pull request #19678 from totten/master-guzzle-url
Eileen McNaughton [Fri, 26 Feb 2021 04:50:54 +0000 (17:50 +1300)]
Merge pull request #19678 from totten/master-guzzle-url

GuzzleMiddleware::url() - Distinguish frontend and backend routes

3 years agoGuzzleMiddleware::url() - Distinguish frontend and backend routes
Tim Otten [Wed, 17 Feb 2021 02:50:24 +0000 (18:50 -0800)]
GuzzleMiddleware::url() - Distinguish frontend and backend routes

Before: The `route://` scheme assumed backend access.

After: The `frontend://` and `backend://` schemes are unambiguous.
       The `route://` scheme will make a best-guess by determining
       if the menu item has `is_public`.

3 years agoSearchKit - Add links/menus/buttons to search displays
Coleman Watts [Thu, 25 Feb 2021 22:07:37 +0000 (17:07 -0500)]
SearchKit - Add links/menus/buttons to search displays

3 years agoJoomla::synchronizeUsers - Fix notice due to old style reference
Tim Otten [Sat, 20 Feb 2021 01:18:16 +0000 (17:18 -0800)]
Joomla::synchronizeUsers - Fix notice due to old style reference

This fixes a PHP notice when synchronizing all users/contacts:

PHP Notice:  Only variables should be assigned by reference in ...CRM/Utils/System/Joomla.php:855

3 years agoAdd test to report template saying no results found if that is the case
eileen [Thu, 25 Feb 2021 00:47:45 +0000 (13:47 +1300)]
Add test to report template saying no results found if that is the case

Note this is done to create minimum white space change. I actuallY
think the criteria around charts should be in the tpl that
makes the decision to include Table.tpl rather than in Table.tpl
and this would become {if }{/else}{ts}No results found{/ts}{/if}

I can do that as a follow up if agreed

3 years agotest showing non-admins can't see closed cases
demeritcowboy [Thu, 25 Feb 2021 22:32:24 +0000 (17:32 -0500)]
test showing non-admins can't see closed cases

3 years agoMerge pull request #19672 from colemanw/contentEditableUI
colemanw [Thu, 25 Feb 2021 21:43:47 +0000 (16:43 -0500)]
Merge pull request #19672 from colemanw/contentEditableUI

Afform - move contentEditable directive into crmUI library for reusability

3 years agoMerge pull request #19662 from colemanw/searchDisplayRewrite
Seamus Lee [Thu, 25 Feb 2021 20:22:43 +0000 (07:22 +1100)]
Merge pull request #19662 from colemanw/searchDisplayRewrite

SearchKit - cleanup display configuration and add "rewrite" feature

3 years agoMerge pull request #19671 from jaapjansma/dev_2424
Eileen McNaughton [Thu, 25 Feb 2021 19:31:55 +0000 (08:31 +1300)]
Merge pull request #19671 from jaapjansma/dev_2424

Fixes dev/core#2424 navigation items order

3 years agoAfform - move contentEditable directive into crmUI library for reusability
Coleman Watts [Thu, 25 Feb 2021 15:50:49 +0000 (10:50 -0500)]
Afform - move contentEditable directive into crmUI library for reusability

3 years agoFixes dev/core#2424 navigation items order
Jaap Jansma [Thu, 25 Feb 2021 14:02:34 +0000 (15:02 +0100)]
Fixes dev/core#2424 navigation items order

3 years agoMerge pull request #19670 from eileenmcnaughton/aff
colemanw [Thu, 25 Feb 2021 13:13:20 +0000 (08:13 -0500)]
Merge pull request #19670 from eileenmcnaughton/aff

Switch afform back to '=' to unbreak deduper

3 years agoSwitch afform back to '=' to unbreak deduper
eileen [Thu, 25 Feb 2021 07:03:25 +0000 (20:03 +1300)]
Switch afform back to '=' to unbreak deduper

https://github.com/eileenmcnaughton/deduper/pull/9

3 years agoMerge pull request #19669 from eileenmcnaughton/cont_status
Seamus Lee [Thu, 25 Feb 2021 04:07:25 +0000 (15:07 +1100)]
Merge pull request #19669 from eileenmcnaughton/cont_status

Metadata: Add html:label for Contribution Status ID

3 years agoMetadata: Add html:label for Contribution Status ID
eileen [Thu, 25 Feb 2021 02:15:28 +0000 (15:15 +1300)]
Metadata: Add html:label for Contribution Status ID

3 years agoMerge pull request #19667 from eileenmcnaughton/recurse
Seamus Lee [Thu, 25 Feb 2021 00:32:23 +0000 (11:32 +1100)]
Merge pull request #19667 from eileenmcnaughton/recurse

Fix master-only regression

3 years agoFix master-only regression
eileen [Wed, 24 Feb 2021 21:30:18 +0000 (10:30 +1300)]
Fix master-only regression

It seems the tests ran before the test that covered this
was merged giving a false positive

See https://github.com/civicrm/civicrm-core/pull/19478#issuecomment-785388559 for rationale

3 years agoMerge pull request #19638 from colemanw/entityRefId
Seamus Lee [Wed, 24 Feb 2021 21:25:20 +0000 (08:25 +1100)]
Merge pull request #19638 from colemanw/entityRefId

 EntityRef - Search by id when an integer is entered

3 years agoMerge pull request #19664 from demeritcowboy/case-rel-minor-cleanup2
colemanw [Wed, 24 Feb 2021 15:26:06 +0000 (10:26 -0500)]
Merge pull request #19664 from demeritcowboy/case-rel-minor-cleanup2

[NFC] minor cleanup in testCaseCreateWithResolvedStatus

3 years agoMerge pull request #19663 from demeritcowboy/case-rel-minor-cleanup
colemanw [Wed, 24 Feb 2021 15:25:11 +0000 (10:25 -0500)]
Merge pull request #19663 from demeritcowboy/case-rel-minor-cleanup

Minor cleanup - ChangeCaseStatus

3 years agoMerge pull request #19665 from seamuslee001/date_search_select
colemanw [Wed, 24 Feb 2021 13:46:47 +0000 (08:46 -0500)]
Merge pull request #19665 from seamuslee001/date_search_select

Afform: Only permit Date fields to be made into a select list if it i…

3 years agoEntityRef - Fix merging api params when searching by id
Coleman Watts [Wed, 24 Feb 2021 13:36:43 +0000 (08:36 -0500)]
EntityRef - Fix merging api params when searching by id

3 years agodev/core#1400 Users with 'view own cases' permission can't open resolved cases
Klaas Eikelboom [Wed, 24 Feb 2021 09:50:36 +0000 (10:50 +0100)]
dev/core#1400 Users with 'view own cases' permission can't open resolved cases

3 years agoAfform: Only permit Date fields to be made into a select list if it is a search form
Seamus Lee [Wed, 24 Feb 2021 09:40:09 +0000 (20:40 +1100)]
Afform: Only permit Date fields to be made into a select list if it is a search form

3 years agoMerge pull request #19632 from colemanw/afformDateRange
Seamus Lee [Wed, 24 Feb 2021 09:19:07 +0000 (20:19 +1100)]
Merge pull request #19632 from colemanw/afformDateRange

Afform - Support date range filters for search displays

3 years agominor cleanup
demeritcowboy [Wed, 24 Feb 2021 04:24:30 +0000 (23:24 -0500)]
minor cleanup

3 years agominor cleanup
demeritcowboy [Wed, 24 Feb 2021 04:18:07 +0000 (23:18 -0500)]
minor cleanup

3 years agoSearchKit - add option to rewrite field output in displays
Coleman Watts [Wed, 24 Feb 2021 01:38:39 +0000 (20:38 -0500)]
SearchKit - add option to rewrite field output in displays

3 years agoMerge pull request #19478 from eileenmcnaughton/ref
colemanw [Tue, 23 Feb 2021 22:24:10 +0000 (17:24 -0500)]
Merge pull request #19478 from eileenmcnaughton/ref

[REF] do not needlessly pass as reference, enforce valid param

3 years agoMerge pull request #19610 from ahed-compucorp/dev/core#2372
Eileen McNaughton [Tue, 23 Feb 2021 21:16:49 +0000 (10:16 +1300)]
Merge pull request #19610 from ahed-compucorp/dev/core#2372

dev/core#2372 Enable submitOnce for some forms

3 years agoMerge pull request #19661 from civicrm/5.35
Eileen McNaughton [Tue, 23 Feb 2021 19:50:17 +0000 (08:50 +1300)]
Merge pull request #19661 from civicrm/5.35

5.35 to master

3 years agoMerge pull request #19659 from demeritcowboy/revert-18782
Eileen McNaughton [Tue, 23 Feb 2021 19:49:47 +0000 (08:49 +1300)]
Merge pull request #19659 from demeritcowboy/revert-18782

revert 18782

3 years agoMerge pull request #19655 from mlutfy/tr32fix
Eileen McNaughton [Tue, 23 Feb 2021 19:41:59 +0000 (08:41 +1300)]
Merge pull request #19655 from mlutfy/tr32fix

dev/translation#32 Contribution ThankYou: partial fix for recurring units

3 years agoSearchKit - More efficient use of space when configuring display fields
Coleman Watts [Tue, 23 Feb 2021 13:31:38 +0000 (08:31 -0500)]
SearchKit - More efficient use of space when configuring display fields

3 years agoSearchKit - Move common displayAdmin fields into shared templates
Coleman Watts [Mon, 22 Feb 2021 19:39:06 +0000 (14:39 -0500)]
SearchKit - Move common displayAdmin fields into shared templates

3 years agoMerge pull request #19643 from colemanw/searchKitButtons
colemanw [Tue, 23 Feb 2021 18:41:55 +0000 (13:41 -0500)]
Merge pull request #19643 from colemanw/searchKitButtons

SearchKit - Don't save on enter key

3 years agodev/translation#32 Contribution ThankYou: partial fix for recurring units
Mathieu Lutfy [Mon, 22 Feb 2021 21:37:31 +0000 (16:37 -0500)]
dev/translation#32 Contribution ThankYou: partial fix for recurring units

3 years agorevert 18782
demeritcowboy [Tue, 23 Feb 2021 12:11:59 +0000 (07:11 -0500)]
revert 18782

3 years agoMerge pull request #19650 from tapashdatta/Enable-"Do-no-trade"-filter-1
Seamus Lee [Tue, 23 Feb 2021 09:18:42 +0000 (20:18 +1100)]
Merge pull request #19650 from tapashdatta/Enable-"Do-no-trade"-filter-1

Enable-"Do-no-trade"-filter

3 years agoMerge pull request #19645 from colemanw/afformLink
Seamus Lee [Tue, 23 Feb 2021 09:02:09 +0000 (20:02 +1100)]
Merge pull request #19645 from colemanw/afformLink

Afform - Add 'View Page' link from afform edit screen

3 years agoMerge pull request #19657 from totten/master-aff-perm-blank
Seamus Lee [Tue, 23 Feb 2021 09:00:00 +0000 (20:00 +1100)]
Merge pull request #19657 from totten/master-aff-perm-blank

dev/core#2404 - Afform - Resolve ambiguity of omitted permissions

3 years ago[REF] Move code that relates to receipts when paying by credit card out of the shared...
eileen [Tue, 23 Feb 2021 01:16:46 +0000 (14:16 +1300)]
[REF] Move code that relates to receipts when paying by credit card out of the shared function

The emailReceipt function is shared between the Batch Entry form and the backoffice
credit card form, while the emailMembershipReceipt is only used in this function.

I aim to copy the function onto the Batch Entry form & split them up but
am first moving this out of the shared code as it only
relates to credit card payments, which are not reachable from the Batch Entry form

3 years agoMerge pull request #19654 from eileenmcnaughton/member
Monish Deb [Tue, 23 Feb 2021 00:44:59 +0000 (06:14 +0530)]
Merge pull request #19654 from eileenmcnaughton/member

[REF] Simplfy parameter

3 years agoMerge pull request #19648 from eileenmcnaughton/mm
Monish Deb [Tue, 23 Feb 2021 00:32:49 +0000 (06:02 +0530)]
Merge pull request #19648 from eileenmcnaughton/mm

dev/core#778 Do not increment tax on validation error

3 years ago(dev/core#2404) afform_core - If "permission" is empty-string, then use default
Tim Otten [Mon, 22 Feb 2021 22:59:03 +0000 (14:59 -0800)]
(dev/core#2404) afform_core - If "permission" is empty-string, then use default

3 years ago(dev/core#2404) afform_admin - Treat "permission" as a required field
Tim Otten [Mon, 22 Feb 2021 22:58:43 +0000 (14:58 -0800)]
(dev/core#2404) afform_admin - Treat "permission" as a required field

3 years ago[REF] Simplfiy parameter
eileen [Mon, 22 Feb 2021 20:37:01 +0000 (09:37 +1300)]
[REF] Simplfiy parameter

Rather than pass in contributionParams & params & combine in the function,
combine when passing in. Note receive_date is always 'now' in this
workflow as it is specifically the card payment workflow (for recurring)
being altered here & that field is not displayed on
credit card payments

3 years agoMerge pull request #19656 from civicrm/5.35
Eileen McNaughton [Mon, 22 Feb 2021 21:51:49 +0000 (10:51 +1300)]
Merge pull request #19656 from civicrm/5.35

5.35 to master

3 years agoMerge pull request #19653 from eileenmcnaughton/535
Eileen McNaughton [Mon, 22 Feb 2021 21:51:07 +0000 (10:51 +1300)]
Merge pull request #19653 from eileenmcnaughton/535

dev/core#2360 - Escape the word `rows` in sql query

3 years agoMerge pull request #19652 from JMAConsulting/money_defaults
Eileen McNaughton [Mon, 22 Feb 2021 20:12:57 +0000 (09:12 +1300)]
Merge pull request #19652 from JMAConsulting/money_defaults

Use specific function when formatting money for a default

3 years agoMerge pull request #19651 from lunar-debian/fix-i18n-data-templates-changelog
Eileen McNaughton [Mon, 22 Feb 2021 20:02:14 +0000 (09:02 +1300)]
Merge pull request #19651 from lunar-debian/fix-i18n-data-templates-changelog

Fix i18n issue with changeLog in data templates

3 years agodev/core#2360 - Escape the word `rows` in sql query
Coleman Watts [Thu, 4 Feb 2021 23:10:42 +0000 (18:10 -0500)]
dev/core#2360 - Escape the word `rows` in sql query

3 years agoUse specific function when formatting money for a default
Monish Deb [Mon, 22 Feb 2021 17:40:27 +0000 (23:10 +0530)]
Use specific function when formatting money for a default

3 years agoMerge pull request #19549 from eileenmcnaughton/member
Yashodha Chaku [Mon, 22 Feb 2021 16:50:57 +0000 (22:20 +0530)]
Merge pull request #19549 from eileenmcnaughton/member

[REF] Use form property rather than formValues to pass generated invoice ID on membership forms

3 years agoFix i18n issue with changeLog in data templates
Lunar [Mon, 22 Feb 2021 14:01:51 +0000 (15:01 +0100)]
Fix i18n issue with changeLog in data templates

There was a small mistake with the translation delimiters of `Change Log` in data templates.

3 years agoMerge pull request #19649 from eileenmcnaughton/bfhe
colemanw [Mon, 22 Feb 2021 13:53:15 +0000 (08:53 -0500)]
Merge pull request #19649 from eileenmcnaughton/bfhe

Mark Old Cividiscount hook support deprecated

3 years agoUpdate Form.php
tapashdatta [Mon, 22 Feb 2021 12:30:57 +0000 (12:30 +0000)]
Update Form.php

3 years agodev/core#778 Do not increment tax on validation error
eileen [Mon, 22 Feb 2021 04:34:44 +0000 (17:34 +1300)]
dev/core#778 Do not increment tax on validation error

After digging into & cleaning up the code that handles tax on the membership form
I concluded that we can fix https://lab.civicrm.org/dev/core/-/issues/778 without
regressing https://issues.civicrm.org/jira/browse/CRM-18827 by simply doing less.
If the form has been already submitted, just load up what was submitted, do not
call the script to mess with stuff.

The script does 3 things
1) checks or unchecks the record_contribution checkbox. This is fine
to leave alone as it will have the right values on new & reload
without intervention
2) sets financial type id - ditto - only needs to be changed
when something else changes
3) sets total_amount - ditto
4) sets the text that says how much tax is included

With this patch 4 will not happen on a validation error. I think
this is OK as it is a bit of an edge case and no message is
better than the 2 previous issues of the amount being wrong.

I did think about fixing but it adds a lot of complexity that
will be easy to do once other changes are done to make
accessing the tax_amount easier, but which are relatively hard
now & my guess is that no-one will notice it not being there

3 years agoAssign tax_rate directly rather than looking up via financial_type
eileen [Mon, 22 Feb 2021 04:15:11 +0000 (17:15 +1300)]
Assign tax_rate directly rather than looking up via financial_type

3 years agoFurther simplification
eileen [Mon, 22 Feb 2021 04:11:27 +0000 (17:11 +1300)]
Further simplification

3 years agoMerge pull request #19647 from eileenmcnaughton/more
Eileen McNaughton [Mon, 22 Feb 2021 05:32:25 +0000 (18:32 +1300)]
Merge pull request #19647 from eileenmcnaughton/more

Remove unreachable code & variable cleanup in membership back office form template

3 years agoMerge pull request #19633 from eileenmcnaughton/campaign
colemanw [Mon, 22 Feb 2021 03:59:47 +0000 (22:59 -0500)]
Merge pull request #19633 from eileenmcnaughton/campaign

[Regression] campaign name no longer accepted

3 years agoAfform Admin - Ensure buttons have 'type' declared
Coleman Watts [Mon, 22 Feb 2021 03:58:59 +0000 (22:58 -0500)]
Afform Admin - Ensure buttons have 'type' declared

3 years agoVariable simplification - assign membershipType to variable
eileen [Mon, 22 Feb 2021 02:46:46 +0000 (15:46 +1300)]
Variable simplification - assign membershipType to variable

3 years ago[REF] Minor clarification - rename membershipType to membershipTypeID
eileen [Mon, 22 Feb 2021 02:38:36 +0000 (15:38 +1300)]
[REF] Minor clarification - rename membershipType to membershipTypeID

3 years agoRemove unreachable code
eileen [Mon, 22 Feb 2021 03:17:25 +0000 (16:17 +1300)]
Remove unreachable code

Term is always set at this point unless we are dealing with a priceset - which
this handling appears to be for, ergo term is always set.

We also know that this code is unreachable as in the 6 years it has been in the
codebase no-one has reported the bug in it. It uses total_amount not total_amount_numerci
in the first part of the calculation - this would fail when the decimal separator
is not a decimal

3 years ago[REF] Remove unused variables
eileen [Mon, 22 Feb 2021 03:10:30 +0000 (16:10 +1300)]
[REF] Remove unused variables

existingAmount is never used except in this if so cannot be true. feeTotal
is used above this point but not below it - so this code is extraneous

3 years agoAfform - Add 'View Page' link from afform edit screen
Coleman Watts [Mon, 22 Feb 2021 02:50:14 +0000 (21:50 -0500)]
Afform - Add 'View Page' link from afform edit screen

3 years agoMark Old Cividiscount hook support deprecated
eileen [Mon, 22 Feb 2021 02:28:50 +0000 (15:28 +1300)]
Mark Old Cividiscount hook support deprecated

This seems to have existed to support a really old approach
(pre regions). It's gone from cividiscount with
https://github.com/civicrm/org.civicrm.module.cividiscount/pull/251
merged so this just adds comments

3 years agoAPIv3 - Legacy support for campaign_id fields which used to have a pseudoconstant
eileen [Fri, 19 Feb 2021 06:18:04 +0000 (19:18 +1300)]
APIv3 - Legacy support for campaign_id fields which used to have a pseudoconstant

3 years agoMerge pull request #19605 from eileenmcnaughton/money
Monish Deb [Mon, 22 Feb 2021 00:59:37 +0000 (06:29 +0530)]
Merge pull request #19605 from eileenmcnaughton/money

dev/translation#65 Further remove moneyValueFormat

3 years agoSearchKit - Don't save on enter key
Coleman Watts [Sun, 21 Feb 2021 22:44:31 +0000 (17:44 -0500)]
SearchKit - Don't save on enter key

3 years agoMerge pull request #19626 from colemanw/multiRecordCustomViewLink
Eileen McNaughton [Sun, 21 Feb 2021 21:56:51 +0000 (10:56 +1300)]
Merge pull request #19626 from colemanw/multiRecordCustomViewLink

SearchKit - Add links to view multi-record custom data

3 years agoMerge pull request #19618 from colemanw/searchAliasFix
Eileen McNaughton [Sun, 21 Feb 2021 21:49:25 +0000 (10:49 +1300)]
Merge pull request #19618 from colemanw/searchAliasFix

dev/core#2388 SearchKit - Fix display of pseudoconstant fields

3 years ago[REF] Load participant id within completeOrder rather than passing it in
eileen [Sun, 21 Feb 2021 21:29:35 +0000 (10:29 +1300)]
[REF] Load participant id within completeOrder rather than passing it in

The participantID passed in is simply loaded by retrieving participant_id from
the participant payment table earlier on. By doing it in the function
instead we can simplify the code that does that. There is no apiv4 for
participant payment as yet and once we start thinking about adding that
other questions arise (should we retrieve it via the line item instead)
so I went for a very limited change that simply replicates the
way it is currently retrieved (and does not, for example, increase the scope
to consider whether Attended should be updated to Registered) - in other
words this is as close to no-change as possible

I also deliberately left any changes to the nasty by-pass out of scope - that
needs to be tackled from the other end - ie removing the reason for the bypass
first and in the meantime we don't want to make it look any less hacky as we
don't want anyone to try to 'use' it
Test cover in testRepeatTransactionPassedInFinancialTypeTwoLineItems

3 years agoMerge pull request #19640 from mattwire/tokendeprecated
Eileen McNaughton [Sun, 21 Feb 2021 19:59:51 +0000 (08:59 +1300)]
Merge pull request #19640 from mattwire/tokendeprecated

Remove single use of extraParams in CRM_Utils_Token::getTokenDetails()

3 years agoRemove single use of extraParams in CRM_Utils_Token::getTokenDetails()
Matthew Wire [Sun, 21 Feb 2021 17:32:07 +0000 (17:32 +0000)]
Remove single use of extraParams in CRM_Utils_Token::getTokenDetails()

3 years agoMerge pull request #19609 from demeritcowboy/case-views
Eileen McNaughton [Sun, 21 Feb 2021 10:50:45 +0000 (23:50 +1300)]
Merge pull request #19609 from demeritcowboy/case-views

[NFC/Unit Test] dev/core#2385 - Add test for getCaseActivityQuery

3 years agoEntityRef - Search by id when an integer is entered
Coleman Watts [Sun, 21 Feb 2021 04:03:37 +0000 (23:03 -0500)]
EntityRef - Search by id when an integer is entered