Andrew Hunt [Thu, 30 Jul 2020 18:15:02 +0000 (14:15 -0400)]
No need for crm-i-button class
Andrew Hunt [Thu, 30 Jul 2020 18:04:39 +0000 (14:04 -0400)]
Icons on buttons positioned inline, not absolute
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
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
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
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
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
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
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
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
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
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
eileen [Mon, 3 Aug 2020 01:10:45 +0000 (13:10 +1200)]
[REF] Remove transaction from completeOrder signature
It is no longer passed in
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
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
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
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
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
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
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
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
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
demeritcowboy [Fri, 31 Jul 2020 14:30:13 +0000 (10:30 -0400)]
Fix naming of fields /remove ones that aren't true
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
Jitendra Purohit [Wed, 15 Jul 2020 10:12:30 +0000 (15:42 +0530)]
Fix code to not overwrite source contribution - unit test for 17455
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
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
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
demeritcowboy [Sun, 2 Aug 2020 18:21:54 +0000 (14:21 -0400)]
fix qill typo
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.....
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
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
Matthew Wire [Sun, 2 Aug 2020 10:18:07 +0000 (11:18 +0100)]
Merge pull request #17912 from eileenmcnaughton/flex2
Update flexmailer release information
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
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
eileen [Sun, 2 Aug 2020 09:39:33 +0000 (21:39 +1200)]
Test - attempt to replicate #17852
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
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 …
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
eileen [Sun, 2 Aug 2020 04:57:34 +0000 (16:57 +1200)]
Add test on status calculation
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
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
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
demeritcowboy [Fri, 31 Jul 2020 21:23:16 +0000 (17:23 -0400)]
missing resubscribe url
Matthew Wire [Sat, 1 Aug 2020 11:09:50 +0000 (12:09 +0100)]
Remove invalid use of crmMoney
Matthew Wire [Sat, 1 Aug 2020 09:38:28 +0000 (10:38 +0100)]
Merge pull request #18010 from eileenmcnaughton/pex
Remove main PaymentExpress class
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
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
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
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...
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
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']
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
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…
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
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
eileen [Sat, 1 Aug 2020 01:56:22 +0000 (13:56 +1200)]
[REF] Stop instantiating transaction in PaypalIPN
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
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
Seamus Lee [Sat, 1 Aug 2020 00:59:36 +0000 (10:59 +1000)]
Merge pull request #17990 from totten/master-bao-cache-adapter
CIVICRM_BAO_CACHE_ADAPTER - Remove obsolete option
Eileen McNaughton [Sat, 1 Aug 2020 00:30:46 +0000 (12:30 +1200)]
Merge pull request #18012 from demeritcowboy/utf8mb4-temptable
SQL temp table not using utf8mb4 if server default already set to utf8mb4
Eileen McNaughton [Fri, 31 Jul 2020 23:56:07 +0000 (11:56 +1200)]
Merge pull request #17996 from demeritcowboy/wrong-link-pcp-domain
Wrong link to admin page in error message about FROM address on PCP page
Seamus Lee [Fri, 31 Jul 2020 23:38:27 +0000 (09:38 +1000)]
Merge pull request #17923 from eileenmcnaughton/dedupe_return
[REF] Tighten up function signature for dedupePair
Seamus Lee [Fri, 31 Jul 2020 23:33:52 +0000 (09:33 +1000)]
dev/mail#72 Remove call to custom fatal error handler from CRM_Core_Error::debug_log_message
Seamus Lee [Fri, 31 Jul 2020 23:25:13 +0000 (09:25 +1000)]
Merge pull request #17982 from eileenmcnaughton/isreceipt
[Ref] Move noisily deprecate BaseIPN->sendMail, call api from it rather than BAO function
Eileen McNaughton [Fri, 31 Jul 2020 23:25:01 +0000 (11:25 +1200)]
Merge pull request #17396 from seamuslee001/use_util_mail_events
[REF] Use CRM_Utils_Mail::send for sending emails for confirming unsu…
Tim Otten [Wed, 29 Jul 2020 04:10:11 +0000 (21:10 -0700)]
CIVICRM_BAO_CACHE_ADAPTER - Remove obsolete option
Overview
--------
The constant `CIVICRM_BAO_CACHE_ADAPTER` was a low-visibility transitional
option added during early 5.x. It facilitated the deprecation of
`CRM_Core_BAO_Cache` (in favor of `Civi::cache()`). The option allowed
certain builds/configurations to be tested in a "purer" configuration where
`Civi::cache()` handled all storage.
However, following #17989, the deprecated functions no longer exist. Hence,
there's no need for transitional mechanism to support them. The
replacements are now mainline.
Before
-------
There's some obsolete stuff hanging around.
After
-----
The obsolete stuff is taking a long walk to the moon.
Tim Otten [Fri, 31 Jul 2020 23:23:02 +0000 (16:23 -0700)]
Merge pull request #17989 from eileenmcnaughton/cache_deprecate
CRM_Core_BAO_Cache - Remove functions deprecated a year ago
Tim Otten [Fri, 31 Jul 2020 21:55:23 +0000 (14:55 -0700)]
Merge pull request #18011 from totten/5.28-tbl
FiveTwentyEight - Provide concrete details about civicrm.files
Seamus Lee [Fri, 31 Jul 2020 21:48:16 +0000 (07:48 +1000)]
Merge pull request #18013 from demeritcowboy/fix-fix-test-test
[Test framework] re-re-fix test and add test for test
demeritcowboy [Fri, 31 Jul 2020 15:39:56 +0000 (11:39 -0400)]
re-re-fix test
demeritcowboy [Fri, 31 Jul 2020 14:34:54 +0000 (10:34 -0400)]
temptable not using utf8mb4 if server default already set
Matthew Wire [Thu, 30 Jul 2020 10:58:57 +0000 (11:58 +0100)]
Change inform-icon to fa-info-circle
Tim Otten [Fri, 31 Jul 2020 04:47:26 +0000 (21:47 -0700)]
FiveTwentyEight - Provide concrete details about civicrm.files
This hopefully makes it easier to decide what to do without needing a
scavenger hunt.
Seamus Lee [Fri, 31 Jul 2020 08:17:05 +0000 (18:17 +1000)]
Merge pull request #18009 from eileenmcnaughton/test
Re-fix test
eileen [Fri, 31 Jul 2020 07:48:19 +0000 (19:48 +1200)]
Remove main PaymentExpress class
I recently identified that this processor had been broken for a long time & removed the broken IPN class
At that time I didn't remove the main class as I was unsure how to deal with any legacy transactions related to it.
However, @mattwire pointed out he had done work earlier to make CiviCRM cope with not-present processor classes and,
on testing, I was unable to trigger any errors after setting up a contribution page & an event page & making a payment
and then deleting the class. I couldn't edit the contribution, but with appropriate in app messaging and no fatal
error.
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
Eileen McNaughton [Fri, 31 Jul 2020 04:02:19 +0000 (16:02 +1200)]
Merge pull request #18004 from colemanw/saveDoc
[NFC] Improve docs for APIv4 Save action
Eileen McNaughton [Fri, 31 Jul 2020 04:00:55 +0000 (16:00 +1200)]
Merge pull request #18006 from demeritcowboy/missing-transactioninfo
dev/core#1909 - E_NOTICE on contribution edit
Eileen McNaughton [Fri, 31 Jul 2020 03:23:02 +0000 (15:23 +1200)]
Merge pull request #18007 from demeritcowboy/strpos-revisited
dev/core#1918 - Remove dubious qfkey checking code that never runs
Eileen McNaughton [Fri, 31 Jul 2020 03:02:15 +0000 (15:02 +1200)]
Merge pull request #18008 from civicrm/5.28
5.28
Seamus Lee [Thu, 30 Jul 2020 23:43:33 +0000 (09:43 +1000)]
Merge pull request #17983 from kcristiano/5.28-wp-notices
dev/wordpress/66 Add Upgrade Notice regarding legacy paths
Seamus Lee [Thu, 30 Jul 2020 23:38:08 +0000 (09:38 +1000)]
Merge pull request #17987 from eileenmcnaughton/pseudo_mem
[REF] Reduce calls to CRM_Member_PseudoConstant::membershipType
Seamus Lee [Thu, 30 Jul 2020 23:37:49 +0000 (09:37 +1000)]
Merge pull request #18002 from demeritcowboy/missing-soft-credit
dev/core#1915 - E_NOTICE when making pcp contribution
Seamus Lee [Thu, 30 Jul 2020 21:01:48 +0000 (07:01 +1000)]
Merge pull request #18003 from demeritcowboy/membership-fail
[Test framework] - Update failing test
demeritcowboy [Thu, 30 Jul 2020 20:57:04 +0000 (16:57 -0400)]
remove dubious code that never runs
demeritcowboy [Thu, 30 Jul 2020 20:27:30 +0000 (16:27 -0400)]
notice on contribution edit
Coleman Watts [Thu, 30 Jul 2020 16:38:15 +0000 (12:38 -0400)]
Improve docs for APIv4 Save action
colemanw [Thu, 30 Jul 2020 15:42:52 +0000 (11:42 -0400)]
Merge pull request #17975 from eileenmcnaughton/matt_yet_another
Fix repeattransaction api to use custom data from the template contribution
demeritcowboy [Thu, 30 Jul 2020 03:28:56 +0000 (23:28 -0400)]
update failing test
Eileen McNaughton [Thu, 30 Jul 2020 03:54:04 +0000 (15:54 +1200)]
Merge pull request #17777 from agh1/dontchangereceivedate
dev/financial#139 contribution receive_date shouldn't change when payments come in
eileen [Thu, 30 Jul 2020 03:27:24 +0000 (15:27 +1200)]
Cache loader - remove legacy handling, handle null result from setting
We are seeing this symptom in our tests in some cases
https://civicrm.stackexchange.com/questions/28897/error-when-merging-accounts
I'm not quite sure why the setting would be empty - but treating empty the same as 'default'
seems better than a hard fail and we know that settings have a track history of not all being
loaded at the right times.
This also removes some legacy handling
demeritcowboy [Thu, 30 Jul 2020 03:07:24 +0000 (23:07 -0400)]
E_NOTICE when pcp contribution
Eileen McNaughton [Wed, 29 Jul 2020 21:31:27 +0000 (09:31 +1200)]
Merge pull request #17997 from civicrm/5.28
5.28
Seamus Lee [Wed, 29 Jul 2020 21:26:58 +0000 (07:26 +1000)]
Merge pull request #17868 from seamuslee001/remove_civicrm_files_override
[REF] Remove civicrm.files override for WordPress to fix issues with…
Eileen McNaughton [Wed, 29 Jul 2020 21:16:50 +0000 (09:16 +1200)]
Merge pull request #17970 from eileenmcnaughton/case_export
Fix case activity field set to allow long details to be exported
demeritcowboy [Wed, 29 Jul 2020 19:39:30 +0000 (15:39 -0400)]
wrong link to admin page
Eileen McNaughton [Wed, 29 Jul 2020 12:50:09 +0000 (00:50 +1200)]
Merge pull request #17986 from seamuslee001/dev_core_1913_alternate
dev/core#1913 Allow for schemas to be added by extensions if they are…
Eileen McNaughton [Wed, 29 Jul 2020 12:49:23 +0000 (00:49 +1200)]
Merge pull request #17707 from seamuslee001/ref_permission_clause_search
[REF] Use Standard function cacheClause to re-use contact acl cache t…
Eileen McNaughton [Wed, 29 Jul 2020 12:47:31 +0000 (00:47 +1200)]
Merge pull request #17978 from kainuk/issue-1914
Fixed filling default values for tagssets in the advanced search form