Alexy Mikhailichenko [Tue, 15 Oct 2019 23:35:44 +0000 (19:35 -0400)]
Fix typo in Manager.php
colemanw [Tue, 15 Oct 2019 20:38:00 +0000 (16:38 -0400)]
Merge pull request #15515 from eileenmcnaughton/event_flow
[REF] remove obsolete code.
Eileen McNaughton [Tue, 15 Oct 2019 19:47:42 +0000 (08:47 +1300)]
Merge pull request #15517 from jitendrapurohit/tax-recur-test
dev/core#1317 - Fix total_amount on repeattransaction when tax amount is involved.
Eileen McNaughton [Tue, 15 Oct 2019 19:46:37 +0000 (08:46 +1300)]
Merge pull request #15485 from demeritcowboy/role-name-heading
[NFC] dev/core#1046 - more accurate column heading
Monish Deb [Tue, 15 Oct 2019 13:37:14 +0000 (19:07 +0530)]
Merge pull request #15514 from eileenmcnaughton/order_participant
Order api updates to fix participant handling & deprecate creating 'completed
Jitendra Purohit [Tue, 15 Oct 2019 10:02:50 +0000 (15:32 +0530)]
dev/core#1317 - Fix total_amount on repeattransaction when tax amount is involved.
eileen [Tue, 15 Oct 2019 07:09:30 +0000 (20:09 +1300)]
Order api updates to fix participant handling & deprecate creating 'completed'
Per https://docs.civicrm.org/dev/en/latest/financial/OrderAPI/
1) we want to deprecate creating orders with a status other than 'Pending'
2) we don't want to have to require status is passed in for Participant.
eileen [Tue, 15 Oct 2019 08:50:26 +0000 (21:50 +1300)]
[REF] remove obsolete code.
On trying to look into a bug around this code I realised that there is quite a bit of code that does nothing.
These lines exist to build the variable - which is never used. Hence they can go.
I also spotted scriptArray is never used either - this stuff came from svn before everyone was using IDEs that
highlighted unused lines
Yashodha Chaku [Tue, 15 Oct 2019 08:46:45 +0000 (14:16 +0530)]
Merge pull request #15358 from colemanw/relDesc
dev/core#1257 Make relationship description searchable
Jitendra Purohit [Tue, 15 Oct 2019 07:29:29 +0000 (12:59 +0530)]
Unit test to replicate dev/core#1317
Eileen McNaughton [Tue, 15 Oct 2019 03:32:37 +0000 (16:32 +1300)]
Merge pull request #15510 from civicrm/5.19
5.19 to master
Monish Deb [Tue, 15 Oct 2019 03:25:38 +0000 (08:55 +0530)]
Merge pull request #15502 from eileenmcnaughton/payment_bug
dev/financial#69 Fix misrecording of payments against non pay_later Pending contribution.
Seamus Lee [Mon, 14 Oct 2019 23:44:30 +0000 (01:44 +0200)]
Merge pull request #15507 from civicrm/5.19
5.19
Seamus Lee [Mon, 14 Oct 2019 22:12:45 +0000 (00:12 +0200)]
Merge pull request #15506 from seamuslee001/ignore_own_extension
Do not check for the extension we are trying to download itself
Seamus Lee [Mon, 14 Oct 2019 20:51:08 +0000 (07:51 +1100)]
Do not check for the extension we are trying to download itself
Matthew Wire [Mon, 14 Oct 2019 15:29:13 +0000 (16:29 +0100)]
Merge pull request #15492 from eileenmcnaughton/credit
[REF] Deprecate calls to createCreditNoteId
Matthew Wire [Mon, 14 Oct 2019 15:28:39 +0000 (16:28 +0100)]
Merge pull request #15499 from eileenmcnaughton/pp
Test calling CRM_Financial_BAO_PaymentProcessor::getPaymentProcessors
eileen [Mon, 14 Oct 2019 10:14:44 +0000 (23:14 +1300)]
Mark test incomplete for now
Matthew Wire [Mon, 14 Oct 2019 08:59:10 +0000 (09:59 +0100)]
Merge pull request #15501 from eileenmcnaughton/order
dev/financial#73 Update Order.create so that total_amount is not required.
eileen [Mon, 14 Oct 2019 04:36:26 +0000 (17:36 +1300)]
dev/financial#73 Update Order.create so that total_amount is not required.
As test shows it is otherwise created from the line items
Eileen McNaughton [Mon, 14 Oct 2019 06:06:38 +0000 (19:06 +1300)]
Merge pull request #15500 from eileenmcnaughton/part_cleanup
Switch creation of ParticipantPayment to use API
eileen [Mon, 14 Oct 2019 05:20:52 +0000 (18:20 +1300)]
dev/financial#69 Fix misrecording of payments against non pay_later Pending contribution.
Fixes bugs when payments are added against a non-pay later contribution. There were 2 different bugs
1) bug in form layer when the payment is fully paid
2) bug in BAO layer for partial payments.
This fixes both. It may be a regression, hence 5.19
Seamus Lee [Mon, 14 Oct 2019 04:40:09 +0000 (06:40 +0200)]
Merge pull request #15497 from seamuslee001/frontend_title_receipts
Ensure that the frontend title is used for contribution page details …
Matthew Wire (MJW Consulting) [Tue, 8 Oct 2019 08:55:30 +0000 (10:55 +0200)]
Switch creation of ParticipantPayment to use API
Switch creation of ParticipantPayment to use API
Seamus Lee [Mon, 14 Oct 2019 01:14:59 +0000 (12:14 +1100)]
Ensure that the frontend title is used for contribution page details in receipts if avaliable
Add in strict checking and simplify code block in contribution page and fix comment style as per EIleen's comments
Eileen McNaughton [Mon, 14 Oct 2019 03:49:14 +0000 (16:49 +1300)]
Merge pull request #15498 from civicrm/5.19
5.19
eileen [Mon, 14 Oct 2019 02:56:23 +0000 (15:56 +1300)]
Test calling CRM_Financial_BAO_PaymentProcessor::getPaymentProcessors
Add test to ensure calling with Test capability only returns testMode processors
Seamus Lee [Mon, 14 Oct 2019 02:35:05 +0000 (04:35 +0200)]
Merge pull request #15399 from eileenmcnaughton/pending
Update tests to simulate labels that are not the same as names
Seamus Lee [Mon, 14 Oct 2019 02:33:17 +0000 (04:33 +0200)]
Merge pull request #15450 from mattwire/extensionupgrade
Check requirements before upgrading extensions via the UI
Eileen McNaughton [Sun, 13 Oct 2019 20:57:14 +0000 (09:57 +1300)]
Merge pull request #15495 from civicrm/5.19
5.19 to master
eileen [Thu, 10 Oct 2019 10:31:49 +0000 (12:31 +0200)]
Deprecate calls to createCreditNoteId
createCreditNoteId is called from BAO_Contribution::add whenever the contribution
status is 'Cancelled' or 'Refunded.
A few lines later recordFinancialAccounts is called, so by the time recordFinancialAccounts is called
it is already set & the empty check will prevent these lines being hit.
All 4 places where updateFinancialAccounts are called in the
code are from recordFinancialAccounts.
Record financial accounts is called from Contribution Create & Payment create.
contribution.create does not rely on these lines to set the creditnote_id, as discussed.
In the BAO_Payment there are 2 scenarios
1) payment is positive
2) payment is negative - in this case recordRefundPayment is called.
It's logically OK for the code to NOT to create a credit note when being called from payment.create
because payment.create is NOT cancelling the contribution or refunding it and the funtion NEVER changes
the contribution status to Refunded, Cancelled, Chargeback (those are 'business' statuses).
Payment.create updates contribution status to reflect a payment has been made - eg change from
Pending to partially paid or various payment-related-statuses to 'Completed'.
ie Payment.create is
- only adding payments (or refunds) to an order
- and the decision as to whether something is being credited back & warrants a credit note id or
whether the payment is being returned due to overpayment or other payment related concerns does
not belong in the payment code.
Payment create never changes contribution
status to Refunded, Cancelled or ChargeBack so the lines would never be hit from payment.create
This leaves us with the conclusion the lines are never hit. For safety/sanity we can deprectate them rather
than remove them by now. That way if the above analysis is wrong a test will fail.
Less likely (given financial test coverage) the deprecation notice will show up in the wild in the next few months.
(It's rather unclear how it DOES fit in since it feels like creditnote_id only applies if the entire
contribution is being refunded & really should be generated at the point at which, for example, the event
fees associated with it are changed - however, complaints to date about creditnote_id have all focussed
on performance issues, not logic issues
Matthew Wire [Sun, 13 Oct 2019 19:16:13 +0000 (20:16 +0100)]
Merge pull request #15494 from eileenmcnaughton/519_mem
Fix 5.18 regression on membership handling
Matthew Wire [Sun, 13 Oct 2019 19:15:14 +0000 (20:15 +0100)]
Merge pull request #15467 from eileenmcnaughton/mess
dev/core#371 Remove template refs to 'print for your records'
eileen [Sun, 13 Oct 2019 18:11:31 +0000 (07:11 +1300)]
Fix 5.18 regression on membership handling
Fixes a bug caused by
https://github.com/civicrm/civicrm-core/commit/
5b9d3ce80f1a64b39bdd63160ad0a1b960f2faed
And picked up in test with https://github.com/civicrm/civicrm-core/pull/15399
eileen [Sat, 5 Oct 2019 11:10:20 +0000 (13:10 +0200)]
Rename (some) labels to differ from names to simulate the fact they are different in internationalised extensions
Adjust tests for renamed labels
eileen [Wed, 9 Oct 2019 13:14:30 +0000 (15:14 +0200)]
Remove template refs to 'print for your records'
We agreed to remove these a while back. Since https://github.com/civicrm/civicrm-core/pull/15466
is already upgrading them it's a good chance to rip our the rest:
Matthew Wire [Sun, 13 Oct 2019 15:55:14 +0000 (16:55 +0100)]
Merge pull request #15144 from JKingsnorth/copying-events-contribution-pages
Improvements to copying events and contribution pages
Matthew Wire [Sun, 13 Oct 2019 15:51:58 +0000 (16:51 +0100)]
Merge pull request #15315 from MegaphoneJon/reporting-20
reporting-20: don't display soft credits by default when force=1
Matthew Wire [Sun, 13 Oct 2019 15:51:15 +0000 (16:51 +0100)]
Merge pull request #15323 from elisseck/dev/core/1266
dev/core/1266 widget header tab next state to pcp tab
Matthew Wire [Sun, 13 Oct 2019 15:47:36 +0000 (16:47 +0100)]
Merge pull request #15223 from seamuslee001/when_package_upgrade
Upgrade When package to the lastest version
Matthew Wire [Sun, 13 Oct 2019 15:42:33 +0000 (16:42 +0100)]
Merge pull request #15472 from ejegg/contribStatusUpdate
dev/financial#72 Filter contribution status lists for batch creation and update
Matthew Wire [Sun, 13 Oct 2019 15:40:27 +0000 (16:40 +0100)]
Merge pull request #15470 from ejegg/filterContribStatus
dev/financial#72 Filter contribution status dropdowns in search and report
Matthew Wire [Sun, 13 Oct 2019 15:37:42 +0000 (16:37 +0100)]
Merge pull request #15458 from eileenmcnaughton/excetp
[REF] move definition of important values & retrieval outside payment…
Matthew Wire [Sun, 13 Oct 2019 15:36:51 +0000 (16:36 +0100)]
Merge pull request #14919 from eileenmcnaughton/mem_review
[Membership-backoffice] Reduce reliance on multiple specific but confusing class variables
Matthew Wire [Sun, 13 Oct 2019 15:33:26 +0000 (16:33 +0100)]
Merge pull request #15293 from ixiam/dev#issue-826
dev/core#826
Matthew Wire [Sun, 13 Oct 2019 15:04:22 +0000 (16:04 +0100)]
Merge pull request #15421 from artfulrobot/queue-safety
Fix bug in SQL queue that can cause tasks to be run twice in a multiprocess environment
Matthew Wire [Sun, 13 Oct 2019 15:01:20 +0000 (16:01 +0100)]
Merge pull request #15468 from aydun/add_order_reference
dev/financial#57 Add order_reference field
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
DemeritCowboy [Fri, 11 Oct 2019 04:19:50 +0000 (00:19 -0400)]
more accurate column heading
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
Elliott Eggleston [Wed, 9 Oct 2019 13:45:55 +0000 (15:45 +0200)]
dev/financial#72 Filter contribution status in create/update
Replacing pseudoconstant calls in batch creation/update using
CRM_Contribute_BAO_Contribution_Utils::getContributionStatuses().
This actually changes the list of options offered, but all the
ones it removes should probably already have been gone.
Elliott Eggleston [Wed, 9 Oct 2019 13:45:55 +0000 (15:45 +0200)]
dev/financial#72 Filter contrib status search selects
Replacing pseudoConstant calls with BAO buildOptions in 'search'
context.
This commit is only intended to touch places where we are building
a list of options to offer to the user, not places where we are
displaying results.
In practice this doesn't remove any currently available statuses,
but now we can filter our the proposed 'Template' status.
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
Aidan Saunders [Wed, 9 Oct 2019 13:29:40 +0000 (14:29 +0100)]
dev/financial#57 Add order_reference field
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