eileen [Tue, 1 Sep 2020 23:54:40 +0000 (11:54 +1200)]
[REF] Remove most interaction with
With this change we are only looking up
1) objects['paymentProcessor'] - we should probably just pass in the id
2) objects['contribution'] - we could make this a param in it's own right & remove objects
3) objects['event'] - just used to get event title - we could do a query off participant
Matthew Wire [Tue, 1 Sep 2020 11:13:37 +0000 (12:13 +0100)]
Merge pull request #18303 from eileenmcnaughton/event_batch
[REF] Clean up return variables on updateContributionStatus, updatePendingOnlineContribution
Matthew Wire [Tue, 1 Sep 2020 11:11:27 +0000 (12:11 +0100)]
Merge pull request #18279 from eileenmcnaughton/ordertest
Fix test set up to call Order.create to create the correct line items
Matthew Wire [Tue, 1 Sep 2020 11:10:19 +0000 (12:10 +0100)]
Merge pull request #18294 from eileenmcnaughton/linecreate
[REF] Separate and move line-item specific portion of checkTaxAmount to LineItem api
Seamus Lee [Tue, 1 Sep 2020 10:10:00 +0000 (20:10 +1000)]
Merge pull request #18305 from civicrm/5.29
5.29
Seamus Lee [Tue, 1 Sep 2020 09:12:06 +0000 (19:12 +1000)]
Merge pull request #18293 from eileenmcnaughton/fin
Move LineItem acl handling from v3 api to financialacls core extension
Seamus Lee [Tue, 1 Sep 2020 09:04:48 +0000 (19:04 +1000)]
Merge pull request #18290 from eileenmcnaughton/tax
dev/core#1983 Fix to tax calculation on multi-line-item
Seamus Lee [Tue, 1 Sep 2020 04:51:04 +0000 (14:51 +1000)]
Merge pull request #17810 from seamuslee001/negative_payment_create
[REF] Fix financial item allocation of negative payments against completed payments
eileen [Tue, 1 Sep 2020 03:21:50 +0000 (15:21 +1200)]
[REF] Clean up return variables on updateContributionStatus, updatePendingOnlineContribution
The return variable from updatePendingOnlineContribution is never used - ergo don't return it. This means
the return value from updateContributionStatus is also never used - ergo - you get it. In addition don't call the function
with empty variables - I've moved the check as to whether they are empty into the calling function - although likely
in a second pass the checks will be removed or change again
Eileen McNaughton [Tue, 1 Sep 2020 01:01:07 +0000 (13:01 +1200)]
Merge pull request #18237 from mattwire/mailingsearchcolumns
Remove 'hack' that overwrites result of searchColumns hook in mailings list
Eileen McNaughton [Tue, 1 Sep 2020 00:15:12 +0000 (12:15 +1200)]
Merge pull request #18302 from civicrm/5.29
5.29 to master
Eileen McNaughton [Tue, 1 Sep 2020 00:14:35 +0000 (12:14 +1200)]
Merge pull request #18301 from demeritcowboy/dev-core-1982-5.29
dev/core#1982 - 5.29 version of PR 18282
Seamus Lee [Mon, 13 Jul 2020 04:38:20 +0000 (14:38 +1000)]
[REF] permit negative payments to be made against completed payments
Add in unit test for adding additional refund payment to contribution already refunded and also adding a negative payment to a contribution that is negative already
demeritcowboy [Mon, 31 Aug 2020 21:58:56 +0000 (17:58 -0400)]
faulty check for simplexml node value - see also PR 18282
Eileen McNaughton [Mon, 31 Aug 2020 19:57:05 +0000 (07:57 +1200)]
Merge pull request #18067 from MegaphoneJon/event-34-reroll
event#34: allow negative self-service/transfer time
colemanw [Mon, 31 Aug 2020 19:45:22 +0000 (15:45 -0400)]
Merge pull request #18292 from eileenmcnaughton/receipt
Add test to check, remove unnecessary lines
Eileen McNaughton [Mon, 31 Aug 2020 19:42:26 +0000 (07:42 +1200)]
Merge pull request #18300 from MegaphoneJon/clean-non-deductible
Clean money for non-deductible amount
colemanw [Mon, 31 Aug 2020 19:22:53 +0000 (15:22 -0400)]
Merge pull request #18291 from eileenmcnaughton/depit
[REF] [test] Slight increase in test cover & make functions more re-usable
colemanw [Mon, 31 Aug 2020 19:21:58 +0000 (15:21 -0400)]
Merge pull request #18296 from eileenmcnaughton/curr_member
[REF] simplify retrieval of existing membership on membership renewal form
Jon Goldberg [Sat, 29 Aug 2020 15:48:11 +0000 (11:48 -0400)]
Clean money for non-deductible amount
tests
eileen [Mon, 31 Aug 2020 01:00:14 +0000 (13:00 +1200)]
Add test to check, remove unnecessary lines
Per the code comment it was likely the removed lines were not needed but tests were required to confirm.
This does that
Eileen McNaughton [Mon, 31 Aug 2020 06:38:07 +0000 (18:38 +1200)]
Merge pull request #18288 from KarinG/extend_testSubmitContributionPageWithPriceSetQuantity
extend_testSubmitContributionPageWithPriceSetQuantity
eileen [Mon, 31 Aug 2020 04:42:15 +0000 (16:42 +1200)]
[REF] simplify retrieval of existing membership on membership renewal form
After stepping through the code I determined that if membershipID is passed into getContactMembership then it either
1) returns the membership id much like membership.get but with is_current_member calculated or
2) returns the owner membership in a similar format
However, the renewal form is not visible for a non-owner membership so getting the owner membership is cruft
from another form & only 1 applies. Calling the api is much more transparent
Eileen McNaughton [Mon, 31 Aug 2020 02:26:26 +0000 (14:26 +1200)]
Merge pull request #18283 from aydun/class_api_tweak
Improve robustness of api/class.api.php
eileen [Mon, 31 Aug 2020 02:14:32 +0000 (14:14 +1200)]
[REF] Separate and move line-item specific portion of checkTaxAmount to LineItem
This is not intended to be the final place but making sense of checkTaxAmount is hard so I wanted to keep this simple and
iterate.
checkTaxAmount is called from 2 places - once from v3 LineItem.create with isLineItem = TRUE
and once from Contribution.create with isLineItem = FALSE
Most of the function is accessible dependent on isLineItem - meaning it's 2 separate functions.
However, the first chuck is called 'whenever id is set'. BUT it makes no sense for line items. It
uses the 'id' - regardless of whether it is a line item id or a contribution id - to get the previous
contribution. It then sets tax amount based on a comparison - but
that really makes zero sense. I'm pretty sure it was never intended to be used for LineItems
eileen [Mon, 31 Aug 2020 01:51:03 +0000 (13:51 +1200)]
Move LineItem acl handling from v3 api to financialacls extension
This makes it available for the v4 api
eileen [Sun, 30 Aug 2020 22:10:35 +0000 (10:10 +1200)]
dev/core#1983 Fix to tax calculation on multi-line-item
This is similar to https://github.com/civicrm/civicrm-core/pull/18284 - it differs in that the totals are calculated by iterating
through the line item array afterwards, rather than expecting the 'getLine' function to calculate totals. Some
obvious follow ups suggest themselves but I will look against master.
This is difficult to test (Karin gave it a really good shot) because of the weird way it's calculated in Main and thenn
used in Confirm. Cleanup should resolve the testability issue too
KarinG [Mon, 31 Aug 2020 01:01:41 +0000 (19:01 -0600)]
extend_testSubmitContributionPageWithPriceSetQuantity
eileen [Sun, 30 Aug 2020 23:21:51 +0000 (11:21 +1200)]
Slight increase in test cover & make functions more re-usable
Just preliminary to increasing cover in another test class
Eileen McNaughton [Sun, 30 Aug 2020 23:12:13 +0000 (11:12 +1200)]
Merge pull request #18289 from MegaphoneJon/actionschedule-serialize
add serialize data to actionschedule
Eileen McNaughton [Sun, 30 Aug 2020 22:27:13 +0000 (10:27 +1200)]
Merge pull request #18285 from colemanw/contains
dev/event#37 Add CONTAINS operator for APIv4 & Search
Jon Goldberg [Sun, 30 Aug 2020 20:58:32 +0000 (16:58 -0400)]
add serialize data to actionschedule
Seamus Lee [Sun, 30 Aug 2020 20:08:22 +0000 (06:08 +1000)]
Merge pull request #17991 from eileenmcnaughton/merge_single
[REF] Extract function to get locations to merge, rename 'operation' …
Jon Goldberg [Fri, 28 Aug 2020 02:00:09 +0000 (22:00 -0400)]
allow negative self-service hours
event #34 message improvement
fixes to message template
fixes
Coleman Watts [Sat, 29 Aug 2020 23:19:06 +0000 (19:19 -0400)]
Search ext - Show translated labels for operators
eileen [Fri, 28 Aug 2020 05:18:00 +0000 (17:18 +1200)]
Fix test set up to call Order.create to create the correct line items
This test is not creating valid line items - so when we expect them to be correct - they aren't
Eileen McNaughton [Sat, 29 Aug 2020 01:08:56 +0000 (13:08 +1200)]
Merge pull request #18275 from eileenmcnaughton/linepre
dev/core#1980 Move (now tested) delete acl check from v3 api to pre delete hook
Coleman Watts [Sat, 29 Aug 2020 00:56:16 +0000 (20:56 -0400)]
APIv4 - Add CONTAINS operator and add to search extension
eileen [Fri, 28 Aug 2020 04:08:56 +0000 (16:08 +1200)]
Move (now tested) delete acl check from v3 api to pre delete hook
Eileen McNaughton [Fri, 28 Aug 2020 22:15:52 +0000 (10:15 +1200)]
Merge pull request #18280 from yashodha/drop_tables
remove dropped tables for activity target and assignment
Coleman Watts [Fri, 28 Aug 2020 17:07:08 +0000 (13:07 -0400)]
APIv4 - Move list of accepted query operators to CoreUtil
Aidan Saunders [Fri, 28 Aug 2020 14:45:59 +0000 (15:45 +0100)]
Use !empty() instead of isset() in constructor so that empty strings don't confuse the logic
Update array syntax in comments
Add test for class.api.php
yashodha [Fri, 28 Aug 2020 11:43:56 +0000 (17:13 +0530)]
remove dropped tables for activity target and assignment
Seamus Lee [Fri, 28 Aug 2020 11:05:52 +0000 (21:05 +1000)]
Merge pull request #18274 from eileenmcnaughton/linetests
Add line item acl tests
Seamus Lee [Fri, 28 Aug 2020 08:21:58 +0000 (18:21 +1000)]
Merge pull request #18276 from civicrm/5.29
5.29
Seamus Lee [Fri, 28 Aug 2020 08:21:05 +0000 (18:21 +1000)]
Merge pull request #18268 from sunilpawar/report_47
report#47 Report Bookkeeping add time field for date filter.
eileen [Fri, 28 Aug 2020 03:49:22 +0000 (15:49 +1200)]
Add line item acl tests
Seamus Lee [Fri, 28 Aug 2020 05:11:11 +0000 (15:11 +1000)]
Merge pull request #18273 from seamuslee001/master
Fix regen and update civicrm_generated
Seamus Lee [Fri, 28 Aug 2020 05:06:55 +0000 (15:06 +1000)]
Merge pull request #18271 from eileenmcnaughton/tax529
dev/core#1972 Fix tax_amount calclation on renewal form
Eileen McNaughton [Fri, 28 Aug 2020 04:19:15 +0000 (16:19 +1200)]
Merge pull request #18270 from seamuslee001/auto_dsn
[REF] Move Auto DSN Switching into a core function
Sunil Pawar [Fri, 28 Aug 2020 04:08:52 +0000 (09:38 +0530)]
added custom clause under whereClause and removed where function from bookkeeping, re-added receipt_date
Seamus Lee [Fri, 28 Aug 2020 02:44:15 +0000 (12:44 +1000)]
Fix regen and update civicrm_generated
Eileen McNaughton [Fri, 28 Aug 2020 02:32:00 +0000 (14:32 +1200)]
Merge pull request #18269 from eileenmcnaughton/finacl
Shell Financial ACLs extension
eileen [Fri, 28 Aug 2020 00:52:42 +0000 (12:52 +1200)]
dev/core#1972 Fix tax_amount calclation on renewal form
Seamus Lee [Thu, 27 Aug 2020 23:59:22 +0000 (09:59 +1000)]
[REF] Move Auto DSN Switching into a core function
eileen [Thu, 27 Aug 2020 22:49:32 +0000 (10:49 +1200)]
Shell Financial ACLs extension
This is intended as a hidden extension while we work through the process of migrating core functionality into it.
I'm expected there to be a bit of work to unravel this into hook interactions - but the core extension mechanism gives us that space
Sunil Pawar [Thu, 27 Aug 2020 17:14:31 +0000 (22:44 +0530)]
report#47 Report Bookkeeping add time field for date filter.
Eileen McNaughton [Thu, 27 Aug 2020 09:14:10 +0000 (21:14 +1200)]
Merge pull request #18266 from sunilpawar/dev_912
dev/core#912 update payment instrument of main contribution record
Matthew Wire [Thu, 27 Aug 2020 08:32:53 +0000 (09:32 +0100)]
Merge pull request #18265 from eileenmcnaughton/objects
Use already determined value for contributionRecurID
Eileen McNaughton [Thu, 27 Aug 2020 07:36:22 +0000 (19:36 +1200)]
Merge pull request #18107 from demeritcowboy/mysql-ssl-install
dev/core#1926 - Allow SSL mysql connections for civicrm-setup
Sunil Pawar [Thu, 27 Aug 2020 06:57:51 +0000 (12:27 +0530)]
fix test case warning
Sunil Pawar [Thu, 27 Aug 2020 06:29:54 +0000 (11:59 +0530)]
Remove additional line
Sunil Pawar [Thu, 27 Aug 2020 06:26:25 +0000 (11:56 +0530)]
dev/core#912 update payment instrument of main contribution record
Eileen McNaughton [Thu, 27 Aug 2020 04:52:39 +0000 (16:52 +1200)]
Merge pull request #18244 from colemanw/drop
Remove old dropped items from the schema xml
eileen [Wed, 26 Aug 2020 22:05:04 +0000 (10:05 +1200)]
Use already detemined value for contributionRecurid
Eileen McNaughton [Wed, 26 Aug 2020 21:38:42 +0000 (09:38 +1200)]
Merge pull request #18257 from eileenmcnaughton/relob
Remove 1 of 2 remaining places where relatedObjects is called in completeOrder
Eileen McNaughton [Wed, 26 Aug 2020 19:21:29 +0000 (07:21 +1200)]
Merge pull request #18252 from JKingsnorth/core-1971-fix
dev/core#1971 Caching of domain-specific option values
eileen [Tue, 25 Aug 2020 20:00:01 +0000 (08:00 +1200)]
Remove 1 or 2 remaining places where relatedObjects is called in completeOrder
If we remove this & the other place we no longer need to call loadRelatedObjects before this
function and only message related places call it
In this case the lines can go as
1) trxn_id should always be used if provided. Casting to isoDate has not been required for a few
years as the DAO now handles
Matthew Wire [Wed, 26 Aug 2020 11:22:59 +0000 (12:22 +0100)]
Merge pull request #18258 from eileenmcnaughton/refer
Remove last pass-by-reference in completeOrder signature
Seamus Lee [Tue, 25 Aug 2020 22:21:26 +0000 (08:21 +1000)]
Merge pull request #18249 from mattwire/utf8mb4moretables
Support more table names for utf8mb4 conversions and database name
John Kingsnorth [Tue, 25 Aug 2020 21:38:23 +0000 (22:38 +0100)]
dev/core#1971 Fix test breaking subsequent tests when it fails
Eileen McNaughton [Tue, 25 Aug 2020 21:08:38 +0000 (09:08 +1200)]
Merge pull request #18250 from seamuslee001/ref_entity_id_group
[REF] Ensure that the form param _id is set when adding a new group w…
Seamus Lee [Tue, 25 Aug 2020 21:03:40 +0000 (07:03 +1000)]
Merge pull request #18248 from JMAConsulting/optimise_proximity_search
Optimise proximity custom search, by reducing addGeocodingData fn call
eileen [Tue, 25 Aug 2020 20:48:12 +0000 (08:48 +1200)]
Remove last pass-by-reference in completeOrder signature
ids is now only referred to once in the function & never altered. I have assigned that value to
a param & unset ids after that to make that clear
Eileen McNaughton [Tue, 25 Aug 2020 20:30:08 +0000 (08:30 +1200)]
Merge pull request #18255 from colemanw/fieldLabel
Expose field label to APIv4 and Search creaor
Eileen McNaughton [Tue, 25 Aug 2020 20:09:38 +0000 (08:09 +1200)]
Merge pull request #18256 from colemanw/fieldTitles
Separate titles from labels in exportable fields
Coleman Watts [Tue, 25 Aug 2020 18:20:51 +0000 (14:20 -0400)]
Separate titles from labels in exportable fields
Follow-up to #18255 and #18114 - this separates field titles (used in export) from labels (used in forms and other displays).
The previous approach was to try to use the title for both, and if that didn't work, override it somewhere.
colemanw [Tue, 25 Aug 2020 17:40:07 +0000 (13:40 -0400)]
Merge pull request #18254 from pradpnayak/casetypeselection
Fix js for case type status change on load
Coleman Watts [Tue, 25 Aug 2020 15:33:09 +0000 (11:33 -0400)]
Expose field label to APIv4 and Search creaor
Pradeep Nayak [Tue, 25 Aug 2020 14:39:33 +0000 (15:39 +0100)]
Fix js for case type status change on load
John Kingsnorth [Tue, 25 Aug 2020 10:35:57 +0000 (11:35 +0100)]
dev/core#1971 Domain-specific option value caching
Matthew Wire [Wed, 22 Apr 2020 09:48:36 +0000 (10:48 +0100)]
Support more table names for utf8mb4 conversions and database name
John Kingsnorth [Tue, 25 Aug 2020 10:26:30 +0000 (11:26 +0100)]
dev/core#1971 Test for domain-specific option values
Seamus Lee [Tue, 25 Aug 2020 07:57:32 +0000 (17:57 +1000)]
[REF] Ensure that the form param _id is set when adding a new group with the newly created group id so that consumers of the hook_civicrm_postProcess can access the id
Seamus Lee [Tue, 25 Aug 2020 06:54:58 +0000 (16:54 +1000)]
Merge pull request #18235 from pradpnayak/dev-1946
Batch Update via Profile does not supply data for editing when custom fields created after participant added to event
colemanw [Mon, 24 Aug 2020 15:46:26 +0000 (11:46 -0400)]
Merge pull request #18236 from mattwire/crmregion_notyou
Wrap "not you" message in crmRegion
Monish Deb [Mon, 24 Aug 2020 12:18:25 +0000 (17:48 +0530)]
Optimise proximity custom search, by reducing addGeocodingData fn call
Matthew Wire [Mon, 24 Aug 2020 10:24:34 +0000 (11:24 +0100)]
Merge pull request #18243 from eileenmcnaughton/static
Do not pass by reference for createRelatedMemberships
Matthew Wire [Mon, 24 Aug 2020 10:21:08 +0000 (11:21 +0100)]
Merge pull request #18242 from eileenmcnaughton/dep
Remove 2019 deprecated function
Seamus Lee [Mon, 24 Aug 2020 10:18:24 +0000 (20:18 +1000)]
Merge pull request #18118 from artfulrobot/artfulrobot-msgtpl-disable-smarty
Add disable_smarty option to MessageTemplate.send API
Rich Lott / Artful Robot [Mon, 10 Aug 2020 16:33:56 +0000 (17:33 +0100)]
Add disable_smarty option to MessageTemplate.send API
Coleman Watts [Mon, 24 Aug 2020 03:16:32 +0000 (23:16 -0400)]
Remove old dropped items from the schema xml
Removes unused fields and indexes which were dropped prior to 4.4.7
which is currently the min upgradable version.
eileen [Mon, 24 Aug 2020 01:11:07 +0000 (13:11 +1200)]
Do not pass by reference for createRelatedMemberships
There are 2 parameters passed by reference to this function
1) dao - this is not altered
2) params - this IS altered but the calling function (create) does not use it again. While it's
possible a function that calls create uses it again the idea that they would want the params
to have been altered to refer to a different related relationship does not seem probable.
Tests on this are in JobTest & apiv3_MembershipTest
Eileen McNaughton [Sun, 23 Aug 2020 22:29:45 +0000 (10:29 +1200)]
Merge pull request #18229 from totten/master-patchset
distmaker - Autogenerate civicrm-*-patchset.tar.gz
eileen [Sun, 23 Aug 2020 22:22:44 +0000 (10:22 +1200)]
Remove 2019 deprecated function
We stopped using this in core & deprecated it in 5.16
Seamus Lee [Sun, 23 Aug 2020 21:32:54 +0000 (07:32 +1000)]
Merge pull request #18153 from larssg-wildsight/patch-1
dev/core#1950 Update help text and description for the profile add to groups setting
Seamus Lee [Sun, 23 Aug 2020 21:32:02 +0000 (07:32 +1000)]
Merge pull request #18221 from civicrm/eileenmcnaughton-patch-1
Remove ref to logging time
Seamus Lee [Sun, 23 Aug 2020 21:28:36 +0000 (07:28 +1000)]
Merge pull request #18240 from demeritcowboy/deprecated-RID
Replace deprecated Drupal 8 constants
Eileen McNaughton [Sun, 23 Aug 2020 21:08:55 +0000 (09:08 +1200)]
Merge pull request #18234 from pradpnayak/dedupeTrim
trim white space when checking dedupe
Seamus Lee [Sun, 23 Aug 2020 20:40:18 +0000 (06:40 +1000)]
Merge pull request #18238 from agileware/separator-not-seperator
Spelling mistake "separator" not "seperator"