Seamus Lee [Fri, 25 Oct 2019 00:31:51 +0000 (11:31 +1100)]
Merge pull request #15509 from eileenmcnaughton/setter
dev/financial#82 Add getters & setters for contributionID on CRM_Core_Payment.
eileen [Mon, 21 Oct 2019 02:13:52 +0000 (15:13 +1300)]
Add a bunch of additional getters & setters
Seamus Lee [Thu, 24 Oct 2019 22:16:19 +0000 (09:16 +1100)]
Merge pull request #15576 from mattwire/settingtraitfilter
Generic Settings Pages: Make getSettingPageFilter() public so we can use it in hooks
Seamus Lee [Thu, 24 Oct 2019 21:21:00 +0000 (08:21 +1100)]
Merge pull request #15503 from magnolia61/Generalize_Thank_You_in_Message_Templates
dev/core#1316 Update 'Thank You' & other corrections
Seamus Lee [Thu, 24 Oct 2019 21:13:37 +0000 (08:13 +1100)]
Merge pull request #15600 from civicrm/5.19
5.19
eileen [Tue, 15 Oct 2019 00:17:30 +0000 (13:17 +1300)]
Add getters & setters for contributionID on CRM_Core_Payment.
This will enable PaymentProcessor.pay to do ->setContributionID(['contribution_id'])
and set a pattern for definining other standardised parameters.
Seamus Lee [Thu, 24 Oct 2019 20:43:47 +0000 (07:43 +1100)]
Merge pull request #15597 from colemanw/apiPath
Update api3 explorer url path for consistency
Matthew Wire (MJW Consulting) [Tue, 22 Oct 2019 14:27:36 +0000 (15:27 +0100)]
Make getSettingPageFilter() public so we can conditionally load resources in hooks
Seamus Lee [Thu, 24 Oct 2019 19:35:46 +0000 (06:35 +1100)]
Merge pull request #15598 from alifrumin/rn5.19
5.19 Release Notes - first pass of sorting, annotating and editing
Alice Frumin [Fri, 18 Oct 2019 00:14:02 +0000 (20:14 -0400)]
5.19 Release Notes - first pass
Coleman Watts [Thu, 24 Oct 2019 15:04:30 +0000 (11:04 -0400)]
Update api3 explorer url path for consistency
Seamus Lee [Thu, 24 Oct 2019 02:25:10 +0000 (13:25 +1100)]
Merge pull request #15546 from eileenmcnaughton/group_type
dev/core#1321 [test] add unit test to demonstrate behaviour
Seamus Lee [Wed, 23 Oct 2019 21:30:25 +0000 (08:30 +1100)]
Merge pull request #15564 from eileenmcnaughton/deprectate
dev/financial#79 minimal deprecation of Contribution.transact.
Seamus Lee [Wed, 23 Oct 2019 21:29:08 +0000 (08:29 +1100)]
Merge pull request #15591 from eileenmcnaughton/noisy_deprecate_transact
Add noisy deprecation warning to Contribution.transact
eileen [Mon, 21 Oct 2019 03:35:09 +0000 (16:35 +1300)]
dev/financial#79 minimal deprecation of Contribution.transact.
It seems urgent that we so some deprecation of this api - this is the absolute minimum.
More would involve creating some noise when people use it but there
is a separate issue for that. This is just to geet it out of being 'promoted'
by the api explorer
colemanw [Wed, 23 Oct 2019 19:46:16 +0000 (15:46 -0400)]
Merge pull request #15589 from mfb/obsolete-method
Remove obsolete supportStorageOfAccents() method.
eileen [Wed, 23 Oct 2019 19:27:45 +0000 (08:27 +1300)]
Add noisy deprecation warning to Contribution.transact
Note that the Order api has been an adequate replacement for over a year - per efforts by wordpress integration
mark burdett [Wed, 23 Oct 2019 17:13:09 +0000 (10:13 -0700)]
Remove obsolete method.
colemanw [Wed, 23 Oct 2019 13:44:48 +0000 (09:44 -0400)]
Merge pull request #15504 from mattwire/transact
Extract deprecated Contribution.transact API into it's own file
Matthew Wire [Wed, 23 Oct 2019 11:48:53 +0000 (12:48 +0100)]
Merge pull request #15587 from eileenmcnaughton/dedupe
[REF] minor extraction in dedupe code
Yashodha Chaku [Wed, 23 Oct 2019 06:04:51 +0000 (11:34 +0530)]
Merge pull request #15581 from mountev/street-address-sorting-contact-detail-report
Support street address sorting for contact detail report
eileen [Wed, 23 Oct 2019 01:25:01 +0000 (14:25 +1300)]
[REF] extract part of the function to build the location blocks
Who hates the variable 'moniker'?
Seamus Lee [Wed, 23 Oct 2019 00:20:29 +0000 (11:20 +1100)]
Merge pull request #15584 from civicrm/5.19
5.19
Tim Otten [Wed, 23 Oct 2019 00:08:02 +0000 (17:08 -0700)]
Merge pull request #15583 from seamuslee001/5.19
5.18.4 Release notes
Eileen McNaughton [Wed, 23 Oct 2019 00:06:19 +0000 (13:06 +1300)]
Merge pull request #15579 from mattwire/additionalpayment_fixstatusbounce
Fix parameters for statusBounce in AdditionalPayment
Tim Otten [Tue, 22 Oct 2019 23:53:11 +0000 (16:53 -0700)]
Update 5.18.4.md
Tim Otten [Tue, 22 Oct 2019 23:48:52 +0000 (16:48 -0700)]
5.18.4.md
There was some ambiguity between original problem-report and PR-description.
Update per MM.
Tim Otten [Tue, 22 Oct 2019 23:38:47 +0000 (16:38 -0700)]
release-notes/5.18.4.md
Seamus Lee [Tue, 22 Oct 2019 23:05:58 +0000 (10:05 +1100)]
Merge pull request #15548 from eileenmcnaughton/order
Support chaining Payment.create from Order api
Mountev [Sun, 20 Oct 2019 21:43:32 +0000 (22:43 +0100)]
street address sorting for contact detail report
Seamus Lee [Tue, 22 Oct 2019 21:04:17 +0000 (08:04 +1100)]
Merge pull request #15577 from mattwire/translate_additionalpayment
Translate two string in AdditionalPayment form
Matthew Wire (MJW Consulting) [Tue, 22 Oct 2019 14:33:27 +0000 (15:33 +0100)]
Translate two string in AdditionalPayment form
Matthew Wire (MJW Consulting) [Tue, 22 Oct 2019 14:41:51 +0000 (15:41 +0100)]
Fix parameters for statusBounce in AdditionalPayment
Matthew Wire [Tue, 22 Oct 2019 14:24:49 +0000 (15:24 +0100)]
Merge pull request #15520 from compucorp/fix-date-format-values
Make sure labels match the actual date input format
Eileen McNaughton [Tue, 22 Oct 2019 00:00:46 +0000 (13:00 +1300)]
Merge pull request #15572 from civicrm/5.19
5.19 to master
Seamus Lee [Mon, 21 Oct 2019 23:52:51 +0000 (10:52 +1100)]
Merge pull request #15569 from eileenmcnaughton/pay_notice
Enotice fix (unreleased enotice)
Seamus Lee [Mon, 21 Oct 2019 23:47:54 +0000 (10:47 +1100)]
Merge pull request #15537 from eileenmcnaughton/pay_check
Fix a regression whereby payment details are not saved from the AdditionalPayment form
eileen [Mon, 21 Oct 2019 21:56:59 +0000 (10:56 +1300)]
Enotice fix
per https://github.com/civicrm/civicrm-core/pull/15545#issuecomment-
544531438
eileen [Fri, 18 Oct 2019 04:20:40 +0000 (17:20 +1300)]
Support payment related fields on Payment.Create
On some digging I found that various payment related fields like pan_truncation & card_type_id were
being quietly ignored rather than saved by Payment.create
The additional payment form now uses this api so it is a regression on that form.
This fixes the metadata, tests & support for payment-related trxn fields
Eileen McNaughton [Mon, 21 Oct 2019 20:15:17 +0000 (09:15 +1300)]
Merge pull request #15567 from yashodha/report_cleanup
CRM-21677 - report clean up for case demographic report
Eileen McNaughton [Mon, 21 Oct 2019 19:18:00 +0000 (08:18 +1300)]
Merge pull request #15568 from eileenmcnaughton/test_pp
Combine IF clause for readability.
Eileen McNaughton [Mon, 21 Oct 2019 19:17:24 +0000 (08:17 +1300)]
Merge pull request #15565 from eileenmcnaughton/payment_processor_label
Fix bug whereby cidZero does not prepopulate billing details for selected contact for pay later.
Elliott Eggleston [Mon, 7 Oct 2019 14:24:37 +0000 (16:24 +0200)]
Update 'Thank You' & other corrections in message templates
Eileen McNaughton [Mon, 21 Oct 2019 11:39:09 +0000 (00:39 +1300)]
Merge pull request #14894 from eileenmcnaughton/date_fisc
Add freeform relative date for 'This Fiscal Year'
eileen [Mon, 21 Oct 2019 10:59:41 +0000 (23:59 +1300)]
Combine IF clause for readability.
I'm still making sense of https://github.com/civicrm/civicrm-core/pull/15330 but these
lines are simply a readability change & 'hiving them off' into a separate PR & getting that
merged should make the actual changes in that PR more parsable.
yashodha [Mon, 21 Oct 2019 10:52:29 +0000 (16:22 +0530)]
CRM-21677 - report clean up for case demographic report
Matthew Wire [Mon, 21 Oct 2019 10:16:22 +0000 (11:16 +0100)]
Merge pull request #15550 from eileenmcnaughton/api3_template
Filter out is_template contributions by default
Eileen McNaughton [Mon, 21 Oct 2019 07:23:50 +0000 (20:23 +1300)]
Merge pull request #15566 from civicrm/5.19
5.19
Seamus Lee [Mon, 21 Oct 2019 06:59:09 +0000 (17:59 +1100)]
Merge pull request #15561 from eileenmcnaughton/payment_amount
dev/core#1333 Fix incorrect balance amount on fully paid payment
eileen [Mon, 21 Oct 2019 04:43:40 +0000 (17:43 +1300)]
Fix bug whereby cidZero does not prepopulate billing details for selected contact for pay later.
To replicate
1) create a contribution page & select pay later (and no other processor) with 'billing address required'
2) access the contribution page with cid=0 in the url
3) select a contact - witness the contacts detaisl have NOT loaded into the billing block
4) follow the same steps on event
I was trying to reduce complexity on this form for another change when I realised that the variable
to determine whether to show the block was wrong when billing details were required for
pay later and on testing there seemed now downside (other than a very minor performance
hit in obscure circumstances) in just always loading the billing profile details.
I saw no js error when the billing block was NOT present and we are already checking
the person has access to see the contact so that is not an issue here (Profile.get
does a permission check
Eileen McNaughton [Mon, 21 Oct 2019 03:36:50 +0000 (16:36 +1300)]
Merge pull request #15563 from civicrm/5.19
5.19 to master
Eileen McNaughton [Mon, 21 Oct 2019 03:35:59 +0000 (16:35 +1300)]
Merge pull request #15558 from eileenmcnaughton/report_page519
(dev/core#1252) Fix paging on contact summary
eileen [Mon, 21 Oct 2019 00:46:55 +0000 (13:46 +1300)]
dev/core#1333 Fix incorrect balance amount on fully paid payment
Per https://lab.civicrm.org/dev/core/issues/1333 this is resulting in an incorrect balance.
The code was previously marked as highly dubious
eileen [Sat, 19 Oct 2019 00:49:17 +0000 (13:49 +1300)]
dev/core#1321 [test] add unit test to demonstrate behaviour
eileen [Sat, 19 Oct 2019 02:30:51 +0000 (15:30 +1300)]
Support chaining Payment.create from Order api
eileen [Wed, 16 Oct 2019 23:19:01 +0000 (12:19 +1300)]
Attempt to fix paging on contact summary
Matthew Wire [Sun, 20 Oct 2019 18:04:44 +0000 (19:04 +0100)]
Merge pull request #15539 from eileenmcnaughton/pay_back
Rename balanceTrxnParams to paymentTrxnParams [REF]
Matthew Wire [Sun, 20 Oct 2019 18:02:16 +0000 (19:02 +0100)]
Merge pull request #15528 from eileenmcnaughton/report_page
dev/core#1252 Attempt to fix paging on contribution summary
Matthew Wire [Sun, 20 Oct 2019 17:53:14 +0000 (18:53 +0100)]
Merge pull request #15554 from demeritcowboy/casetype-xml-array
dev/core#1335 - Prevent php warning when saving case type
DemeritCowboy [Sun, 20 Oct 2019 04:45:34 +0000 (00:45 -0400)]
prevent php warning
Eileen McNaughton [Sat, 19 Oct 2019 23:21:52 +0000 (12:21 +1300)]
Merge pull request #15551 from civicrm/5.19
5.19 to master
Eileen McNaughton [Sat, 19 Oct 2019 23:20:57 +0000 (12:20 +1300)]
Merge pull request #15545 from eileenmcnaughton/pay_email_p
dev/core#1322 Fix regression whereby Additional Payment Form not setting from when sending email confirmations
eileen [Sat, 19 Oct 2019 22:47:18 +0000 (11:47 +1300)]
Filter out is_template contributions by default
Eileen McNaughton [Sat, 19 Oct 2019 01:19:50 +0000 (14:19 +1300)]
Merge pull request #15431 from ejegg/templateContrib
dev/financial#72 add 'Template' contribution status
eileen [Wed, 16 Oct 2019 23:19:01 +0000 (12:19 +1300)]
Attempt to fix paging on contact summary
eileen [Fri, 18 Oct 2019 22:27:23 +0000 (11:27 +1300)]
Ensure a default FROM address is used when sending email confirmations
Eileen McNaughton [Fri, 18 Oct 2019 23:23:21 +0000 (12:23 +1300)]
Merge pull request #15542 from demeritcowboy/upgrade-convert-autoassignee-2
Upgrade script to flip autoassignees using bidirectional relationship in older civicase configs
Eileen McNaughton [Fri, 18 Oct 2019 21:48:16 +0000 (10:48 +1300)]
Merge pull request #15483 from demeritcowboy/say-my-name-2
dev/core#1046 - Fix name vs label for case roles - alternate with case type edit screen code cleanup
Eileen McNaughton [Fri, 18 Oct 2019 21:47:31 +0000 (10:47 +1300)]
Merge pull request #15491 from magnolia61/Additional_Email_Greetings_in_workflow_message_templates
dev/core#781 Additional email greetings in message templates
Eileen McNaughton [Fri, 18 Oct 2019 21:25:56 +0000 (10:25 +1300)]
Merge pull request #15540 from wmortada/unfreeze_membership_end_date
dev/core#1126 - Don't freeze the end date if the membership is linked to a recurring payment
Eileen McNaughton [Fri, 18 Oct 2019 21:13:17 +0000 (10:13 +1300)]
Merge pull request #15544 from civicrm/5.19
5.19 to master
Eileen McNaughton [Fri, 18 Oct 2019 21:08:29 +0000 (10:08 +1300)]
Merge pull request #15538 from eileenmcnaughton/ppal_std
Regression fix on Paypal Std with memberships not being finalised correctly.
Eileen McNaughton [Fri, 18 Oct 2019 21:08:01 +0000 (10:08 +1300)]
Merge pull request #15543 from MegaphoneJon/reporting-22
fix 'balance due' on Pledge Detail for non-US installs
DemeritCowboy [Fri, 18 Oct 2019 16:31:17 +0000 (12:31 -0400)]
update script to flip the autoassignee direction
Jon Goldberg [Fri, 18 Oct 2019 19:35:49 +0000 (15:35 -0400)]
fix 'balance due' on Pledge Detail for non-US installs
William Mortada [Fri, 18 Oct 2019 14:10:58 +0000 (15:10 +0100)]
Don't freeze the end date if the membership is linked to a recurring payment
Andrew Hunt [Wed, 16 Oct 2019 16:32:18 +0000 (12:32 -0400)]
Additional email greetings in message templates
eileen [Fri, 18 Oct 2019 03:53:13 +0000 (16:53 +1300)]
Rename balanceTrxnParams to paymentTrxnParams [REF]
This array needs some fixes but I wanted to rename the parameter first as balanceTrxnParams is misleading.
The parameters are for the financial_trxn entry corresponding to the payment
Seamus Lee [Fri, 18 Oct 2019 06:48:39 +0000 (17:48 +1100)]
Merge pull request #15535 from eileenmcnaughton/payment_simp
[REF] Rename balanceTrxnParams variable to paymentTrxnParams
eileen [Fri, 18 Oct 2019 06:46:47 +0000 (19:46 +1300)]
Regression fix on Paypal Std with memberships not being finalised correctly.
Per https://github.com/civicrm/civicrm-core/pull/15053#issuecomment-
542770130
eileen [Fri, 18 Oct 2019 03:53:13 +0000 (16:53 +1300)]
Rename balanceTrxnParams to paymentTrxnParams [REF]
This array needs some fixes but I wanted to rename the parameter first as balanceTrxnParams is misleading.
The parameters are for the financial_trxn entry corresponding to the payment
Seamus Lee [Fri, 18 Oct 2019 03:13:56 +0000 (14:13 +1100)]
Merge pull request #15533 from eileenmcnaughton/confirm_tpl
Simplify logic for displaying card details for Event online registraion Confirm, Thankyou page
Seamus Lee [Fri, 18 Oct 2019 03:13:21 +0000 (14:13 +1100)]
Merge pull request #15532 from eileenmcnaughton/event_cont_mode
Fix logic determining whether (masked) credit card details are displayed in event online receipts
eileen [Fri, 18 Oct 2019 01:45:03 +0000 (14:45 +1300)]
Simplify logic for displaying card details for Confirm and Thank you page
eileen [Fri, 18 Oct 2019 01:32:48 +0000 (14:32 +1300)]
Fix Event online receipts to display credit card info if available.
We currently have a very complex IF clause which includes some deprecated parameters.
However, we can simplify this to simply display the information if availble. We only collect
credit card information if we require it & hence the presence of it is an adequate indicator
as to whether to display it.
We could check for credit_card_number instead but actually there is precedent in another tpl
for checking credit_card_type & it's pretty neutral as both should be present or missing
Seamus Lee [Fri, 18 Oct 2019 01:40:04 +0000 (12:40 +1100)]
Merge pull request #15531 from eileenmcnaughton/silly_template
Remove extraneous full stop, line
Matthew Wire [Thu, 17 Oct 2019 20:35:19 +0000 (21:35 +0100)]
Merge pull request #15525 from eileenmcnaughton/evetn_template
Add test for participant receipts, super minor consistency fix.
eileen [Thu, 17 Oct 2019 19:56:19 +0000 (08:56 +1300)]
Remove extraneous full stop, line
I noticed in testing the template looks like
Dear p, Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to Registered. .
===========================================================
Event Information and Location
===========================================================
Annual CiviCRM meet
eileen [Wed, 16 Oct 2019 22:43:05 +0000 (11:43 +1300)]
Add test for participant receipts, super minor consistency fix.
This is mostly adding testing for participant receipts. The one change to core code is to move the assignment
of contactID to the template from a specific path into the shared code. This parameter is not required by
the templates but it is somewhat common for sites to want to have it assigned to templates for
customisation which is presumably why it's there. Since it is there in one path we should either remove or
have it in all & for a field like contactID all makes sense. Tests lock in that var
Eileen McNaughton [Thu, 17 Oct 2019 17:26:27 +0000 (06:26 +1300)]
Merge pull request #15529 from civicrm/5.19
5.19
Seamus Lee [Thu, 17 Oct 2019 04:43:21 +0000 (06:43 +0200)]
Merge pull request #15527 from eileenmcnaughton/merge
Fix default mode on Contact.merge api
Eileen McNaughton [Thu, 17 Oct 2019 03:58:07 +0000 (16:58 +1300)]
Merge pull request #15521 from agh1/5.19.0-releasenotes-initial
5.19.0 release notes initial run
Eileen McNaughton [Thu, 17 Oct 2019 03:57:59 +0000 (16:57 +1300)]
Merge branch '5.19' into 5.19.0-releasenotes-initial
Seamus Lee [Thu, 17 Oct 2019 03:42:00 +0000 (05:42 +0200)]
Merge pull request #15526 from civicrm/5.19
5.19 to master
DemeritCowboy [Thu, 17 Oct 2019 02:57:59 +0000 (22:57 -0400)]
fix name vs label for case roles
eileen [Wed, 16 Oct 2019 23:09:36 +0000 (12:09 +1300)]
Fix default mode on Contact.merge api
I believe this was a change I made in error & only the Contact.get_merge_conflicts api should
receive an array for 'mode'. The mode is part of a loop within that api
Eileen McNaughton [Wed, 16 Oct 2019 22:52:33 +0000 (11:52 +1300)]
Merge pull request #15524 from seamuslee001/5_18_3_release_notes
5 18 3 release notes
Seamus Lee [Wed, 16 Oct 2019 22:22:17 +0000 (00:22 +0200)]
Merge pull request #13365 from mattwire/caseformatcustomdata
Format details for case custom data activity in a human readable format
Tim Otten [Tue, 15 Oct 2019 21:08:43 +0000 (14:08 -0700)]
Update 5.18.3.md
Seamus Lee [Tue, 15 Oct 2019 06:04:43 +0000 (17:04 +1100)]
Add in release notes for 5.18.3