demeritcowboy [Sat, 17 Jul 2021 03:40:39 +0000 (23:40 -0400)]
fix tests that assume setup from a separate test
colemanw [Sat, 17 Jul 2021 03:32:12 +0000 (23:32 -0400)]
Merge pull request #20850 from eileenmcnaughton/int
Use type hinting for id
colemanw [Sat, 17 Jul 2021 01:41:31 +0000 (21:41 -0400)]
Merge pull request #20848 from eileenmcnaughton/dep
Remove deprecated code
colemanw [Sat, 17 Jul 2021 01:40:19 +0000 (21:40 -0400)]
Merge pull request #20853 from eileenmcnaughton/auth
Remove never-true-if
colemanw [Sat, 17 Jul 2021 01:07:54 +0000 (21:07 -0400)]
Merge pull request #20881 from eileenmcnaughton/batch2
Remove non-variable variables
Tim Otten [Fri, 16 Jul 2021 21:54:32 +0000 (14:54 -0700)]
Merge pull request #20879 from colemanw/fixOnCrmUiSelect
Fix onCrmUiSelect to use current scope and apply to the digest cycle
Eileen McNaughton [Fri, 16 Jul 2021 20:50:22 +0000 (08:50 +1200)]
Merge pull request #20878 from colemanw/fixSearchKitCount
SearchKit - Fix pager count return value
Eileen McNaughton [Fri, 16 Jul 2021 20:26:25 +0000 (08:26 +1200)]
Remove non-variable variables
Coleman Watts [Fri, 16 Jul 2021 19:11:36 +0000 (15:11 -0400)]
Fix onCrmUiSelect to use current scope and apply to the digest cycle
Evaluates expression in current scope rather than parent scope,
and uses $scope.$apply.
demeritcowboy [Fri, 16 Jul 2021 19:07:03 +0000 (15:07 -0400)]
Merge pull request #20871 from eileenmcnaughton/val
[Ref] Remove never-passed parameter
Coleman Watts [Fri, 16 Jul 2021 16:03:25 +0000 (12:03 -0400)]
SearchKit - Fix pager count return value
colemanw [Fri, 16 Jul 2021 15:10:30 +0000 (11:10 -0400)]
Merge pull request #20874 from eileenmcnaughton/batch
[REF] Remove some non-variable variables
Matthew Wire [Fri, 16 Jul 2021 14:20:42 +0000 (15:20 +0100)]
Merge pull request #20864 from eileenmcnaughton/tok
dev/core#2650 Add support for contribution_status_id to the token processor
demeritcowboy [Fri, 16 Jul 2021 12:06:02 +0000 (08:06 -0400)]
Merge pull request #20801 from eileenmcnaughton/upg
Enotice fix on extensions page
Yashodha Chaku [Fri, 16 Jul 2021 11:26:26 +0000 (16:56 +0530)]
Merge pull request #20873 from eileenmcnaughton/remove_dep
Remove deprecated lines of code
Eileen McNaughton [Fri, 16 Jul 2021 00:59:06 +0000 (12:59 +1200)]
dev/core#2650 Add support for contribution_status_id to the processor
Per https://lab.civicrm.org/dev/core/-/issues/2650 the goal is to get the
token processor (for each entity, in this case contributions) to be processing fields
in the same way as the legacy processor does and for this to be thoroughly tested.
This allows us to expose the token processor classes to message template processing
and use them interchangeably, with an eventual goal of migrating over.
It turns out that althought 'Contribution Status ID' is exposed in the UI
for scheduled reminders it did not work. This left us open to simply add the
token contribution.contribution_status_id and add tests.
Per 2650 the handling of pseudoconstants is inconsistent but our preferred goal
is that they would follow apiv4 style syntax and that the actual field name
would hold the actual field value.
Although the token processor exposes a value 'status' - it seems this is likely never
actually exposed to the user and is probably unused.
We can come back to how to deprecate & remove
Eileen McNaughton [Fri, 16 Jul 2021 10:40:06 +0000 (22:40 +1200)]
Merge pull request #20876 from eileenmcnaughton/cust
Api test cleanup fixes
Eileen McNaughton [Fri, 16 Jul 2021 08:25:01 +0000 (20:25 +1200)]
Api test cleanup fixes
Eileen McNaughton [Fri, 16 Jul 2021 06:52:13 +0000 (18:52 +1200)]
[REF] Remove some non-variable variables
This previously shared function has parameters that are hard set to a specific value.
Most notably pending is set to FALSE - this removes all references to pending from the function
Monish Deb [Fri, 16 Jul 2021 06:36:16 +0000 (12:06 +0530)]
Merge pull request #20791 from eileenmcnaughton/batch_renew
[REF] Simplify isRenew handling on batch for membership
Eileen McNaughton [Fri, 16 Jul 2021 06:22:47 +0000 (18:22 +1200)]
Remove deprecated lines of code
Eileen McNaughton [Fri, 16 Jul 2021 05:55:57 +0000 (17:55 +1200)]
[Ref] Remove never-passed parameter
this function is called from only one place & it does not pass in financialTrxnValues
Eileen McNaughton [Fri, 16 Jul 2021 05:23:18 +0000 (17:23 +1200)]
Merge pull request #20820 from eileenmcnaughton/tpl
dev/core#2684 Fix filters tpl in civi reports to permit more than one table in a grouping
Monish Deb [Fri, 16 Jul 2021 02:52:51 +0000 (08:22 +0530)]
Merge pull request #20829 from eileenmcnaughton/order
[REF] Further order api cleanup
colemanw [Fri, 16 Jul 2021 01:20:53 +0000 (21:20 -0400)]
Merge pull request #20863 from eileenmcnaughton/api4
Fix v4 api to do custom field delete in tearDown
Eileen McNaughton [Thu, 15 Jul 2021 22:44:34 +0000 (10:44 +1200)]
Fix v4 api to do custom field delete in tearDown
This existing efforts are wrong because
1) the delete has to go in the tearDown not the clean up
2) it is rigid about the custom group table name - which
will get us into problems as the name can be set and we
should be ensuring that it can in our tests
demeritcowboy [Thu, 15 Jul 2021 21:10:18 +0000 (17:10 -0400)]
Merge pull request #20578 from eileenmcnaughton/admin_data
Give administer CiviCRM data access to administer custom groups
Eileen McNaughton [Fri, 9 Jul 2021 01:46:51 +0000 (13:46 +1200)]
dev/core#2684 Fix filters tpl in civi reports to permit more than one table in a grouping
Eileen McNaughton [Thu, 15 Jul 2021 20:57:34 +0000 (08:57 +1200)]
Merge pull request #20860 from civicrm/5.40
5.40 to master
Eileen McNaughton [Thu, 15 Jul 2021 20:57:05 +0000 (08:57 +1200)]
Merge pull request #20859 from agh1/5.40.0-releasenotes-initial
5.40.0 release notes initial run
Andrew Hunt [Thu, 15 Jul 2021 19:29:30 +0000 (15:29 -0400)]
5.40.0 release notes: added boilerplate
Andrew Hunt [Thu, 15 Jul 2021 19:26:09 +0000 (15:26 -0400)]
5.40.0 release notes: raw from script
Eileen McNaughton [Thu, 15 Jul 2021 01:32:10 +0000 (13:32 +1200)]
Merge pull request #20840 from colemanw/membershipTypeAutoRenewFix
APIv4 - Fix output of membershipType auto_renew field
Eileen McNaughton [Thu, 15 Jul 2021 01:14:48 +0000 (13:14 +1200)]
Merge pull request #20852 from eileenmcnaughton/paypal
[REF] [towards dev/core#2693] Use getter rather than passing variable
Seamus Lee [Thu, 15 Jul 2021 00:51:14 +0000 (10:51 +1000)]
Merge pull request #20849 from civicrm/5.40
5.40
Eileen McNaughton [Thu, 15 Jul 2021 00:32:34 +0000 (12:32 +1200)]
Remove never-true-if
This code is in the recur() function. the lines immediately before this function ensure contribution->contribution_status_id
is unset if it is 1 - meaning this if can never be true
Eileen McNaughton [Thu, 15 Jul 2021 00:24:33 +0000 (12:24 +1200)]
Merge pull request #20847 from eileenmcnaughton/ref
Minor simplification - use casting
colemanw [Thu, 15 Jul 2021 00:18:27 +0000 (20:18 -0400)]
Merge pull request #20718 from eileenmcnaughton/ipn
[REF] Minor auth.net ipn simplification
Eileen McNaughton [Thu, 15 Jul 2021 00:07:28 +0000 (12:07 +1200)]
Merge pull request #20844 from demeritcowboy/report-rectype
dev/core#2691 - On logging detail civireport show words instead of numbers
Eileen McNaughton [Wed, 14 Jul 2021 23:47:43 +0000 (11:47 +1200)]
[REF] Use getter rather than passing variable
txnType is a required parameter for recurring & unused for single. This switches to retrieving
it as needed rather than passing it around. It removes one check for whether it is
set because the abort will exit if not
Eileen McNaughton [Wed, 14 Jul 2021 22:45:21 +0000 (10:45 +1200)]
Use type hinting for id
This clarifies that the id must be an integer (0 for anonymous)
Function is only called from one place
Seamus Lee [Wed, 14 Jul 2021 22:41:09 +0000 (08:41 +1000)]
Merge pull request #20846 from colemanw/fixCkEditorExtension
CKEditor - Fix .tpl insertion on every form
Eileen McNaughton [Wed, 14 Jul 2021 22:40:02 +0000 (10:40 +1200)]
Remove deprecated code
We deprecated NOT passing an id into the function in 2018 - this removes
Note I double checked - if you pass in '2' to a strict casting of int
it accepts it and casts to int
Eileen McNaughton [Wed, 14 Jul 2021 22:30:15 +0000 (10:30 +1200)]
Minor simplification
Eileen McNaughton [Wed, 14 Jul 2021 20:12:36 +0000 (08:12 +1200)]
Merge pull request #20843 from demeritcowboy/smartyreptable
Smarty notices - Missing type on logging civireport
colemanw [Wed, 14 Jul 2021 18:52:35 +0000 (14:52 -0400)]
Merge pull request #20768 from eileenmcnaughton/mem_type_acl
dev/core#2115 Switch membership type browse page to use v4api for get, thus using acls properly
Coleman Watts [Wed, 14 Jul 2021 18:45:58 +0000 (14:45 -0400)]
CKEditor - Fix .tpl insertion on every form
colemanw [Wed, 14 Jul 2021 18:28:13 +0000 (14:28 -0400)]
Merge pull request #20842 from in2part/add-to-contributors-file
Add to contributors file
colemanw [Wed, 14 Jul 2021 18:27:29 +0000 (14:27 -0400)]
Merge pull request #20821 from colemanw/afformBeta
Mark afform extensions as beta
Coleman Watts [Tue, 13 Jul 2021 14:44:29 +0000 (10:44 -0400)]
APIv4 - Fix output of membershipType auto_renew field.
The field had been declared a "boolean" in the schema, which at a SQL level
is exactly the same as "tinyint" but it was resulting in incorrect API output.
demeritcowboy [Wed, 14 Jul 2021 15:32:11 +0000 (11:32 -0400)]
show words instead of numbers
demeritcowboy [Wed, 14 Jul 2021 15:06:05 +0000 (11:06 -0400)]
missing type
Mads Mitchell [Wed, 14 Jul 2021 09:19:21 +0000 (12:19 +0300)]
Add to contributors file
Seamus Lee [Wed, 14 Jul 2021 00:16:58 +0000 (10:16 +1000)]
Merge pull request #20839 from in2part/fix-typo-in-social-buttons
Fix a typo in social networking buttons
Eileen McNaughton [Tue, 13 Jul 2021 20:09:31 +0000 (08:09 +1200)]
Merge pull request #20833 from colemanw/customPerm
CustomGroup - change admin permission to 'administer CiviCRM data'
demeritcowboy [Tue, 13 Jul 2021 19:41:44 +0000 (15:41 -0400)]
Merge pull request #20834 from colemanw/fixUnusedVars
[REF] Remove unused variables
Coleman Watts [Mon, 12 Jul 2021 18:32:44 +0000 (14:32 -0400)]
Remove unused variables
Mads Mitchell [Tue, 13 Jul 2021 13:08:01 +0000 (16:08 +0300)]
Fix a typo in social networking buttons
Monish Deb [Tue, 13 Jul 2021 05:40:07 +0000 (11:10 +0530)]
Merge pull request #20831 from eileenmcnaughton/order_part
Remove a couple of instances of 'contribution_mode' from tests
Monish Deb [Tue, 13 Jul 2021 05:38:56 +0000 (11:08 +0530)]
Merge pull request #20775 from eileenmcnaughton/loadlines
Deprecate guess work in line item handling
Eileen McNaughton [Mon, 12 Jul 2021 02:51:10 +0000 (14:51 +1200)]
[REF] Further order api cleanup
Eileen McNaughton [Sun, 20 Jun 2021 21:16:08 +0000 (09:16 +1200)]
Deprecate guess work in processPriceSet
Testing to see how much of this we can deprecate - line items should
be 'complete' before reaching the processing function
Monish Deb [Tue, 13 Jul 2021 03:31:18 +0000 (09:01 +0530)]
Merge pull request #20784 from eileenmcnaughton/pay_fix
Fixes getTemplateContribution to use a more reliable way to load line items
Seamus Lee [Tue, 13 Jul 2021 01:42:41 +0000 (11:42 +1000)]
Merge pull request #20838 from civicrm/5.40
5.40
Eileen McNaughton [Mon, 12 Jul 2021 23:50:25 +0000 (11:50 +1200)]
Merge pull request #20836 from seamuslee001/dev_rc_13
Resolve dev/rc#13 by permitting civi.setupui events to be dispatched …
Seamus Lee [Mon, 12 Jul 2021 21:58:25 +0000 (07:58 +1000)]
Resolve dev/rc#13 by permitting civi.setupui events to be dispatched during install
Seamus Lee [Mon, 12 Jul 2021 21:52:57 +0000 (07:52 +1000)]
Merge pull request #20587 from eileenmcnaughton/rr
dev/core#2648 update redis class off deprecated functions
Coleman Watts [Mon, 12 Jul 2021 16:02:24 +0000 (12:02 -0400)]
CustomGroup - change admin permission to 'administer CiviCRM data'
This permission is a subset of 'administer CiviCRM' and is more precise,
allowing finer-grained admin permissions.
Eileen McNaughton [Mon, 12 Jul 2021 10:54:56 +0000 (22:54 +1200)]
Remove a couple of instances of 'contribution_mdoe' from tests
This should not be required - we should pass in correct line items....
Eileen McNaughton [Sun, 4 Jul 2021 23:36:39 +0000 (11:36 +1200)]
Switch membership type to use apiv4
url is civicrm/admin/member/membershipType?reset=1
test cover in https://github.com/civicrm/civicrm-core/pull/20761
Eileen McNaughton [Mon, 12 Jul 2021 10:18:13 +0000 (22:18 +1200)]
Merge pull request #20830 from eileenmcnaughton/ttp
E-notice fix
Eileen McNaughton [Mon, 12 Jul 2021 10:17:48 +0000 (22:17 +1200)]
Merge pull request #20650 from eileenmcnaughton/partorder
Enable check on created participant payment rows
Seamus Lee [Mon, 12 Jul 2021 09:05:50 +0000 (19:05 +1000)]
Merge pull request #20799 from colemanw/filterByPrefix
APIv4 - Fix pseudoconstant matching reliability across joins
Eileen McNaughton [Mon, 12 Jul 2021 08:30:48 +0000 (20:30 +1200)]
Merge pull request #20828 from colemanw/tplFix
Fix undefined tpl vars
Eileen McNaughton [Mon, 12 Jul 2021 08:11:31 +0000 (20:11 +1200)]
E-notice fix
Eileen McNaughton [Fri, 18 Jun 2021 04:10:35 +0000 (16:10 +1200)]
Enable check on created participant payment rows
Extend participant check
Monish Deb [Mon, 12 Jul 2021 05:45:48 +0000 (11:15 +0530)]
Merge pull request #20670 from eileenmcnaughton/reg
Fix transfer registration to transfer participant_payment row
Eileen McNaughton [Tue, 6 Jul 2021 18:54:32 +0000 (06:54 +1200)]
Fixes getTemplateContribution to use a more reliable way to load line items
My efforts to add testing a 'deprecate weird stuff' have identified an odd and fragile
flow for the line items in getTemplateContribution. It calls
getLineItemsByContributionID which, as it turns out, substitues the
actual entity table with 'civicrm_contribution'.
Then this line of weird handling swoops in and saves the day.
https://github.com/civicrm/civicrm-core/pull/20775/files#diff-a16d4d7449cf5f3a0616d1d282a32f27ab6d3f7d2726d076c02ad1d4d655af41R393
This switches us to something cleaner than just loads the line items (with v4 LineItem.get) and
no weird handling
Seamus Lee [Mon, 12 Jul 2021 02:30:53 +0000 (12:30 +1000)]
Merge pull request #20826 from civicrm/5.40
Merge 5.40 to master
Coleman Watts [Mon, 12 Jul 2021 01:17:20 +0000 (21:17 -0400)]
Fix undefined tpl vars
colemanw [Mon, 12 Jul 2021 01:09:16 +0000 (21:09 -0400)]
Merge pull request #20827 from eileenmcnaughton/tpl3
tpl enotice fix
Eileen McNaughton [Fri, 11 Jun 2021 05:52:24 +0000 (17:52 +1200)]
Give administer CiviCRM data access to administer custom groups
Eileen McNaughton [Sun, 11 Jul 2021 23:02:05 +0000 (11:02 +1200)]
tpl enotice fix
Eileen McNaughton [Sat, 19 Jun 2021 03:22:55 +0000 (15:22 +1200)]
Fix transfer registration to transfer participant_payment row
colemanw [Sun, 11 Jul 2021 21:49:41 +0000 (17:49 -0400)]
Merge pull request #20818 from sadashivdalvi/crm-2685
Fix for issue 2685
colemanw [Sun, 11 Jul 2021 21:47:07 +0000 (17:47 -0400)]
Merge pull request #20824 from colemanw/fixUpdateOperators
SearchKit - Fix reloading a search with an OR group in the WHERE clause
Coleman Watts [Sun, 11 Jul 2021 19:43:20 +0000 (15:43 -0400)]
SearchKit - Fix reloading a search with an OR group in the WHERE clause
Fixes dev/report#71
Eileen McNaughton [Sun, 11 Jul 2021 02:34:20 +0000 (14:34 +1200)]
Merge pull request #20315 from mattwire/recaptchahelpers
(REF) dev/core#2571 - Add helper functions for reCAPTCHA extension
Coleman Watts [Fri, 9 Jul 2021 22:16:55 +0000 (18:16 -0400)]
Mark afform extensions as beta
Matthew Wire [Sun, 16 May 2021 19:07:21 +0000 (20:07 +0100)]
Add helper functions for reCAPTCHA extension
colemanw [Fri, 9 Jul 2021 15:08:51 +0000 (11:08 -0400)]
Merge pull request #20817 from colemanw/fixBasicGetColor
APIv4 - Fix dumb typo breaking color lookup
colemanw [Fri, 9 Jul 2021 15:08:35 +0000 (11:08 -0400)]
Merge pull request #20816 from colemanw/optionsPageFixes
PHP notice fixes on options page
Matthew Wire [Fri, 9 Jul 2021 10:32:21 +0000 (11:32 +0100)]
Merge pull request #20399 from jaapjansma/dev_2624_2
dev/core#2624 display line items from the template contribution at the view recurring contribution screen.
sadashiv [Fri, 9 Jul 2021 03:38:55 +0000 (09:08 +0530)]
Fix for issue 2685
Seamus Lee [Fri, 9 Jul 2021 08:19:28 +0000 (18:19 +1000)]
Merge pull request #20819 from seamuslee001/fix_apiv4_syntaxtests
[REF] Add in APIv4 Product Entity and Fix APIv4 Syntax Conformance te…
Seamus Lee [Fri, 9 Jul 2021 04:13:05 +0000 (14:13 +1000)]
[REF] Add in APIv4 Product Entity and Fix APIv4 Syntax Conformance test failures on ContributionProduct and EntityBatch APIs
update version
Coleman Watts [Fri, 9 Jul 2021 00:38:51 +0000 (20:38 -0400)]
Fix dumb typo breaking color lookup
Coleman Watts [Fri, 9 Jul 2021 00:04:19 +0000 (20:04 -0400)]
PHP notice fixes on options page
Eileen McNaughton [Thu, 8 Jul 2021 23:00:05 +0000 (11:00 +1200)]
Merge pull request #20815 from civicrm/5.40
5.40 to master
Eileen McNaughton [Thu, 8 Jul 2021 22:59:34 +0000 (10:59 +1200)]
Merge pull request #20814 from seamuslee001/dev_core_2680
dev/core#2680 Remove rows in the civicrm_contribution_product table t…