civicrm-core.git
5 years agoBackdrop support for adding roles and perms
Herb [Mon, 21 Oct 2019 22:23:39 +0000 (18:23 -0400)]
Backdrop support for adding roles and perms

5 years agoMerge pull request #15567 from yashodha/report_cleanup
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

5 years agoMerge pull request #15568 from eileenmcnaughton/test_pp
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.

5 years agoMerge pull request #15565 from eileenmcnaughton/payment_processor_label
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.

5 years agoMerge pull request #14894 from eileenmcnaughton/date_fisc
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'

5 years agoCombine IF clause for readability.
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.

5 years agoCRM-21677 - report clean up for case demographic report
yashodha [Mon, 21 Oct 2019 10:52:29 +0000 (16:22 +0530)]
CRM-21677 - report clean up for case demographic report

5 years agoMerge pull request #15550 from eileenmcnaughton/api3_template
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

5 years agoMerge pull request #15566 from civicrm/5.19
Eileen McNaughton [Mon, 21 Oct 2019 07:23:50 +0000 (20:23 +1300)]
Merge pull request #15566 from civicrm/5.19

5.19

5 years agoMerge pull request #15561 from eileenmcnaughton/payment_amount
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

5 years agoFix bug whereby cidZero does not prepopulate billing details for selected contact...
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

5 years agoMerge pull request #15563 from civicrm/5.19
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

5 years agoMerge pull request #15558 from eileenmcnaughton/report_page519
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

5 years agodev/core#1333 Fix incorrect balance amount on fully paid payment
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

5 years agoAttempt to fix paging on contact summary
eileen [Wed, 16 Oct 2019 23:19:01 +0000 (12:19 +1300)]
Attempt to fix paging on contact summary

5 years agoMerge pull request #15539 from eileenmcnaughton/pay_back
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]

5 years agoMerge pull request #15528 from eileenmcnaughton/report_page
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

5 years agoMerge pull request #15554 from demeritcowboy/casetype-xml-array
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

5 years agoprevent php warning
DemeritCowboy [Sun, 20 Oct 2019 04:45:34 +0000 (00:45 -0400)]
prevent php warning

5 years agoMerge pull request #15551 from civicrm/5.19
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

5 years agoMerge pull request #15545 from eileenmcnaughton/pay_email_p
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

5 years agoFilter out is_template contributions by default
eileen [Sat, 19 Oct 2019 22:47:18 +0000 (11:47 +1300)]
Filter out is_template contributions by default

5 years agoMerge pull request #15431 from ejegg/templateContrib
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

5 years agoAttempt to fix paging on contact summary
eileen [Wed, 16 Oct 2019 23:19:01 +0000 (12:19 +1300)]
Attempt to fix paging on contact summary

5 years agoEnsure a default FROM address is used when sending email confirmations
eileen [Fri, 18 Oct 2019 22:27:23 +0000 (11:27 +1300)]
Ensure a default FROM address is used when sending email confirmations

5 years agoMerge pull request #15542 from demeritcowboy/upgrade-convert-autoassignee-2
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

5 years agoMerge pull request #15483 from demeritcowboy/say-my-name-2
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

5 years agoMerge pull request #15491 from magnolia61/Additional_Email_Greetings_in_workflow_mess...
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

5 years agoMerge pull request #15540 from wmortada/unfreeze_membership_end_date
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

5 years agoMerge pull request #15544 from civicrm/5.19
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

5 years agoMerge pull request #15538 from eileenmcnaughton/ppal_std
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.

5 years agoMerge pull request #15543 from MegaphoneJon/reporting-22
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

5 years agoupdate script to flip the autoassignee direction
DemeritCowboy [Fri, 18 Oct 2019 16:31:17 +0000 (12:31 -0400)]
update script to flip the autoassignee direction

5 years agofix 'balance due' on Pledge Detail for non-US installs
Jon Goldberg [Fri, 18 Oct 2019 19:35:49 +0000 (15:35 -0400)]
fix 'balance due' on Pledge Detail for non-US installs

5 years agoDon't freeze the end date if the membership is linked to a recurring payment
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

5 years agoAdditional email greetings in message templates
Andrew Hunt [Wed, 16 Oct 2019 16:32:18 +0000 (12:32 -0400)]
Additional email greetings in message templates

5 years agoRename balanceTrxnParams to paymentTrxnParams [REF]
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

5 years agoMerge pull request #15535 from eileenmcnaughton/payment_simp
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

5 years agoRegression fix on Paypal Std with memberships not being finalised correctly.
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

5 years agoRename balanceTrxnParams to paymentTrxnParams [REF]
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

5 years agoMerge pull request #15533 from eileenmcnaughton/confirm_tpl
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

5 years agoMerge pull request #15532 from eileenmcnaughton/event_cont_mode
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

5 years agoSimplify logic for displaying card details for Confirm and Thank you page
eileen [Fri, 18 Oct 2019 01:45:03 +0000 (14:45 +1300)]
Simplify logic for displaying card details for Confirm and Thank you page

5 years agoFix Event online receipts to display credit card info if available.
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

5 years agoMerge pull request #15531 from eileenmcnaughton/silly_template
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

5 years agoMerge pull request #15525 from eileenmcnaughton/evetn_template
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.

5 years agoRemove extraneous full stop, line
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

5 years agoAdd test for participant receipts, super minor consistency fix.
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

5 years agoMerge pull request #15529 from civicrm/5.19
Eileen McNaughton [Thu, 17 Oct 2019 17:26:27 +0000 (06:26 +1300)]
Merge pull request #15529 from civicrm/5.19

5.19

5 years agoMerge pull request #15527 from eileenmcnaughton/merge
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

5 years agoMerge pull request #15521 from agh1/5.19.0-releasenotes-initial
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

5 years agoMerge branch '5.19' into 5.19.0-releasenotes-initial
Eileen McNaughton [Thu, 17 Oct 2019 03:57:59 +0000 (16:57 +1300)]
Merge branch '5.19' into 5.19.0-releasenotes-initial

5 years agoMerge pull request #15526 from civicrm/5.19
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

5 years agofix name vs label for case roles
DemeritCowboy [Thu, 17 Oct 2019 02:57:59 +0000 (22:57 -0400)]
fix name vs label for case roles

5 years agoFix default mode on Contact.merge api
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

5 years agoMerge pull request #15524 from seamuslee001/5_18_3_release_notes
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

5 years agoMerge pull request #13365 from mattwire/caseformatcustomdata
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

5 years agoUpdate 5.18.3.md
Tim Otten [Tue, 15 Oct 2019 21:08:43 +0000 (14:08 -0700)]
Update 5.18.3.md

5 years agoAdd in release notes for 5.18.3
Seamus Lee [Tue, 15 Oct 2019 06:04:43 +0000 (17:04 +1100)]
Add in release notes for 5.18.3

5 years agoMerge pull request #15522 from MegaphoneJon/core-1323
Eileen McNaughton [Wed, 16 Oct 2019 20:23:39 +0000 (09:23 +1300)]
Merge pull request #15522 from MegaphoneJon/core-1323

Fix error when adding activities from Search Builder

5 years agoFix error when adding activities from Search Builder
Jon Goldberg [Wed, 16 Oct 2019 17:37:54 +0000 (13:37 -0400)]
Fix error when adding activities from Search Builder

5 years ago5.19.0 release notes: added boilerplate
Andrew Hunt [Wed, 16 Oct 2019 16:40:57 +0000 (12:40 -0400)]
5.19.0 release notes: added boilerplate

5 years ago5.19.0 release notes - raw from script
Andrew Hunt [Wed, 16 Oct 2019 16:32:18 +0000 (12:32 -0400)]
5.19.0 release notes - raw from script

5 years agoMerge pull request #15486 from demeritcowboy/displaylabel-vs-displayLabel
Matthew Wire [Wed, 16 Oct 2019 16:23:27 +0000 (17:23 +0100)]
Merge pull request #15486 from demeritcowboy/displaylabel-vs-displayLabel

[NFC] dev/core#1046 - minor consistency change

5 years agoMerge pull request #15493 from artfulrobot/final-death-of-openflash
Seamus Lee [Wed, 16 Oct 2019 11:10:48 +0000 (13:10 +0200)]
Merge pull request #15493 from artfulrobot/final-death-of-openflash

Remove references to open flash chart, including uploadchartimage fun…

5 years agoRemove references to open flash chart, including uploadchartimage function, calls...
Rich Lott / Artful Robot [Sun, 13 Oct 2019 17:57:06 +0000 (18:57 +0100)]
Remove references to open flash chart, including uploadchartimage function, calls and routes

regen sql/civicrm_generated.mysql

5 years agoMerge pull request #15519 from eileenmcnaughton/dedupe
Seamus Lee [Wed, 16 Oct 2019 05:08:19 +0000 (07:08 +0200)]
Merge pull request #15519 from eileenmcnaughton/dedupe

[REF] minor extraction with code to build dedupe arrays

5 years agoMerge pull request #15516 from eileenmcnaughton/part_mult
Seamus Lee [Wed, 16 Oct 2019 02:42:51 +0000 (04:42 +0200)]
Merge pull request #15516 from eileenmcnaughton/part_mult

[REF] basic extraction of sendMails functionality along with a small test extension

5 years ago[REF] minor extraction with code to build dedupe arrays
eileen [Wed, 16 Oct 2019 02:13:10 +0000 (15:13 +1300)]
[REF] minor extraction with code to build dedupe arrays

5 years agoMerge pull request #15184 from eileenmcnaughton/dedupe9
Eileen McNaughton [Wed, 16 Oct 2019 01:47:44 +0000 (14:47 +1300)]
Merge pull request #15184 from eileenmcnaughton/dedupe9

dev/core#1230 [Ref] Rationalise dedupe code loop.

5 years agoMerge pull request #15518 from alexymik/manager-typo
Eileen McNaughton [Wed, 16 Oct 2019 01:14:21 +0000 (14:14 +1300)]
Merge pull request #15518 from alexymik/manager-typo

Fix typo in Manager.php

5 years ago[REF] basic extraction of sendMails functionality along with a small test extension
eileen [Tue, 15 Oct 2019 09:39:57 +0000 (22:39 +1300)]
[REF] basic extraction of sendMails functionality along with a small test extension

5 years agoFix typo in Manager.php
Alexy Mikhailichenko [Tue, 15 Oct 2019 23:35:44 +0000 (19:35 -0400)]
Fix typo in Manager.php

5 years agoMerge pull request #15515 from eileenmcnaughton/event_flow
colemanw [Tue, 15 Oct 2019 20:38:00 +0000 (16:38 -0400)]
Merge pull request #15515 from eileenmcnaughton/event_flow

[REF] remove obsolete code.

5 years agoMerge pull request #15517 from jitendrapurohit/tax-recur-test
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.

5 years agoMerge pull request #15485 from demeritcowboy/role-name-heading
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

5 years agodev/financial#72 add 'Template' contribution status
Elliott Eggleston [Mon, 7 Oct 2019 14:24:37 +0000 (16:24 +0200)]
dev/financial#72 add 'Template' contribution status

This status exists to exclude template contributions from reports
that don't yet know about the is_template field to be added to
civicrm_contribution. This status is not meant to be available to
be set via the UI, just for the process creating a ContributionRecur
record and associated template contribution.

5 years agoMerge pull request #15514 from eileenmcnaughton/order_participant
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

5 years agodev/core#1317 - Fix total_amount on repeattransaction when tax amount is involved.
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.

5 years agoOrder api updates to fix participant handling & deprecate creating 'completed'
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.

5 years ago[REF] remove obsolete code.
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

5 years agoMerge pull request #15358 from colemanw/relDesc
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

5 years agoUnit test to replicate dev/core#1317
Jitendra Purohit [Tue, 15 Oct 2019 07:29:29 +0000 (12:59 +0530)]
Unit test to replicate dev/core#1317

5 years agoMerge pull request #15510 from civicrm/5.19
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

5 years agoMerge pull request #15502 from eileenmcnaughton/payment_bug
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.

5 years agoMerge pull request #15507 from civicrm/5.19
Seamus Lee [Mon, 14 Oct 2019 23:44:30 +0000 (01:44 +0200)]
Merge pull request #15507 from civicrm/5.19

5.19

5 years agoMerge pull request #15506 from seamuslee001/ignore_own_extension
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

5 years agoDo 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

5 years agoMerge pull request #15492 from eileenmcnaughton/credit
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

5 years agoMerge pull request #15499 from eileenmcnaughton/pp
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

5 years agoMark test incomplete for now
eileen [Mon, 14 Oct 2019 10:14:44 +0000 (23:14 +1300)]
Mark test incomplete for now

5 years agoMerge pull request #15501 from eileenmcnaughton/order
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.

5 years agodev/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

5 years agoMerge pull request #15500 from eileenmcnaughton/part_cleanup
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

5 years agodev/financial#69 Fix misrecording of payments against non pay_later Pending contribution.
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

5 years agoMerge pull request #15497 from seamuslee001/frontend_title_receipts
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 …

5 years agoSwitch creation of ParticipantPayment to use API
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

5 years agoEnsure that the frontend title is used for contribution page details in receipts...
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

5 years agoMerge pull request #15498 from civicrm/5.19
Eileen McNaughton [Mon, 14 Oct 2019 03:49:14 +0000 (16:49 +1300)]
Merge pull request #15498 from civicrm/5.19

5.19

5 years agoTest calling CRM_Financial_BAO_PaymentProcessor::getPaymentProcessors
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