civicrm-core.git
2 years agoMerge pull request #21328 from colemanw/downloadCSV
Eileen McNaughton [Thu, 2 Sep 2021 03:20:38 +0000 (15:20 +1200)]
Merge pull request #21328 from colemanw/downloadCSV

SearchKit - Add download CSV action

2 years agoMerge pull request #21336 from totten/master-smarty-alias
Eileen McNaughton [Thu, 2 Sep 2021 02:41:10 +0000 (14:41 +1200)]
Merge pull request #21336 from totten/master-smarty-alias

TokenProcessor - Allow defining Smarty variables which are populated via token

2 years agoMerge pull request #21279 from eileenmcnaughton/upsub
Seamus Lee [Thu, 2 Sep 2021 02:31:26 +0000 (12:31 +1000)]
Merge pull request #21279 from eileenmcnaughton/upsub

[Ref] Deprecate Core_Error handling

2 years agoMerge pull request #21287 from colemanw/afformButton
Seamus Lee [Thu, 2 Sep 2021 02:25:45 +0000 (12:25 +1000)]
Merge pull request #21287 from colemanw/afformButton

Afform - Fix button appearance and block form during submission

2 years agoMerge pull request #21345 from seamuslee001/fix_afform_test
Seamus Lee [Thu, 2 Sep 2021 02:20:39 +0000 (12:20 +1000)]
Merge pull request #21345 from seamuslee001/fix_afform_test

[NFC] Fix E-notice in Afform unit tests

2 years agoSearchKit - Add download CSV action
Coleman Watts [Tue, 31 Aug 2021 12:57:22 +0000 (08:57 -0400)]
SearchKit - Add download CSV action

2 years agoMerge pull request #21344 from seamuslee001/fix_page_hook_test
Seamus Lee [Thu, 2 Sep 2021 01:17:26 +0000 (11:17 +1000)]
Merge pull request #21344 from seamuslee001/fix_page_hook_test

[REF] Fix Page Hook test on php8 by putting in guard into customDataB…

2 years agoMerge pull request #21343 from colemanw/searchKitLinks
Eileen McNaughton [Thu, 2 Sep 2021 01:13:20 +0000 (13:13 +1200)]
Merge pull request #21343 from colemanw/searchKitLinks

SearchKit - Add links to admin table and refresh after popups

2 years ago[NFC] Fix E-notice in Afform unit tests
Seamus Lee [Thu, 2 Sep 2021 00:16:26 +0000 (00:16 +0000)]
[NFC] Fix E-notice in Afform unit tests

2 years agoMerge pull request #21342 from vingle/vingle-patch-1
Seamus Lee [Thu, 2 Sep 2021 00:03:29 +0000 (10:03 +1000)]
Merge pull request #21342 from vingle/vingle-patch-1

Tidies Joomla 4 integration (menu, padding) after final release

2 years agoMerge pull request #21285 from mattwire/contributionviewlineitems
Eileen McNaughton [Thu, 2 Sep 2021 00:02:22 +0000 (12:02 +1200)]
Merge pull request #21285 from mattwire/contributionviewlineitems

Simplify ContributionView form. Always display "lineitems"

2 years ago[REF] Fix Page Hook test on php8 by putting in guard into customDataBlock around...
Seamus Lee [Wed, 1 Sep 2021 23:28:42 +0000 (23:28 +0000)]
[REF] Fix Page Hook test on php8 by putting in guard into customDataBlock around the SubType variable

2 years agoMerge pull request #21340 from colemanw/upgradeFunctions
Tim Otten [Wed, 1 Sep 2021 23:21:59 +0000 (16:21 -0700)]
Merge pull request #21340 from colemanw/upgradeFunctions

[NFC] Cleanup boilerplate code in extension upgrader classes

2 years agoMerge pull request #21337 from eileenmcnaughton/tokens
Seamus Lee [Wed, 1 Sep 2021 22:01:09 +0000 (08:01 +1000)]
Merge pull request #21337 from eileenmcnaughton/tokens

dev/core#2806 Fix accidental exposure of v4 tokens

2 years agoSearchKit - Add links to admin table and refresh after popups
Coleman Watts [Wed, 1 Sep 2021 19:41:22 +0000 (15:41 -0400)]
SearchKit - Add links to admin table and refresh after popups

2 years agoJ4 menu fixes
Nicol [Wed, 1 Sep 2021 19:15:13 +0000 (21:15 +0200)]
J4 menu fixes

Adjustments in response to changed Joomla 4 admin menu height; removal of smallest screen behaviour as no longer needed.

2 years agoJ4 release tidying
Nicol [Wed, 1 Sep 2021 19:12:11 +0000 (21:12 +0200)]
J4 release tidying

2 years agoMerge pull request #21341 from demeritcowboy/token-time
demeritcowboy [Wed, 1 Sep 2021 17:54:14 +0000 (13:54 -0400)]
Merge pull request #21341 from demeritcowboy/token-time

[NFC/Unit test] Update flaky test CRM_Utils_TokenConsistencyTest::testCaseTokenConsistency

2 years agocreated and modified are backwards
demeritcowboy [Wed, 1 Sep 2021 15:07:13 +0000 (11:07 -0400)]
created and modified are backwards

2 years agoCleanup boilerplate code in extension upgrader classes
Coleman Watts [Wed, 1 Sep 2021 14:49:25 +0000 (10:49 -0400)]
Cleanup boilerplate code in extension upgrader classes

2 years agoMerge pull request #21334 from eileenmcnaughton/pdf_tokens
demeritcowboy [Wed, 1 Sep 2021 13:25:41 +0000 (09:25 -0400)]
Merge pull request #21334 from eileenmcnaughton/pdf_tokens

[REF] dev/core#2790 deprecate preProcessSingle

2 years agoMerge pull request #21316 from colemanw/afformGet
Seamus Lee [Wed, 1 Sep 2021 09:15:07 +0000 (19:15 +1000)]
Merge pull request #21316 from colemanw/afformGet

Afform - Optimize Get by checking type

2 years agoMerge pull request #21286 from vingle/patch-13
Seamus Lee [Wed, 1 Sep 2021 09:10:38 +0000 (19:10 +1000)]
Merge pull request #21286 from vingle/patch-13

Fixes unusable modals in Joomla 4

2 years agodev/core#2806 Fix accidental exposure of v4 tokens
Eileen McNaughton [Wed, 1 Sep 2021 07:15:59 +0000 (19:15 +1200)]
dev/core#2806 Fix accidental exposure of v4 tokens

2 years agoTokenProcessor - Allow defining Smarty variables which are opulated from tokens
Tim Otten [Wed, 1 Sep 2021 04:21:41 +0000 (21:21 -0700)]
TokenProcessor - Allow defining Smarty variables which are opulated from tokens

Overview
--------

This allow more interoperability between Smarty expressions and tokens.  For
example, suppose one had a contribution-related message that could use the
Smarty variable `$theInvoiceId` and/or the token `{contribution.invoice_id}`.
This revision allows the Smarty variable to function as an alias for the token.

Before
------

The caller would need to precompute Smarty values, eg

```php
$theInvoiceId = civicrm_api4('Contribution', 'get', [
  'select' => 'invoice_id',
  'where' => [['id', '=', $contributionId]]
]);
$p = new TokenProcessor($this->dispatcher, [
  'controller' => __CLASS__,
  'schema' => ['contributionId'],
  'smarty' => TRUE,
]);
$p->addMessage('example', 'Invoice #{$theInvoiceId}!', 'text/plain');
$p->addRow(['contributionId' => 123]);
```

After
-----

The caller can declare a Smarty=>Token alias and leverage token data-loader.

```php
$p = new TokenProcessor($this->dispatcher, [
  'controller' => __CLASS__,
  'schema' => ['contributionId'],
  'smarty' => TRUE,
  'smartyTokenAlias' => [
    'theInvoiceId' => 'contribution.invoice_id',
  ],
]);
$p->addMessage('example', 'Invoice #{$theInvoiceId}!', 'text/plain');
$p->addRow(['contributionId' => 123]);
```

Comments
--------

The target token must be populated via `civi.token.eval` (e.g `$e->token('foo', 'bar', 'value')`).
This would work with `CRM_*_Tokens`.  But if the token is evaluted by other means (eg
`CRM_Utils_Token::replaceGreetingTokens()`), then it won't currently be resolved.

2 years ago[REF] dev/core#2790 deprecate preProcessSingle
Eileen McNaughton [Wed, 1 Sep 2021 03:29:48 +0000 (15:29 +1200)]
[REF] dev/core#2790 deprecate preProcessSingle

This is only called from here & is short & can just be part of the main function.

2 years agoMerge pull request #21270 from colemanw/searchKitListing
colemanw [Wed, 1 Sep 2021 00:12:10 +0000 (20:12 -0400)]
Merge pull request #21270 from colemanw/searchKitListing

SearchKit - Use a search display to display searches

2 years agoMerge pull request #21333 from colemanw/searchKitTableBug
colemanw [Wed, 1 Sep 2021 00:11:37 +0000 (20:11 -0400)]
Merge pull request #21333 from colemanw/searchKitTableBug

SearchKit - Fix pager count and add 'None Found' text in empty tables

2 years agoMerge pull request #21331 from eileenmcnaughton/pdf
demeritcowboy [Tue, 31 Aug 2021 23:54:21 +0000 (19:54 -0400)]
Merge pull request #21331 from eileenmcnaughton/pdf

[REF] dev/core#2790 move preProcess static to the trait

2 years ago[REF] dev/core#2790 move preProcess static to the trait
Eileen McNaughton [Tue, 31 Aug 2021 19:14:46 +0000 (07:14 +1200)]
[REF] dev/core#2790 move preProcess static to the trait

2 years agoMerge pull request #21305 from eileenmcnaughton/mem_pdf
demeritcowboy [Tue, 31 Aug 2021 22:01:09 +0000 (18:01 -0400)]
Merge pull request #21305 from eileenmcnaughton/mem_pdf

[REF] dev/core#2790 Deprecate CRM/Member/Form/Task/PDFLetterCommon

2 years agoSearchKit - Fix pager count and add 'None Found' text in empty tables
Coleman Watts [Tue, 31 Aug 2021 21:29:53 +0000 (17:29 -0400)]
SearchKit - Fix pager count and add 'None Found' text in empty tables

2 years agoSearchKit - Use a searchDisplay instead of ad-hoc table to display main list of saved...
Coleman Watts [Thu, 26 Aug 2021 15:29:12 +0000 (11:29 -0400)]
SearchKit - Use a searchDisplay instead of ad-hoc table to display main list of saved searches

2 years agoSearchKit - only show sortable help text for sortable columns in table display
Coleman Watts [Thu, 26 Aug 2021 14:02:51 +0000 (10:02 -0400)]
SearchKit - only show sortable help text for sortable columns in table display

2 years agoSearchKit - Add custom template column type
Coleman Watts [Thu, 26 Aug 2021 12:52:48 +0000 (08:52 -0400)]
SearchKit - Add custom template column type

2 years agoMerge pull request #21332 from civicrm/5.41
Eileen McNaughton [Tue, 31 Aug 2021 19:21:31 +0000 (07:21 +1200)]
Merge pull request #21332 from civicrm/5.41

5.41 to master

2 years agoMerge pull request #21330 from demeritcowboy/contrib-token-warning
Eileen McNaughton [Tue, 31 Aug 2021 19:00:46 +0000 (07:00 +1200)]
Merge pull request #21330 from demeritcowboy/contrib-token-warning

dev/core#2807 - Contribution thank-you letters give Undefined index: contribution when you don't use any contribution tokens

2 years agoput loop back inside the if
demeritcowboy [Tue, 31 Aug 2021 14:47:43 +0000 (10:47 -0400)]
put loop back inside the if

2 years agoMerge pull request #21310 from eileenmcnaughton/prepro
demeritcowboy [Tue, 31 Aug 2021 13:03:09 +0000 (09:03 -0400)]
Merge pull request #21310 from eileenmcnaughton/prepro

[REF] dev/core#2790 Pre process cleanup on pdf tasks

2 years agoMerge pull request #21276 from eileenmcnaughton/pdf
demeritcowboy [Tue, 31 Aug 2021 13:02:55 +0000 (09:02 -0400)]
Merge pull request #21276 from eileenmcnaughton/pdf

[REF] dev/core#2790 towards pdf task trait

2 years agoMerge pull request #21254 from colemanw/afformLocationType
Seamus Lee [Tue, 31 Aug 2021 08:26:52 +0000 (18:26 +1000)]
Merge pull request #21254 from colemanw/afformLocationType

Afform - selectable location type for address, email, etc

2 years agoMerge pull request #21320 from colemanw/searchKitRun
Eileen McNaughton [Tue, 31 Aug 2021 05:26:14 +0000 (17:26 +1200)]
Merge pull request #21320 from colemanw/searchKitRun

 dev/core#2732 SearchKit - Move field formatting from client-side to server-side

2 years agoMerge pull request #21256 from demeritcowboy/support-link
Eileen McNaughton [Tue, 31 Aug 2021 04:47:58 +0000 (16:47 +1200)]
Merge pull request #21256 from demeritcowboy/support-link

Fix support link just added in oauth-client extension info.xml

2 years ago[REF] Pre process cleanup
Eileen McNaughton [Sun, 29 Aug 2021 23:14:27 +0000 (11:14 +1200)]
[REF] Pre process cleanup

2 years ago[REF] dev/core#2790 towards pdf task trait
Eileen McNaughton [Fri, 27 Aug 2021 02:29:55 +0000 (14:29 +1200)]
[REF] dev/core#2790 towards pdf task trait

Deprecate CRM_Activity_Form_Task_PDFLetterCommon

This gets us to having 2 classes rather than 3 that manage the activityPDF task
functionality.

CRM_Activity_Form_Task_PDFLetterCommon doesn't really add anything from a structure POV
but it does make it more confusing. There are also functions on the parent
that are only used by this class - which makes switching to a trait
harder. This untangles that part.

Note that once we have the trait (& some more token cleanup done) we will be well placed
to re-share some of these functions again

2 years agoMerge pull request #21325 from eileenmcnaughton/build
Seamus Lee [Tue, 31 Aug 2021 01:15:01 +0000 (11:15 +1000)]
Merge pull request #21325 from eileenmcnaughton/build

Remove extraneous buildQuickForm

2 years agoMerge pull request #21324 from seamuslee001/fix_php8_testing
Eileen McNaughton [Tue, 31 Aug 2021 00:39:08 +0000 (12:39 +1200)]
Merge pull request #21324 from seamuslee001/fix_php8_testing

[NFC] Fix UpdateSubscriptionTest on php8 by creating a Payment Processor

2 years agoRemove extraneous buildQuickForm
Eileen McNaughton [Mon, 30 Aug 2021 23:06:49 +0000 (11:06 +1200)]
Remove extraneous buildQuickForm

2 years agoMerge pull request #21297 from eileenmcnaughton/pdftrait
demeritcowboy [Mon, 30 Aug 2021 22:33:59 +0000 (18:33 -0400)]
Merge pull request #21297 from eileenmcnaughton/pdftrait

[REF] dev/core#2790 move buildForm to pdfTrait

2 years ago[NFC] Fix UpdateSubscriptionTest on php8 by creating a Payment Processor
Seamus Lee [Mon, 30 Aug 2021 22:28:54 +0000 (08:28 +1000)]
[NFC] Fix UpdateSubscriptionTest on php8 by creating a Payment Processor

2 years agoMerge pull request #21323 from civicrm/5.41
Eileen McNaughton [Mon, 30 Aug 2021 21:52:57 +0000 (09:52 +1200)]
Merge pull request #21323 from civicrm/5.41

5.41 to master

2 years agoMerge pull request #21322 from alifrumin/rn5.41
Eileen McNaughton [Mon, 30 Aug 2021 21:52:30 +0000 (09:52 +1200)]
Merge pull request #21322 from alifrumin/rn5.41

[NFC] 5.41 Release Notes - First pass

2 years agoMerge pull request #21177 from colemanw/rand
colemanw [Mon, 30 Aug 2021 20:02:39 +0000 (16:02 -0400)]
Merge pull request #21177 from colemanw/rand

SearchKit - Allow random sorting (Fixes dev/report#75)

2 years agoMerge pull request #21321 from colemanw/basicCriteria
Eileen McNaughton [Mon, 30 Aug 2021 19:40:59 +0000 (07:40 +1200)]
Merge pull request #21321 from colemanw/basicCriteria

[REF] Fix undefined smarty vars in Advanced Search

2 years agorelease notes 5.41 - first pass
Alice Frumin [Mon, 16 Aug 2021 15:10:13 +0000 (11:10 -0400)]
release notes 5.41 - first pass

2 years agoSearchKit - Move field formatting from client-side to server-side
Coleman Watts [Mon, 30 Aug 2021 15:39:02 +0000 (11:39 -0400)]
SearchKit - Move field formatting from client-side to server-side

Formattig field values server-side allows the view values to be reused in exports.
It also opens the door for more complex formatting to happen on the server, if needed.

2 years agoSearchKit - Break part of Run action into a base class
Coleman Watts [Sat, 28 Aug 2021 19:16:34 +0000 (15:16 -0400)]
SearchKit - Break part of Run action into a base class

2 years agoFix undefined smarty vars in Advanced Search
Coleman Watts [Mon, 30 Aug 2021 17:24:13 +0000 (13:24 -0400)]
Fix undefined smarty vars in Advanced Search

2 years agoMerge pull request #21317 from michaelmcandrew/dev-core-2797
colemanw [Mon, 30 Aug 2021 17:19:24 +0000 (13:19 -0400)]
Merge pull request #21317 from michaelmcandrew/dev-core-2797

better target multivalue checkbox and multiselect import validation

2 years agobetter target multivalue checkbox and multiselect import validation
Michael McAndrew [Mon, 30 Aug 2021 14:59:30 +0000 (15:59 +0100)]
better target multivalue checkbox and multiselect import validation

2 years agoAfform - Optimize Get by checking type before parsing html or loading custom data
Coleman Watts [Mon, 30 Aug 2021 12:31:11 +0000 (08:31 -0400)]
Afform - Optimize Get by checking type before parsing html or loading custom data

Sometimes afforms are fetched by type, e.g. `cv api4 Afform.get +w type=search`
Previously this would load all html files and custom data groups before
discarding the ones not of type search.
Now it will skip irrelevant files.

2 years agoMerge pull request #21120 from eileenmcnaughton/acl_setting
colemanw [Mon, 30 Aug 2021 11:55:16 +0000 (07:55 -0400)]
Merge pull request #21120 from eileenmcnaughton/acl_setting

Move financial acl setting to the extension

2 years agoMerge pull request #21315 from deb1990/fix-searchkit-add-button-ui
colemanw [Mon, 30 Aug 2021 11:45:45 +0000 (07:45 -0400)]
Merge pull request #21315 from deb1990/fix-searchkit-add-button-ui

Fix Searchkit "Add" columns button UI

2 years agoMerge pull request #21314 from seamuslee001/fix_php8_testing
Eileen McNaughton [Mon, 30 Aug 2021 09:40:07 +0000 (21:40 +1200)]
Merge pull request #21314 from seamuslee001/fix_php8_testing

[NFC] Fix undefined array key when running CRM unit test suite in php8

2 years agoFix searchkit add button ui
Debarshi Bhaumik [Mon, 30 Aug 2021 08:11:26 +0000 (09:11 +0100)]
Fix searchkit add button ui

2 years ago[NFC] Fix undefined array key when running CRM unit test suite in php8
Seamus Lee [Mon, 30 Aug 2021 07:30:36 +0000 (17:30 +1000)]
[NFC] Fix undefined array key when running CRM unit test suite in php8

2 years agoMerge pull request #21313 from seamuslee001/address_custom_data
Seamus Lee [Mon, 30 Aug 2021 05:01:13 +0000 (15:01 +1000)]
Merge pull request #21313 from seamuslee001/address_custom_data

[REF] Improve Custom data insert performance when using the copyCusto…

2 years agoMerge pull request #21312 from colemanw/entityOptions
Eileen McNaughton [Mon, 30 Aug 2021 04:39:04 +0000 (16:39 +1200)]
Merge pull request #21312 from colemanw/entityOptions

SavedSearch - Add pseudoconstant for api_entity field

2 years agoFix Address test failure by passing the hook through to copyCustomFields and fix...
Seamus Lee [Mon, 30 Aug 2021 03:01:02 +0000 (13:01 +1000)]
Fix Address test failure by passing the hook through to copyCustomFields and fix Contribution Recur test failures by doing some cleanup

2 years agoMerge pull request #21241 from eileenmcnaughton/entity_batch
Seamus Lee [Mon, 30 Aug 2021 01:44:04 +0000 (11:44 +1000)]
Merge pull request #21241 from eileenmcnaughton/entity_batch

dev/core#2682 Entity batch declare option group for pseudoconstant

2 years ago[REF] Improve Custom data insert performance when using the copyCustomFields
Seamus Lee [Mon, 30 Aug 2021 01:07:12 +0000 (11:07 +1000)]
[REF] Improve Custom data insert performance when using the copyCustomFields

2 years agoAPIv4 - Add caching in Entity.get to avoid repeated file scanning
Coleman Watts [Mon, 30 Aug 2021 00:25:39 +0000 (20:25 -0400)]
APIv4 - Add caching in Entity.get to avoid repeated file scanning

2 years agoSavedSearch - Add pseudoconstant for api_entity field
Coleman Watts [Sun, 29 Aug 2021 23:58:17 +0000 (19:58 -0400)]
SavedSearch - Add pseudoconstant for api_entity field

This makes it easier to display in the UI what a search is for,
e.g. `->addSelect('api_entity:label')` would return "Contacts" for a search of Contacts.

2 years agoMerge pull request #21309 from eileenmcnaughton/get
Seamus Lee [Sun, 29 Aug 2021 23:25:56 +0000 (09:25 +1000)]
Merge pull request #21309 from eileenmcnaughton/get

Use getter to get subscription id

2 years agoMerge pull request #21306 from eileenmcnaughton/prepro
demeritcowboy [Sun, 29 Aug 2021 23:10:42 +0000 (19:10 -0400)]
Merge pull request #21306 from eileenmcnaughton/prepro

[REF] Copy preProcessFromAddress back into the pdf function

2 years agoRegenerate Generated sql file and also set civicrm_financial_trxn to be default entit...
Seamus Lee [Sun, 29 Aug 2021 22:36:58 +0000 (08:36 +1000)]
Regenerate Generated sql file and also set civicrm_financial_trxn to be default entity_table when created via APIv4

2 years agoMerge pull request #21282 from eileenmcnaughton/test_sub
Eileen McNaughton [Sun, 29 Aug 2021 22:36:51 +0000 (10:36 +1200)]
Merge pull request #21282 from eileenmcnaughton/test_sub

Add test to UpdateSubscription form

2 years agoUse getter to get subscription id
Eileen McNaughton [Sun, 29 Aug 2021 21:32:36 +0000 (09:32 +1200)]
Use getter to get subscription id

These places all effectively do the same as

I was tempted to update that function to set the type to 'Integer'
since it is retrieved that way once it must be the case that
it could only be an integer (or that line will fail).

2 years agodev/core#2682 Entity batch declare option group for pseudoconstant
Eileen McNaughton [Mon, 23 Aug 2021 19:46:54 +0000 (07:46 +1200)]
dev/core#2682 Entity batch declare option group for pseudoconstant

2 years agoMerge pull request #21308 from mattwire/deprecatedjoi
Seamus Lee [Sun, 29 Aug 2021 21:18:45 +0000 (07:18 +1000)]
Merge pull request #21308 from mattwire/deprecatedjoi

Fix deprecated API4 Join on Email in dynamic profile

2 years agoAdd test to UpdateSubscription form
Eileen McNaughton [Fri, 27 Aug 2021 07:31:39 +0000 (19:31 +1200)]
Add test to UpdateSubscription form

2 years agoFix deprecated API4 Join
Matthew Wire [Sun, 29 Aug 2021 19:37:43 +0000 (20:37 +0100)]
Fix deprecated API4 Join

2 years agoMerge pull request #20115 from larssandergreen/fix-internal-anchor-URLs-in-mailings
Matthew Wire [Sun, 29 Aug 2021 18:06:53 +0000 (19:06 +0100)]
Merge pull request #20115 from larssandergreen/fix-internal-anchor-URLs-in-mailings

Do not add tracking to internal anchor URLs

2 years agoMerge pull request #20135 from larssandergreen/add-settings,-disable,-delete-to-group...
Matthew Wire [Sun, 29 Aug 2021 17:48:16 +0000 (18:48 +0100)]
Merge pull request #20135 from larssandergreen/add-settings,-disable,-delete-to-group-page

dev/core#2546 Add settings button to group page

2 years agoMerge pull request #21307 from civicrm/5.41
Seamus Lee [Sun, 29 Aug 2021 09:40:59 +0000 (19:40 +1000)]
Merge pull request #21307 from civicrm/5.41

5.41

2 years agoMerge pull request #21295 from eileenmcnaughton/541test
Seamus Lee [Sun, 29 Aug 2021 06:49:04 +0000 (16:49 +1000)]
Merge pull request #21295 from eileenmcnaughton/541test

Fix restoreMembershipTypes to use the api

2 years agoREF Copy preProcessFromAddress back into the pdf function
Eileen McNaughton [Sun, 29 Aug 2021 05:02:10 +0000 (17:02 +1200)]
REF Copy preProcessFromAddress back into the pdf function

This is really hard to unravel without splitting it between classes -
mostly because it does stuff to do with setting properties on the form
that are not even relevant to all forms. This is a divide & conquer
case to cleaning up the function from
the deprecated class

Note that I removed the bounce on no-email. It felt like we would still want
to be able to download pdfs if the logged in user had no email. The bounce param seems
to have been added as an after thought - presumably to block
the bounce in a flow where they realised it made no sense

2 years agoMerge pull request #21303 from civicrm/5.41
Seamus Lee [Sun, 29 Aug 2021 03:41:10 +0000 (13:41 +1000)]
Merge pull request #21303 from civicrm/5.41

5.41

2 years agoMerge pull request #21302 from seamuslee001/fix_conformance_tests
Eileen McNaughton [Sun, 29 Aug 2021 03:08:47 +0000 (15:08 +1200)]
Merge pull request #21302 from seamuslee001/fix_conformance_tests

[NFC] Fix APIv4 Conformance tests on php8

2 years ago[REF] dev/core#2790 Deprecate CRM/Member/Form/Task/PDFLetterCommon
Eileen McNaughton [Sun, 29 Aug 2021 02:27:16 +0000 (14:27 +1200)]
[REF] dev/core#2790 Deprecate CRM/Member/Form/Task/PDFLetterCommon

This gets rid of the pseudo oo model on this class
and gets us to only having 2 classes in play

We are moving towards a trait

2 years agoMerge pull request #21291 from eileenmcnaughton/541r
Seamus Lee [Sun, 29 Aug 2021 01:22:26 +0000 (11:22 +1000)]
Merge pull request #21291 from eileenmcnaughton/541r

dev/core#2786 Ensure non-English installs have a default financial type for membership default price set

2 years ago[NFC] Fix APIv4 Conformance tests on php8
Seamus Lee [Sun, 29 Aug 2021 01:20:13 +0000 (11:20 +1000)]
[NFC] Fix APIv4 Conformance tests on php8

2 years agoMerge pull request #21289 from eileenmcnaughton/tokens
demeritcowboy [Sun, 29 Aug 2021 00:48:07 +0000 (20:48 -0400)]
Merge pull request #21289 from eileenmcnaughton/tokens

[Ref] intial testing on case tokens, make knownTokens optional

2 years agodev/core#2786 Ensure non-English installs have a default financial type for membershi...
Eileen McNaughton [Sat, 28 Aug 2021 00:21:34 +0000 (12:21 +1200)]
dev/core#2786 Ensure non-English installs have a default financial type for membership default price set

2 years agoFix Restore Membership types to create price set
Eileen McNaughton [Sat, 28 Aug 2021 23:13:50 +0000 (11:13 +1200)]
Fix Restore Membership types to create price set

2 years agoMerge pull request #21300 from colemanw/imageField
colemanw [Sat, 28 Aug 2021 18:37:24 +0000 (14:37 -0400)]
Merge pull request #21300 from colemanw/imageField

SearchKit - Image field handler implementation

2 years agoSearchKit - Image field handler implementation
Kurund Jalmi [Mon, 23 Aug 2021 17:05:42 +0000 (18:05 +0100)]
SearchKit - Image field handler implementation

Fixes dev/core#2781

2 years agoMerge pull request #21298 from eileenmcnaughton/silly
demeritcowboy [Sat, 28 Aug 2021 14:27:04 +0000 (10:27 -0400)]
Merge pull request #21298 from eileenmcnaughton/silly

[REF] Remove duplicate IF

2 years agoMerge pull request #21292 from eileenmcnaughton/camps
Eileen McNaughton [Sat, 28 Aug 2021 08:11:48 +0000 (20:11 +1200)]
Merge pull request #21292 from eileenmcnaughton/camps

Fix for new prefetch key

2 years ago[REF] Remove duplicate IF
Eileen McNaughton [Sat, 28 Aug 2021 07:33:58 +0000 (19:33 +1200)]
[REF] Remove duplicate IF

Earlier in the function there was already a RETURN if
so this IF is always true