civicrm-core.git
3 years agoMerge pull request #18058 from eileenmcnaughton/date
Seamus Lee [Tue, 4 Aug 2020 20:22:55 +0000 (06:22 +1000)]
Merge pull request #18058 from eileenmcnaughton/date

[REF] Even less variable variables

3 years agoMerge pull request #18064 from agh1/configicons-ts
Eileen McNaughton [Tue, 4 Aug 2020 19:34:24 +0000 (07:34 +1200)]
Merge pull request #18064 from agh1/configicons-ts

dev/core#1905 rework #17942 with simpler ts strings

3 years agodev/core#1905 rework #17942 with simpler ts strings
Andrew Hunt [Tue, 4 Aug 2020 17:04:37 +0000 (13:04 -0400)]
dev/core#1905 rework #17942 with simpler ts strings

3 years agoMerge pull request #18039 from eileenmcnaughton/mail
Matthew Wire [Tue, 4 Aug 2020 13:40:02 +0000 (14:40 +0100)]
Merge pull request #18039 from eileenmcnaughton/mail

Extract code to set isEmailReceipt in Contribution.completeOrder

3 years agoMerge pull request #18055 from eileenmcnaughton/curr_copy
Matthew Wire [Tue, 4 Aug 2020 13:38:37 +0000 (14:38 +0100)]
Merge pull request #18055 from eileenmcnaughton/curr_copy

[REF] remove first attempt to set currency in repeattransaction flow

3 years agoMerge pull request #18063 from civicrm/5.28
Seamus Lee [Tue, 4 Aug 2020 11:58:07 +0000 (21:58 +1000)]
Merge pull request #18063 from civicrm/5.28

5.28

3 years agoMerge pull request #17942 from jitendrapurohit/configure-link
Eileen McNaughton [Tue, 4 Aug 2020 11:57:00 +0000 (23:57 +1200)]
Merge pull request #17942 from jitendrapurohit/configure-link

dev/core#1905 Add configure icons on public pages

3 years agoMerge pull request #17995 from colemanw/updateHook
Eileen McNaughton [Tue, 4 Aug 2020 11:32:52 +0000 (23:32 +1200)]
Merge pull request #17995 from colemanw/updateHook

CRM_Utils_Hook: deprecation warning and short array syntax

3 years agoMerge pull request #18040 from MegaphoneJon/selfservice-fixes
Eileen McNaughton [Tue, 4 Aug 2020 11:30:37 +0000 (23:30 +1200)]
Merge pull request #18040 from MegaphoneJon/selfservice-fixes

event#35: move statusBounce out of BAO layer; don't allow self-service when dis…

3 years agoMerge pull request #18054 from agh1/no-button-bg
Matthew Wire [Tue, 4 Aug 2020 11:30:28 +0000 (12:30 +0100)]
Merge pull request #18054 from agh1/no-button-bg

Why not make the buttons flat?

3 years agoMerge pull request #18061 from seamuslee001/5274_notes
Seamus Lee [Tue, 4 Aug 2020 10:13:27 +0000 (20:13 +1000)]
Merge pull request #18061 from seamuslee001/5274_notes

[NFC] 5.27.4 Release Notes

3 years agoMerge pull request #18062 from eileenmcnaughton/error_juice
Matthew Wire [Tue, 4 Aug 2020 10:05:44 +0000 (11:05 +0100)]
Merge pull request #18062 from eileenmcnaughton/error_juice

Improve error handling on IPN

3 years agoImprove error handling on IPN
eileen [Tue, 4 Aug 2020 07:44:33 +0000 (19:44 +1200)]
Improve error handling on IPN

https://civicrm.stackexchange.com/questions/37277/paypal-standard-payments-are-being-accepted-but-marked-as-incomplete-transaction/37279#37279

shows how unhelpful this error is - getting data from the exception should help.

Targetting 5.28 in case the gitlab relates to a regression & we need to solicit more debug info

3 years agorelease-notes.md - Small copy-edits
Tim Otten [Tue, 4 Aug 2020 06:26:11 +0000 (23:26 -0700)]
release-notes.md - Small copy-edits

3 years agoAdd release-notes/5.27.4.md
Tim Otten [Mon, 3 Aug 2020 10:04:07 +0000 (03:04 -0700)]
Add release-notes/5.27.4.md

3 years agoMerge pull request #17951 from eileenmcnaughton/export_im
Seamus Lee [Tue, 4 Aug 2020 05:53:48 +0000 (15:53 +1000)]
Merge pull request #17951 from eileenmcnaughton/export_im

[REF] Simplify location metadata handling in Export class

3 years ago[REF] remove first attempt to set currency in repeattransaction flow
eileen [Tue, 4 Aug 2020 00:25:23 +0000 (12:25 +1200)]
[REF] remove first attempt to set currency in repeattransaction flow

The currency is retrieved from the template transaction, these lines are no longer needed, as demonstrated
in the test

3 years agoMerge pull request #18059 from civicrm/5.28
Seamus Lee [Tue, 4 Aug 2020 04:13:04 +0000 (14:13 +1000)]
Merge pull request #18059 from civicrm/5.28

5.28

3 years agoMerge pull request #18053 from seamuslee001/test_ports
Seamus Lee [Tue, 4 Aug 2020 04:11:44 +0000 (14:11 +1000)]
Merge pull request #18053 from seamuslee001/test_ports

[NFC] Port some recent test fixes from master to 5.28

3 years agoMerge pull request #18057 from eileenmcnaughton/single
Seamus Lee [Tue, 4 Aug 2020 02:33:43 +0000 (12:33 +1000)]
Merge pull request #18057 from eileenmcnaughton/single

[REF] Do not pass by reference to the recur function

3 years ago(REF) WebsiteTest - Mitigate flaky failures
Tim Otten [Tue, 14 Jul 2020 18:18:08 +0000 (11:18 -0700)]
(REF) WebsiteTest - Mitigate flaky failures

Overview
--------

In recent days, api_v3_WebsiteTest has emitted sporadic failures like this:

```
api_v3_WebsiteTest::testDeleteWebsite with data set #0 (3)
Failed asserting that 3 matches expected 0.

/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/api/v3/WebsiteTest.php:75
/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:209
/home/jenkins/bknix-max/extern/phpunit7/phpunit7.phar:615
```

and

```
api_v3_WebsiteTest::testDeleteWebsiteInvalid with data set #0 (3)
Failed asserting that 4 matches expected 1.

/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/api/v3/WebsiteTest.php:88
/home/jenkins/bknix-max/build/build-2/web/sites/all/modules/civicrm/tests/phpunit/CiviTest/CiviUnitTestCase.php:209
/home/jenkins/bknix-max/extern/phpunit7/phpunit7.phar:615
```

These failures do not reproduce for me in isolation.

Before
------

Both the failing assertions make an implicit assumption that the baseline content of `civicrm_website` is empty.

After
-----

The failing assertions use an explicit baseline (`$beforeCount`).

Comments
--------

The test failures are sporadic and only seem to seem occur when run in the full suite.

My theory is that something else is leaking `civicrm_website` records;
however, it's hard to track that down amidst a full suite (when the full
suite takes so long to execute).  Therefore, I cannot be certain that this
is actually fixes the problem.  However, this really just tightens up the
assumptions of the test - as long as it passes the PR tests, it should be
safe to merge and then watch in the `CiviCRM-Core-Matrix`.

3 years ago[REF] Even less variable variables
eileen [Tue, 4 Aug 2020 01:30:55 +0000 (13:30 +1200)]
[REF] Even less variable variables

3 years agoMerge pull request #18051 from demeritcowboy/member-status
Eileen McNaughton [Tue, 4 Aug 2020 01:12:54 +0000 (13:12 +1200)]
Merge pull request #18051 from demeritcowboy/member-status

[REF] Simplify getMembershipStatusByDate more

3 years ago[REF] Do not pass by reference to the recur function
eileen [Tue, 4 Aug 2020 00:43:40 +0000 (12:43 +1200)]
[REF] Do not pass by reference to the recur function

This is called twice (from with the same file). In both cases the calling function exits straight after
without using or returning the value and the calling function has not itself received them by reference

3 years agoNo need to make Cancel button color imperceptibly dimmer
Andrew Hunt [Mon, 3 Aug 2020 23:59:24 +0000 (19:59 -0400)]
No need to make Cancel button color imperceptibly dimmer

3 years agoRemove crm-button-bg
Andrew Hunt [Mon, 3 Aug 2020 23:57:50 +0000 (19:57 -0400)]
Remove crm-button-bg

3 years agoMerge pull request #17993 from eileenmcnaughton/mm
Seamus Lee [Tue, 4 Aug 2020 00:05:20 +0000 (10:05 +1000)]
Merge pull request #17993 from eileenmcnaughton/mm

Fix obscure dedupe scenario where 'bad' location data can overwrite good data

3 years agoMerge pull request #17915 from demeritcowboy/useradd-messages
Eileen McNaughton [Tue, 4 Aug 2020 00:02:46 +0000 (12:02 +1200)]
Merge pull request #17915 from demeritcowboy/useradd-messages

dev/drupal#127 - require email for the Useradd task and errors not showing

3 years agoExtract code to set isEmailReceipt in Contribution.completeOrder
eileen [Sun, 2 Aug 2020 11:03:01 +0000 (23:03 +1200)]
Extract code to set isEmailReceipt in Contribution.completeOrder

This consolidates all the code in the completeOrder that determines whether or not to send an email receipt.

Note that
- testCompleteTransactionWithEmailReceiptInput tests that input is respected
- for events the event::sendMail function will not send unless it's configured for the event - which
explains our final default of TRUE (testCompleteTransactionWithParticipantRecord)
- testCompleteTransaction covers the back-office case which also defaults to true
- I figure the cost of reloading the value for contribution_recur is pretty cheap compared to the confusion of passing values around
- testpayLater covers contribution_page with is_email_receipt

3 years agoFix for failing test
eileen [Sun, 2 Aug 2020 04:41:16 +0000 (16:41 +1200)]
Fix for failing test

BY ensuring join_date is in the past we get away from situations where there is no valid status

3 years agore-re-fix test
demeritcowboy [Fri, 31 Jul 2020 15:39:56 +0000 (11:39 -0400)]
re-re-fix test

3 years agoRe-fix test
eileen [Fri, 31 Jul 2020 04:27:55 +0000 (16:27 +1200)]
Re-fix test

The strtotime calculation adds 4 months before setting the day of month. However

July 31 + 4 months is 1 Dec - ie the month is 12 not 11 due to there being only 30 days. So to
get 27 Nov we need to get the July month (7) and add 4 and voila 11, not 12

3 years agoupdate failing test
demeritcowboy [Thu, 30 Jul 2020 03:28:56 +0000 (23:28 -0400)]
update failing test

3 years agomake test less time-sensitive
demeritcowboy [Tue, 21 Jul 2020 03:14:46 +0000 (23:14 -0400)]
make test less time-sensitive

3 years agoapi_v3_TaxContributionPageTest fix - remove hard coded processor id
eileen [Thu, 16 Jul 2020 07:12:54 +0000 (19:12 +1200)]
api_v3_TaxContributionPageTest fix - remove hard coded processor id

3 years agoMerge pull request #18025 from eileenmcnaughton/isotosql
Seamus Lee [Mon, 3 Aug 2020 23:31:19 +0000 (09:31 +1000)]
Merge pull request #18025 from eileenmcnaughton/isotosql

dev/core#1921 [Ref] remove isoToMysql

3 years agomove statusBounce out of BAO layer; don't allow self-service when disabled; support...
Jon Goldberg [Sat, 1 Aug 2020 21:25:23 +0000 (17:25 -0400)]
move statusBounce out of BAO layer; don't allow self-service when disabled; support cancel deadlines > 24 hours.

3 years agoMerge pull request #18052 from seamuslee001/master
Seamus Lee [Mon, 3 Aug 2020 23:02:45 +0000 (09:02 +1000)]
Merge pull request #18052 from seamuslee001/master

dev/core#1665 Remove the having clause as well as having needs a group by

3 years agoRemove the having clause as well as having needs a group by
Seamus Lee [Mon, 3 Aug 2020 21:34:21 +0000 (07:34 +1000)]
Remove the having clause as well as having needs a group by

3 years agoMerge pull request #16877 from agileware/CIVICRM-1457
Seamus Lee [Mon, 3 Aug 2020 21:35:26 +0000 (07:35 +1000)]
Merge pull request #16877 from agileware/CIVICRM-1457

Remove ORDER BY and GROUP BY from alphabetQuery to improve performance

3 years agosimplification and add more test
demeritcowboy [Mon, 3 Aug 2020 17:51:40 +0000 (13:51 -0400)]
simplification and add more test

3 years agoMerge pull request #17937 from seamuslee001/radio_jquery_require
Matthew Wire [Mon, 3 Aug 2020 14:20:40 +0000 (15:20 +0100)]
Merge pull request #17937 from seamuslee001/radio_jquery_require

Fix JQuery Validation for radios

3 years agoMerge pull request #18030 from eileenmcnaughton/fail
Matthew Wire [Mon, 3 Aug 2020 13:18:45 +0000 (14:18 +0100)]
Merge pull request #18030 from eileenmcnaughton/fail

[REF] Simplify membership status date handling

3 years agoMerge pull request #18044 from eileenmcnaughton/pprefs
Matthew Wire [Mon, 3 Aug 2020 13:17:40 +0000 (14:17 +0100)]
Merge pull request #18044 from eileenmcnaughton/pprefs

Fix PaypalIPN single function to not receive-by-reference

3 years agoMerge pull request #18018 from eileenmcnaughton/cont_status
Matthew Wire [Mon, 3 Aug 2020 13:15:16 +0000 (14:15 +0100)]
Merge pull request #18018 from eileenmcnaughton/cont_status

Remove requirement to pass 'contribution_status_id' => Pending from order.create

3 years agoMerge pull request #18032 from eileenmcnaughton/single
Matthew Wire [Mon, 3 Aug 2020 13:13:44 +0000 (14:13 +0100)]
Merge pull request #18032 from eileenmcnaughton/single

[REF] Clean up handling of financial_type_id override

3 years agoMerge pull request #18033 from eileenmcnaughton/cont_id
Matthew Wire [Mon, 3 Aug 2020 13:11:20 +0000 (14:11 +0100)]
Merge pull request #18033 from eileenmcnaughton/cont_id

Use saved contribution's line items rather than the primaryContributionID

3 years agoMerge pull request #18046 from eileenmcnaughton/trans
Eileen McNaughton [Mon, 3 Aug 2020 03:42:38 +0000 (15:42 +1200)]
Merge pull request #18046 from eileenmcnaughton/trans

[REF] Remove transaction from completeOrder signature

3 years agoMerge pull request #17966 from pradpnayak/divwrap
Eileen McNaughton [Mon, 3 Aug 2020 01:52:00 +0000 (13:52 +1200)]
Merge pull request #17966 from pradpnayak/divwrap

Wrap multi record custom field inside a div

3 years ago[REF] Clean up handling of financial_type_id override
eileen [Sat, 1 Aug 2020 20:45:13 +0000 (08:45 +1200)]
[REF] Clean up handling of financial_type_id override

Currently we use the primaryContributionID to determine whether the templateContribution will
have more than one line item & unset the parameter. It makes much more sense to do evaluations
on how many line items the template contribution will have when we have loaded it's line items.

The logic is that the financial_type_id can be overriden either by editing the recurring contribution
(which you are permitted to do if only one line item exists) or by passing it in via input (which
is ignored if there is more than one line item.

This change ensures the input parameter reaches repeatTrannsaction - which is the appropriate
place to determine whether to apply it.

It removes one of 2 places that refers to primaryContributionID. The other is also inappropriate
as it is basically used to look up the line items to see the number of terms for the membership. However,
we already know that for any repeat transactions as we have already loaded the line items. In
completeOrder the line items are that of the contribution being saved.

We could pass the saved contribution id into this function as a quick way to eliminate the primaryContributionID
or we could just determine num_terms rather than primaryContributionID earlier on

3 years agoMerge pull request #18045 from eileenmcnaughton/sleep
Eileen McNaughton [Mon, 3 Aug 2020 01:16:37 +0000 (13:16 +1200)]
Merge pull request #18045 from eileenmcnaughton/sleep

[Test fix] We might need this to ensure really quick test runs don't fail

3 years ago[REF] Remove transaction from completeOrder signature
eileen [Mon, 3 Aug 2020 01:10:45 +0000 (13:10 +1200)]
[REF] Remove transaction from completeOrder signature

It is no longer passed in

3 years agoMerge pull request #17706 from demeritcowboy/mysql-ssl-alt
Eileen McNaughton [Mon, 3 Aug 2020 00:57:31 +0000 (12:57 +1200)]
Merge pull request #17706 from demeritcowboy/mysql-ssl-alt

dev/core#1137 - Allow ssl connection to mysql by specifying in DSN

3 years agoMerge pull request #18038 from eileenmcnaughton/perm_test
Seamus Lee [Mon, 3 Aug 2020 00:16:10 +0000 (10:16 +1000)]
Merge pull request #18038 from eileenmcnaughton/perm_test

Test - attempt to replicate #17852

3 years agoMerge pull request #18042 from eileenmcnaughton/transact
Seamus Lee [Mon, 3 Aug 2020 00:15:30 +0000 (10:15 +1000)]
Merge pull request #18042 from eileenmcnaughton/transact

[REF] Remove transaction from BaseIPN completeTransaction call

3 years agoMerge pull request #17700 from ixiam/dev-#1843
Eileen McNaughton [Sun, 2 Aug 2020 23:56:16 +0000 (11:56 +1200)]
Merge pull request #17700 from ixiam/dev-#1843

Remove url-tracking in mass sms. dev/core#1843

3 years agoMerge pull request #17972 from eileenmcnaughton/matt_another
Eileen McNaughton [Sun, 2 Aug 2020 23:54:36 +0000 (11:54 +1200)]
Merge pull request #17972 from eileenmcnaughton/matt_another

Do not overwrite values saved from the repeatContribution routine

3 years agoMerge pull request #18043 from demeritcowboy/liar-fields
Eileen McNaughton [Sun, 2 Aug 2020 23:54:20 +0000 (11:54 +1200)]
Merge pull request #18043 from demeritcowboy/liar-fields

dev/core#1916 - Fix naming of case export fields / remove ones that aren't true

3 years agoMerge pull request #17824 from colemanw/checks
Eileen McNaughton [Sun, 2 Aug 2020 23:48:13 +0000 (11:48 +1200)]
Merge pull request #17824 from colemanw/checks

SystemCheck: add ability to efficiently run only specified checks

3 years ago[Test fix] We might need this to ensure really quick test runs don't fail
eileen [Sun, 2 Aug 2020 23:24:07 +0000 (11:24 +1200)]
[Test fix] We might need this to ensure really quick test runs don't fail

3 years agoFix PaypalIPN single function to not receive-by-reference
eileen [Sun, 2 Aug 2020 22:05:02 +0000 (10:05 +1200)]
Fix PaypalIPN single function to not receive-by-reference

The function is called from 2 places
- main
- recur

In both cases it is at the end of the function & so the vars, if altered, are not used again.
In the case of main they are internal to the function whereas for recur they are not returned to the
calling function

3 years agoFix naming of fields /remove ones that aren't true
demeritcowboy [Fri, 31 Jul 2020 14:30:13 +0000 (10:30 -0400)]
Fix naming of fields /remove ones that aren't true

3 years ago[REF] Remove transaction from BaseIPN completeTransaction call
eileen [Sun, 2 Aug 2020 21:43:56 +0000 (09:43 +1200)]
[REF] Remove transaction from BaseIPN completeTransaction call

This is now never passed in

3 years agoFix code to not overwrite source contribution - unit test for 17455
Jitendra Purohit [Wed, 15 Jul 2020 10:12:30 +0000 (15:42 +0530)]
Fix code to not overwrite source contribution - unit test for 17455

3 years agoMerge pull request #18028 from eileenmcnaughton/anet
Seamus Lee [Sun, 2 Aug 2020 21:24:03 +0000 (07:24 +1000)]
Merge pull request #18028 from eileenmcnaughton/anet

Add testing to Authorize.net and remove the lines that are repeated

3 years agoMerge pull request #18037 from eileenmcnaughton/status_check
Seamus Lee [Sun, 2 Aug 2020 20:37:26 +0000 (06:37 +1000)]
Merge pull request #18037 from eileenmcnaughton/status_check

Add test on status calculation

3 years agoMerge pull request #18041 from demeritcowboy/status-type-whats-the-diff
Seamus Lee [Sun, 2 Aug 2020 20:35:55 +0000 (06:35 +1000)]
Merge pull request #18041 from demeritcowboy/status-type-whats-the-diff

Fix qill typo

3 years agofix qill typo
demeritcowboy [Sun, 2 Aug 2020 18:21:54 +0000 (14:21 -0400)]
fix qill typo

3 years agoRemove requirement to pass 'contribution_status_id' => Pending from order.create
eileen [Sat, 1 Aug 2020 00:36:27 +0000 (12:36 +1200)]
Remove requirement to pass 'contribution_status_id' => Pending from order.create

contribution_status_id is a required param, but the only acceptable value is Pending. Let's make it optional.....

3 years agoMerge pull request #18015 from demeritcowboy/resubscribe-missing
Matthew Wire [Sun, 2 Aug 2020 10:23:12 +0000 (11:23 +0100)]
Merge pull request #18015 from demeritcowboy/resubscribe-missing

dev/core#1919 - Missing resubscribe url in text/plain version of unsubscribe confirmation email

3 years agoMerge pull request #18029 from eileenmcnaughton/sendmail
Matthew Wire [Sun, 2 Aug 2020 10:20:26 +0000 (11:20 +0100)]
Merge pull request #18029 from eileenmcnaughton/sendmail

[Ref] Simplify is_email_receipt in sendMail

3 years agoMerge pull request #17912 from eileenmcnaughton/flex2
Matthew Wire [Sun, 2 Aug 2020 10:18:07 +0000 (11:18 +0100)]
Merge pull request #17912 from eileenmcnaughton/flex2

Update flexmailer release information

3 years agoUse saved contribution's line items rather than the primaryContributionID
eileen [Sat, 1 Aug 2020 21:58:39 +0000 (09:58 +1200)]
Use saved contribution's line items rather than the primaryContributionID

By the time we reach this point in the code we know that
1) the contributon exists and it has an id
2) it has line items  - either those created in it's pending stage or those calculated in repeattransaction

Therefore we can reasonably assume these line items are accurate now and use them, rather than the confusing
primaryContributionID that we have doubts about the validity of

3 years agoMerge pull request #18019 from eileenmcnaughton/event_clean
Seamus Lee [Sun, 2 Aug 2020 09:40:54 +0000 (19:40 +1000)]
Merge pull request #18019 from eileenmcnaughton/event_clean

[REF] [Test] Minor simplification on test

3 years agoTest - attempt to replicate #17852
eileen [Sun, 2 Aug 2020 09:39:33 +0000 (21:39 +1200)]
Test - attempt to replicate #17852

3 years agoAdd testing to Authorize.net and remove the lines that are repeated
eileen [Sat, 1 Aug 2020 05:10:20 +0000 (17:10 +1200)]
Add testing to Authorize.net and remove the lines that are repeated

In Authorize.netIPN updates are made to the contributionRecur that are later made in ContributionRecur::updateOnNewPayment

This adds test cover to ensure no change and then removes them.

With these lines gone it's apparent that the transaction is not required here

3 years agoMerge pull request #17943 from jitendrapurohit/core-1906
Eileen McNaughton [Sun, 2 Aug 2020 07:39:29 +0000 (19:39 +1200)]
Merge pull request #17943 from jitendrapurohit/core-1906

dev/core#1906 - Allow payment create api to record payment on Failed …

3 years agoFix obscure dedupe scenario where 'bad' location data can overwrite good data
eileen [Wed, 29 Jul 2020 12:20:43 +0000 (00:20 +1200)]
Fix obscure dedupe scenario where 'bad' location data can overwrite good data

Our api permits the creation of addresses with no actual address-related data. I'm not sure this is a good
thing but one way or another some addresses got into our database with no useful information and I'm not convinced we
are alone.

When merging it's possible for a null address record to be treated as 'not a conflict' with an address record
with the same location but actual data, and for the null record to be retained. This fixes it such that in that
scenario the retained record is the one with data.

This is pretty obscure and an argument could be made for not fixing it. On the other hand this extends tests on the code
(in addition to the fairly extensive set in testBatchMergesAddresses) and I also did a few tangental cleanups

3 years agoMerge pull request #18036 from eileenmcnaughton/exp_test
Eileen McNaughton [Sun, 2 Aug 2020 06:28:14 +0000 (18:28 +1200)]
Merge pull request #18036 from eileenmcnaughton/exp_test

Fix for failing test

3 years agoAdd test on status calculation
eileen [Sun, 2 Aug 2020 04:57:34 +0000 (16:57 +1200)]
Add test on status calculation

3 years agoFix for failing test
eileen [Sun, 2 Aug 2020 04:41:16 +0000 (16:41 +1200)]
Fix for failing test

BY ensuring join_date is in the past we get away from situations where there is no valid status

3 years agoMerge pull request #18031 from mattwire/crmmoney
Eileen McNaughton [Sat, 1 Aug 2020 21:34:07 +0000 (09:34 +1200)]
Merge pull request #18031 from mattwire/crmmoney

Remove invalid use of crmMoney formatter

3 years ago[REF] [Test] Minor simplification on test
eileen [Sat, 1 Aug 2020 01:16:44 +0000 (13:16 +1200)]
[REF] [Test] Minor simplification on test

This is towards standardising on one way to reference created entities -ie

->ids['Participant'][key] = 4

3 years agomissing resubscribe url
demeritcowboy [Fri, 31 Jul 2020 21:23:16 +0000 (17:23 -0400)]
missing resubscribe url

3 years agoRemove invalid use of crmMoney
Matthew Wire [Sat, 1 Aug 2020 11:09:50 +0000 (12:09 +0100)]
Remove invalid use of crmMoney

3 years agoMerge pull request #18010 from eileenmcnaughton/pex
Matthew Wire [Sat, 1 Aug 2020 09:38:28 +0000 (10:38 +0100)]
Merge pull request #18010 from eileenmcnaughton/pex

Remove main PaymentExpress class

3 years ago[REF] Simplify membership status date handling
eileen [Sat, 1 Aug 2020 06:52:46 +0000 (18:52 +1200)]
[REF] Simplify membership status date handling

We have a test error coming out of this code. I find it unreadable - I think this would help....

There are some obvious next steps if this is all good

3 years agoMerge pull request #18026 from eileenmcnaughton/pptrans
Eileen McNaughton [Sat, 1 Aug 2020 05:43:31 +0000 (17:43 +1200)]
Merge pull request #18026 from eileenmcnaughton/pptrans

[Ref] Remove transaction instantiation in PaypalPro

3 years ago[Ref] Simplify is_email_receipt in sendMail
eileen [Sat, 1 Aug 2020 05:35:38 +0000 (17:35 +1200)]
[Ref] Simplify is_email_receipt in sendMail

This function has evolved through refactoring so there was a time when this code needed to decide whether to
send emails out or not. However, the function is now called more deliberately -ie
1) from completeTransaction - where it is only called if the decision to send an email is made
2) from the search action send Email receipts - where a user has made the decision to send (or pdf)
receipts and unless it's being called with returnMessageText = TRUE (to construct a pdf) then
send makes sense

Ergo we should send unless returnMessageText = TRUE

3 years agodev/core#1921 [Ref] remove isoToMysql
eileen [Sat, 1 Aug 2020 04:06:40 +0000 (16:06 +1200)]
dev/core#1921 [Ref] remove isoToMysql

It used to be necessary (until maybe 5 years ago) to reformat retrieved date params before re-saving

https://lab.civicrm.org/dev/core/-/issues/1921

3 years ago[Ref] Remove transaction instantiation in PaypalPro
eileen [Sat, 1 Aug 2020 04:13:59 +0000 (16:13 +1200)]
[Ref] Remove transaction instantiation in PaypalPro

The transaction is an optional param & we are not doing any saves so let's take the option to not pass it in...

3 years agoMerge pull request #18020 from eileenmcnaughton/pptrans
Seamus Lee [Sat, 1 Aug 2020 04:10:47 +0000 (14:10 +1000)]
Merge pull request #18020 from eileenmcnaughton/pptrans

[REF] Stop instantiating transaction in PaypalIPN

3 years agoMerge pull request #18021 from eileenmcnaughton/ids_billing
Seamus Lee [Sat, 1 Aug 2020 04:08:35 +0000 (14:08 +1000)]
Merge pull request #18021 from eileenmcnaughton/ids_billing

Remove unused parameter ids['billing']

3 years agoMerge pull request #18023 from civicrm/5.28
Eileen McNaughton [Sat, 1 Aug 2020 03:47:36 +0000 (15:47 +1200)]
Merge pull request #18023 from civicrm/5.28

5.28 to master

3 years agoMerge pull request #18017 from seamuslee001/dev_mail_72
Eileen McNaughton [Sat, 1 Aug 2020 03:47:11 +0000 (15:47 +1200)]
Merge pull request #18017 from seamuslee001/dev_mail_72

dev/mail#72 Remove call to custom fatal error handler from CRM_Core_E…

3 years agoMerge pull request #17999 from eileenmcnaughton/sql_cache
Seamus Lee [Sat, 1 Aug 2020 03:03:18 +0000 (13:03 +1000)]
Merge pull request #17999 from eileenmcnaughton/sql_cache

Cache loader - remove legacy handling, handle null result from setting

3 years agoRemove unused parameter ids['billing']
eileen [Sat, 1 Aug 2020 02:06:39 +0000 (14:06 +1200)]
Remove unused parameter ids['billing']

This is no longer used in later functions and a quick grep of the code finds only one deprecated
function still refers to ids-billing after this

3 years ago[REF] Stop instantiating transaction in PaypalIPN
eileen [Sat, 1 Aug 2020 01:56:22 +0000 (13:56 +1200)]
[REF] Stop instantiating transaction in PaypalIPN

3 years agoMerge pull request #18001 from mattwire/inform-icon
Eileen McNaughton [Sat, 1 Aug 2020 01:25:38 +0000 (13:25 +1200)]
Merge pull request #18001 from mattwire/inform-icon

Change inform-icon to fa-info-circle

3 years agoMerge pull request #17984 from eileenmcnaughton/sendref
Seamus Lee [Sat, 1 Aug 2020 00:59:53 +0000 (10:59 +1000)]
Merge pull request #17984 from eileenmcnaughton/sendref

[REF] Remove pass-by-reference & always empty param