Coleman Watts [Thu, 25 Feb 2021 22:07:37 +0000 (17:07 -0500)]
SearchKit - Add links/menus/buttons to search displays
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
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
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
Coleman Watts [Thu, 25 Feb 2021 15:50:49 +0000 (10:50 -0500)]
Afform - move contentEditable directive into crmUI library for reusability
Jaap Jansma [Thu, 25 Feb 2021 14:02:34 +0000 (15:02 +0100)]
Fixes dev/core#2424 navigation items order
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
eileen [Thu, 25 Feb 2021 02:15:28 +0000 (15:15 +1300)]
Metadata: Add html:label for Contribution Status ID
Seamus Lee [Thu, 25 Feb 2021 00:32:23 +0000 (11:32 +1100)]
Merge pull request #19667 from eileenmcnaughton/recurse
Fix 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
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
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
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
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…
Coleman Watts [Wed, 24 Feb 2021 13:36:43 +0000 (08:36 -0500)]
EntityRef - Fix merging api params when searching by id
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
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
demeritcowboy [Wed, 24 Feb 2021 04:24:30 +0000 (23:24 -0500)]
minor cleanup
demeritcowboy [Wed, 24 Feb 2021 04:18:07 +0000 (23:18 -0500)]
minor cleanup
Coleman Watts [Wed, 24 Feb 2021 01:38:39 +0000 (20:38 -0500)]
SearchKit - add option to rewrite field output in displays
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
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
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
Eileen McNaughton [Tue, 23 Feb 2021 19:49:47 +0000 (08:49 +1300)]
Merge pull request #19659 from demeritcowboy/revert-18782
revert 18782
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
Coleman Watts [Tue, 23 Feb 2021 13:31:38 +0000 (08:31 -0500)]
SearchKit - More efficient use of space when configuring display fields
Coleman Watts [Mon, 22 Feb 2021 19:39:06 +0000 (14:39 -0500)]
SearchKit - Move common displayAdmin fields into shared templates
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
Mathieu Lutfy [Mon, 22 Feb 2021 21:37:31 +0000 (16:37 -0500)]
dev/translation#32 Contribution ThankYou: partial fix for recurring units
demeritcowboy [Tue, 23 Feb 2021 12:11:59 +0000 (07:11 -0500)]
revert 18782
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
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
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
Monish Deb [Tue, 23 Feb 2021 00:44:59 +0000 (06:14 +0530)]
Merge pull request #19654 from eileenmcnaughton/member
[REF] Simplfy parameter
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
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
Tim Otten [Mon, 22 Feb 2021 22:58:43 +0000 (14:58 -0800)]
(dev/core#2404) afform_admin - Treat "permission" as a required field
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
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
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
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
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
Coleman Watts [Thu, 4 Feb 2021 23:10:42 +0000 (18:10 -0500)]
dev/core#2360 - Escape the word `rows` in sql query
Monish Deb [Mon, 22 Feb 2021 17:40:27 +0000 (23:10 +0530)]
Use specific function when formatting money for a default
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
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.
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
tapashdatta [Mon, 22 Feb 2021 12:30:57 +0000 (12:30 +0000)]
Update Form.php
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
eileen [Mon, 22 Feb 2021 04:15:11 +0000 (17:15 +1300)]
Assign tax_rate directly rather than looking up via financial_type
eileen [Mon, 22 Feb 2021 04:11:27 +0000 (17:11 +1300)]
Further simplification
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
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
Coleman Watts [Mon, 22 Feb 2021 03:58:59 +0000 (22:58 -0500)]
Afform Admin - Ensure buttons have 'type' declared
eileen [Mon, 22 Feb 2021 02:46:46 +0000 (15:46 +1300)]
Variable simplification - assign membershipType to variable
eileen [Mon, 22 Feb 2021 02:38:36 +0000 (15:38 +1300)]
[REF] Minor clarification - rename membershipType to membershipTypeID
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
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
Coleman Watts [Mon, 22 Feb 2021 02:50:14 +0000 (21:50 -0500)]
Afform - Add 'View Page' link from afform edit screen
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
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
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
Coleman Watts [Sun, 21 Feb 2021 22:44:31 +0000 (17:44 -0500)]
SearchKit - Don't save on enter key
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
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
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()
Matthew Wire [Sun, 21 Feb 2021 17:32:07 +0000 (17:32 +0000)]
Remove single use of extraParams in CRM_Utils_Token::getTokenDetails()
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
Coleman Watts [Sun, 21 Feb 2021 04:03:37 +0000 (23:03 -0500)]
EntityRef - Search by id when an integer is entered
Eileen McNaughton [Sun, 21 Feb 2021 00:36:32 +0000 (13:36 +1300)]
Merge pull request #19348 from sunilpawar/dev_age_at_deceased_date
Show Contact age on deceased date
Eileen McNaughton [Sat, 20 Feb 2021 22:57:14 +0000 (11:57 +1300)]
Merge pull request #19637 from demeritcowboy/static-event
dev/event#50 - Non static function called statically for event ical downloads
demeritcowboy [Sat, 20 Feb 2021 14:15:36 +0000 (09:15 -0500)]
non static function called statically
Eileen McNaughton [Fri, 19 Feb 2021 23:04:00 +0000 (12:04 +1300)]
Merge pull request #19631 from colemanw/searchKitLinks
SearchKit - Enable links for implicit joins
Eileen McNaughton [Fri, 19 Feb 2021 22:53:13 +0000 (11:53 +1300)]
Merge pull request #19636 from demeritcowboy/saventest
dev/core#2398 - Fix save'n'test button on mail account form
Eileen McNaughton [Fri, 19 Feb 2021 21:35:00 +0000 (10:35 +1300)]
Merge pull request #19620 from colemanw/searchKitSelectCurrentUser
Search kit select current user
colemanw [Fri, 19 Feb 2021 20:53:50 +0000 (15:53 -0500)]
Merge pull request #19597 from eileenmcnaughton/nfc
[REF] simplify parameter, use preferred strict
Eileen McNaughton [Fri, 19 Feb 2021 20:47:28 +0000 (09:47 +1300)]
Merge pull request #19608 from totten/master-wp-status
WordPress - If we hit a "permission denied" error, return HTTP 403
Eileen McNaughton [Fri, 19 Feb 2021 20:20:12 +0000 (09:20 +1300)]
Merge pull request #19625 from colemanw/fixTs
Fix incorrect use of ts when setting custom data form title
demeritcowboy [Fri, 19 Feb 2021 19:08:34 +0000 (14:08 -0500)]
fix save'n'test button
Seamus Lee [Fri, 19 Feb 2021 08:19:54 +0000 (19:19 +1100)]
Merge pull request #19634 from eileenmcnaughton/iif
dev/financial#166 Clean up money formatting in iif
Seamus Lee [Fri, 19 Feb 2021 07:56:27 +0000 (18:56 +1100)]
Merge pull request #19627 from colemanw/readonly
Metadata - Add 'readonly' to id fields, custom fields & contact fields
eileen [Fri, 19 Feb 2021 07:02:10 +0000 (20:02 +1300)]
dev/financial#166 Clean up money formatting in iif
This does not turn out to be necessary but I tested & it works & is more correct
Coleman Watts [Fri, 19 Feb 2021 01:59:40 +0000 (20:59 -0500)]
Afform - Support date range filters for search displays
Seamus Lee [Fri, 19 Feb 2021 01:17:22 +0000 (12:17 +1100)]
Merge pull request #19579 from totten/master-aff-test
Afform - Allow public submission (PUB-CONTACT). Expand E2E test coverage.
Tim Otten [Thu, 18 Feb 2021 22:09:43 +0000 (14:09 -0800)]
mockPublicForm.test.php - Relax assertion
Note that the actual type reported varies slightly by CMS/configuration.
assertContentType() should factor-out those differences. We just need
loose claim here.
Coleman Watts [Thu, 18 Feb 2021 21:02:25 +0000 (16:02 -0500)]
SearchKit - Enable links for implicit joins
Automatically create links for any implicitly joined entity linked through an fk field
Coleman Watts [Thu, 18 Feb 2021 18:44:54 +0000 (13:44 -0500)]
Fix APIv4 unit test for 'readonly' attribute
Coleman Watts [Thu, 18 Feb 2021 15:43:47 +0000 (10:43 -0500)]
Regenerate DAOs with readonly attribute for id fields
Coleman Watts [Thu, 18 Feb 2021 15:41:28 +0000 (10:41 -0500)]
Add 'readonly' attribute to schema fields
For core fields, applies to primaryKey fields and fields tagged <readonly>.
For custom fields, this comes through via the 'is_view' property.
This will help autogenerated forms to know whether a field is appropriate to show to the user.
Coleman Watts [Thu, 18 Feb 2021 14:16:16 +0000 (09:16 -0500)]
SearchKit - Add links to view multi-record custom data
Ideally custom entities would have a full set of CRUD links, but the form code is a bizarre mess
and requires a bunch of extra url params that have to be calcultated when constructing the links.
Just getting the VIEW link was difficult because I had to remove the requirement of passing CID
& teach the form to look it up.
Coleman Watts [Thu, 18 Feb 2021 13:57:52 +0000 (08:57 -0500)]
Fix incorrect use of ts when setting custom data form title
Matthew Wire [Thu, 18 Feb 2021 10:25:54 +0000 (10:25 +0000)]
Merge pull request #19598 from eileenmcnaughton/msg_tpl_less
Convert Smarty & domain token processing to use token processor
Seamus Lee [Thu, 18 Feb 2021 10:07:47 +0000 (21:07 +1100)]
Merge pull request #19615 from totten/master-joomla-getufid
Joomla - Implement getUfId(). Fix `@user:<name>`.
Seamus Lee [Thu, 18 Feb 2021 09:29:26 +0000 (20:29 +1100)]
Merge pull request #19617 from colemanw/searchKitEditAfformLink
dev/core#2389 SearchKit - Show edit link to searchDisplay afforms
eileen [Sat, 6 Feb 2021 00:34:38 +0000 (13:34 +1300)]
[REF] Use form property rather than formValues to pass generated invoice ID
formValues is 'sort of' the array for 'submittedValues' but it has stuff added to it
& passed around. This is part of an attempt to make it clearer where
various values come from to faciliate cleaning up the code and
removing some of the very many arrays in use.
Eileen McNaughton [Wed, 17 Feb 2021 23:01:01 +0000 (12:01 +1300)]
Merge pull request #19621 from demeritcowboy/reldate
dev/core#2392 - Deprecated url parameters in contribution dashboard detail links
demeritcowboy [Tue, 16 Feb 2021 03:38:26 +0000 (22:38 -0500)]
add test for getCaseActivityQuery
Tim Otten [Wed, 17 Feb 2021 22:17:01 +0000 (14:17 -0800)]
Merge pull request #19614 from eileenmcnaughton/dispatch
Ensure dispatcher has loaded listeners
Eileen McNaughton [Wed, 17 Feb 2021 22:07:25 +0000 (11:07 +1300)]
Merge pull request #19622 from demeritcowboy/setting-description-ts
Remove empty {ts}
demeritcowboy [Wed, 17 Feb 2021 20:30:44 +0000 (15:30 -0500)]
there's no string to translate here