civicrm-core.git
3 years agoMerge pull request #18602 from eileenmcnaughton/msg
Seamus Lee [Mon, 28 Sep 2020 20:11:24 +0000 (06:11 +1000)]
Merge pull request #18602 from eileenmcnaughton/msg

dev/core#2035 Invoice template - show Amount paid even when it is fully paid

3 years agoMerge pull request #18615 from eileenmcnaughton/530
Seamus Lee [Mon, 28 Sep 2020 00:31:39 +0000 (10:31 +1000)]
Merge pull request #18615 from eileenmcnaughton/530

Fix regression on back-office membership renewal by credit card

3 years agoFix regression or back-office membership renewal by credit card
eileen [Sun, 27 Sep 2020 01:14:25 +0000 (14:14 +1300)]
Fix regression or back-office membership renewal by credit card

Looking at the code I realised a mistake was made in  https://github.com/civicrm/civicrm-core/pull/17398 whereby
the actual membership id would not be passed through correctly

3 years agodev/core#2035 Invoice template - show Amount paid even when it is fully paid
eileen [Sat, 26 Sep 2020 00:43:38 +0000 (12:43 +1200)]
dev/core#2035 Invoice template - show Amount paid even when it is fully paid

In https://github.com/civicrm/civicrm-core/pull/16680/files?w=1#diff-b211e0dac858fdad5d480c118d645e0bR129 there was a change from
'show amount paid & due depending on pay-later status' to 'show amount paid & due depending on whether payment is due'

This has been experienced as a regression and, being an invoice, there seems no reason to only change it sometimes.

This change just alters the template that new installs will receive. If approved another step is needed to update existing
installs (unless they have customised the template)

3 years agoMerge pull request #18534 from eileenmcnaughton/5.30
Seamus Lee [Tue, 22 Sep 2020 02:35:51 +0000 (12:35 +1000)]
Merge pull request #18534 from eileenmcnaughton/5.30

Follow up fix on paypal redirect

3 years agoMerge pull request #18547 from totten/5.30-ml-test
Seamus Lee [Tue, 22 Sep 2020 00:40:33 +0000 (10:40 +1000)]
Merge pull request #18547 from totten/5.30-ml-test

api_v3_MultilingualTest - Skip Cxn entities

3 years agoapi_v3_MultilingualTest - Skip Cxn entities
Tim Otten [Mon, 21 Sep 2020 22:28:45 +0000 (15:28 -0700)]
api_v3_MultilingualTest - Skip Cxn entities

3 years agoFollow up fix on paypal redirect
eileen [Sun, 20 Sep 2020 23:13:50 +0000 (11:13 +1200)]
Follow up fix on paypal redirect

Turns out we did some function renaming & missed a spot before merge.

As an aside I fixed Paypal to call CRM_Core_Config::singleton()->userSystem->prePostRedirect()
directly rather than via system. I'm tempted to take the System function back out
again - I don't think it offers a better one-liner

3 years agoMerge pull request #18525 from christianwach/lab-core-1997-530
Eileen McNaughton [Sun, 20 Sep 2020 20:34:39 +0000 (08:34 +1200)]
Merge pull request #18525 from christianwach/lab-core-1997-530

Fix PayPal Standard session loss in WordPress (5.30)

3 years agoMerge pull request #18524 from MegaphoneJon/core-2052-rc
Eileen McNaughton [Sun, 20 Sep 2020 20:33:34 +0000 (08:33 +1200)]
Merge pull request #18524 from MegaphoneJon/core-2052-rc

fix datepickers to show correct minDate

3 years agoMerge pull request #18530 from seamuslee001/fix_date_relationship
Eileen McNaughton [Sun, 20 Sep 2020 20:31:26 +0000 (08:31 +1200)]
Merge pull request #18530 from seamuslee001/fix_date_relationship

[NFC] Fix dates in RelationshipTest

3 years ago[NFC] Fix dates in RelationshipTest
Seamus Lee [Sun, 20 Sep 2020 06:00:46 +0000 (16:00 +1000)]
[NFC] Fix dates in RelationshipTest

3 years agoFix PayPal Standard session loss in WordPress
Christian Wach [Sat, 19 Sep 2020 11:47:26 +0000 (12:47 +0100)]
Fix PayPal Standard session loss in WordPress

3 years agofix datepickers to show correct minDate
Jon Goldberg [Fri, 18 Sep 2020 20:21:22 +0000 (16:21 -0400)]
fix datepickers to show correct minDate

3 years agoMerge pull request #18520 from colemanw/searchGroupBy
Seamus Lee [Fri, 18 Sep 2020 21:18:22 +0000 (07:18 +1000)]
Merge pull request #18520 from colemanw/searchGroupBy

Search ext: Aggregate field fixes

3 years agoSearch ext: Ensure all non-grouped columns are aggregated if using GROUP BY
Coleman Watts [Fri, 18 Sep 2020 15:27:20 +0000 (11:27 -0400)]
Search ext: Ensure all non-grouped columns are aggregated if using GROUP BY

3 years agoSearch ext: When removing a column from SELECT, also remove from ORDER BY
Coleman Watts [Fri, 18 Sep 2020 15:16:16 +0000 (11:16 -0400)]
Search ext: When removing a column from SELECT, also remove from ORDER BY

3 years agoSearch ext: Fix field label for aggregate fields
Coleman Watts [Fri, 18 Sep 2020 14:34:27 +0000 (10:34 -0400)]
Search ext: Fix field label for aggregate fields

3 years agoMerge pull request #18482 from seamuslee001/5.30
Eileen McNaughton [Wed, 16 Sep 2020 04:17:47 +0000 (16:17 +1200)]
Merge pull request #18482 from seamuslee001/5.30

release-notes/5.29.1.md

3 years agorelease-notes/5.29.1.md
Tim Otten [Wed, 16 Sep 2020 01:28:47 +0000 (18:28 -0700)]
release-notes/5.29.1.md

3 years agoMerge pull request #18473 from demeritcowboy/install-pear-db
Seamus Lee [Tue, 15 Sep 2020 21:04:16 +0000 (07:04 +1000)]
Merge pull request #18473 from demeritcowboy/install-pear-db

dev/core#2036 - PEAR::DB is no longer in packages, now autoloaded from vendor

3 years agoDB is no longer in packages, now autoloaded from vendor
demeritcowboy [Tue, 15 Sep 2020 17:57:24 +0000 (13:57 -0400)]
DB is no longer in packages, now autoloaded from vendor

4 years agoMerge pull request #18459 from seamuslee001/dev_financial_147
Eileen McNaughton [Mon, 14 Sep 2020 04:02:26 +0000 (16:02 +1200)]
Merge pull request #18459 from seamuslee001/dev_financial_147

dev/financial#147 Ensure that jQuery Validation doesn't execute when …

4 years agodev/financial#147 Ensure that jQuery Validation doesn't execute when we click the...
Seamus Lee [Mon, 14 Sep 2020 00:59:28 +0000 (10:59 +1000)]
dev/financial#147 Ensure that jQuery Validation doesn't execute when we click the paypal express button and ensure the style of the button doesn't change

4 years agoMerge pull request #18453 from demeritcowboy/receipt-from-email-5.30
Eileen McNaughton [Sun, 13 Sep 2020 23:53:54 +0000 (11:53 +1200)]
Merge pull request #18453 from demeritcowboy/receipt-from-email-5.30

E_NOTICE on contribution confirm page

4 years agomissing ?? when converted from Array::value
demeritcowboy [Sun, 13 Sep 2020 22:40:35 +0000 (18:40 -0400)]
missing ?? when converted from Array::value

4 years agoMerge pull request #18437 from colemanw/api4Perms
Eileen McNaughton [Sat, 12 Sep 2020 20:17:19 +0000 (08:17 +1200)]
Merge pull request #18437 from colemanw/api4Perms

dev/core#2008 APIv4 - Map specific action names to more generic versions

4 years agoAPIv4 - Map specific action names to more generic versions
Coleman Watts [Sat, 12 Sep 2020 01:03:36 +0000 (21:03 -0400)]
APIv4 - Map specific action names to more generic versions

4 years agoMerge pull request #18402 from eileenmcnaughton/5.30
Seamus Lee [Tue, 8 Sep 2020 20:58:02 +0000 (06:58 +1000)]
Merge pull request #18402 from eileenmcnaughton/5.30

Fix search extension excluded from tarball

4 years agoMerge pull request #18408 from alifrumin/5.30rn
Seamus Lee [Tue, 8 Sep 2020 20:57:19 +0000 (06:57 +1000)]
Merge pull request #18408 from alifrumin/5.30rn

[NFC] 5.30 release-notes: first stab at annotating and sorting release notes

4 years ago5.30 release-notes: first stab at release notes
Alice Frumin [Thu, 3 Sep 2020 20:41:49 +0000 (16:41 -0400)]
5.30 release-notes: first stab at release notes

4 years agoFix search extension excluded from tarball
eileen [Tue, 8 Sep 2020 00:37:25 +0000 (12:37 +1200)]
Fix search extension excluded from tarball

4 years agoMerge pull request #18363 from colemanw/5.30
Seamus Lee [Sat, 5 Sep 2020 02:05:23 +0000 (12:05 +1000)]
Merge pull request #18363 from colemanw/5.30

Forward-merge 5.29 -> 5.30

4 years agoMerge pull request #18361 from seamuslee001/update_event_checksum
Eileen McNaughton [Sat, 5 Sep 2020 00:48:25 +0000 (12:48 +1200)]
Merge pull request #18361 from seamuslee001/update_event_checksum

[NFC] Update Event DAO Checksum

4 years agoFix customField legacy handling in APIv3
Coleman Watts [Fri, 4 Sep 2020 00:59:25 +0000 (20:59 -0400)]
Fix customField legacy handling in APIv3

4 years agodev/core#1998 Address dedupe clash on dashboard contact
eileen [Fri, 4 Sep 2020 07:10:06 +0000 (19:10 +1200)]
dev/core#1998 Address dedupe clash on dashboard contact

4 years ago[NFC] Update Event DAO Checksum
Seamus Lee [Fri, 4 Sep 2020 22:51:27 +0000 (08:51 +1000)]
[NFC] Update Event DAO Checksum

4 years agoMerge pull request #18342 from agh1/5.30.0-releasenotes-initial
Seamus Lee [Thu, 3 Sep 2020 20:51:46 +0000 (06:51 +1000)]
Merge pull request #18342 from agh1/5.30.0-releasenotes-initial

5.30.0 release notes initial run

4 years ago5.30.0 release notes: added boilerplate
Andrew Hunt [Thu, 3 Sep 2020 18:53:04 +0000 (14:53 -0400)]
5.30.0 release notes: added boilerplate

4 years ago5.30.0 release notes: raw from script
Andrew Hunt [Thu, 3 Sep 2020 18:50:46 +0000 (14:50 -0400)]
5.30.0 release notes: raw from script

4 years agoSet version to 5.30.beta1
CiviCRM [Thu, 3 Sep 2020 09:05:29 +0000 (09:05 +0000)]
Set version to 5.30.beta1

4 years agoMerge pull request #18335 from eileenmcnaughton/query
Tim Otten [Thu, 3 Sep 2020 09:03:50 +0000 (02:03 -0700)]
Merge pull request #18335 from eileenmcnaughton/query

Add ability to enable query logging per process

4 years agoAdd ability to enable query logging per process
eileen [Thu, 3 Sep 2020 03:40:47 +0000 (15:40 +1200)]
Add ability to enable query logging per process

This allows us to run a command such as

env CIVICRM_DEBUG_LOG_QUERY=1 drush cvapi Contact.get

and the queries for that process (but not others) are logged.

This facilitates a cleaner record of queries as it is just one process and more flexibility
(and less risk of leaving it on by mistake)

4 years agoMerge pull request #18334 from civicrm/5.29
Seamus Lee [Thu, 3 Sep 2020 02:28:21 +0000 (12:28 +1000)]
Merge pull request #18334 from civicrm/5.29

5.29

4 years agoMerge pull request #18333 from totten/5.29-rn-catchup
Seamus Lee [Thu, 3 Sep 2020 02:26:37 +0000 (12:26 +1000)]
Merge pull request #18333 from totten/5.29-rn-catchup

(NFC) 5.29.0.md - Small updates

4 years agoMerge pull request #18332 from totten/5.29-norm-basepage
Seamus Lee [Thu, 3 Sep 2020 02:25:40 +0000 (12:25 +1000)]
Merge pull request #18332 from totten/5.29-norm-basepage

dev/wordpress#73 - Be more forgiving about slash in wpBasePage

4 years ago5.29.0.md - Small copy-edits
Tim Otten [Thu, 3 Sep 2020 01:25:10 +0000 (18:25 -0700)]
5.29.0.md - Small copy-edits

4 years agoMerge pull request #17980 from eileenmcnaughton/dupe
Seamus Lee [Thu, 3 Sep 2020 01:26:48 +0000 (11:26 +1000)]
Merge pull request #17980 from eileenmcnaughton/dupe

[REF] Move function to delete merged contacts to the Merger class and include all instances of the pair

4 years ago5.29.0.md - Last minute addition
Tim Otten [Thu, 3 Sep 2020 01:20:30 +0000 (18:20 -0700)]
5.29.0.md - Last minute addition

4 years agodev/wordpress#73 - Be more forgiving about slash in wpBasePage
Tim Otten [Wed, 2 Sep 2020 23:34:27 +0000 (16:34 -0700)]
dev/wordpress#73 - Be more forgiving about slash in wpBasePage

Overview
--------

The correct functioning of `wpBasePage` depends on whether the administrator
omitted or added a trailing slash.  This is apparent on URLs with a trailing slash, eg

```
http://wpmaster.bknix:8001/civicrm/contribute/transact/?reset=1&id=1
```

Make it less sensitive.

Before
------

URL is OK with default setting `wpBasePage=civicrm`

URL fails with setting `wpBasePage=civicrm/`

After
-----

URL is OK with either setting `wpBasePage=civicrm` or `wpBasePage=civicrm/`

Technical Details
-----------------

I believe the old symptom arose because of the formula which produces the WP
rewrite rules (`'^' .  $config->wpBasePage .  '/([^?]*)?'`) expects that
there is no trailing slash. You could theoretically patch there, but this
seems like it'll provide more thorough normalization.

When testing, the results affect the WP rewrite rules, so you may need to be particularly
aggressive about clearing caches whenever you make a change in code or settings, eg

```
wp cache flush ; cv flush;  wp rewrite flush
```

4 years agoMerge pull request #18323 from demeritcowboy/reminder-groups-dropdown
Eileen McNaughton [Thu, 3 Sep 2020 00:15:25 +0000 (12:15 +1200)]
Merge pull request #18323 from demeritcowboy/reminder-groups-dropdown

dev/core#1956 - Typo in call to nestedGroup on scheduled reminders admin form

4 years agoMerge pull request #18327 from civicrm/5.29
Seamus Lee [Wed, 2 Sep 2020 23:22:26 +0000 (09:22 +1000)]
Merge pull request #18327 from civicrm/5.29

5.29

4 years agoMerge pull request #18325 from aydun/spec_fix
Eileen McNaughton [Wed, 2 Sep 2020 22:10:15 +0000 (10:10 +1200)]
Merge pull request #18325 from aydun/spec_fix

dev/mail#24, item 1 - Fix spec labels MailingEventSubscribe.create

4 years agoMerge pull request #18326 from agh1/5.29.0-releasenotes
Seamus Lee [Wed, 2 Sep 2020 21:23:46 +0000 (07:23 +1000)]
Merge pull request #18326 from agh1/5.29.0-releasenotes

5.29.0 release notes final

4 years agoMerge pull request #18320 from civicrm/5.29
Eileen McNaughton [Wed, 2 Sep 2020 19:59:36 +0000 (07:59 +1200)]
Merge pull request #18320 from civicrm/5.29

5.29

4 years ago5.29.0 release notes: get sections in right order
Andrew Hunt [Wed, 2 Sep 2020 19:19:00 +0000 (15:19 -0400)]
5.29.0 release notes: get sections in right order

4 years ago5.29.0 release notes: finished writing
Andrew Hunt [Wed, 2 Sep 2020 19:14:34 +0000 (15:14 -0400)]
5.29.0 release notes: finished writing

4 years agosorting and annotating
Alice Frumin [Tue, 1 Sep 2020 21:02:10 +0000 (17:02 -0400)]
sorting and annotating

4 years agocommenting and sorting
Alice Frumin [Tue, 1 Sep 2020 18:15:29 +0000 (14:15 -0400)]
commenting and sorting

4 years ago5.29 Release Notes first pass
Alice Frumin [Tue, 1 Sep 2020 17:16:51 +0000 (13:16 -0400)]
5.29 Release Notes first pass

4 years agoFix spec labels - see dev/mail#24, item 1
Aidan Saunders [Wed, 2 Sep 2020 18:54:53 +0000 (19:54 +0100)]
Fix spec labels - see dev/mail#24, item 1

4 years agotypo in call to nestedGroup
demeritcowboy [Wed, 2 Sep 2020 14:35:18 +0000 (10:35 -0400)]
typo in call to nestedGroup

4 years agoMerge pull request #18319 from seamuslee001/5.29
Seamus Lee [Wed, 2 Sep 2020 09:33:15 +0000 (19:33 +1000)]
Merge pull request #18319 from seamuslee001/5.29

5.28.4 release notes

4 years agoMerge pull request #18315 from eileenmcnaughton/ordergo
Matthew Wire [Wed, 2 Sep 2020 09:22:09 +0000 (10:22 +0100)]
Merge pull request #18315 from eileenmcnaughton/ordergo

[REF] Remove most interaction with $objects in completeOrder

4 years agoMerge pull request #18295 from eileenmcnaughton/linetests
Seamus Lee [Wed, 2 Sep 2020 08:46:27 +0000 (18:46 +1000)]
Merge pull request #18295 from eileenmcnaughton/linetests

Test & remove handling for max_related in renewal form

4 years agoFix anchors in release-notes/5.28.3.md
Tim Otten [Tue, 1 Sep 2020 23:19:19 +0000 (16:19 -0700)]
Fix anchors in release-notes/5.28.3.md

4 years agoAdd release-notes/5.28.4.md
Tim Otten [Tue, 1 Sep 2020 23:08:39 +0000 (16:08 -0700)]
Add release-notes/5.28.4.md

4 years agoMerge pull request #18316 from civicrm/5.29
Eileen McNaughton [Wed, 2 Sep 2020 00:11:34 +0000 (12:11 +1200)]
Merge pull request #18316 from civicrm/5.29

5.29 to master

4 years agoMerge pull request #18272 from eileenmcnaughton/custchange
Eileen McNaughton [Wed, 2 Sep 2020 00:11:08 +0000 (12:11 +1200)]
Merge pull request #18272 from eileenmcnaughton/custchange

dev/core#1974 Fix incorrect handling of serialize key when changing custom field type

4 years agoMerge pull request #18307 from agh1/5.29.0-releasenotes-initial
Eileen McNaughton [Wed, 2 Sep 2020 00:06:07 +0000 (12:06 +1200)]
Merge pull request #18307 from agh1/5.29.0-releasenotes-initial

5.29.0 release notes initial run

4 years agoMerge pull request #18310 from colemanw/revert-18005
Eileen McNaughton [Wed, 2 Sep 2020 00:05:30 +0000 (12:05 +1200)]
Merge pull request #18310 from colemanw/revert-18005

Revert #18005 Fix buggy placement of icons

4 years agoMerge pull request #18311 from mattwire/repeattrxn_unused
Eileen McNaughton [Wed, 2 Sep 2020 00:03:30 +0000 (12:03 +1200)]
Merge pull request #18311 from mattwire/repeattrxn_unused

REF Remove unused passbyreference and var from ipn_process_transaction

4 years ago[REF] Remove most interaction with
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

4 years agodev/core#1974 - ChangeFieldType - "Select (w/serialize)" field should be treated...
Noah Miller [Tue, 1 Sep 2020 22:23:25 +0000 (15:23 -0700)]
dev/core#1974 - ChangeFieldType - "Select (w/serialize)" field should be treated like older "Multi-Select" fields

4 years agoRemove unused passbyreference and var from ipn_process_transaction
Matthew Wire [Tue, 1 Sep 2020 21:41:21 +0000 (22:41 +0100)]
Remove unused passbyreference and var from ipn_process_transaction

4 years agoRevert #18005 Fix buggy placement of icons
Coleman Watts [Tue, 1 Sep 2020 20:48:57 +0000 (16:48 -0400)]
Revert #18005 Fix buggy placement of icons

4 years agoMerge pull request #18304 from highfalutin/noah/dev-core-1974
Eileen McNaughton [Tue, 1 Sep 2020 19:43:56 +0000 (07:43 +1200)]
Merge pull request #18304 from highfalutin/noah/dev-core-1974

dev/core#1974: correct UI regression on custom field edit

4 years ago5.29.0 release notes: yank changes already in 5.8.x
Andrew Hunt [Tue, 1 Sep 2020 15:18:38 +0000 (11:18 -0400)]
5.29.0 release notes: yank changes already in 5.8.x

4 years ago5.29.0 release notes: added boilerplate
Andrew Hunt [Tue, 1 Sep 2020 15:18:07 +0000 (11:18 -0400)]
5.29.0 release notes: added boilerplate

4 years ago5.29.0 release notes: raw from script
Andrew Hunt [Tue, 1 Sep 2020 15:08:02 +0000 (11:08 -0400)]
5.29.0 release notes: raw from script

4 years agoMerge pull request #18303 from eileenmcnaughton/event_batch
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

4 years agoMerge pull request #18279 from eileenmcnaughton/ordertest
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

4 years agoMerge pull request #18294 from eileenmcnaughton/linecreate
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

4 years agoMerge pull request #18305 from civicrm/5.29
Seamus Lee [Tue, 1 Sep 2020 10:10:00 +0000 (20:10 +1000)]
Merge pull request #18305 from civicrm/5.29

5.29

4 years agoMerge pull request #18293 from eileenmcnaughton/fin
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

4 years agoMerge pull request #18290 from eileenmcnaughton/tax
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

4 years agoCustom field create/edit form: replace dysfunctional checkbox with static label in...
Noah Miller [Tue, 1 Sep 2020 06:38:30 +0000 (23:38 -0700)]
Custom field create/edit form: replace dysfunctional checkbox with static label in edit mode

4 years agoMerge pull request #17810 from seamuslee001/negative_payment_create
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

4 years ago[REF] Clean up return variables on updateContributionStatus, updatePendingOnlineContr...
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

4 years agoMerge pull request #18237 from mattwire/mailingsearchcolumns
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

4 years agoMerge pull request #18302 from civicrm/5.29
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

4 years agoMerge pull request #18301 from demeritcowboy/dev-core-1982-5.29
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

4 years ago[REF] permit negative payments to be made against completed payments
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

4 years agofaulty check for simplexml node value - see also PR 18282
demeritcowboy [Mon, 31 Aug 2020 21:58:56 +0000 (17:58 -0400)]
faulty check for simplexml node value - see also PR 18282

4 years agoMerge pull request #18067 from MegaphoneJon/event-34-reroll
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

4 years agoMerge pull request #18292 from eileenmcnaughton/receipt
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

4 years agoMerge pull request #18300 from MegaphoneJon/clean-non-deductible
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

4 years agoMerge pull request #18291 from eileenmcnaughton/depit
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

4 years agoMerge pull request #18296 from eileenmcnaughton/curr_member
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

4 years agoClean money for non-deductible amount
Jon Goldberg [Sat, 29 Aug 2020 15:48:11 +0000 (11:48 -0400)]
Clean money for non-deductible amount

tests