Eileen McNaughton [Wed, 28 Oct 2020 20:14:15 +0000 (09:14 +1300)]
Merge pull request #18306 from mattwire/refactororderapientityparams
Refactor entityParams in Order.Create API so it is easier to understand/modify
Eileen McNaughton [Wed, 28 Oct 2020 20:13:10 +0000 (09:13 +1300)]
Merge pull request #18840 from yashodha/activity_report
(core/dev#2104) Add gender column for target contact to activity report
Matthew Wire [Wed, 28 Oct 2020 09:41:17 +0000 (09:41 +0000)]
Merge pull request #18853 from eileenmcnaughton/base
dev/core#927 Move cancelling of related memberships to extension from BaseIPN
Matthew Wire [Wed, 28 Oct 2020 09:38:50 +0000 (09:38 +0000)]
Merge pull request #18849 from eileenmcnaughton/finacl2
Move filtering of unpermitted options for reports/ search select to financialacl extension
eileen [Fri, 23 Oct 2020 05:36:14 +0000 (18:36 +1300)]
Move filtering of unpermitted options for reports/ search select to financial acl extension
Seamus Lee [Tue, 27 Oct 2020 22:11:40 +0000 (09:11 +1100)]
Merge pull request #18862 from demeritcowboy/mb-substr
dev/core#2146 - Long unicode contact names get truncated badly causing a crash
Eileen McNaughton [Tue, 27 Oct 2020 19:20:18 +0000 (08:20 +1300)]
Merge pull request #18860 from colemanw/fixEncode
APIv4 - Fix type coersion of non-string input
colemanw [Tue, 27 Oct 2020 18:25:26 +0000 (14:25 -0400)]
Merge pull request #18856 from eileenmcnaughton/int_amount
Remove meaningless legacy code
demeritcowboy [Mon, 26 Oct 2020 23:48:37 +0000 (19:48 -0400)]
truncate unicode strings better
Seamus Lee [Tue, 27 Oct 2020 03:06:13 +0000 (14:06 +1100)]
Merge pull request #18859 from masetto/italian_provinces
updated italian provinces (CRM-5048)
Eileen McNaughton [Tue, 27 Oct 2020 02:47:36 +0000 (15:47 +1300)]
Merge pull request #18861 from civicrm/5.31
5.31
Seamus Lee [Mon, 26 Oct 2020 23:11:24 +0000 (10:11 +1100)]
Merge pull request #18792 from eileenmcnaughton/status2
Fix campaign_id handling for batch entry
Seamus Lee [Mon, 26 Oct 2020 23:10:04 +0000 (10:10 +1100)]
Merge pull request #18857 from eileenmcnaughton/sort2
dev/core#2132 Fix for sort on search results
Matthew Wire [Fri, 21 Aug 2020 10:43:06 +0000 (11:43 +0100)]
Refactor entityParams in Order.Create API so it is easier to understand/modify
eileen [Mon, 26 Oct 2020 05:56:58 +0000 (18:56 +1300)]
dev/core#2132 Fix for sort on search results
Simpler fix - accept bad sql but catch it :-(
Ideally we would always be in exception mode
Coleman Watts [Mon, 26 Oct 2020 20:03:35 +0000 (16:03 -0400)]
APIv4 - Fix type coersion of non-string input
Eileen McNaughton [Mon, 26 Oct 2020 19:42:31 +0000 (08:42 +1300)]
Merge pull request #18808 from jvos/set-id-postProcess-mailing-Component
Set id after save for the mailing component in the postProcess
Samuele Masetto [Mon, 26 Oct 2020 18:07:40 +0000 (19:07 +0100)]
updated italian provinces (CRM-5048)
Samuele Masetto [Mon, 26 Oct 2020 15:55:33 +0000 (16:55 +0100)]
updated italian provinces (CRM-5048)
Dev [Tue, 20 Oct 2020 08:00:31 +0000 (10:00 +0200)]
Set id after save for the mailing component in the postProcess
Added comment and removed whitespace
Removed empty line.
eileen [Mon, 26 Oct 2020 05:22:38 +0000 (18:22 +1300)]
Remove meaningless legacy code
I looked around & I am pretty sure int_amount is never set and init_amount is never used
Seamus Lee [Mon, 26 Oct 2020 04:11:57 +0000 (15:11 +1100)]
Merge pull request #18848 from eileenmcnaughton/finacl
Move CRM_Member_BAO_MembershipType::getPermissionedMembershipTypes to financial acl extension
eileen [Mon, 19 Oct 2020 02:23:57 +0000 (15:23 +1300)]
Fix campaign_id handling for batch entry
Fixes a bug whereby campaign_id is not updated on batch entry if it has been added to the profile.
The underlying issue appears to be an attack of copy and paste. I tidied up the variable
in both the places that call the processMembership function such that it is passed in
as an array of pass-through params. The function can be simplified & eventually removed.
Eileen McNaughton [Sat, 24 Oct 2020 22:16:57 +0000 (11:16 +1300)]
Merge pull request #18745 from seamuslee001/backdrop_session
backdrop#116 Override sessionStart function and use backdrop function…
eileen [Fri, 23 Oct 2020 22:44:26 +0000 (11:44 +1300)]
dev/core#927 Move cancelling of related memberships to extension from BaseIPN
This moves the code to cancel memberships on a related contribution cancel to the contributioncancelactions
core extension.
Before
The cancellations are done using convoluted & elsewhere duplicated logic in BaseIPN
using convoluted input params
After
When a contribution is updated & the status_id of 'Cancellled' is set then
the hook will kick in, look for any related pending memberships and cancel them.
The test demonstrates that the api call will ensure related pending memberships
are cancelled.
Note that I am using line_items table to get the membership - we have been storing this
membership_payment link there for log enough it should be reliable but if there
are remaining data issues then this is a lower risk flow to flush them out.
Also note that once this is cleaned up I'll move to the 2 other flows I'm aware of
Order.create api & Contribuion form edits
Eileen McNaughton [Fri, 23 Oct 2020 21:57:20 +0000 (10:57 +1300)]
Merge pull request #18842 from ixiam/dev-#2138
Get phone_type by name. dev/core#2138
Matthew Wire [Fri, 23 Oct 2020 16:27:45 +0000 (17:27 +0100)]
Merge pull request #18850 from aydun/user-interface#34
dev/user-interface#34 Replace <th> with <td> on ContributionPage configuration Amount tab
Monish Deb [Fri, 23 Oct 2020 13:13:14 +0000 (18:43 +0530)]
Merge pull request #18835 from eileenmcnaughton/aip
dev/financial#152 [REF] Clean up interaction with contribution recur object
Monish Deb [Fri, 23 Oct 2020 12:39:36 +0000 (18:09 +0530)]
Merge pull request #18813 from eileenmcnaughton/base
dev/core#927 preliminary cleanup
Aidan Saunders [Fri, 23 Oct 2020 12:06:30 +0000 (13:06 +0100)]
Replace <th> with <td> on ContributionPage Amount tab
Diego Muñio [Fri, 23 Oct 2020 10:38:55 +0000 (07:38 -0300)]
Get phone_type by name. dev/core#2138
eileen [Fri, 23 Oct 2020 04:52:53 +0000 (17:52 +1300)]
Move financialacl code from buildMembershipTypeValues to hook
eileen [Fri, 23 Oct 2020 04:28:14 +0000 (17:28 +1300)]
Unit test for financial acl CRM_Member_BAO_MembershipType::getPermissionedMembershipTypes function
Seamus Lee [Fri, 23 Oct 2020 03:46:28 +0000 (14:46 +1100)]
Merge pull request #18846 from eileenmcnaughton/ornery
dev/core#2029 exclude ornery test
Seamus Lee [Fri, 23 Oct 2020 03:43:58 +0000 (14:43 +1100)]
Merge pull request #18837 from eileenmcnaughton/minor
[REF] Determine values where they are needed rather than passing them around (in tested function)
eileen [Wed, 21 Oct 2020 10:55:25 +0000 (23:55 +1300)]
[REF] Determine values where they are needed rather than passing them around
The membershipTypes array is constructed, but barely used. One place it is used
is in this function - which is explictly tested by CRM_Member_Form_MembershipTest::testSubmit
This fixes it to get the values when needed rather than construct a variable miles away from
where it is used - no more pass the parcel
Eileen McNaughton [Thu, 22 Oct 2020 23:14:08 +0000 (12:14 +1300)]
Merge pull request #18847 from civicrm/5.31
5.31 to master
Eileen McNaughton [Thu, 22 Oct 2020 23:13:44 +0000 (12:13 +1300)]
Merge pull request #18799 from
deb1990/CPS-332-support-new-button-markup
CPS-332: Button markup fix in PremiumBlock.tpl
Seamus Lee [Thu, 22 Oct 2020 22:37:43 +0000 (09:37 +1100)]
Merge pull request #18843 from bluehorndigital/dev/core-2140
dev/core#2140 Fix site path for Drupal 8 and 9
eileen [Thu, 22 Oct 2020 21:53:29 +0000 (10:53 +1300)]
dev/core#2029 exclude ornery test
E2E.Core.PrevNextTest.testDeleteByCacheKey
Matt Glaman [Thu, 22 Oct 2020 17:03:13 +0000 (12:03 -0500)]
dev/core#2140 Fix site path for Drupal 8 and 9
This fixes hardcoded assumptions of the site path. This breaks testing
integration, which has sites in a subdirectory of `simpletest`
Seamus Lee [Thu, 22 Oct 2020 08:24:18 +0000 (19:24 +1100)]
Merge pull request #18839 from civicrm/5.31
5.31
yashodha [Thu, 22 Oct 2020 06:15:47 +0000 (11:45 +0530)]
(core/dev#2104) Add gender column for target contact to activity report
Seamus Lee [Thu, 22 Oct 2020 06:11:22 +0000 (17:11 +1100)]
Merge pull request #18821 from eileenmcnaughton/531im
dev/membership#30 switch Membership import to use the v3 api
Seamus Lee [Thu, 22 Oct 2020 04:35:18 +0000 (15:35 +1100)]
Merge pull request #18836 from civicrm/5.31
5.31
Seamus Lee [Thu, 22 Oct 2020 01:33:59 +0000 (12:33 +1100)]
Merge pull request #18834 from demeritcowboy/file-add
Fix deprecated passing of string attributes to CRM_Core_Form::add for contact import
Seamus Lee [Thu, 22 Oct 2020 00:26:08 +0000 (11:26 +1100)]
Merge pull request #18831 from seamuslee001/dev_core_2136
dev/core#2136 Fix the loading of groups on the contact Individual screen
Seamus Lee [Thu, 22 Oct 2020 00:25:42 +0000 (11:25 +1100)]
Merge pull request #18820 from eileenmcnaughton/531
More buttonrama fallout
eileen [Wed, 21 Oct 2020 23:38:54 +0000 (12:38 +1300)]
[REF] Clean up interaction with contribution recur object
It we look in getIDS and through that to getContributionObject we can see that an exception
is thrown if there is no valid recurring contribution object (A.net only does IPNs for recurring).
This removes a bunch of condition ifs around it's presence and also uses the object more consistently
Seamus Lee [Wed, 21 Oct 2020 22:57:16 +0000 (09:57 +1100)]
Merge pull request #18829 from eileenmcnaughton/aip
[REF] Minor extraction
demeritcowboy [Wed, 21 Oct 2020 22:23:53 +0000 (18:23 -0400)]
deprecated string
Seamus Lee [Wed, 21 Oct 2020 21:31:56 +0000 (08:31 +1100)]
Merge pull request #18826 from eileenmcnaughton/extract
Remove a few lines of deprecated code
Seamus Lee [Wed, 21 Oct 2020 20:38:17 +0000 (07:38 +1100)]
Fix the loading of groups on the contact Individual screen
eileen [Wed, 21 Oct 2020 05:28:00 +0000 (18:28 +1300)]
More buttonrama fallout
Eileen McNaughton [Wed, 21 Oct 2020 20:03:42 +0000 (09:03 +1300)]
Merge pull request #18827 from yashodha/activity_report
(core/dev#2104) Add birth date column for target contact to activity …
eileen [Wed, 21 Oct 2020 19:43:50 +0000 (08:43 +1300)]
Minor extraction
eileen [Tue, 20 Oct 2020 23:46:10 +0000 (12:46 +1300)]
dev/core#927 preliminary cleanup
This just splits out the (I believe unreachable) 'no contribution id flow'
and makes it clear the mystical addRecurLineItems is part of that flow - in
preparation for
moving handling to the cancelcontributionactions extension
Eileen McNaughton [Wed, 21 Oct 2020 19:17:36 +0000 (08:17 +1300)]
Merge pull request #18825 from seamuslee001/en2
[REF] Include contributioncancelactions extension in dismaker and reg…
Matthew Wire [Wed, 21 Oct 2020 14:47:25 +0000 (15:47 +0100)]
Merge pull request #18814 from eileenmcnaughton/recur_out
dev/core#927 Remove code to update recur on cancel & fail where there is no recur
Matthew Wire [Wed, 21 Oct 2020 14:43:25 +0000 (15:43 +0100)]
Merge pull request #18746 from eileenmcnaughton/aip
[REF] Extract handling for loading contribution recur object.
yashodha [Wed, 21 Oct 2020 12:38:49 +0000 (18:08 +0530)]
(core/dev#2104) Add birth date column for target contact to activity report
eileen [Wed, 21 Oct 2020 10:29:17 +0000 (23:29 +1300)]
Remove a few lines of deprecated code
Eileen McNaughton [Wed, 21 Oct 2020 09:22:19 +0000 (22:22 +1300)]
Merge pull request #18818 from civicrm/5.31
5.31
Eileen McNaughton [Wed, 21 Oct 2020 09:21:38 +0000 (22:21 +1300)]
Merge pull request #18822 from totten/master-prevnexttest
(NFC) dev/core#2029 - Make assertions in PrevNextTest more skimmable
Seamus Lee [Wed, 21 Oct 2020 03:44:36 +0000 (14:44 +1100)]
[REF] Include contributioncancelactions extension in dismaker and regenerate civicrm_generated
Monish Deb [Wed, 21 Oct 2020 07:13:56 +0000 (12:43 +0530)]
Merge pull request #18740 from eileenmcnaughton/hook
dev/core#2115 Move some more financialacl code to a hook within the extension
eileen [Wed, 21 Oct 2020 05:43:15 +0000 (18:43 +1300)]
dev/membership#30 switch Membership import to use the v3 api
ITturns out the addition of a unique name at some point caused is_override not to be passed in
inn a way the BAO recognises - the api has handling for this...
Tim Otten [Wed, 21 Oct 2020 05:41:37 +0000 (22:41 -0700)]
(NFC) dev/core#2029 - Make assertions in PrevNextTest more skimmable
Overview
--------
The test appears to have a random failure. Making it more readable may help figure out why.
Before
------
`testDeleteByCacheKey()` and the related `testFillArray()` both have some assertions in these two forms:
```
// Form #1, more verbose
$all = ...getSelections($cacheKey, $action);
$this->assertEquals([...expected...], array_keys($all)...);
// Form #2, more pithy
$this->assertSelections([...expected...], $action, $cacheKey);
```
After
-----
The verbose form is replaced with the pithier form.
In the pithier form, some of the default inputs are made explicit.
Comment
-------
It is confusing that the method `getSelections()` has a parameter `$action`
which can be `get` or `getall` -- and that `getall` does not (in fact) return
selections. It returns all! (The fact that the contract is weird makes the
unit-test helpful imho...)
Seamus Lee [Wed, 21 Oct 2020 05:26:02 +0000 (16:26 +1100)]
Merge pull request #18815 from eileenmcnaughton/recursoft
dev/financial#152 move code only relevant to repeattransaction into that function
Eileen McNaughton [Wed, 21 Oct 2020 05:02:04 +0000 (18:02 +1300)]
Merge pull request #18812 from eileenmcnaughton/en
dev/core#927 Enable contribution cancel actions extension
Seamus Lee [Wed, 21 Oct 2020 04:59:55 +0000 (15:59 +1100)]
Merge pull request #18817 from seamuslee001/5-30-1-notes
release-notes/5.30.1.md
Tim Otten [Wed, 21 Oct 2020 04:04:24 +0000 (21:04 -0700)]
release-notes/5.30.1.md
Seamus Lee [Wed, 21 Oct 2020 04:09:44 +0000 (15:09 +1100)]
Merge pull request #18805 from eileenmcnaughton/date
Rationalise date formatting
eileen [Tue, 20 Oct 2020 22:56:52 +0000 (11:56 +1300)]
Enable contribution cancel actions
Once completed this extension will be unhidden and available to disable
Tim Otten [Wed, 21 Oct 2020 00:45:34 +0000 (17:45 -0700)]
Merge pull request #18811 from colemanw/savedSearchIndex
SavedSearch: add UI_name index to upgrade script
eileen [Wed, 21 Oct 2020 00:25:29 +0000 (13:25 +1300)]
dev/financial#152 move code only relevant to repeattransaction into that function
Per https://github.com/civicrm/civicrm-core/pull/18814 I dug into this addRecurSoftCredits and
it simply copies soft credits from the first transaction in the series to the new one. As such
it belongs in repeattransaction not the main body of completeOrder
eileen [Wed, 21 Oct 2020 00:08:17 +0000 (13:08 +1300)]
dev/core#927 Remove code to update recur on cancel & fail
I've been racking my brains as to why we do this and it just feels like copy & paste that has survived forever
This code is called only from the 2 PaypalIPN classes. In both cases the classes follow the same flow - ie
if the payment is part of a recurring series, then call recur
if the payment is NOT the first in the series then call repeattransaction
only proceed to the 'single' function if we are confirming the
first recurring payment or it is not recurring
This means the cancelled & failed functions can only be reached when the flow is not
recurring OR the payment is the first - in neither case does it make sense to copy date
from one payment in the series to others - I'm pretty sure this precedes many many code changes
Seamus Lee [Tue, 20 Oct 2020 22:27:57 +0000 (09:27 +1100)]
Merge pull request #18786 from eileenmcnaughton/cancelextwtest
dev/core#927 add first test on cancel
Coleman Watts [Tue, 20 Oct 2020 21:19:57 +0000 (17:19 -0400)]
SavedSearch: add UI_name index to upgrade script
Seamus Lee [Tue, 20 Oct 2020 20:21:38 +0000 (07:21 +1100)]
Merge pull request #18806 from eileenmcnaughton/constant
Update CRM_Utils_Constant::value to support env variables
Seamus Lee [Tue, 20 Oct 2020 19:51:32 +0000 (06:51 +1100)]
Merge pull request #18804 from eileenmcnaughton/manual
Declare support for cancelRecurring in manual processor
eileen [Fri, 16 Oct 2020 06:11:41 +0000 (19:11 +1300)]
Add initial test to the new extension
I made a small change to support the test - causing Membership.create not to set the
stattus_id if it is specified.
Seamus Lee [Tue, 20 Oct 2020 19:50:50 +0000 (06:50 +1100)]
Merge pull request #18803 from eileenmcnaughton/canceltest
Remove always-true IF
Eileen McNaughton [Tue, 20 Oct 2020 19:48:59 +0000 (08:48 +1300)]
Merge pull request #18784 from eileenmcnaughton/cancelext
dev/core#927 Add shell extension to move contribution cancel actions into
eileen [Tue, 20 Oct 2020 01:54:27 +0000 (14:54 +1300)]
Rationalise date formatting
This came out of discovering a place in the code was 'accidentally formatted correctly'
and finding it far too hard to figure out the right way to specify the date formatting -
something that seems confirmed by finding various places with hard-coded date formattin
rather than using the setting
Eileen McNaughton [Tue, 20 Oct 2020 19:39:01 +0000 (08:39 +1300)]
Merge pull request #18809 from colemanw/savedSearchName
SavedSearch - Add name and label columns
Coleman Watts [Tue, 20 Oct 2020 13:39:02 +0000 (09:39 -0400)]
SavedSearch - Add name and label columns
eileen [Tue, 20 Oct 2020 02:27:00 +0000 (15:27 +1300)]
Update CRM_Utils_Constant::value to support env variables
This is something I discussed with @totten earlier but as the rc was being cut at the time
we went for the more conservative approach of only adding env support to thhe debug_query
function. This extends to all defines - meaning they can be defined at the script level e.
env CIVICRM_DEBUG_LOG_QUERY=backtrace drush cvapi
(that already works)
Debarshi Bhaumik [Tue, 6 Oct 2020 07:34:02 +0000 (08:34 +0100)]
CPS-332: Button markup fix in PremiumBlock.tpl
Eileen McNaughton [Tue, 20 Oct 2020 02:55:34 +0000 (15:55 +1300)]
Merge pull request #18645 from seamuslee001/frontend_group
Display public title and description on profiles and unsubscribe/subs…
eileen [Tue, 20 Oct 2020 00:52:48 +0000 (13:52 +1300)]
Declare support for cancelRecurring in manual processor
Reviewer's partial from https://github.com/civicrm/civicrm-core/pull/18196
eileen [Tue, 20 Oct 2020 00:47:18 +0000 (13:47 +1300)]
Remove always-true IF
As can be seen by searching for calls to recurLinks recurID is not
an optional parameter for the call - so the IF is extraneous.
I've updated almost all the places that call it to
pass strict-type-casted int (or in one place ensured it already is)
as a bit of 'tightening'
Seamus Lee [Tue, 20 Oct 2020 00:35:36 +0000 (11:35 +1100)]
Merge pull request #18801 from eileenmcnaughton/canceltest
Remove always true if
Seamus Lee [Mon, 19 Oct 2020 21:06:57 +0000 (08:06 +1100)]
Merge pull request #18800 from agh1/5.31.0-releasenotes-initial
5.31.0 release notes initial run
eileen [Mon, 19 Oct 2020 19:24:56 +0000 (08:24 +1300)]
Remove always true if
Since paymentProcessorObj is loaded as the manual processor where another does not exist
the processor condition is always true - so this if is obsolete
Eileen McNaughton [Mon, 19 Oct 2020 19:21:45 +0000 (08:21 +1300)]
Merge pull request #18790 from eileenmcnaughton/canceltest
Add test for recurring links and clean up method of retrieving recurring
Eileen McNaughton [Mon, 19 Oct 2020 19:21:15 +0000 (08:21 +1300)]
Merge pull request #18798 from eileenmcnaughton/memtest
Replace BAO calls with api calls in test class
Eileen McNaughton [Mon, 19 Oct 2020 19:20:55 +0000 (08:20 +1300)]
Merge pull request #18797 from eileenmcnaughton/apim
Switch to calling api
Andrew Hunt [Mon, 19 Oct 2020 15:22:06 +0000 (11:22 -0400)]
5.31.0 release notes: added boilerplate
Andrew Hunt [Mon, 19 Oct 2020 15:18:21 +0000 (11:18 -0400)]
5.31.0 release notes: raw from script