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
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
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
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"
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"
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
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.
demeritcowboy [Wed, 14 Apr 2021 16:40:21 +0000 (12:40 -0400)]
wrong link
Ahed [Tue, 6 Apr 2021 09:26:11 +0000 (12:26 +0300)]
dev/core#2512 Set membership's status properly when recording the payment
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.
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
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
Eileen McNaughton [Tue, 13 Apr 2021 19:16:50 +0000 (07:16 +1200)]
Merge pull request #20048 from colemanw/fixApi4Setting
APIv4 - Fix unserialize settings
Coleman Watts [Tue, 13 Apr 2021 15:43:12 +0000 (11:43 -0400)]
APIv4 - Fix unserialize settings
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.
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
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
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
Matthew Wire [Sun, 11 Apr 2021 20:38:41 +0000 (21:38 +0100)]
Test fixes to support moving dummy payment processor to doPayment
Matthew Wire [Sat, 10 Apr 2021 09:23:09 +0000 (10:23 +0100)]
Convert Dummy payment processor to use doPayment function
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…
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
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
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
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
Eileen McNaughton [Sun, 11 Apr 2021 22:24:31 +0000 (10:24 +1200)]
Merge pull request #20039 from civicrm/5.37
5.37
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
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
Matthew Wire [Mon, 1 Feb 2021 20:51:16 +0000 (20:51 +0000)]
Add amount as standard property
Matthew Wire [Sun, 11 Apr 2021 20:16:47 +0000 (21:16 +0100)]
Add legacy methods to catch old code
Matthew Wire [Sat, 10 Apr 2021 09:33:06 +0000 (10:33 +0100)]
Initial refactor of PayPal core processor to stop using doDirectPayment/doTransferCheckout
Eileen McNaughton [Sun, 11 Apr 2021 19:19:18 +0000 (07:19 +1200)]
Merge pull request #20023 from mattwire/propertybaginstallments
Add installments to propertyBag
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
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
Coleman Watts [Sun, 11 Apr 2021 15:51:35 +0000 (11:51 -0400)]
SearchKit - Rename 'Filters' to 'Having' for clarity
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 …
Eileen McNaughton [Sun, 11 Apr 2021 04:58:38 +0000 (16:58 +1200)]
Merge pull request #20022 from mattwire/dopaymentpropertybag
Use propertyBag in doPayment
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
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
Coleman Watts [Sun, 11 Apr 2021 01:28:20 +0000 (21:28 -0400)]
SearchKit - Flush Angular cache when saving
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
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
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
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
Jitendra Purohit [Fri, 9 Apr 2021 14:40:37 +0000 (20:10 +0530)]
Fix soft credit on creating membership using backend form
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
Matthew Wire [Sat, 3 Apr 2021 17:06:00 +0000 (18:06 +0100)]
Add installments to propertyBag
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
Matthew Wire [Fri, 9 Apr 2021 10:16:10 +0000 (11:16 +0100)]
Use propertyBag in doPayment
Matthew Wire [Fri, 9 Apr 2021 09:07:25 +0000 (10:07 +0100)]
Use standard function to add reCAPTCHA to PCPAccount form
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 …
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
Monish Deb [Tue, 6 Apr 2021 05:33:37 +0000 (11:03 +0530)]
Add unit test for core#19628
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
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
Monish Deb [Fri, 9 Apr 2021 05:18:42 +0000 (10:48 +0530)]
Merge pull request #20007 from eileenmcnaughton/mem_rec
Extract out getReceiveDate
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
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
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…
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
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
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…
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
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
Eileen McNaughton [Fri, 9 Apr 2021 00:26:24 +0000 (12:26 +1200)]
Merge pull request #20010 from eileenmcnaughton/mem_ord
[Ref] One more place to use total fn
eileen [Fri, 26 Mar 2021 03:26:06 +0000 (16:26 +1300)]
Move tpl assignment to email function
Seamus Lee [Thu, 8 Apr 2021 23:08:07 +0000 (09:08 +1000)]
Migrate current recaptcha library into extension and fix a couple of ts calls
Eileen McNaughton [Thu, 8 Apr 2021 23:54:26 +0000 (11:54 +1200)]
Merge pull request #20006 from eileenmcnaughton/pay_fix
[NFC] [Test] Minor preliminary cleanup
eileen [Thu, 8 Apr 2021 23:52:07 +0000 (11:52 +1200)]
[NFC] [Test] Preliminary cleanup
Coleman Watts [Thu, 8 Apr 2021 23:08:11 +0000 (19:08 -0400)]
APIv4 - Add CaseActivity entity
eileen [Fri, 26 Mar 2021 00:20:44 +0000 (13:20 +1300)]
[Ref] One more place to use total fn
eileen [Thu, 25 Mar 2021 23:43:21 +0000 (12:43 +1300)]
Extract out getReceiveDate
eileen [Thu, 8 Apr 2021 22:19:55 +0000 (10:19 +1200)]
[NFC] [Test] Minor preliminary cleanup
colemanw [Thu, 8 Apr 2021 22:15:06 +0000 (18:15 -0400)]
Merge pull request #19902 from eileenmcnaughton/mem_cont
[REF] [Towards membership api] Simplify determination on contribution recur contact id
Eileen McNaughton [Thu, 8 Apr 2021 22:05:40 +0000 (10:05 +1200)]
Merge pull request #20004 from colemanw/searchKitContributionTasks
SearchKit - Make contribution tasks available as actions
Coleman Watts [Thu, 8 Apr 2021 19:03:38 +0000 (15:03 -0400)]
SearchKit - Make contribution tasks available as actions
So far there is only one action (Send Receipt) available,
and it only works for contributions with status=Completed.
SearchKit doesn't yet respect that limitation and shows the action for every record.
Eileen McNaughton [Thu, 8 Apr 2021 20:43:33 +0000 (08:43 +1200)]
Merge pull request #20005 from civicrm/5.37
5.37 to master
Eileen McNaughton [Thu, 8 Apr 2021 20:33:21 +0000 (08:33 +1200)]
Merge pull request #20003 from colemanw/fixSearchKitExport
SearchKit - Fix broken export action
colemanw [Thu, 8 Apr 2021 19:44:06 +0000 (15:44 -0400)]
Merge pull request #19964 from eileenmcnaughton/mem_install
Membership form Remove check for installments as not on the form (copied from shared code)
colemanw [Thu, 8 Apr 2021 19:43:26 +0000 (15:43 -0400)]
Merge pull request #19965 from eileenmcnaughton/mem_trxn
Remove reference to trxn_id, not on form, from previously shared code
colemanw [Thu, 8 Apr 2021 18:11:22 +0000 (14:11 -0400)]
Merge pull request #19848 from eileenmcnaughton/task2
Add support for receipt task outside the search process
Coleman Watts [Thu, 8 Apr 2021 15:12:25 +0000 (11:12 -0400)]
SearchKit - Fix broken export action
Monish Deb [Thu, 8 Apr 2021 12:28:20 +0000 (17:58 +0530)]
Merge pull request #19744 from totten/master-upg-cleanup
dev/release#16 - Cleanup empty upgrade steps
Monish Deb [Thu, 8 Apr 2021 12:27:18 +0000 (17:57 +0530)]
Merge pull request #19966 from eileenmcnaughton/mem_source
[REF] [Towards membership api] extract getContributionSource
Monish Deb [Thu, 8 Apr 2021 12:22:36 +0000 (17:52 +0530)]
Merge pull request #19890 from mlutfy/fixEmptyFileField
File CustomField: avoid renaming an empty file
Seamus Lee [Thu, 8 Apr 2021 10:04:09 +0000 (20:04 +1000)]
Merge pull request #20000 from civicrm/5.37
5.37
Seamus Lee [Thu, 8 Apr 2021 08:37:20 +0000 (18:37 +1000)]
Merge pull request #19999 from eileenmcnaughton/5.37
Add recaptcha to distmaker
Seamus Lee [Thu, 8 Apr 2021 07:22:55 +0000 (17:22 +1000)]
Merge pull request #19998 from colemanw/afformAssetRefresh
Afform - Refresh assetBuilder when saving a form
Seamus Lee [Thu, 8 Apr 2021 06:38:51 +0000 (16:38 +1000)]
Merge pull request #19997 from colemanw/afformSearchDisplayDropdown
Afform - Fix endless spinner on "New Search Display" dropdown
eileen [Thu, 8 Apr 2021 06:33:20 +0000 (18:33 +1200)]
Add recaptcha to distmaker
Coleman Watts [Thu, 8 Apr 2021 02:33:47 +0000 (22:33 -0400)]
Afform - Refresh assetBuilder when saving a form
On sites with caching enabled, changes were not showing until a manual flush
Coleman Watts [Thu, 8 Apr 2021 02:11:03 +0000 (22:11 -0400)]
Afform - Fix endless spinner on "New Search Display" dropdown when there are none
Tim Otten [Sat, 6 Mar 2021 10:36:08 +0000 (02:36 -0800)]
(Cleanup) Upgrader - Remove empty steps from 5.0x-series
Tim Otten [Sat, 6 Mar 2021 10:08:05 +0000 (02:08 -0800)]
(Cleanup) Upgrader - Remove empty steps from 5.10-series
Tim Otten [Sat, 6 Mar 2021 10:02:25 +0000 (02:02 -0800)]
(Cleanup) Upgrader - Remove empty steps from 5.20-series
Tim Otten [Sat, 6 Mar 2021 09:58:23 +0000 (01:58 -0800)]
(Cleanup) Upgrader - Remove empty steps from 5.30-series
CiviCRM [Thu, 8 Apr 2021 01:50:19 +0000 (01:50 +0000)]
Set version to 5.38.alpha1
Eileen McNaughton [Thu, 8 Apr 2021 01:46:44 +0000 (13:46 +1200)]
Merge pull request #19995 from demeritcowboy/ufgroup-active
dev/core#2501 - api uf_group.create overwrites existing fields when updating if they aren't specified
CiviCRM [Thu, 8 Apr 2021 01:42:10 +0000 (01:42 +0000)]
Set version to 5.37.beta1
Tim Otten [Thu, 8 Apr 2021 01:24:53 +0000 (18:24 -0700)]
Merge pull request #19996 from colemanw/misc_admin_settings
Rename 'Misc' menu item machine name to a safe string