Coleman Watts [Thu, 30 Apr 2020 19:14:07 +0000 (15:14 -0400)]
APIv4 - Improve pseudoconstants in HAVING and Explorer
Coleman Watts [Fri, 24 Apr 2020 17:50:26 +0000 (13:50 -0400)]
APIv4 - Allow field options to be returned in multiple formats
Seamus Lee [Thu, 30 Apr 2020 22:46:46 +0000 (08:46 +1000)]
Merge pull request #17209 from civicrm/5.25
5.25
Seamus Lee [Thu, 30 Apr 2020 22:45:39 +0000 (08:45 +1000)]
Merge pull request #17208 from seamuslee001/5.25
Update 5.24.6.md
Tim Otten [Thu, 30 Apr 2020 22:42:44 +0000 (15:42 -0700)]
Update 5.24.6.md
Seamus Lee [Thu, 30 Apr 2020 22:33:14 +0000 (08:33 +1000)]
Merge pull request #17207 from civicrm/5.25
5.25
Eileen McNaughton [Thu, 30 Apr 2020 22:32:06 +0000 (10:32 +1200)]
Merge pull request #17205 from colemanw/noMultiJoins
APIv4 - Don't advertise implicit multi-joins in Explorer
Seamus Lee [Thu, 30 Apr 2020 22:30:24 +0000 (08:30 +1000)]
Merge pull request #17206 from seamuslee001/5.25
5.24.6 Release Notes
Tim Otten [Thu, 30 Apr 2020 21:52:58 +0000 (14:52 -0700)]
Update release-notes/5.24.6
Tim Otten [Thu, 30 Apr 2020 03:04:31 +0000 (20:04 -0700)]
Add release-notes/5.24.6.md
Seamus Lee [Thu, 30 Apr 2020 22:02:58 +0000 (08:02 +1000)]
Merge pull request #17201 from civicrm/5.25
5.25
colemanw [Thu, 30 Apr 2020 20:17:12 +0000 (16:17 -0400)]
Merge pull request #17176 from eileenmcnaughton/batch1
Move batch-form support code back to the form
Coleman Watts [Thu, 30 Apr 2020 20:09:12 +0000 (16:09 -0400)]
APIv4 - Don't advertise implicit multi-joins in Explorer
These joins are problematic and may be removed. The Explorer should not display them.
colemanw [Thu, 30 Apr 2020 19:26:53 +0000 (15:26 -0400)]
Merge pull request #17195 from eileenmcnaughton/act_report2
[REF] Simplify determination of enabled components
Seamus Lee [Thu, 30 Apr 2020 07:17:16 +0000 (17:17 +1000)]
Merge pull request #17200 from eileenmcnaughton/rep
dev/core#1729 Fix filters skipping on activity report
eileen [Thu, 30 Apr 2020 04:19:34 +0000 (16:19 +1200)]
dev/core#1729 Fix filters skipping onn activity report
Seamus Lee [Thu, 30 Apr 2020 04:08:36 +0000 (14:08 +1000)]
Merge pull request #17190 from mattwire/contributionpageselectedchildfromactions
dev/core#1738 Fix opening specific contribution page tab from Manage Contribution Pages
Seamus Lee [Thu, 30 Apr 2020 03:48:29 +0000 (13:48 +1000)]
Merge pull request #17199 from seamuslee001/new_master
5.25
Seamus Lee [Thu, 30 Apr 2020 03:46:42 +0000 (13:46 +1000)]
merge in 5.25
Seamus Lee [Thu, 30 Apr 2020 03:42:51 +0000 (13:42 +1000)]
Merge pull request #17188 from totten/5.25-contrib-virt-itemcanon
Fix loading, saving, and upgrade of CiviContribute settings
Seamus Lee [Thu, 30 Apr 2020 03:42:20 +0000 (13:42 +1000)]
Merge pull request #17194 from eileenmcnaughton/act_report
[REF] stop overriding postProcess function in activity report detail
eileen [Thu, 30 Apr 2020 02:17:00 +0000 (14:17 +1200)]
[REF] stop overriding postProcess function in activity report detail
The function is the same as master except one extra thing that can be done in the function intended for
report-specific preProcess overrides
eileen [Thu, 30 Apr 2020 02:30:26 +0000 (14:30 +1200)]
[REF] Simplify determination of enabled components
Tim Otten [Thu, 30 Apr 2020 01:23:40 +0000 (18:23 -0700)]
testHandlingOfContributionInvoiceSetting() - More realistic data+assertion
In practice, for the old setting `contribution_invoice_settings`, the
`invoicing` property could take one of two values:
1. If enabled, the value is an array with trueish subkey: `['invoicing'=>['invoicing'=>1]]`
2. If disabled, the value is a numeric `0`: `['invoicing'=>0]`
Following this means better compatibility.
The format is counter-intuitive, and the unit-test sets the value to enabled
using a more intuitive format (`['invoicing'=>1]`). It's currently valid to
`set()` this way, but `get()`ting the value produces the
more-compatible/historical format.
Tim Otten [Wed, 29 Apr 2020 04:54:12 +0000 (21:54 -0700)]
dev/core#1724 - Backward-compatible handling of 'contribution_invoice_settings.invoicing'
In the old setting `contribution_invoice_settings`, the `invoicing`
property (aka "CiviContribute Component Settings" => "Enable Tax and
Invoicing") could take one of two values:
1. If enabled, it's an array with trueish subkey: `['invoicing'=>1]`
2. If disabled, it's a numeric zero.
This encoding is weird, and `contribution_invoice_settings` is generally deprecated
and has been replaced by a virtual rendition which needs to be consistent with the
old representation -- so that a couple-dozen things continue working.
For testing, it helped me to try these commands at different points:
```
cv ev 'return CRM_Invoicing_Utils::isInvoicingEnabled();'
cv api setting.get return=invoicing
cv api setting.get return=contribution_invoice_settings
select * from civicrm_setting where name like 'contrib%' or name like 'invoic%';
```
Tim Otten [Wed, 29 Apr 2020 00:40:03 +0000 (17:40 -0700)]
FiveTwentyFive - Convert settings during upgrade
Consider this use-case:
* Install 5.22
* Configure `CiviContribute Component Settings`
* Upgrade to 5.25.beta
The settings are lost during the upgrade.
Tim Otten [Wed, 29 Apr 2020 23:34:28 +0000 (16:34 -0700)]
Set version to 5.25.beta3
colemanw [Wed, 29 Apr 2020 13:55:59 +0000 (09:55 -0400)]
Merge pull request #17068 from colemanw/currentPath
[REF] Reconcile CRM_Utils_System::getUrlPath and CRM_Utils_System::currentPath
Matthew Wire [Wed, 29 Apr 2020 10:31:42 +0000 (11:31 +0100)]
Fix opening specific contribution page tab from Manage Contribution Pages
Seamus Lee [Wed, 29 Apr 2020 09:34:59 +0000 (19:34 +1000)]
Merge pull request #17125 from eileenmcnaughton/dupe1
Fix Dedupe entity_tag mangling bug
Eileen McNaughton [Wed, 29 Apr 2020 02:26:19 +0000 (14:26 +1200)]
Merge pull request #17187 from alexymik/recur_contribution_source
Add contribution source to recurring contribution report
Eileen McNaughton [Wed, 29 Apr 2020 01:03:23 +0000 (13:03 +1200)]
Merge pull request #17186 from demeritcowboy/gitlab-issue-template
Gitlab issue template - Ask for link to stackexchange or chat conversations
Tim Otten [Tue, 28 Apr 2020 22:33:33 +0000 (15:33 -0700)]
dev/core#1724 - Fix defaults for invoice-related settings
The default values were previously stored in 'contribution_invoice_settings', but
the updates are stored in individual settings, which makes it difficult to reconcile
the default values and explicit values.
With this revision, 'contribution_invoice_settings' is strictly virtual, and
all the other settings (like 'invoice_due_date') are canonical.
Tim Otten [Tue, 28 Apr 2020 21:14:45 +0000 (14:14 -0700)]
(REF) dev/core#1724 - SettingsBag - Convert to computeVirtual/updateVirtual
The `SettingsBag` uses the `$combined` property to (locally) cache a full
view of the active settings (based on combining different layers of data --
default-values, explicit-values, and mandatory-values). This design is
good for read-mostly data.
This patch changes the `__ContributionSettings` to be another layer in the
construction of `$combined` -- the virtual-values layer. It fixes issues
wherein:
1. The virtual value is recomputed during every call to `get($key)`.
2. The virtual value is only based on explicit-values -- it disregards
default-values and mandatory-values.
Tim Otten [Tue, 28 Apr 2020 21:24:34 +0000 (14:24 -0700)]
dev/core#1724 - SettingsBagTest - Add coverage for contribution_invoice_settings
Alexy Mikhailichenko [Tue, 28 Apr 2020 20:55:51 +0000 (13:55 -0700)]
Add contribution source to recurring contribution report
demeritcowboy [Tue, 28 Apr 2020 20:35:40 +0000 (16:35 -0400)]
ask for link to external conversations
colemanw [Tue, 28 Apr 2020 13:04:49 +0000 (09:04 -0400)]
Merge pull request #17182 from eileenmcnaughton/dep
Remove deprecated calls to optionValueQuery and no-longer-need param
Eileen McNaughton [Tue, 28 Apr 2020 10:40:41 +0000 (22:40 +1200)]
Merge pull request #17177 from mattwire/showsendreceiptonrecurdetail
Show email receipt status on view recurring contribution
eileen [Tue, 28 Apr 2020 08:57:15 +0000 (20:57 +1200)]
Remove deprecated calls to optionValueQuery and no-longer-need param
All calls to optionValueQuery that don't pass have been deprecated for well over a year. We can remove them now,
and hence the handling of
eileen [Tue, 28 Apr 2020 07:38:57 +0000 (19:38 +1200)]
dev/core#1724 Fix Changes to CiviContribute Component Settings not saved
It seems that, depending on the order in which settings are loaded, this is not always populated. Moving it here
addresses, although medium term we should address all references to it
Eileen McNaughton [Tue, 28 Apr 2020 06:39:26 +0000 (18:39 +1200)]
Merge pull request #17127 from totten/master-dispatch-policy
dev/core#1460 - CiviEventDispatcher - Add policy options
colemanw [Tue, 28 Apr 2020 00:31:38 +0000 (20:31 -0400)]
Merge pull request #17129 from eileenmcnaughton/email2
Switch cc field on emailTrait to use entity reference
Matthew Wire [Mon, 27 Apr 2020 22:40:07 +0000 (23:40 +0100)]
Display email receipt status on recur details
Matthew Wire [Mon, 27 Apr 2020 22:39:53 +0000 (23:39 +0100)]
Convert view recurring contribution to use EntityPageTrait
eileen [Mon, 27 Apr 2020 22:34:21 +0000 (10:34 +1200)]
Move batch-form support code back to the form
I've dug around onn this and there is no reason for this code to be in the BAO - it is only
relevant to support this form & should live there. Longer term the form should call
api v4....
colemanw [Mon, 27 Apr 2020 17:31:48 +0000 (13:31 -0400)]
Merge pull request #17174 from pradpnayak/ruleTitle
show title on status message instead machine name
Matthew Wire [Mon, 27 Apr 2020 16:17:13 +0000 (17:17 +0100)]
Merge pull request #16882 from wmortada/wp#46
dev/wp#46 - Remove styling that attempts to make inputs match select2
Matthew Wire [Mon, 27 Apr 2020 13:42:30 +0000 (14:42 +0100)]
Merge pull request #17071 from eileenmcnaughton/payment
Refactor api3 Payment.Get API to support options + most fields in civicrm_financial_trxn
Pradeep Nayak [Mon, 27 Apr 2020 13:16:54 +0000 (14:16 +0100)]
show title on status message instead machine name
Matthew Wire [Thu, 20 Feb 2020 17:15:37 +0000 (17:15 +0000)]
Refactor api3 Payment.Get API to support options + most fields in civicrm_financial_trxn
Unit test for PR#16603
Alternative for fix ups on Payment.get
Eileen McNaughton [Mon, 27 Apr 2020 03:07:28 +0000 (15:07 +1200)]
Merge pull request #17173 from civicrm/5.25
5.25 to master
Eileen McNaughton [Mon, 27 Apr 2020 02:56:09 +0000 (14:56 +1200)]
Merge pull request #17128 from seamuslee001/dev_core_1710
dev/core#1710 Ensure that civicrm_case_activity is properly populated…
Seamus Lee [Tue, 21 Apr 2020 09:21:23 +0000 (19:21 +1000)]
dev/core#1710 Ensure that civicrm_case_activity is properly populated for use by report query when run in force mode
Move table definition into constructor to set alias using standard ways and only rely on the code in the buildQuery to add in the case_id column as necessary
Fix hiding of case_id column
Update to include Case ID column
Matthew Wire [Sun, 26 Apr 2020 21:34:23 +0000 (22:34 +0100)]
Merge pull request #17131 from eileenmcnaughton/batch
Remove unused parameter, immediately overwritten parameter
Matthew Wire [Sun, 26 Apr 2020 21:27:13 +0000 (22:27 +0100)]
Merge pull request #16733 from eileenmcnaughton/smarty
Do not create smarty cached templates for processed greetings
Eileen McNaughton [Sun, 26 Apr 2020 02:45:59 +0000 (14:45 +1200)]
Merge pull request #17171 from civicrm/5.25
5.25
Eileen McNaughton [Sat, 25 Apr 2020 23:24:46 +0000 (11:24 +1200)]
Merge pull request #17170 from colemanw/optionValueDefault
OptionValue - Use DB defaults instead of setting them in BAO::add
Seamus Lee [Sat, 25 Apr 2020 21:18:28 +0000 (07:18 +1000)]
Merge pull request #17164 from pradpnayak/invoicingHidden
Invoice action not shown when invoicing enabled
Pradeep Nayak [Fri, 24 Apr 2020 15:17:06 +0000 (16:17 +0100)]
Invoice action not shown when invoicing enabled
Coleman Watts [Sat, 25 Apr 2020 13:22:21 +0000 (09:22 -0400)]
OptionValue - Use DB defaults instead of setting them in BAO::add
Of the 4 defaults being set in the DAO, 3 already had db defaults; I added DEFAULT NULL for the last.
colemanw [Sat, 25 Apr 2020 13:12:29 +0000 (09:12 -0400)]
Merge pull request #17168 from colemanw/contactFieldPerms
[REF] APIv4 - Enforce contact field permissions via metadata
Eileen McNaughton [Sat, 25 Apr 2020 03:26:38 +0000 (15:26 +1200)]
Merge pull request #17165 from pradpnayak/ActivitySource
Add contribution id as activity source record when downloading or emailing invoice
Eileen McNaughton [Sat, 25 Apr 2020 03:21:22 +0000 (15:21 +1200)]
Merge pull request #17166 from colemanw/optionGroupTitle
Correct option_group pseudoconstant and regenerate dao
colemanw [Sat, 25 Apr 2020 03:14:24 +0000 (23:14 -0400)]
Merge pull request #17161 from eileenmcnaughton/out
[REF] Code readability changes on activity tokens.
Coleman Watts [Fri, 24 Apr 2020 19:32:42 +0000 (15:32 -0400)]
APIv4 - Enforce contact field permissions via metadata instead of class override
Now that 'permission' metadata has been added to the schema, there's no need for specialized code for that field.
This adds generic code to handle any field with permissions declared.
Coleman Watts [Fri, 24 Apr 2020 17:00:04 +0000 (13:00 -0400)]
Correct option_group pseudoconstant and regenerate dao
The option_group_id pseudoconstant was returning the `name` field as both "name" and "label"
whereas the `title` field works better as "label".
Pradeep Nayak [Fri, 24 Apr 2020 15:23:29 +0000 (16:23 +0100)]
activity api accepts name in activity type
Pradeep Nayak [Fri, 24 Apr 2020 15:20:51 +0000 (16:20 +0100)]
Add contribution id as activity source record when downloading or emailing invoice
Eileen McNaughton [Fri, 24 Apr 2020 06:21:11 +0000 (18:21 +1200)]
Merge pull request #17159 from eileenmcnaughton/ids
Less svn
eileen [Fri, 24 Apr 2020 04:33:26 +0000 (16:33 +1200)]
[REF] Code readability changes on activity tokens.
I've been trying to get to grips with this code and this addresses 2 things I found very confusing - notably
- using activityId when we were referring to a fieldname - we use a combination of & for
variables but normally when it's closely related to a query we use activity_id
- the function name getEntityContextSchema() was unclear to me - I concluded that in fact we were retrieving
the nname of the field for the entity ID
Yashodha Chaku [Fri, 24 Apr 2020 04:37:25 +0000 (10:07 +0530)]
Merge pull request #17160 from eileenmcnaughton/out
[REF] Minor extraction
eileen [Fri, 24 Apr 2020 00:31:24 +0000 (12:31 +1200)]
[REF] Minor extraction
Extract the code that renders the generated html it pdfs or word docs
eileen [Thu, 23 Apr 2020 11:33:19 +0000 (23:33 +1200)]
Less svn
Eileen McNaughton [Fri, 24 Apr 2020 00:13:34 +0000 (12:13 +1200)]
Merge pull request #17158 from colemanw/optionNames
OptionValues - Munge custom value names and return names in validate context
Coleman Watts [Thu, 23 Apr 2020 17:58:55 +0000 (13:58 -0400)]
REF - Code cleaup: replace clunky coalesce conditionals with simple coalesce expressions using ??
Coleman Watts [Thu, 23 Apr 2020 17:50:25 +0000 (13:50 -0400)]
OptionValues - Munge custom value names and return names in validate context
Fixes a couple core bugs, where option value names were not being munged by default,
and custom field options were not being returned correctly in the 'validate' context.
This is the core change as part of APIV4 work
See https://lab.civicrm.org/dev/core/-/issues/1705
Yashodha Chaku [Thu, 23 Apr 2020 15:27:15 +0000 (20:57 +0530)]
Merge pull request #17155 from eileenmcnaughton/pdf
[NFC] Superficial code clean up
Eileen McNaughton [Thu, 23 Apr 2020 12:42:52 +0000 (00:42 +1200)]
Merge pull request #17157 from eileenmcnaughton/ids
[NFC] A bit less svn in our code
eileen [Thu, 23 Apr 2020 11:18:05 +0000 (23:18 +1200)]
[NFC] A bit less svn in our code
eileen [Thu, 23 Apr 2020 06:57:54 +0000 (18:57 +1200)]
[NFC] Superficial code clean up
Seamus Lee [Thu, 23 Apr 2020 09:04:06 +0000 (19:04 +1000)]
Merge pull request #17154 from eileenmcnaughton/disp
[REF] Consistently lookup dispatcher via `Civi::dispatcher()`
Seamus Lee [Thu, 23 Apr 2020 07:34:28 +0000 (17:34 +1000)]
Merge pull request #17153 from eileenmcnaughton/acti
Convert test to use APIV4 in setup for cleaner code
eileen [Thu, 23 Apr 2020 06:25:08 +0000 (18:25 +1200)]
[REF] Make instantiation of dispatcher consistent.
We have 3 ways of iniatiging a dispatcher
Civi\Core\Container::singleton()->get('dispatcher')
Civi::service('dispatcher')
Civi::dispatcher()
Tim confirms there is no functional difference, so this consolidates on the shortest one :-)
eileen [Thu, 23 Apr 2020 04:33:24 +0000 (16:33 +1200)]
Convert test to use APIV4 in setup for cleaner code
Eileen McNaughton [Thu, 23 Apr 2020 05:23:27 +0000 (17:23 +1200)]
Merge pull request #17152 from eileenmcnaughton/act2
[NFC] [Test] minor code cleanup
Eileen McNaughton [Thu, 23 Apr 2020 04:31:45 +0000 (16:31 +1200)]
Merge pull request #17138 from colemanw/api4pseudoconstants
dev/core#1705 APIv4 - Support pseudoconstant lookups
eileen [Thu, 23 Apr 2020 03:33:45 +0000 (15:33 +1200)]
[NFC] [Test] minor code cleanup
Seamus Lee [Thu, 23 Apr 2020 02:50:34 +0000 (12:50 +1000)]
Merge pull request #17150 from civicrm/5.25
5.25
Seamus Lee [Thu, 23 Apr 2020 02:48:46 +0000 (12:48 +1000)]
Merge pull request #17149 from seamuslee001/5.25
Add release-notes/5.24.5.md
Tim Otten [Thu, 23 Apr 2020 00:03:35 +0000 (17:03 -0700)]
Add release-notes/5.24.5.md
Coleman Watts [Wed, 22 Apr 2020 21:48:34 +0000 (17:48 -0400)]
APIv4 - Fix contactFieldsToRemove to work with joins and pseudoconstants
Coleman Watts [Mon, 20 Apr 2020 13:00:07 +0000 (09:00 -0400)]
APIv4 - Support pseudoconstant lookups
Appending a suffix to a field name e.g. location_type_id:name or gender_id:label
will automatically lookup values from field option lists.
colemanw [Wed, 22 Apr 2020 15:57:36 +0000 (11:57 -0400)]
Merge pull request #17141 from mlutfy/reportOutput
[NFC]Â Cleanup CRM_Report_Form
Matthew Wire [Wed, 22 Apr 2020 12:33:42 +0000 (13:33 +0100)]
Merge pull request #17136 from demeritcowboy/portugal-provinces
Update more Portugal provinces
eileen [Tue, 21 Apr 2020 05:34:09 +0000 (17:34 +1200)]
Fix Dedupe entity_tag mangling bug
Seamus Lee [Wed, 22 Apr 2020 06:32:08 +0000 (16:32 +1000)]
Merge pull request #17139 from civicrm/5.25
5.25
Seamus Lee [Wed, 22 Apr 2020 03:54:42 +0000 (13:54 +1000)]
Merge pull request #17134 from jitendrapurohit/core-1723-rc
dev/core#1723 - Adv Search - Reciprocal relationship search with custom fields leads to error
Jitendra Purohit [Tue, 21 Apr 2020 11:31:34 +0000 (17:01 +0530)]
RC fix for #17132
unit test fix
eileen [Tue, 21 Apr 2020 10:00:46 +0000 (22:00 +1200)]
Switch cc field on emailTrait to use entity reference