Coleman Watts [Thu, 22 Jul 2021 22:37:51 +0000 (18:37 -0400)]
REF - Use function rather than static variable to return SQLFunction params
colemanw [Wed, 28 Jul 2021 18:49:24 +0000 (14:49 -0400)]
Merge pull request #20962 from eileenmcnaughton/float
Cast to float when setting overrideTotalAmount - regression in master
Mathieu Lu [Wed, 28 Jul 2021 18:22:04 +0000 (14:22 -0400)]
Merge pull request #20885 from eileenmcnaughton/param_replace
Invoice template: Add function to update message tokens during upgrade
Mathieu Lu [Wed, 28 Jul 2021 17:55:07 +0000 (13:55 -0400)]
Merge pull request #20927 from alifrumin/priceplaceholder
Improve accessibility for price fields of the type select by adding the price field label to the placeholder.
colemanw [Wed, 28 Jul 2021 17:25:18 +0000 (13:25 -0400)]
Merge pull request #20837 from colemanw/customACLs
Distinguish custom field VIEW from EDIT permissions
Monish Deb [Wed, 28 Jul 2021 12:15:42 +0000 (17:45 +0530)]
Merge pull request #20941 from eileenmcnaughton/ord
Fix Payment.create to update financial_item.status_id
Eileen McNaughton [Wed, 28 Jul 2021 08:38:51 +0000 (20:38 +1200)]
Merge pull request #20919 from JMAConsulting/issue_2710
dev/core#2710 Cannot disable contact type/sub-type
Monish Deb [Wed, 28 Jul 2021 03:40:18 +0000 (09:10 +0530)]
dev/core#2710 Cannot disable contact type/sub-type
Eileen McNaughton [Fri, 23 Jul 2021 23:24:46 +0000 (11:24 +1200)]
Fix Payment.create to update financial_item.status_id
When I try to switch to the order->create flow for membership forms it turns
out we are leaving the financial_item.status_id as 'unpaid' when adding a payment.
No one has noticed because this field is kinda unused - but it needs to work
to pass tests
Eileen McNaughton [Tue, 27 Jul 2021 23:37:00 +0000 (11:37 +1200)]
Fix order api to set price field value for default price set
This makes it such that when using the default price set for contributions it not only
fills the default price field id. I originally had this in the code but I pulled it out
because the line item test failed. However, I'm seeing cases where not
having a price_field_value_id fails to add tax and I think the issue with the line item
test is that it is, incorrecly, trying to add 2 line items on the price field in
the default price set - which is not actually the expectation on the default price set
I do, separately, wonder if we need the unique id for price_field_id + contribution_id
+ price_field_value_id - but out of scope on this
Eileen McNaughton [Wed, 28 Jul 2021 00:58:49 +0000 (12:58 +1200)]
Merge pull request #20964 from eileenmcnaughton/cast
[REF] [Super trivial] -tighten up some casting
Eileen McNaughton [Tue, 27 Jul 2021 23:11:21 +0000 (11:11 +1200)]
[REF] [Super trivial] -tighten up some casting
demeritcowboy [Tue, 27 Jul 2021 18:16:25 +0000 (14:16 -0400)]
Merge pull request #20308 from masetto/master
Fix unit translation for recurring contributions
Samuele Masetto [Fri, 14 May 2021 17:33:34 +0000 (19:33 +0200)]
fixed unit translation for recurring contributions
small fix
double "every" and `p` tag fixed, removed final `else`
demeritcowboy [Tue, 27 Jul 2021 13:36:03 +0000 (09:36 -0400)]
Merge pull request #20482 from MegaphoneJon/translation-69
fix missing 'on behalf of' and honoree labels in multilingual
Eileen McNaughton [Fri, 16 Jul 2021 22:08:49 +0000 (10:08 +1200)]
Add function to update message tokens during upgrade
In conjunction with https://github.com/civicrm/civicrm-core/pull/20867
Eileen McNaughton [Tue, 27 Jul 2021 08:51:10 +0000 (20:51 +1200)]
Cast to float when setting overrideTotalAmount
This is a regression in master whereby submitting a new contribution and leaving total_amount empty
causes a fatal before it can get to the validation error - back office contribution form
Eileen McNaughton [Tue, 27 Jul 2021 05:14:02 +0000 (17:14 +1200)]
Merge pull request #20957 from demeritcowboy/smarty-tags
Smarty notices for New Activity / New Case for tags for attachments
Seamus Lee [Tue, 27 Jul 2021 02:12:06 +0000 (12:12 +1000)]
Merge pull request #20955 from eileenmcnaughton/sql3
dev/core#2721 [Ref] simplify passed parameters
Seamus Lee [Tue, 27 Jul 2021 02:08:58 +0000 (12:08 +1000)]
Merge pull request #20956 from eileenmcnaughton/valid_fix
Fix test to use valid financials
Seamus Lee [Tue, 27 Jul 2021 02:08:28 +0000 (12:08 +1000)]
Merge pull request #20954 from eileenmcnaughton/sql2
dev/core#2721 [REF] Further divide savedSearchParam loading into the sql functions
Seamus Lee [Tue, 27 Jul 2021 00:49:19 +0000 (10:49 +1000)]
Merge pull request #20960 from civicrm/5.40
5.40
Seamus Lee [Mon, 26 Jul 2021 22:10:23 +0000 (08:10 +1000)]
Merge pull request #20959 from alifrumin/rn5.40
[NFC] Release notes for 5.40
Matthew Wire [Mon, 26 Jul 2021 21:01:43 +0000 (22:01 +0100)]
Merge pull request #20685 from jaapjansma/dev_financials_6_contactsummary_3
dev/financial#6: Button for create/view template contribution on contact summary
Alice Frumin [Wed, 21 Jul 2021 15:03:12 +0000 (11:03 -0400)]
Improve accessibility for price fields of the type select by adding the field label to the placeholder text
Alice Frumin [Thu, 15 Jul 2021 21:40:26 +0000 (17:40 -0400)]
[NFC] 5.40: first stab at release notes
demeritcowboy [Mon, 26 Jul 2021 19:16:23 +0000 (15:16 -0400)]
Merge pull request #20918 from eileenmcnaughton/cust2
dev/core#2709 Enable logging for custom data tables with non-standard names
demeritcowboy [Mon, 26 Jul 2021 15:14:02 +0000 (11:14 -0400)]
smarty notices
Jaap Jansma [Wed, 30 Jun 2021 11:04:08 +0000 (13:04 +0200)]
dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab
dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab
dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab
dev/financial#6 exclude template contributions from the contact summary and add a button to view them to the recurring contributions tab
Mathieu Lu [Mon, 26 Jul 2021 12:56:26 +0000 (08:56 -0400)]
Merge pull request #20867 from eileenmcnaughton/display_name
Swap {$displayName} smarty for {contact.display_name} token
Seamus Lee [Mon, 26 Jul 2021 10:19:47 +0000 (20:19 +1000)]
Merge pull request #20939 from eileenmcnaughton/num_term
[Test] Add cover for setting num_terms to 2
Eileen McNaughton [Mon, 26 Jul 2021 05:28:06 +0000 (17:28 +1200)]
Additional opt ins & outs on validateFinancials
Ideally we opt in the class & opt out specific tests as an interim. Moving
towards opt in everything & opt out specific tests
Eileen McNaughton [Mon, 26 Jul 2021 05:26:00 +0000 (17:26 +1200)]
[Test] Opt a couple more classes into validateFinancials
Eileen McNaughton [Mon, 26 Jul 2021 05:07:34 +0000 (17:07 +1200)]
Fix test to use valid financials
Eileen McNaughton [Mon, 26 Jul 2021 04:48:06 +0000 (16:48 +1200)]
Merge pull request #20948 from demeritcowboy/smarty-repdet
Smarty notices on logging detail report
Eileen McNaughton [Mon, 26 Jul 2021 04:30:19 +0000 (16:30 +1200)]
[Ref] simplify passed parameters
I think if we want to make this some sort of hook or listener we don't really
want to pass out 'add select' and 'exclude clause' when they are just group id
with a bit of string. It seems cleaner to specify the sql within the function
Eileen McNaughton [Mon, 26 Jul 2021 02:10:46 +0000 (14:10 +1200)]
[REF] Further divide savedSearchParam loading into the sql functions
Eileen McNaughton [Mon, 26 Jul 2021 01:56:41 +0000 (13:56 +1200)]
[REF] start unravelling the way we retrieve the saved search
We have 3 types of saved searches
- search kit
- legacy core searches
- legacy custom searches
The only information these 3 need to load is the savedSearch details and
the group ID (to add in the add & exclude). The wrangling of the params should
happen in the getSql functions - which we can think about being in a listener once
they have standard inputs & outputs. However, to get to that point
we want to standardise those inputs & outputs. This removes
only point of randomness - ie savedSearch has a consistent value & the wrangling
of what is in it is pushed closer to the relevant functions
colemanw [Sun, 25 Jul 2021 21:37:19 +0000 (17:37 -0400)]
Merge pull request #20923 from totten/master-phptype
CRM_Utils_Type::validatePhpType - Helper to validate PHP type expressions
Eileen McNaughton [Sun, 25 Jul 2021 21:11:01 +0000 (09:11 +1200)]
Merge pull request #20949 from demeritcowboy/smarty-reppager
Smarty warning about pager location on all CiviReports
demeritcowboy [Sun, 25 Jul 2021 17:02:36 +0000 (13:02 -0400)]
smarty warning - rows per page filter missing
demeritcowboy [Sun, 25 Jul 2021 16:39:11 +0000 (12:39 -0400)]
smarty warnings
Monish Deb [Sun, 25 Jul 2021 11:04:28 +0000 (16:34 +0530)]
Merge pull request #20946 from mattwire/managedentitydeleteerror
Fix error message when unable to delete ManagedEntity
Matthew Wire [Sat, 24 Jul 2021 22:19:54 +0000 (23:19 +0100)]
Fix error message when unable to delete managedentity
demeritcowboy [Sat, 24 Jul 2021 20:27:02 +0000 (16:27 -0400)]
Merge pull request #20857 from scardinius/translation-status-bounces
Add ts() function within CRM_Core_Error::statusBounce() method
demeritcowboy [Sat, 24 Jul 2021 17:08:00 +0000 (13:08 -0400)]
Merge pull request #20943 from eileenmcnaughton/cc
[NFC] Remove exceptions from comments
Eileen McNaughton [Sat, 24 Jul 2021 04:19:37 +0000 (16:19 +1200)]
[NFC] Remove exceptions from comments
callApiSuccess now uses fail rather than throwing an exception so
we don't need these here
Eileen McNaughton [Sat, 24 Jul 2021 01:02:33 +0000 (13:02 +1200)]
Merge pull request #20877 from kurund/patch-1
add support for profile map view
Eileen McNaughton [Sat, 24 Jul 2021 01:00:10 +0000 (13:00 +1200)]
Fix spelling
Eileen McNaughton [Sat, 24 Jul 2021 00:57:08 +0000 (12:57 +1200)]
Update CRM/Contribute/Page/ContributionRecur.php
Co-authored-by: demeritcowboy <demeritcowboy@hotmail.com>
Eileen McNaughton [Fri, 23 Jul 2021 21:33:40 +0000 (09:33 +1200)]
[Test] Add cover for setting num_terms to 2
Monish Deb [Fri, 23 Jul 2021 12:22:45 +0000 (17:52 +0530)]
Merge pull request #20882 from eileenmcnaughton/hh
Extract getCurrentMembership
Eileen McNaughton [Fri, 23 Jul 2021 07:50:57 +0000 (19:50 +1200)]
Merge pull request #20937 from civicrm/5.40
5.40
Eileen McNaughton [Fri, 23 Jul 2021 04:11:13 +0000 (16:11 +1200)]
Merge pull request #20925 from demeritcowboy/install-linemode
dev/drupal#161 - (not just drupal) Can't install sample data using UI installer
Eileen McNaughton [Fri, 23 Jul 2021 01:47:40 +0000 (13:47 +1200)]
Merge pull request #20924 from JMAConsulting/cust_deadlock
Reduce deadlock while inserting custom data for Address
Eileen McNaughton [Fri, 16 Jul 2021 02:27:29 +0000 (14:27 +1200)]
Swap displayName smarty for {contact.display_name token}
This swaps over the smartyToken for the token token on the template added on new installs, and adds a test.
Separately I will look at an upgrade script and other templates
To test make sure you enable invoicing & then generate an invoice from search results.
use the demo site due to aforementioned lack of upgrade and check the display name is still on
the left hand side
colemanw [Thu, 22 Jul 2021 22:29:05 +0000 (18:29 -0400)]
Merge pull request #20932 from eileenmcnaughton/mgd
Add v4 managed api entity
Eileen McNaughton [Thu, 22 Jul 2021 22:21:02 +0000 (10:21 +1200)]
Merge pull request #20835 from MegaphoneJon/core-2687
fixes core#2687: regression on group rebuild scheduled job
Eileen McNaughton [Thu, 22 Jul 2021 21:53:05 +0000 (09:53 +1200)]
Merge pull request #20934 from demeritcowboy/lybunt-param
[NFC] Typo in parameter for lybunt test
demeritcowboy [Thu, 22 Jul 2021 14:58:20 +0000 (10:58 -0400)]
Merge pull request #20926 from mlutfy/fixInclusiveTaxTs
Fix 'includes tax' translation for PriceSet Checkbox fields
demeritcowboy [Thu, 22 Jul 2021 13:50:43 +0000 (09:50 -0400)]
incorrect parameter
demeritcowboy [Thu, 22 Jul 2021 12:24:19 +0000 (08:24 -0400)]
Merge pull request #20556 from ixiam/dev#2642
Add filter by custom fields in Accounting Batch. https://lab.civicrm.…
Diego Muñio [Fri, 18 Jun 2021 14:37:11 +0000 (11:37 -0300)]
Add filter by custom fields in Accounting Batch. https://lab.civicrm.org/dev/core/-/issues/2642
Seamus Lee [Thu, 22 Jul 2021 09:14:44 +0000 (19:14 +1000)]
Merge pull request #20910 from colemanw/searchKitPickLists
[REF] SearchKit - Refactor pick-lists to use onCrmUiSelect directive
Eileen McNaughton [Thu, 22 Jul 2021 02:08:59 +0000 (14:08 +1200)]
Add v4 managed api entity
Note that this is searchable since it seems useful to me to be able to search these - albeit
for more advanced users!
colemanw [Thu, 22 Jul 2021 01:26:33 +0000 (21:26 -0400)]
Merge pull request #20930 from eileenmcnaughton/total
Enable range search for money fields in search kit + afform
Seamus Lee [Wed, 21 Jul 2021 22:32:51 +0000 (08:32 +1000)]
Merge pull request #20931 from civicrm/5.40
5.40
Eileen McNaughton [Wed, 21 Jul 2021 21:15:46 +0000 (09:15 +1200)]
Enable range search for money fields
Allow total_amount to be exposed for searching by range
Eileen McNaughton [Wed, 21 Jul 2021 06:54:45 +0000 (18:54 +1200)]
dev/core#2709 Enable logging for custom data tables with non-standard names
Eileen McNaughton [Wed, 21 Jul 2021 19:54:51 +0000 (07:54 +1200)]
Merge pull request #20928 from demeritcowboy/20914-5.40
dev/core#2699 - 5.40 version of Attempt regression fix
demeritcowboy [Wed, 21 Jul 2021 15:36:52 +0000 (11:36 -0400)]
Fix for cust field
Mathieu Lu [Wed, 21 Jul 2021 17:27:16 +0000 (13:27 -0400)]
Merge pull request #20904 from mattwire/pcpcurrency
Display configured currency on PCPPage instead of default
colemanw [Wed, 21 Jul 2021 14:58:13 +0000 (10:58 -0400)]
Merge pull request #20920 from eileenmcnaughton/cleanup2
Add check to see if these indices are actually removed + call the function which should
colemanw [Wed, 21 Jul 2021 14:19:06 +0000 (10:19 -0400)]
Merge pull request #20868 from eileenmcnaughton/load_acls
[REF] Extract the function to load from the acl table
Eileen McNaughton [Fri, 16 Jul 2021 07:07:03 +0000 (19:07 +1200)]
Extract getCurrentMembership
Note I've moved the fixmembershipStatusBeforeRenew here - it is just compensating for the possibility of
the job not being run. On the Membership form we run it in preProcess but this feels like our first
chance in this form
Mathieu Lutfy [Wed, 21 Jul 2021 12:42:04 +0000 (08:42 -0400)]
Fix 'includes tax' translation for PriceSet Checkbox fields
Eileen McNaughton [Fri, 16 Jul 2021 03:17:10 +0000 (15:17 +1200)]
[REF] Extract the function to load from the acl table
demeritcowboy [Wed, 21 Jul 2021 11:58:12 +0000 (07:58 -0400)]
linemode not needed
Seamus Lee [Wed, 21 Jul 2021 11:25:26 +0000 (21:25 +1000)]
Merge pull request #20854 from eileenmcnaughton/response
Remove obsolete code
Monish Deb [Wed, 21 Jul 2021 11:22:00 +0000 (16:52 +0530)]
Reduce deadlock while inserting custom data from Address
Seamus Lee [Wed, 21 Jul 2021 11:14:35 +0000 (21:14 +1000)]
Merge pull request #20911 from colemanw/select2css
Greenwich - fix select2 font size
Tim Otten [Wed, 21 Jul 2021 09:23:29 +0000 (02:23 -0700)]
CRM_Utils_Type::validatePhpType - Helper to validate PHP type expressions
Eileen McNaughton [Wed, 21 Jul 2021 01:45:15 +0000 (13:45 +1200)]
Add check to see if these indices are actually removed
This check for indices seems to be much more reliable - the question is whether we can
run it against a range of dbs to confirm
Eileen McNaughton [Wed, 21 Jul 2021 04:09:52 +0000 (16:09 +1200)]
Merge pull request #20913 from colemanw/fixCapitalizationOfSqlFunction
Capitalization Fix
Coleman Watts [Wed, 21 Jul 2021 01:53:08 +0000 (21:53 -0400)]
Capitalization Fix
Coleman Watts [Wed, 21 Jul 2021 01:14:22 +0000 (21:14 -0400)]
Greenwich - fix select2 font size
Coleman Watts [Wed, 21 Jul 2021 01:03:27 +0000 (21:03 -0400)]
SearchKit - Refactor pick-lists to use onCrmUiSelect directive
Eileen McNaughton [Tue, 20 Jul 2021 23:34:05 +0000 (11:34 +1200)]
Merge pull request #20908 from colemanw/fixApiCalculatedBridgeFields
APIv4 - Fix calculated fields in bridge entities
Coleman Watts [Mon, 12 Jul 2021 23:45:35 +0000 (19:45 -0400)]
Distinguish custom field VIEW from EDIT permissions
Before: CustomGroup ACLs made no distinction between VIEW and EDIT
After: User with VIEW can see a custom group but not edit it, both in the UI and the API.
Coleman Watts [Tue, 20 Jul 2021 16:24:20 +0000 (12:24 -0400)]
APIv4 - Fix calculated fields in bridge entities
Fixes a crash-inducing bug in the use of calculated fields on a bridge entity,
such as RelationshipCache.is_current.
colemanw [Tue, 20 Jul 2021 14:04:42 +0000 (10:04 -0400)]
Merge pull request #20886 from colemanw/searchKitRelationshipLinks
SearchKit - Add links to view/edit/delete relationships
Seamus Lee [Tue, 20 Jul 2021 08:16:32 +0000 (18:16 +1000)]
Merge pull request #20866 from totten/master-pathmove
CRM_Utils_Array::pathMove - Add helper to move an item within array tree
Seamus Lee [Tue, 20 Jul 2021 02:50:20 +0000 (12:50 +1000)]
Merge pull request #20906 from eileenmcnaughton/api4
Add test & fix for failing OR clause in apv4
Seamus Lee [Tue, 20 Jul 2021 01:26:31 +0000 (11:26 +1000)]
Merge pull request #20900 from colemanw/angularTraits
[REF] Refactor SearchKit displays to inherit traits from a common base
Eileen McNaughton [Tue, 20 Jul 2021 01:14:30 +0000 (13:14 +1200)]
Add test for failing OR clause
This fails because when the field is being concatenated like
`a`.`first_name`='x' OR`a`.`last_name`='x'
The lack of a space between OR and `a` is fugly but it
is parsed by mysql. However, when the value requires utf8mb4
to be supported to do the comparison it returns '0=1' if the
database does not support utf8mb (or it thinks it doesn't per
0 = 1 OR0 = 1
Seamus Lee [Mon, 19 Jul 2021 23:43:28 +0000 (09:43 +1000)]
Merge pull request #20870 from totten/master-tokensmarty
(REF) Extract TokenSmarty::render() from MessageTemplate::renderMessageTemplate()
Seamus Lee [Mon, 19 Jul 2021 23:43:13 +0000 (09:43 +1000)]
Merge pull request #20895 from demeritcowboy/test-upper
[NFC/Unit test] - Test for #20892 - New smarty plugin crmUpper
Seamus Lee [Mon, 19 Jul 2021 22:51:23 +0000 (08:51 +1000)]
Merge pull request #20887 from demeritcowboy/lazytests
[NFC/Unit test] ReportTemplateTest - fix tests that assume setup from a separate test
Matthew Wire [Mon, 19 Jul 2021 22:36:11 +0000 (23:36 +0100)]
Display configured currency on PCPPage instead of default
demeritcowboy [Mon, 19 Jul 2021 21:35:30 +0000 (17:35 -0400)]
Merge pull request #20892 from seamuslee001/utf8mb4_smarty_upper
[REF] Add in smarty modifier to replcae the upper smarty modifier to …