civicrm-core.git
3 years agofailing test for php 7.4 and IDS
demeritcowboy [Sat, 20 Mar 2021 02:58:11 +0000 (22:58 -0400)]
failing test for php 7.4 and IDS

3 years agoMerge pull request #19849 from seamuslee001/member_event_form_test_fixes
Seamus Lee [Sat, 20 Mar 2021 00:08:56 +0000 (11:08 +1100)]
Merge pull request #19849 from seamuslee001/member_event_form_test_fixes

[NFC] Fix test failures on PHP 7.4 caused by either NULL being set fo…

3 years agoMerge pull request #19847 from seamuslee001/fix_test_failures_mysql8
Seamus Lee [Fri, 19 Mar 2021 23:27:12 +0000 (10:27 +1100)]
Merge pull request #19847 from seamuslee001/fix_test_failures_mysql8

[NFC] Fix Test failures on MySQL 8 caused by change in output of eith…

3 years agoMerge pull request #19846 from seamuslee001/fix_contribution_page_tests
Seamus Lee [Fri, 19 Mar 2021 23:07:44 +0000 (10:07 +1100)]
Merge pull request #19846 from seamuslee001/fix_contribution_page_tests

[NFC] Fix PHP 7.4 errors on ContributionPage tests

3 years agoMerge pull request #19845 from seamuslee001/fix_membership_type_test
Seamus Lee [Fri, 19 Mar 2021 23:06:06 +0000 (10:06 +1100)]
Merge pull request #19845 from seamuslee001/fix_membership_type_test

[NFC] Fix Membership Type Test error on php7.4

3 years agoMerge pull request #19844 from seamuslee001/php74_membership_api_fix
Seamus Lee [Fri, 19 Mar 2021 22:47:55 +0000 (09:47 +1100)]
Merge pull request #19844 from seamuslee001/php74_membership_api_fix

[REF] Fix APIv3 MembershipJob test failure on php7.4 by only doing ch…

3 years ago[NFC] Fix test failures on PHP 7.4 caused by either NULL being set for the membership...
Seamus Lee [Fri, 19 Mar 2021 22:45:52 +0000 (09:45 +1100)]
[NFC] Fix test failures on PHP 7.4 caused by either NULL being set for the membership_type_id or Payment Processor not being set on the form

3 years ago[NFC] Fix Test failures on MySQL 8 caused by change in output of either create table...
Seamus Lee [Fri, 19 Mar 2021 22:17:14 +0000 (09:17 +1100)]
[NFC] Fix Test failures on MySQL 8 caused by change in output of either create table or Column names in queries

3 years ago[NFC] Fix PHP 7.4 errors on ContributionPage tests
Seamus Lee [Fri, 19 Mar 2021 21:54:54 +0000 (08:54 +1100)]
[NFC] Fix PHP 7.4 errors on ContributionPage tests

3 years ago[NFC] Fix Membership Type Test error on php7.4
Seamus Lee [Fri, 19 Mar 2021 21:37:06 +0000 (08:37 +1100)]
[NFC] Fix Membership Type Test error on php7.4

3 years ago[REF] Fix APIv3 MembershipJob test failure on php7.4 by only doing checking if it...
Seamus Lee [Fri, 19 Mar 2021 21:29:30 +0000 (08:29 +1100)]
[REF] Fix APIv3 MembershipJob test failure on php7.4 by only doing checking  if it is not empty

3 years agoMerge pull request #19787 from demeritcowboy/cancel-button
colemanw [Fri, 19 Mar 2021 19:07:12 +0000 (15:07 -0400)]
Merge pull request #19787 from demeritcowboy/cancel-button

dev/financial#170 - Cancel button on financial batch export is no longer an input so code needs updating

3 years agoMerge pull request #19839 from tschuettler/core_2466
colemanw [Fri, 19 Mar 2021 17:43:16 +0000 (13:43 -0400)]
Merge pull request #19839 from tschuettler/core_2466

(dev/core#2466) - Drop HTML markup in exports for link custom fields

3 years agoMerge pull request #19834 from eileenmcnaughton/seq
colemanw [Fri, 19 Mar 2021 17:43:00 +0000 (13:43 -0400)]
Merge pull request #19834 from eileenmcnaughton/seq

Code cleanup in bootstrap.php

3 years agoMerge pull request #19835 from eileenmcnaughton/task
colemanw [Fri, 19 Mar 2021 12:18:25 +0000 (08:18 -0400)]
Merge pull request #19835 from eileenmcnaughton/task

[REF] Minor function extraction

3 years agoDrop HTML markup in exports for link custom fields
Thomas Schüttler [Fri, 19 Mar 2021 11:25:34 +0000 (12:25 +0100)]
Drop HTML markup in exports for link custom fields

3 years agoMerge pull request #19838 from eileenmcnaughton/nfc
Seamus Lee [Fri, 19 Mar 2021 08:57:16 +0000 (19:57 +1100)]
Merge pull request #19838 from eileenmcnaughton/nfc

[NFC] Minor coding standards cleanup

3 years agoMerge pull request #19836 from eileenmcnaughton/legacy
Seamus Lee [Fri, 19 Mar 2021 03:52:54 +0000 (14:52 +1100)]
Merge pull request #19836 from eileenmcnaughton/legacy

Remove legacy phpunit param

3 years ago[NFC] Minor coding standards cleanup
eileen [Fri, 19 Mar 2021 02:50:51 +0000 (15:50 +1300)]
[NFC] Minor coding standards cleanup

3 years ago[REF] Minor function extraction
eileen [Fri, 19 Mar 2021 01:32:32 +0000 (14:32 +1300)]
[REF] Minor function extraction

3 years agoMerge pull request #19833 from eileenmcnaughton/test
Seamus Lee [Fri, 19 Mar 2021 02:02:27 +0000 (13:02 +1100)]
Merge pull request #19833 from eileenmcnaughton/test

Remove safe+mode setting

3 years agoRemove legacy phpunit param
eileen [Fri, 19 Mar 2021 02:00:19 +0000 (15:00 +1300)]
Remove legacy phpunit param

3 years agoMerge pull request #19832 from seamuslee001/core_ext_void
Seamus Lee [Fri, 19 Mar 2021 01:48:18 +0000 (12:48 +1100)]
Merge pull request #19832 from seamuslee001/core_ext_void

[NFC] Add in Void statements on varios Core Ext Tests to future support PHP…

3 years agoMerge pull request #19624 from agileware/CIVICRM-1670
Eileen McNaughton [Fri, 19 Mar 2021 01:10:58 +0000 (14:10 +1300)]
Merge pull request #19624 from agileware/CIVICRM-1670

Issue #2384 - Remove text about email receipts for each recurring contribution

3 years agoCode cleanup in bootstrap.php
eileen [Fri, 19 Mar 2021 00:38:13 +0000 (13:38 +1300)]
Code cleanup in bootstrap.php

3 years agoRemove safe+mode setting
eileen [Fri, 19 Mar 2021 00:27:10 +0000 (13:27 +1300)]
Remove safe+mode setting

This is php5.4 compatibility = not needed

3 years agoAdd in Void statements on varios Core Ext Tests to future support PHPUnit8
Seamus Lee [Fri, 19 Mar 2021 00:14:49 +0000 (11:14 +1100)]
Add in Void statements on varios Core Ext Tests to future support PHPUnit8

3 years agoMerge pull request #19831 from colemanw/angularUpgrade
Eileen McNaughton [Thu, 18 Mar 2021 22:07:46 +0000 (11:07 +1300)]
Merge pull request #19831 from colemanw/angularUpgrade

Upgrade angularJs from 1.8.0 to 1.8.2

3 years agoMerge pull request #19753 from eileenmcnaughton/format
Seamus Lee [Thu, 18 Mar 2021 21:48:55 +0000 (08:48 +1100)]
Merge pull request #19753 from eileenmcnaughton/format

dev/core#1494 & dev/translation#65 call brickmoney number formatting, where supported

3 years agoMerge pull request #19830 from kewljuice/patch-6
Eileen McNaughton [Thu, 18 Mar 2021 21:24:42 +0000 (10:24 +1300)]
Merge pull request #19830 from kewljuice/patch-6

Fix deprecated Redis::delete() (issue #2468)

3 years agoUpgrade angularJs from 1.8.0 to 1.8.2
Coleman Watts [Thu, 18 Mar 2021 20:34:05 +0000 (16:34 -0400)]
Upgrade angularJs from 1.8.0 to 1.8.2

3 years agoFix deprecated Redis::delete() (issue #2468)
Wouter H [Thu, 18 Mar 2021 19:45:52 +0000 (20:45 +0100)]
Fix deprecated Redis::delete() (issue #2468)

3 years agoMerge pull request #19827 from civicrm/5.36
Seamus Lee [Thu, 18 Mar 2021 08:33:13 +0000 (19:33 +1100)]
Merge pull request #19827 from civicrm/5.36

5.36

3 years agoAdd release-notes/5.35.1
Tim Otten [Thu, 18 Mar 2021 02:00:27 +0000 (19:00 -0700)]
Add release-notes/5.35.1

3 years ago(security/core#105) Joomla::authenticate() - Fix escaping
Tim Otten [Tue, 16 Feb 2021 21:45:23 +0000 (13:45 -0800)]
(security/core#105) Joomla::authenticate() - Fix escaping

3 years ago(security/core#105) Joomla::checkUserNameEmailExists - Fix mismatched escaping
Tim Otten [Tue, 16 Feb 2021 21:42:52 +0000 (13:42 -0800)]
(security/core#105) Joomla::checkUserNameEmailExists - Fix mismatched escaping

This uses the escaping rule from CRM_Core_DAO to construct a query for JDatabaseDriver.
However, they use different connections and (therefore) could require different
escaping rules.

3 years ago(security/core#104) CRM_Utils_System::authenticateKey - Use secure equality test
Tim Otten [Thu, 25 Feb 2021 01:54:42 +0000 (17:54 -0800)]
(security/core#104) CRM_Utils_System::authenticateKey - Use secure equality test

3 years ago(security/core#97) PHP CLI guard is the opposite of correct
Tim Otten [Thu, 25 Feb 2021 05:01:26 +0000 (21:01 -0800)]
(security/core#97) PHP CLI guard is the opposite of correct

3 years agoEscape api params in APIv4 Explorer
Coleman Watts [Fri, 29 Jan 2021 19:30:38 +0000 (14:30 -0500)]
Escape api params in APIv4 Explorer

3 years agoPurify PCP introductory text field
Seamus Lee [Wed, 23 Dec 2020 09:04:18 +0000 (20:04 +1100)]
Purify PCP introductory text field

3 years agoEscape information supplied by extensions to prevent XSS
Seamus Lee [Wed, 23 Dec 2020 08:45:56 +0000 (19:45 +1100)]
Escape information supplied by extensions to prevent XSS

3 years agosecurity/core#97 Ensure that php scripts where applicable in sql and tools that shoul...
Seamus Lee [Mon, 9 Nov 2020 09:11:24 +0000 (20:11 +1100)]
security/core#97 Ensure that php scripts where applicable in sql and tools that should only be run in CLI can be run in CLI

Use more portable check for cli and add in 404 header as per Rich's comments

3 years agosecurity/core#100 Escape uploaded data to prevent Reflected Cross site scripting...
Seamus Lee [Mon, 16 Nov 2020 08:06:16 +0000 (19:06 +1100)]
security/core#100 Escape uploaded data to prevent Reflected Cross site scripting from uploaded CSVs

3 years agoMerge pull request #19824 from eileenmcnaughton/url_form
Seamus Lee [Wed, 17 Mar 2021 21:50:01 +0000 (08:50 +1100)]
Merge pull request #19824 from eileenmcnaughton/url_form

Remove now-empty function

3 years agoMerge pull request #19765 from colemanw/inPlaceEdit
Eileen McNaughton [Wed, 17 Mar 2021 19:21:44 +0000 (08:21 +1300)]
Merge pull request #19765 from colemanw/inPlaceEdit

SearchKit - Add "in-place edit" feature

3 years agoRemove now-empty function
eileen [Wed, 17 Mar 2021 19:20:50 +0000 (08:20 +1300)]
Remove now-empty function

3 years agoMerge pull request #19823 from tunbola/fix-isfrontpage-wrong-value
Eileen McNaughton [Wed, 17 Mar 2021 19:19:00 +0000 (08:19 +1300)]
Merge pull request #19823 from tunbola/fix-isfrontpage-wrong-value

dev/core#2464: Fix Drupal Base 'isFrontEndPage' Returns Wrong Value After Saving A Settings Page

3 years agodev/core#2464: Rebuild Menu after clearing db cache
Tunbola Ogunwande [Wed, 17 Mar 2021 14:07:59 +0000 (15:07 +0100)]
dev/core#2464: Rebuild Menu after clearing db cache

3 years agoMerge pull request #19766 from WeMoveEU/faster-select2-groups
colemanw [Wed, 17 Mar 2021 01:45:39 +0000 (21:45 -0400)]
Merge pull request #19766 from WeMoveEU/faster-select2-groups

dev/core#2451 Faster processing of optgroups in select2 elements

3 years agoMerge pull request #19816 from eileenmcnaughton/dupe_state
colemanw [Wed, 17 Mar 2021 01:38:45 +0000 (21:38 -0400)]
Merge pull request #19816 from eileenmcnaughton/dupe_state

[NFC] Minor IDE cleanup in test class

3 years agoMerge pull request #19821 from eileenmcnaughton/import
Eileen McNaughton [Tue, 16 Mar 2021 22:07:09 +0000 (11:07 +1300)]
Merge pull request #19821 from eileenmcnaughton/import

Remove an unnecessary ampersand

3 years agoRemove an unnecessary ampersand
eileen [Tue, 16 Mar 2021 20:28:42 +0000 (09:28 +1300)]
Remove an unnecessary ampersand

3 years agoMerge pull request #19794 from MegaphoneJon/core-2459
Eileen McNaughton [Tue, 16 Mar 2021 07:15:26 +0000 (20:15 +1300)]
Merge pull request #19794 from MegaphoneJon/core-2459

dev/core#2459 Fix custom fields changed from multiple-choice data type to Text

3 years agoMerge pull request #19798 from colemanw/api4cleanup
Eileen McNaughton [Tue, 16 Mar 2021 07:10:59 +0000 (20:10 +1300)]
Merge pull request #19798 from colemanw/api4cleanup

APIv4 - Code cleanup & improve links to @see annotations in Explorer

3 years agoSearchKit - add draggable arrows when configuring display columns
Coleman Watts [Tue, 16 Mar 2021 05:25:20 +0000 (01:25 -0400)]
SearchKit - add draggable arrows when configuring display columns

3 years agoSearchKit - Additional link settings for opening in new tab or popup
Coleman Watts [Wed, 10 Mar 2021 20:17:43 +0000 (15:17 -0500)]
SearchKit - Additional link settings for opening in new tab or popup

3 years agoSearchKit - Add "in-place edit" feature
Coleman Watts [Tue, 9 Mar 2021 15:42:31 +0000 (10:42 -0500)]
SearchKit - Add "in-place edit" feature

3 years agoMerge pull request #19813 from eileenmcnaughton/dupe
Eileen McNaughton [Tue, 16 Mar 2021 02:52:00 +0000 (15:52 +1300)]
Merge pull request #19813 from eileenmcnaughton/dupe

[NFC] IDE cleanup on test class

3 years agoMerge pull request #19815 from civicrm/5.36
Eileen McNaughton [Tue, 16 Mar 2021 02:35:22 +0000 (15:35 +1300)]
Merge pull request #19815 from civicrm/5.36

5.36 to master

3 years ago[NFC] IDE cleanup on test class
eileen [Tue, 16 Mar 2021 00:26:01 +0000 (13:26 +1300)]
[NFC] IDE cleanup on test class

3 years ago[NFC] Minor IDE cleanup
eileen [Tue, 16 Mar 2021 01:26:06 +0000 (14:26 +1300)]
[NFC] Minor IDE cleanup

3 years agoMerge pull request #19811 from jmcclelland/reserve-respondents-5.36
Eileen McNaughton [Tue, 16 Mar 2021 00:58:03 +0000 (13:58 +1300)]
Merge pull request #19811 from jmcclelland/reserve-respondents-5.36

avoid error when reserving respondents in a survey.

3 years agoavoid error when reserving respondents in a survey.
Jamie McClelland [Mon, 15 Mar 2021 13:54:03 +0000 (09:54 -0400)]
avoid error when reserving respondents in a survey.

The full error is:

Error: Call to a member function getSelectedIDs() on null in CRM_Campaign_Form_Task->preProcess() (line 38 of /var/www/powerbase/sites/all/modules/civicrm/CRM/Campaign/Form/Task.php).

I'm not sure if we should somehow be passing &$form to this function
instead?

3 years agoMerge pull request #19779 from artfulrobot/artfulrobot-improve-quicksearch
Eileen McNaughton [Mon, 15 Mar 2021 20:45:00 +0000 (09:45 +1300)]
Merge pull request #19779 from artfulrobot/artfulrobot-improve-quicksearch

Improve quicksearch result presentation to enable browser link functions

3 years agoMerge pull request #19803 from eileenmcnaughton/little_bit_super
Eileen McNaughton [Mon, 15 Mar 2021 19:52:26 +0000 (08:52 +1300)]
Merge pull request #19803 from eileenmcnaughton/little_bit_super

[REF] Minor extraction to help cleanup permission code

3 years agoMerge pull request #19810 from jaapjansma/dev_2447
Eileen McNaughton [Mon, 15 Mar 2021 18:44:37 +0000 (07:44 +1300)]
Merge pull request #19810 from jaapjansma/dev_2447

Fix for dev/core#2447: wrong event fee stored

3 years agoMerge pull request #19805 from MegaphoneJon/escape-boolean-booleans
colemanw [Mon, 15 Mar 2021 18:44:08 +0000 (14:44 -0400)]
Merge pull request #19805 from MegaphoneJon/escape-boolean-booleans

core#2461 - allow booleans to be of type boolean

3 years agoMerge pull request #19807 from jaapjansma/dev_2449
Eileen McNaughton [Mon, 15 Mar 2021 18:39:45 +0000 (07:39 +1300)]
Merge pull request #19807 from jaapjansma/dev_2449

Fixed issue dev/core#2449: remove an unnecessary call to cleanMoney

3 years agoFix for dev/core#2447: wrong event fee stored
Jaap Jansma [Mon, 15 Mar 2021 16:25:31 +0000 (17:25 +0100)]
Fix for dev/core#2447: wrong event fee stored

3 years agoFixed issue dev/core#2449
Jaap Jansma [Mon, 15 Mar 2021 13:38:57 +0000 (14:38 +0100)]
Fixed issue dev/core#2449

3 years agoImprove docs in comments
Romain Thouvenin [Mon, 15 Mar 2021 13:34:40 +0000 (14:34 +0100)]
Improve docs in comments

3 years agoFixed issue dev/core#2449
Jaap Jansma [Mon, 15 Mar 2021 13:27:27 +0000 (14:27 +0100)]
Fixed issue dev/core#2449

3 years agoMerge pull request #19799 from eileenmcnaughton/mem_recur
Seamus Lee [Mon, 15 Mar 2021 10:11:10 +0000 (21:11 +1100)]
Merge pull request #19799 from eileenmcnaughton/mem_recur

[REF] Minor parameter cleanup

3 years agoImprove quicksearch result presentation to enable browser link functions
Rich Lott / Artful Robot [Mon, 15 Mar 2021 09:00:13 +0000 (09:00 +0000)]
Improve quicksearch result presentation to enable browser link functions

3 years agocore#2461 - allow booleans to be of type boolean
Jon Goldberg [Mon, 15 Mar 2021 01:25:19 +0000 (21:25 -0400)]
core#2461 - allow booleans to be of type boolean

3 years agoMerge pull request #19802 from demeritcowboy/carmarthenshire
Eileen McNaughton [Sun, 14 Mar 2021 21:44:12 +0000 (10:44 +1300)]
Merge pull request #19802 from demeritcowboy/carmarthenshire

dev/core#2027 - Fix state/province abbreviation for Carmarthenshire

3 years agoMerge pull request #19784 from eileenmcnaughton/member
colemanw [Sun, 14 Mar 2021 21:26:26 +0000 (17:26 -0400)]
Merge pull request #19784 from eileenmcnaughton/member

[REF] Extract code to get generic membership parameters

3 years ago[REF] Minor extraction to help cleanup permission code
eileen [Sun, 14 Mar 2021 21:20:36 +0000 (10:20 +1300)]
[REF] Minor extraction to help cleanup permission code

3 years agoMerge pull request #19796 from eileenmcnaughton/desc
colemanw [Sun, 14 Mar 2021 20:49:31 +0000 (16:49 -0400)]
Merge pull request #19796 from eileenmcnaughton/desc

[REF] Cleanup on permission code

3 years agofix abbreviation
demeritcowboy [Sun, 14 Mar 2021 19:31:50 +0000 (15:31 -0400)]
fix abbreviation

3 years ago[REF] Minor parameter cleanup
eileen [Sun, 14 Mar 2021 02:23:13 +0000 (15:23 +1300)]
[REF] Minor parameter cleanup

Removes 2 params that are set in order to be passed into
legacyProcessRecurringContribution - however that function does not use them

3 years ago[REF] Extract code to get generic membership parameters
eileen [Thu, 11 Mar 2021 20:50:22 +0000 (09:50 +1300)]
[REF] Extract code to get generic membership parameters

The form has 2 types of membership parameters
1) submitted parameters
2) calculated parameters that are per membership type

This extracts the portion that are submitted to be fetched
from a single place that will return the same result whereever
it is called from (allows us to move
code around without breaking the fragile parameter chain)

3 years agoMerge pull request #19795 from MJCO/resetPathsAPI4
Eileen McNaughton [Sun, 14 Mar 2021 01:41:10 +0000 (14:41 +1300)]
Merge pull request #19795 from MJCO/resetPathsAPI4

Add `resetPaths` as per issue #2458 #1

3 years agoFix docblock
Mikey O'Toole [Sat, 13 Mar 2021 17:08:00 +0000 (17:08 +0000)]
Fix docblock

3 years agoMerge pull request #19793 from eileenmcnaughton/pay_mem
colemanw [Sat, 13 Mar 2021 17:03:59 +0000 (12:03 -0500)]
Merge pull request #19793 from eileenmcnaughton/pay_mem

[REF] Extract getPaymentInstrumentID

3 years agoAPIv4 - Code cleanup & improve links to @see annotations in Explorer
Coleman Watts [Sat, 13 Mar 2021 16:40:06 +0000 (11:40 -0500)]
APIv4 - Code cleanup & improve links to @see annotations in Explorer

3 years ago[REF] Cleanup on permission code
eileen [Fri, 12 Mar 2021 21:24:10 +0000 (10:24 +1300)]
[REF] Cleanup on permission code

The function returns either an array of arrays or an array of the
first key in the array, depending on the 'desriptions' parameter.

This cleans it up so that instead of handling the descriptions
parameter in multiple places we get the array
in all cases and do the formatting at the end

3 years ago[REF] Extract getPaymentInstrumentID
eileen [Thu, 11 Mar 2021 20:59:53 +0000 (09:59 +1300)]
[REF] Extract getPaymentInstrumentID

This allows it to be consistently accessed

3 years agoMerge pull request #19786 from eileenmcnaughton/mem4
Eileen McNaughton [Fri, 12 Mar 2021 19:43:05 +0000 (08:43 +1300)]
Merge pull request #19786 from eileenmcnaughton/mem4

[Ref] Remove copy and paste overkill

3 years agoAdd ResetPaths API4 endpoint #2458
Mikey O'Toole [Fri, 12 Mar 2021 18:42:53 +0000 (18:42 +0000)]
Add ResetPaths API4 endpoint #2458

3 years agoFix custom fields changed from multiple-choice data type to Text
Jon Goldberg [Fri, 12 Mar 2021 17:07:51 +0000 (12:07 -0500)]
Fix custom fields changed from multiple-choice data type to Text

3 years agoMerge pull request #19697 from eileenmcnaughton/setting
colemanw [Fri, 12 Mar 2021 14:55:22 +0000 (09:55 -0500)]
Merge pull request #19697 from eileenmcnaughton/setting

Enable & do single field metadata conversion for defaultContactCountry

3 years agoMerge pull request #19790 from eileenmcnaughton/token
colemanw [Fri, 12 Mar 2021 14:46:39 +0000 (09:46 -0500)]
Merge pull request #19790 from eileenmcnaughton/token

Add further test for token custom fields

3 years agoMerge pull request #19789 from eileenmcnaughton/permc
colemanw [Fri, 12 Mar 2021 14:45:02 +0000 (09:45 -0500)]
Merge pull request #19789 from eileenmcnaughton/permc

[REF]  getCorePermissions cleanup

3 years agoMerge pull request #19792 from civicrm/5.36
Eileen McNaughton [Fri, 12 Mar 2021 09:25:58 +0000 (22:25 +1300)]
Merge pull request #19792 from civicrm/5.36

5.36

3 years ago[Ref] Remove copy and paste overkill
eileen [Thu, 11 Mar 2021 21:39:59 +0000 (10:39 +1300)]
[Ref] Remove copy and paste overkill

This is a previously shared function that was copied and pasted back. However in the
context of this form they don't make sense because

1) It doesn't make sense to try to maintain the integrity (via the transaction)
of the contribution & recurring contribution over & above the other
items on the form - without the memberships they don't actually have integrity
and this might have made a little more sense front end in terms
of ensuring they were committed if a payment is made but
we can expect a back office user to observe an error

2) setting the contribution id on the form here doesn't make sense as
this line is only hit for credit-card recurring contributions and
either we are doing it elsewhere anyway or we should do it nowhere - there
is no logic for 'only do this in this one obscure flow' that makes
sense back office. Front office this was likely added for an otherwise missed
scenario

3 years agoMerge pull request #19785 from eileenmcnaughton/mem2
Seamus Lee [Fri, 12 Mar 2021 08:38:34 +0000 (19:38 +1100)]
Merge pull request #19785 from eileenmcnaughton/mem2

[REF] Very minor simplification

3 years agoMerge pull request #19791 from eileenmcnaughton/memberjs
Seamus Lee [Fri, 12 Mar 2021 08:36:17 +0000 (19:36 +1100)]
Merge pull request #19791 from eileenmcnaughton/memberjs

Fix rc regression - js error on autorenew checkbox

3 years agoFix rc regression - js error on autorenew checkbox
eileen [Fri, 12 Mar 2021 06:58:17 +0000 (19:58 +1300)]
Fix rc regression - js error on autorenew checkbox

This commit
https://github.com/civicrm/civicrm-core/pull/19647/commits/cfab7c9d1dc5d1e8438131354685928cd9da3877 renamed membershipType to membershipTypeID but missed this spot,
resulting in js errors on the new membership by credit card form

3 years agoAdd further test for token custom fields
eileen [Fri, 12 Mar 2021 05:38:20 +0000 (18:38 +1300)]
Add further test for token custom fields