Matthew Wire [Sun, 13 Oct 2019 14:59:31 +0000 (15:59 +0100)]
Merge pull request #15488 from eileenmcnaughton/fin_acc
[REF] Minor cleanup to determine taxterm with a helper function.
Matthew Wire [Sun, 13 Oct 2019 14:58:47 +0000 (15:58 +0100)]
Merge pull request #15489 from eileenmcnaughton/credit_dep
[REF] Replace deprecated function call with a more readable alternative
Seamus Lee [Sun, 13 Oct 2019 00:36:14 +0000 (02:36 +0200)]
Merge pull request #15490 from eileenmcnaughton/fn_ref
[REF] improve function signature on updateFinancialAccountsOnContributionStatusChange
eileen [Thu, 10 Oct 2019 08:16:28 +0000 (10:16 +0200)]
[REF] improve function signature on updateFinancialAccountsOnContributionStatusChange
This private function is only called from one place. The conditional before it is called is
if ($context == 'changedStatus') {
Ergo $context is ALWAYS changedStatus when this function is called.
As a result I have removed context from the function signature & the if that checks it is
equal to 'changedStatus'
eileen [Thu, 10 Oct 2019 09:21:14 +0000 (11:21 +0200)]
Replace deprecated function call with a more readable alternative
This adds a wrapper to getting financial accounts with the type. We could call the other directly but it's less
readable & requires the account name to be specified which feels like a look-up for devs
eileen [Thu, 10 Oct 2019 09:03:09 +0000 (11:03 +0200)]
Minor cleanup to determine taxterm with a helper function.
Simple cleanup to reduce the lines of code and make it more greppable
Matthew Wire [Fri, 11 Oct 2019 09:12:26 +0000 (10:12 +0100)]
Merge pull request #15476 from mattwire/paymentprocessorpay_typo
Fix typo in parameter description for PaymentProcessor.pay
Seamus Lee [Thu, 10 Oct 2019 22:02:36 +0000 (00:02 +0200)]
Merge pull request #15482 from seamuslee001/fix_merge_array
Fixes an issue where the two arrays weren't always being merged correctly
Seamus Lee [Thu, 10 Oct 2019 18:43:46 +0000 (05:43 +1100)]
Fix merge hook arrays
Matthew Wire (MJW Consulting) [Thu, 10 Oct 2019 13:55:24 +0000 (15:55 +0200)]
Fix typo in parameter description for PaymentProcessor.pay
Seamus Lee [Thu, 10 Oct 2019 12:54:35 +0000 (14:54 +0200)]
Merge pull request #15474 from artfulrobot/fix-missing-contribution-charts
Fix missing/broken contribution charts
Seamus Lee [Thu, 10 Oct 2019 09:21:18 +0000 (11:21 +0200)]
Merge pull request #15339 from seamuslee001/hook_before_boot
Do no invoke Hooks via UF unless container has been built or it is a …
Seamus Lee [Thu, 10 Oct 2019 09:17:42 +0000 (11:17 +0200)]
Merge pull request #15473 from demeritcowboy/too-loopy
The loop doth process too much, methinks
Rich Lott / Artful Robot [Thu, 10 Oct 2019 07:39:29 +0000 (09:39 +0200)]
Fix missing/broken contribution charts
Eileen McNaughton [Thu, 10 Oct 2019 07:31:44 +0000 (09:31 +0200)]
Merge pull request #15442 from artfulrobot/fix-select2-height-followup-from-15403
Fix CSS for public select2 elements regardless of parent theme box-si…
DemeritCowboy [Wed, 9 Oct 2019 22:31:30 +0000 (18:31 -0400)]
be less loopy
Matthew Wire [Wed, 9 Oct 2019 16:47:42 +0000 (18:47 +0200)]
Merge pull request #15232 from eileenmcnaughton/credit
Respect calling code passing in 'null' for creditnote_id.
Rich Lott / Artful Robot [Wed, 9 Oct 2019 16:05:33 +0000 (18:05 +0200)]
Reuse larger size more typical for public facing forms
Matthew Wire [Wed, 9 Oct 2019 15:44:42 +0000 (17:44 +0200)]
Merge pull request #15322 from alifrumin/removePrintIcon
Remove Print Icon
Seamus Lee [Wed, 9 Oct 2019 15:27:32 +0000 (17:27 +0200)]
Merge pull request #15373 from eileenmcnaughton/case_url_support
Extract contribution search functions to help with case search improvements
eileen [Fri, 6 Sep 2019 21:47:43 +0000 (09:47 +1200)]
Respect calling code passing in 'null
for creditnote_id.
The credit note code was implemented in core quite a while ago, before we were really pushing these things
out to extensions. It was implemented such that it iterates through all credit notes & has performance
implications in order to meet a use case that is not common to all.
Ideally we would move it to an extension, but short of that we can at least respect
calling code setting the value to 'null' in order to override it.
There is no precedent anywhere in our code for the BAO to deliberately override efforts by
calling code to null out a value & in this case it solves a performance problem too
Probably we should longer term simply have a hook
hook::getCreditNoteID() & more this function to an extension called by that hook
Seamus Lee [Wed, 9 Oct 2019 14:31:37 +0000 (16:31 +0200)]
Merge pull request #15407 from mattwire/membershippayment_2
Further cleanup and clarification on MembershipPayment
Seamus Lee [Wed, 9 Oct 2019 14:31:09 +0000 (16:31 +0200)]
Merge pull request #15291 from mattwire/formatpaymentparams_addccip
REF Move ipAddress and CC expiry date to prepareParamsForPaymentProcessor
Seamus Lee [Wed, 9 Oct 2019 14:08:56 +0000 (16:08 +0200)]
Merge pull request #15469 from wmortada/patch-1
Update my organisation
William Mortada [Wed, 9 Oct 2019 14:01:45 +0000 (16:01 +0200)]
Update my organisation
Seamus Lee [Wed, 9 Oct 2019 13:49:00 +0000 (15:49 +0200)]
Merge pull request #15283 from christianwach/lab-1200-3
Restrict inactive Dashlet query to Dashlets in the current domain
eileen [Wed, 2 Oct 2019 07:23:43 +0000 (09:23 +0200)]
Extract code for handling forced search
Seamus Lee [Wed, 9 Oct 2019 13:05:45 +0000 (15:05 +0200)]
Merge pull request #15465 from eileenmcnaughton/dep_fn
[REF] remove call to deprecated function
Seamus Lee [Wed, 9 Oct 2019 13:03:45 +0000 (15:03 +0200)]
Merge pull request #15462 from eileenmcnaughton/event_api
[REF] Fix typos and remove unused variables
Eileen McNaughton [Wed, 9 Oct 2019 12:58:18 +0000 (14:58 +0200)]
Merge pull request #15456 from aydun/change_getTemplateContrib
dev/financial#72 Modify getTemplateContribution() to use is_template field
Matthew Wire [Wed, 9 Oct 2019 11:41:40 +0000 (13:41 +0200)]
Merge pull request #15463 from eileenmcnaughton/status_fix
[REF] Improve signature on updateFinancialAccountsOnContributionStatusChange
eileen [Wed, 9 Oct 2019 11:26:09 +0000 (13:26 +0200)]
[REF] remove call to deprecated function
getPartialPaymentType basically just calls CRM_Contribute_BAO_Contribution::getContributionBalance
& then returns the balance in a different array key depending on the value.
This switches to calling it directly & completes the work of removing all calls to it & more heavily deprecating it
Eileen McNaughton [Wed, 9 Oct 2019 11:29:57 +0000 (13:29 +0200)]
Merge pull request #15461 from civicrm/5.19
5.19
Eileen McNaughton [Wed, 9 Oct 2019 11:29:38 +0000 (13:29 +0200)]
Merge pull request #15464 from seamuslee001/5.19
5.18.2 release notes
Matthew Wire (MJW Consulting) [Tue, 8 Oct 2019 09:57:45 +0000 (11:57 +0200)]
Fix typos and remove unused variables
Seamus Lee [Wed, 9 Oct 2019 10:30:18 +0000 (12:30 +0200)]
Merge pull request #15448 from artfulrobot/replace-openflash-charts
Replace openflash charts with charts that work
Tim Otten [Wed, 9 Oct 2019 10:24:10 +0000 (12:24 +0200)]
Update release-notes.md
Tim Otten [Wed, 9 Oct 2019 10:22:05 +0000 (12:22 +0200)]
Update 5.18.2.md
Seamus Lee [Wed, 9 Oct 2019 08:00:43 +0000 (19:00 +1100)]
Update release notes following recent merges
Seamus Lee [Tue, 8 Oct 2019 12:40:42 +0000 (23:40 +1100)]
Update release notes for fix for dev/core#1269
Seamus Lee [Tue, 8 Oct 2019 09:36:42 +0000 (20:36 +1100)]
Add in release notes for 5.18.2
Seamus Lee [Wed, 9 Oct 2019 10:13:58 +0000 (12:13 +0200)]
Merge pull request #15460 from eileenmcnaughton/event_transact
[REF] Remove transaction as part of minor code cleanup
Aidan Saunders [Wed, 9 Oct 2019 08:49:13 +0000 (09:49 +0100)]
Change getTemplateContribution to prefer is_template contrib
Add test
eileen [Wed, 9 Oct 2019 09:27:52 +0000 (11:27 +0200)]
Improve signature on updateFinancialAccountsOnContributionStatusChange
Eileen McNaughton [Wed, 9 Oct 2019 09:18:20 +0000 (11:18 +0200)]
Merge pull request #15459 from eileenmcnaughton/event_clean
[ref] Simplify function signature as parameter is not used
Christian Wach [Wed, 9 Oct 2019 08:33:29 +0000 (09:33 +0100)]
Pass contact ID as param to executeQuery()
Rich Lott / Artful Robot [Wed, 9 Oct 2019 08:31:36 +0000 (10:31 +0200)]
Tidy up charts code, including avoiding js error on tabular data view
eileen [Wed, 9 Oct 2019 08:28:48 +0000 (10:28 +0200)]
[REF] Remove transaction.
@mattwire proposed moving this in
https://github.com/civicrm/civicrm-core/pull/15446/commits/
8f76cfacf156cfbd11e280b9a86926e0a5082c27
However, I believe removing it is the correct action. The usefullness of transactions is to maintain integrity
by rolling back the creation of a bunch of related entities together if one fails.
However in this case it's not rolling back the contribution or participant record or non discount line items so
if it worked (which I doubt) it would reduce rather than increase db integrity
Aidan Saunders [Wed, 9 Oct 2019 08:28:16 +0000 (09:28 +0100)]
Make getTemplateContribution match is_test
- non-test recurs should only pick up non-test templates
- test recurs should only pick up test templates
Add test
Matthew Wire (MJW Consulting) [Tue, 8 Oct 2019 08:24:52 +0000 (10:24 +0200)]
Simplify function signature as parameter is not used
Seamus Lee [Wed, 9 Oct 2019 07:48:07 +0000 (09:48 +0200)]
Merge pull request #15453 from eileenmcnaughton/import_campaign
dev/core#1285 import support for campaign_id (& other fields where it could be an id, a name or a label.
Seamus Lee [Tue, 8 Oct 2019 22:56:50 +0000 (00:56 +0200)]
Merge pull request #15454 from demeritcowboy/custom-fieldspec-bao
dev/core#1305 - fieldspec bao not defined for custom fields
Eileen McNaughton [Tue, 8 Oct 2019 17:21:15 +0000 (19:21 +0200)]
Merge pull request #15444 from civicrm/5.19
5.19
Aidan Saunders [Tue, 8 Oct 2019 17:05:48 +0000 (18:05 +0100)]
Convert getTemplateContribution to api4
DemeritCowboy [Tue, 8 Oct 2019 17:04:26 +0000 (13:04 -0400)]
dev/core#1305
eileen [Tue, 8 Oct 2019 16:51:13 +0000 (18:51 +0200)]
dev/core#1285 import support for campaign_id (& other fields where it could be an id, a name or a label.
After digging into https://lab.civicrm.org/dev/core/issues/1285 it feels a little arguable what we should support but issues in
gitlab indicate there is at least some demand for id & label so it now will
- accept id if input matches an id
- accept name if input matches a name
- accept label if input matches a label.
This means for payment instrument it would accept '1', 'Check' or 'Cheque' (in that order if name were renamed).
This should apply to a few fields - payment instrument, constribution status & per the issue campaign
(on contribution). There are 'some' on membership too I think
Rich Lott / Artful Robot [Mon, 7 Oct 2019 20:25:00 +0000 (21:25 +0100)]
WIP checkin
WIP: bar chart sort of working now
Pie and Bar charts working, with download in SVG and PNG links
oops remove accidental inclusion
remove accidentally included crap
remove 3d barchart as unnecessary (and unimplemented)
Seamus Lee [Tue, 8 Oct 2019 15:55:26 +0000 (17:55 +0200)]
Merge pull request #15321 from yashodha/dev_1065
(dev/core#1065) Pledge in Edit mode needs to be shown consistently
Seamus Lee [Tue, 8 Oct 2019 15:50:11 +0000 (17:50 +0200)]
Merge pull request #15443 from eileenmcnaughton/ex_merge
dev/core#1302 fix regression on exported when merging addresses with specified fields
Eileen McNaughton [Tue, 8 Oct 2019 15:34:10 +0000 (17:34 +0200)]
Merge pull request #15433 from aydun/add_contribution_is_template
dev/financial#72 Add is_template field to contribution entity
eileen [Tue, 8 Oct 2019 14:18:23 +0000 (16:18 +0200)]
dev/core#1302 fix regression on merge export
Seamus Lee [Tue, 8 Oct 2019 13:03:59 +0000 (00:03 +1100)]
Fix example
Seamus Lee [Tue, 8 Oct 2019 12:31:56 +0000 (14:31 +0200)]
Merge pull request #15447 from seamuslee001/dev_core_1269
dev/core#1269 Add in fix for undefined index bao in parsePseudoConst…
Matthew Wire [Tue, 8 Oct 2019 10:22:48 +0000 (12:22 +0200)]
Merge pull request #14891 from eileenmcnaughton/saved_search
[Code-quality] remove references to where_tables, where_clause
Seamus Lee [Tue, 8 Oct 2019 10:20:59 +0000 (12:20 +0200)]
Merge pull request #15439 from eileenmcnaughton/ex_bug
dev/core#1293 Fix regression on export filtering for postal address only
Seamus Lee [Tue, 8 Oct 2019 10:04:10 +0000 (21:04 +1100)]
dev/core#1269 Add in fix for underfined index bao in parsePseudoConstantField for Import Parser
Matthew Wire (MJW Consulting) [Thu, 12 Sep 2019 08:51:28 +0000 (09:51 +0100)]
Add ipAddress and creditcard expiry date to prepareParamsForPaymentProcessor
Aidan Saunders [Mon, 7 Oct 2019 13:27:53 +0000 (14:27 +0100)]
Add is_template field to contribution entity
Update tests and examples
Seamus Lee [Tue, 8 Oct 2019 09:10:47 +0000 (11:10 +0200)]
Merge pull request #15440 from eileenmcnaughton/ex_zero
dev/core#1293 Still output csv file on export, even if no rows are in it
Rich Lott / Artful Robot [Tue, 8 Oct 2019 08:49:58 +0000 (10:49 +0200)]
Fix CSS for public select2 elements regardless of parent theme box-sizing
Seamus Lee [Tue, 8 Oct 2019 08:25:32 +0000 (10:25 +0200)]
Merge pull request #15438 from demeritcowboy/emailprocessor-still-hungry-alt
dev/core#1270 - fix email processor dropping attachments - ALTERNATE
Seamus Lee [Tue, 8 Oct 2019 08:01:54 +0000 (10:01 +0200)]
Merge pull request #15281 from mattwire/formatpaymentparams_useprepare
REF Use the new prepareParamsForPaymentProcessor function in more places
eileen [Tue, 8 Oct 2019 06:21:21 +0000 (08:21 +0200)]
dev/core#1293 Fix regression on export filtering for postal address only
eileen [Tue, 8 Oct 2019 07:33:26 +0000 (09:33 +0200)]
Still output csv file, even if no rows are in it
Seamus Lee [Tue, 8 Oct 2019 06:51:49 +0000 (08:51 +0200)]
Merge pull request #15425 from eileenmcnaughton/loc_clean
[NFC] minor simplification
Seamus Lee [Tue, 8 Oct 2019 06:50:00 +0000 (08:50 +0200)]
Merge pull request #15418 from seamuslee001/frontend_contribution_page_title
Add in frontend_title field for Contribution Pages to allow site mana…
DemeritCowboy [Tue, 8 Oct 2019 02:33:55 +0000 (22:33 -0400)]
fix email processor dropping attachments
eileen [Mon, 7 Oct 2019 15:50:12 +0000 (17:50 +0200)]
[NFC] minor simplification
This just changes how return vars are handled to make it clearer that ONLY contact::Create
cares about location_block::create return values
Eileen McNaughton [Mon, 7 Oct 2019 23:02:25 +0000 (01:02 +0200)]
Merge pull request #15434 from civicrm/5.19
5.19 to master
Eileen McNaughton [Mon, 7 Oct 2019 22:55:50 +0000 (00:55 +0200)]
Merge pull request #15428 from greenpeace-cee/fix-status-check
Fix status check not rendering before 5.19 migrations
Seamus Lee [Mon, 7 Oct 2019 21:09:27 +0000 (23:09 +0200)]
Merge pull request #15411 from systopia/dev_l10nx
Allow custom ts functions in extensions; defer custom ts calls until booted
Seamus Lee [Mon, 7 Oct 2019 19:47:22 +0000 (21:47 +0200)]
Merge pull request #15430 from civicrm/5.19
5.19
Seamus Lee [Mon, 7 Oct 2019 17:46:30 +0000 (19:46 +0200)]
Merge pull request #15412 from demeritcowboy/fly-backwards
Minor a_b/b_a mixup on case type edit screen
Seamus Lee [Mon, 7 Oct 2019 17:42:13 +0000 (19:42 +0200)]
Merge pull request #15420 from eileenmcnaughton/live_notice
dev/core#1281 fix e-notice on isLiveMode
Seamus Lee [Mon, 7 Oct 2019 17:19:16 +0000 (19:19 +0200)]
Merge pull request #15359 from fkohrt/master
Improve item order inside Online Contributions section of configuration checklist; see lab issue dev/core#1278
Patrick Figel [Mon, 7 Oct 2019 17:05:59 +0000 (19:05 +0200)]
Fix status check not rendering before 5.19 migrations
This fixes an issue where the status check page does not render when
migrations to 5.19 are pending because the is_active column hasn't been
added yet.
The rationale for this change is to avoid scenarios where users forget
to run upgrades because there's no status check warning.
Seamus Lee [Mon, 7 Oct 2019 16:49:39 +0000 (18:49 +0200)]
Merge pull request #15424 from eileenmcnaughton/email_form
[NFC] code formatting
Eileen McNaughton [Mon, 7 Oct 2019 16:27:36 +0000 (18:27 +0200)]
Merge pull request #15423 from greenpeace-cee/fix-is-required-address-field
Fix E_NOTICE for is_required in address form
Seamus Lee [Mon, 7 Oct 2019 12:05:48 +0000 (23:05 +1100)]
Add in frontend_title field for Contribution Pages to allow site managers to specify a title for a page different to that for use from the backend
eileen [Mon, 7 Oct 2019 15:12:23 +0000 (17:12 +0200)]
[NFC] code formatting
Eileen McNaughton [Mon, 7 Oct 2019 15:09:06 +0000 (17:09 +0200)]
Merge pull request #15419 from eileenmcnaughton/event_filter
dev/financial#72 Make is_template=0 the default for api get requests.
CiviCRM [Mon, 7 Oct 2019 15:07:03 +0000 (15:07 +0000)]
Set version to 5.20.alpha1
CiviCRM [Mon, 7 Oct 2019 15:01:46 +0000 (15:01 +0000)]
Set version to 5.19.beta1
Patrick Figel [Mon, 7 Oct 2019 14:48:51 +0000 (16:48 +0200)]
Fix E_NOTICE for is_required in address form
This fixes an E_NOTICE that's triggered for optional address custom
fields in CRM_Contact_Form_Edit_Address.
eileen [Mon, 7 Oct 2019 13:49:28 +0000 (15:49 +0200)]
dev/core#1281 fix e-notice on isLiveMode
Looks like a regression from https://github.com/civicrm/civicrm-core/commit/
752cee47213094c29b8e6ae5d0b20f0800520d80
which hit in 5.15 - seems good to merge to rc / about to cut to rc
eileen [Mon, 7 Oct 2019 13:09:50 +0000 (15:09 +0200)]
dev/financial#72 Make is_template=0 the default for api get requests.
We are planning on adding is_template to the civicrm_contribution table - following the precedent from event.
By default it is NOT desirable to get template entities returned in a get request - this fixes that at the generic
apiv4 level and means that it will be a default filter when present
Matthew Wire [Mon, 7 Oct 2019 12:43:02 +0000 (14:43 +0200)]
Merge pull request #15417 from eileenmcnaughton/matt
Add trxn_id as a parameter on Payment.get
Seamus Lee [Mon, 7 Oct 2019 11:44:02 +0000 (13:44 +0200)]
Merge pull request #15414 from eileenmcnaughton/fix_log_text
dev/core#1283 fix inability to export more than 255 chars
Seamus Lee [Mon, 7 Oct 2019 11:43:32 +0000 (13:43 +0200)]
Merge pull request #15416 from civicrm/eileenmcnaughton-patch-1
Update fix - should not be localisable
eileen [Mon, 7 Oct 2019 11:22:42 +0000 (13:22 +0200)]
Accept trxn_id to Payment.get
Alternative to #15166 (incorporates #15229 )