civicrm-core.git
3 years agoMerge pull request #20067 from civicrm/5.37
Seamus Lee [Fri, 16 Apr 2021 02:17:44 +0000 (12:17 +1000)]
Merge pull request #20067 from civicrm/5.37

5.37

3 years agoMerge pull request #19886 from eileenmcnaughton/import
Seamus Lee [Fri, 16 Apr 2021 01:44:36 +0000 (11:44 +1000)]
Merge pull request #19886 from eileenmcnaughton/import

Fix for importing preferred language (and other fields) by label

3 years agoMerge pull request #20071 from eileenmcnaughton/537d
Seamus Lee [Fri, 16 Apr 2021 00:35:19 +0000 (10:35 +1000)]
Merge pull request #20071 from eileenmcnaughton/537d

dev/core#2498 dedupe rule saving fix

3 years agoMerge pull request #20055 from davidjosephhayes/fix-authx-setting-display
Tim Otten [Thu, 15 Apr 2021 23:56:37 +0000 (16:56 -0700)]
Merge pull request #20055 from davidjosephhayes/fix-authx-setting-display

Fix AuthX Setting Labels

3 years agoMerge pull request #20074 from seamuslee001/fix_format_money
Seamus Lee [Thu, 15 Apr 2021 23:29:58 +0000 (09:29 +1000)]
Merge pull request #20074 from seamuslee001/fix_format_money

REF Ensure that getAmount includes 0s in decimal places up to 2 places

3 years agoMerge pull request #20041 from eileenmcnaughton/mem_cont_switch
colemanw [Thu, 15 Apr 2021 23:23:03 +0000 (19:23 -0400)]
Merge pull request #20041 from eileenmcnaughton/mem_cont_switch

Switch to Call contribution api

3 years agoMerge pull request #20073 from seamuslee001/dev_event_53
Seamus Lee [Thu, 15 Apr 2021 23:15:31 +0000 (09:15 +1000)]
Merge pull request #20073 from seamuslee001/dev_event_53

dev/event#53 Fix issue where by Sold out option was not being properl…

3 years agoMerge pull request #20014 from eileenmcnaughton/mem_params
colemanw [Thu, 15 Apr 2021 23:14:57 +0000 (19:14 -0400)]
Merge pull request #20014 from eileenmcnaughton/mem_params

[Ref] Simplify getMembershipParameters

3 years agoMerge pull request #20072 from colemanw/apiv4SettingFix
Eileen McNaughton [Thu, 15 Apr 2021 22:16:57 +0000 (10:16 +1200)]
Merge pull request #20072 from colemanw/apiv4SettingFix

APIv4 - Fix Setting api to work with index param

3 years agoREF Ensure that getAmount includes 0s in decimal places up to 2 places
Seamus Lee [Thu, 15 Apr 2021 22:01:23 +0000 (08:01 +1000)]
REF Ensure that getAmount includes 0s in decimal places up to 2 places

3 years agodev/event#53 Fix issue where by Sold out option was not being properly frozen
Seamus Lee [Thu, 15 Apr 2021 21:33:23 +0000 (07:33 +1000)]
dev/event#53 Fix issue where by Sold out option was not being properly frozen

3 years agoAPIv4 - Fix Setting api to work with index param
Coleman Watts [Thu, 15 Apr 2021 19:36:55 +0000 (15:36 -0400)]
APIv4 - Fix Setting api to work with index param

The api tries to force index params into the "Select" clause
which doesn't make sense for the oddball "Setting" api.

3 years agodev/core#2498 dedupe rule saving fix
eileen [Thu, 15 Apr 2021 19:37:48 +0000 (07:37 +1200)]
dev/core#2498 dedupe rule saving fix

3 years agoMerge pull request #20069 from larssandergreen/Remove-group-limit-for-mailings
Eileen McNaughton [Thu, 15 Apr 2021 05:24:32 +0000 (17:24 +1200)]
Merge pull request #20069 from larssandergreen/Remove-group-limit-for-mailings

Removed limit of 25 groups and past mailings

3 years agoRemoved limit of 25 groups and past mailings
Lars SG [Thu, 15 Apr 2021 04:05:23 +0000 (22:05 -0600)]
Removed limit of 25 groups and past mailings

Before: Saving a mailing with more than 25 groups or past mailing recipients caused the number of groups to be reduced to 25.
After: As many groups as desired can be added.

3 years agoMerge pull request #20040 from eileenmcnaughton/537
colemanw [Thu, 15 Apr 2021 04:04:27 +0000 (00:04 -0400)]
Merge pull request #20040 from eileenmcnaughton/537

dev/core#2493 Stop attempting to format money in the processor class

3 years agoMerge pull request #20066 from seamuslee001/dev_core_2528
Seamus Lee [Thu, 15 Apr 2021 04:00:47 +0000 (14:00 +1000)]
Merge pull request #20066 from seamuslee001/dev_core_2528

dev/core#2528 Set Modified date to be current timestamp in civicrm_co…

3 years agoAdd in deprecated warning if amount is not numeric and use filter var to return appro...
Seamus Lee [Thu, 15 Apr 2021 01:34:44 +0000 (11:34 +1000)]
Add in deprecated warning if amount is not numeric and use filter var to return appropriate amount in that case otherwise just return amount

3 years agodev/core#2528 Set Modified date to be current timestamp in civicrm_contribution_recur...
Seamus Lee [Thu, 15 Apr 2021 01:28:55 +0000 (11:28 +1000)]
dev/core#2528 Set Modified date to be current timestamp in civicrm_contribution_recur if it is null before setting the field to NOT NULL

3 years agoMerge pull request #20043 from seamuslee001/payflow_pro_core_ext
Seamus Lee [Thu, 15 Apr 2021 01:18:33 +0000 (11:18 +1000)]
Merge pull request #20043 from seamuslee001/payflow_pro_core_ext

(REF) Payflow Pro - Migrate code into a core extension

3 years agoMerge pull request #20051 from civicrm/5.37
Eileen McNaughton [Wed, 14 Apr 2021 22:06:43 +0000 (10:06 +1200)]
Merge pull request #20051 from civicrm/5.37

5.37

3 years agoMerge pull request #20056 from colemanw/api4GetApiFix
Eileen McNaughton [Wed, 14 Apr 2021 19:29:00 +0000 (07:29 +1200)]
Merge pull request #20056 from colemanw/api4GetApiFix

APIv4 - Improve entity name lookup

3 years agoMerge pull request #20061 from larssandergreen/contribution-page-pager
Eileen McNaughton [Wed, 14 Apr 2021 19:19:16 +0000 (07:19 +1200)]
Merge pull request #20061 from larssandergreen/contribution-page-pager

Add pager to bottom of Manage Contribution Pages

3 years agoMerge pull request #20054 from highfalutin/patch-5
Eileen McNaughton [Wed, 14 Apr 2021 19:18:34 +0000 (07:18 +1200)]
Merge pull request #20054 from highfalutin/patch-5

When generating boilerplate code from xml, make error text more helpful and spelt correckly

3 years agoMerge pull request #20060 from demeritcowboy/grantview
colemanw [Wed, 14 Apr 2021 19:05:29 +0000 (15:05 -0400)]
Merge pull request #20060 from demeritcowboy/grantview

dev/core#2509 - Search kit display link for grant view is wrong

3 years agoMerge pull request #20057 from christianwach/lab-wp-82
Eileen McNaughton [Wed, 14 Apr 2021 18:59:47 +0000 (06:59 +1200)]
Merge pull request #20057 from christianwach/lab-wp-82

Fix issues with "Create User Record" process

3 years agoMerge pull request #20062 from civicrm/revert-19975-dev/core#2512
Eileen McNaughton [Wed, 14 Apr 2021 18:52:10 +0000 (06:52 +1200)]
Merge pull request #20062 from civicrm/revert-19975-dev/core#2512

Revert "dev/core#2512 Set membership's status properly when recording the payment"

3 years agoRevert "dev/core#2512 Set membership's status properly when recording the payment"
Eileen McNaughton [Wed, 14 Apr 2021 18:51:47 +0000 (06:51 +1200)]
Revert "dev/core#2512 Set membership's status properly when recording the payment"

3 years agoMerge pull request #19975 from ahed-compucorp/dev/core#2512
Eileen McNaughton [Wed, 14 Apr 2021 18:51:37 +0000 (06:51 +1200)]
Merge pull request #19975 from ahed-compucorp/dev/core#2512

dev/core#2512 Set membership's status properly when recording the payment

3 years agoAdd pager to bottom of Manage Contribution Pages
Lars SG [Wed, 14 Apr 2021 17:02:55 +0000 (11:02 -0600)]
Add pager to bottom of Manage Contribution Pages

There was no pager at the bottom of the page, now there is.

3 years agowrong link
demeritcowboy [Wed, 14 Apr 2021 16:40:21 +0000 (12:40 -0400)]
wrong link

3 years agofix styling per checks
David Hayes [Wed, 14 Apr 2021 16:32:23 +0000 (09:32 -0700)]
fix styling per checks

3 years agoFix issues with "Create User Record" process
Christian Wach [Wed, 14 Apr 2021 13:31:03 +0000 (14:31 +0100)]
Fix issues with "Create User Record" process

3 years agoAPIv4 - Improve entity name lookup & add test
Coleman Watts [Wed, 14 Apr 2021 12:35:58 +0000 (08:35 -0400)]
APIv4 - Improve entity name lookup & add test

3 years agodev/core#2512 Set membership's status properly when recording the payment
Ahed [Tue, 6 Apr 2021 09:26:11 +0000 (12:26 +0300)]
dev/core#2512 Set membership's status properly when recording the payment

3 years agoconsistent spacing
David Hayes [Wed, 14 Apr 2021 07:03:50 +0000 (00:03 -0700)]
consistent spacing

3 years agoset flow in setting title
David Hayes [Wed, 14 Apr 2021 06:38:04 +0000 (23:38 -0700)]
set flow in setting title

3 years agoMake error text more helpful and spelt correckly
highfalutin [Wed, 14 Apr 2021 05:59:41 +0000 (22:59 -0700)]
Make error text more helpful and spelt correckly

Provide a bit more context when possible.

3 years ago[REF] Fix Creating of Recurring Contribution using PayFlow Pro Processor
Seamus Lee [Fri, 26 Mar 2021 08:40:28 +0000 (19:40 +1100)]
[REF] Fix Creating of Recurring Contribution using PayFlow Pro Processor

3 years agoFlesh out readme, info.xml and remove Payflow Pro Payment Processor Type from install...
Seamus Lee [Tue, 13 Apr 2021 23:36:09 +0000 (09:36 +1000)]
Flesh out readme, info.xml and remove Payflow Pro Payment Processor Type from install data and add in upgrade step to enable extension appropriately as needed and add in civicrm managed file

Mark Processor as supporting recurring

3 years agoMerge pull request #20050 from colemanw/fixEntityRef37
Eileen McNaughton [Wed, 14 Apr 2021 02:11:51 +0000 (14:11 +1200)]
Merge pull request #20050 from colemanw/fixEntityRef37

Fix entity-ref search by id & update search prompt

3 years agoFix entity-ref search by id & update search prompt
Coleman Watts [Tue, 13 Apr 2021 20:39:36 +0000 (16:39 -0400)]
Fix entity-ref search by id & update search prompt

Fixes a bug where searching by id wasn't working.
Also updates search prompt to indicate that searching by id is possible.

3 years agoMerge pull request #20045 from colemanw/fixWpPermissionPage
Eileen McNaughton [Tue, 13 Apr 2021 21:35:30 +0000 (09:35 +1200)]
Merge pull request #20045 from colemanw/fixWpPermissionPage

Update WP permission page for new string array keys

3 years agoMerge pull request #20042 from colemanw/afformContactLayout
Seamus Lee [Tue, 13 Apr 2021 20:55:26 +0000 (06:55 +1000)]
Merge pull request #20042 from colemanw/afformContactLayout

Afform - Improve integration with ContactLayout editor

3 years agoMerge pull request #20048 from colemanw/fixApi4Setting
Eileen McNaughton [Tue, 13 Apr 2021 19:16:50 +0000 (07:16 +1200)]
Merge pull request #20048 from colemanw/fixApi4Setting

APIv4 - Fix unserialize settings

3 years agoAPIv4 - Fix unserialize settings
Coleman Watts [Tue, 13 Apr 2021 15:43:12 +0000 (11:43 -0400)]
APIv4 - Fix unserialize settings

3 years agoUpdate WP permission page for new string array keys
Coleman Watts [Tue, 13 Apr 2021 12:49:16 +0000 (08:49 -0400)]
Update WP permission page for new string array keys

This fixes an undefined index notice for permissions that use the new-style
'label' and 'description' array keys instead of numeric keys.

3 years agoAfform - Improve integration with ContactLayout editor
Coleman Watts [Mon, 12 Apr 2021 22:15:49 +0000 (18:15 -0400)]
Afform - Improve integration with ContactLayout editor

- Adds a separate category of ContactLayout block per afform-type
- Adds a helper function to getFields so non-dao entities can load options from an optionGroup
- Renames search display afforms to "Search Form" to distinguish them from actual search displays

3 years agoREF migrate Payflow Pro code into a core Extension
Seamus Lee [Tue, 13 Apr 2021 01:35:28 +0000 (11:35 +1000)]
REF migrate Payflow Pro code into a core Extension

3 years agoMerge pull request #20029 from mattwire/dummydopayment
Seamus Lee [Mon, 12 Apr 2021 23:49:16 +0000 (09:49 +1000)]
Merge pull request #20029 from mattwire/dummydopayment

Convert Dummy payment processor to use doPayment function

3 years agoMerge pull request #20038 from mattwire/suppresswarnings
Seamus Lee [Mon, 12 Apr 2021 22:17:02 +0000 (08:17 +1000)]
Merge pull request #20038 from mattwire/suppresswarnings

Suppress legacy warnings by default in propertyBag to allow transition to propertyBag without hitting legacy warnings on unconverted payment processors

3 years agoTest fixes to support moving dummy payment processor to doPayment
Matthew Wire [Sun, 11 Apr 2021 20:38:41 +0000 (21:38 +0100)]
Test fixes to support moving dummy payment processor to doPayment

3 years agoConvert Dummy payment processor to use doPayment function
Matthew Wire [Sat, 10 Apr 2021 09:23:09 +0000 (10:23 +0100)]
Convert Dummy payment processor to use doPayment function

3 years agoSwitch to Call contribution api, remove unused
eileen [Thu, 25 Mar 2021 23:55:26 +0000 (12:55 +1300)]
Switch to Call contribution api, remove unused

is_pay_later & skipLineItem could only be unset here

3 years agoMerge pull request #19917 from seamuslee001/wordpress_shortcode_timeout
Eileen McNaughton [Mon, 12 Apr 2021 19:49:03 +0000 (07:49 +1200)]
Merge pull request #19917 from seamuslee001/wordpress_shortcode_timeout

[REF] Fix error where entryURL does not contain id of the contributio…

3 years agoSuppress legacy warnings by default in propertyBag to allow transition to propertyBag...
Matthew Wire [Sun, 11 Apr 2021 21:56:34 +0000 (22:56 +0100)]
Suppress legacy warnings by default in propertyBag to allow transition to propertyBag without hitting legacy warnings on unconverted payment processors

3 years agoMerge pull request #20017 from eileenmcnaughton/mem_contrib
Matthew Wire [Mon, 12 Apr 2021 14:03:45 +0000 (15:03 +0100)]
Merge pull request #20017 from eileenmcnaughton/mem_contrib

[REF] Simplify interaction with contributionRecur

3 years ago[REF] Fix error where entryURL does not contain id of the contribution page when...
Seamus Lee [Fri, 26 Mar 2021 08:44:37 +0000 (19:44 +1100)]
[REF] Fix error where entryURL does not contain id of the contribution page when coming from a shortcode which leads to infinite redirect loop if session timesout

Add in comment and expand fix to cover event registratons as well

3 years agodev/core#2493 Stop attempting to format money in the processor class
eileen [Mon, 12 Apr 2021 03:23:07 +0000 (15:23 +1200)]
dev/core#2493 Stop attempting to format money in the processor class

We've said this is wrong before but it has survived until now because it seemed scarier to change it. However,
now the reverse seems true.

The value in amount should always be machine friendly and there are no known processors
that expect locale specific formatting.

On the other hand the format() function is intended to prepare money for DISPLAY which
is not what is going on here

3 years agoMerge pull request #20037 from mattwire/amountstandardprop
Seamus Lee [Mon, 12 Apr 2021 00:22:35 +0000 (10:22 +1000)]
Merge pull request #20037 from mattwire/amountstandardprop

Add amount as standard property to PaymentPropertyBag

3 years agoMerge pull request #20039 from civicrm/5.37
Eileen McNaughton [Sun, 11 Apr 2021 22:24:31 +0000 (10:24 +1200)]
Merge pull request #20039 from civicrm/5.37

5.37

3 years agoMerge pull request #20019 from mattwire/recaptchapcp
Seamus Lee [Sun, 11 Apr 2021 22:22:25 +0000 (08:22 +1000)]
Merge pull request #20019 from mattwire/recaptchapcp

Use standard function to add reCAPTCHA to PCPAccount form

3 years agoMerge pull request #20030 from mattwire/paymentdopayment
Eileen McNaughton [Sun, 11 Apr 2021 22:03:23 +0000 (10:03 +1200)]
Merge pull request #20030 from mattwire/paymentdopayment

Initial refactor of PayPal core processor to stop using doDirectPayment/doTransferCheckout

3 years agoAdd amount as standard property
Matthew Wire [Mon, 1 Feb 2021 20:51:16 +0000 (20:51 +0000)]
Add amount as standard property

3 years agoAdd legacy methods to catch old code
Matthew Wire [Sun, 11 Apr 2021 20:16:47 +0000 (21:16 +0100)]
Add legacy methods to catch old code

3 years agoInitial refactor of PayPal core processor to stop using doDirectPayment/doTransferChe...
Matthew Wire [Sat, 10 Apr 2021 09:33:06 +0000 (10:33 +0100)]
Initial refactor of PayPal core processor to stop using doDirectPayment/doTransferCheckout

3 years agoMerge pull request #20023 from mattwire/propertybaginstallments
Eileen McNaughton [Sun, 11 Apr 2021 19:19:18 +0000 (07:19 +1200)]
Merge pull request #20023 from mattwire/propertybaginstallments

Add installments to propertyBag

3 years agoMerge pull request #20034 from civicrm/5.37
Eileen McNaughton [Sun, 11 Apr 2021 19:09:08 +0000 (07:09 +1200)]
Merge pull request #20034 from civicrm/5.37

5.37 to master

3 years agoMerge pull request #20033 from colemanw/searchKitHavingLabel
Eileen McNaughton [Sun, 11 Apr 2021 19:08:35 +0000 (07:08 +1200)]
Merge pull request #20033 from colemanw/searchKitHavingLabel

dev/report#58 SearchKit - Rename 'Filters' to 'Having' for clarity

3 years agoSearchKit - Rename 'Filters' to 'Having' for clarity
Coleman Watts [Sun, 11 Apr 2021 15:51:35 +0000 (11:51 -0400)]
SearchKit - Rename 'Filters' to 'Having' for clarity

3 years agoMerge pull request #20020 from mattwire/deprecateddoXpayment
Eileen McNaughton [Sun, 11 Apr 2021 05:01:02 +0000 (17:01 +1200)]
Merge pull request #20020 from mattwire/deprecateddoXpayment

Make it clear that doDirectPayment/doTransferCheckout are deprecated …

3 years agoMerge pull request #20022 from mattwire/dopaymentpropertybag
Eileen McNaughton [Sun, 11 Apr 2021 04:58:38 +0000 (16:58 +1200)]
Merge pull request #20022 from mattwire/dopaymentpropertybag

Use propertyBag in doPayment

3 years agoMerge pull request #20032 from civicrm/5.37
Eileen McNaughton [Sun, 11 Apr 2021 04:52:54 +0000 (16:52 +1200)]
Merge pull request #20032 from civicrm/5.37

5.37 to master

3 years agoMerge pull request #20031 from colemanw/searchKitFlushCache
Eileen McNaughton [Sun, 11 Apr 2021 04:52:23 +0000 (16:52 +1200)]
Merge pull request #20031 from colemanw/searchKitFlushCache

SearchKit - Flush Angular cache when saving

3 years agoSearchKit - Flush Angular cache when saving
Coleman Watts [Sun, 11 Apr 2021 01:28:20 +0000 (21:28 -0400)]
SearchKit - Flush Angular cache when saving

3 years agoMake it clear that doDirectPayment/doTransferCheckout are deprecated and should not...
Matthew Wire [Fri, 9 Apr 2021 10:13:58 +0000 (11:13 +0100)]
Make it clear that doDirectPayment/doTransferCheckout are deprecated and should not be used

3 years agoMerge pull request #20021 from mattwire/payment_status
Eileen McNaughton [Sat, 10 Apr 2021 00:32:22 +0000 (12:32 +1200)]
Merge pull request #20021 from mattwire/payment_status

Add payment_status in default doPayment per dev/financial#141

3 years agoMerge pull request #20027 from civicrm/5.37
Eileen McNaughton [Sat, 10 Apr 2021 00:26:14 +0000 (12:26 +1200)]
Merge pull request #20027 from civicrm/5.37

5.37 to master

3 years agoMerge pull request #20025 from jitendrapurohit/memsoftcredit-537
Eileen McNaughton [Sat, 10 Apr 2021 00:24:09 +0000 (12:24 +1200)]
Merge pull request #20025 from jitendrapurohit/memsoftcredit-537

Soft credit fails when membership is created using backend form

3 years agoFix soft credit on creating membership using backend form
Jitendra Purohit [Fri, 9 Apr 2021 14:40:37 +0000 (20:10 +0530)]
Fix soft credit on creating membership using backend form

3 years agoMerge pull request #20008 from eileenmcnaughton/pay_fee
Matthew Wire [Fri, 9 Apr 2021 13:15:50 +0000 (14:15 +0100)]
Merge pull request #20008 from eileenmcnaughton/pay_fee

Fix Payment.create to update (recalculate) contribution fee_amount

3 years agoAdd installments to propertyBag
Matthew Wire [Sat, 3 Apr 2021 17:06:00 +0000 (18:06 +0100)]
Add installments to propertyBag

3 years agoAdd in default doPayment per https://lab.civicrm.org/dev/financial/-/issues/141
Matthew Wire [Fri, 9 Apr 2021 10:17:23 +0000 (11:17 +0100)]
Add  in default doPayment per https://lab.civicrm.org/dev/financial/-/issues/141

3 years agoUse propertyBag in doPayment
Matthew Wire [Fri, 9 Apr 2021 10:16:10 +0000 (11:16 +0100)]
Use propertyBag in doPayment

3 years agoUse standard function to add reCAPTCHA to PCPAccount form
Matthew Wire [Fri, 9 Apr 2021 09:07:25 +0000 (10:07 +0100)]
Use standard function to add reCAPTCHA to PCPAccount form

3 years agoMerge pull request #20011 from seamuslee001/migrate_library
Matthew Wire [Fri, 9 Apr 2021 08:35:29 +0000 (09:35 +0100)]
Merge pull request #20011 from seamuslee001/migrate_library

Migrate current recaptcha library into extension and fix a couple of …

3 years agoMerge pull request #19972 from JMAConsulting/issue_2383_unit_test
Eileen McNaughton [Fri, 9 Apr 2021 08:04:39 +0000 (20:04 +1200)]
Merge pull request #19972 from JMAConsulting/issue_2383_unit_test

Add unit test for core#19628

3 years agoAdd unit test for core#19628
Monish Deb [Tue, 6 Apr 2021 05:33:37 +0000 (11:03 +0530)]
Add unit test for core#19628

3 years agoMerge pull request #19903 from eileenmcnaughton/paypal
Monish Deb [Fri, 9 Apr 2021 05:37:11 +0000 (11:07 +0530)]
Merge pull request #19903 from eileenmcnaughton/paypal

[REF] [ipn] Simplification around contributionRecur ID

3 years ago[REF] Simplify interaction with contributionRecur
eileen [Fri, 9 Apr 2021 05:30:26 +0000 (17:30 +1200)]
[REF] Simplify interaction with contributionRecur

Since creating a recurring contribution record no longer relies on anything else in the
form we create it, if needed, the first time the id is requested

3 years agoMerge pull request #20007 from eileenmcnaughton/mem_rec
Monish Deb [Fri, 9 Apr 2021 05:18:42 +0000 (10:48 +0530)]
Merge pull request #20007 from eileenmcnaughton/mem_rec

Extract out getReceiveDate

3 years agoFix Payment.create to update (recalculate) contribution fee_amount
eileen [Thu, 8 Apr 2021 22:50:50 +0000 (10:50 +1200)]
Fix Payment.create to update (recalculate) contribution fee_amount

This recalculates the fee amount when a payment is received. Our data integrity expects the fee
amount on the contribution to equal the sum of the fee amount on the payments. However,
it's possible a pending contribution has an 'estimated' fee amount so we can't just add on
the fee_amount and assume it will be right

3 years agoMerge pull request #20012 from eileenmcnaughton/bao_test
Seamus Lee [Fri, 9 Apr 2021 02:21:18 +0000 (12:21 +1000)]
Merge pull request #20012 from eileenmcnaughton/bao_test

[NFC] [Test] Preliminary cleanup

3 years agoMerge pull request #20016 from seamuslee001/unit_test_2502
Eileen McNaughton [Fri, 9 Apr 2021 02:19:49 +0000 (14:19 +1200)]
Merge pull request #20016 from seamuslee001/unit_test_2502

dev/core#2502 Add unit test to lock in fix on tag searching in search…

3 years agoMerge pull request #20013 from eileenmcnaughton/mem_mover
Eileen McNaughton [Fri, 9 Apr 2021 01:36:19 +0000 (13:36 +1200)]
Merge pull request #20013 from eileenmcnaughton/mem_mover

Move tpl assignment to email function

3 years agodev/core#2502 Add unit test to lock in fix on tag searching in search builder
Seamus Lee [Fri, 9 Apr 2021 00:55:57 +0000 (10:55 +1000)]
dev/core#2502 Add unit test to lock in fix on tag searching in search builder

3 years agoMerge pull request #19718 from aydun/wp-login-redirect
Eileen McNaughton [Fri, 9 Apr 2021 00:53:07 +0000 (12:53 +1200)]
Merge pull request #19718 from aydun/wp-login-redirect

dev/core#2436 On WordPress, redirect back to the event registration o…

3 years agoMerge pull request #20015 from civicrm/5.37
Eileen McNaughton [Fri, 9 Apr 2021 00:35:40 +0000 (12:35 +1200)]
Merge pull request #20015 from civicrm/5.37

5.37 to master

3 years agoMerge pull request #20009 from colemanw/caseActivity
Eileen McNaughton [Fri, 9 Apr 2021 00:28:24 +0000 (12:28 +1200)]
Merge pull request #20009 from colemanw/caseActivity

dev/report#53 APIv4 - Add CaseActivity entity

3 years ago[REF] Simplify max_related
eileen [Fri, 26 Mar 2021 03:49:37 +0000 (16:49 +1300)]
[REF] Simplify max_related