civicrm-core.git
12 months agoConsolidate fee preProcess into feeBuildForm
Eileen McNaughton [Tue, 28 Nov 2023 21:42:15 +0000 (10:42 +1300)]
Consolidate fee preProcess into feeBuildForm

12 months agoMerge pull request #28289 from eileenmcnaughton/part_send
Eileen McNaughton [Tue, 28 Nov 2023 21:28:40 +0000 (10:28 +1300)]
Merge pull request #28289 from eileenmcnaughton/part_send

Use getCurrency() function for currency retrieval

12 months agoMerge pull request #28342 from braders/remove-tempclause
Matthew Wire [Tue, 28 Nov 2023 20:45:19 +0000 (20:45 +0000)]
Merge pull request #28342 from braders/remove-tempclause

Remove unused _tempClause

12 months agoMerge pull request #28341 from braders/contact-selector-unused-param
Eileen McNaughton [Tue, 28 Nov 2023 20:29:37 +0000 (09:29 +1300)]
Merge pull request #28341 from braders/contact-selector-unused-param

[REF][PHP8.2] Remove unused property from CRM_Contact_Selector

12 months agoConsolidate getCurrency()
Eileen McNaughton [Thu, 23 Nov 2023 22:00:43 +0000 (11:00 +1300)]
Consolidate getCurrency()

12 months agoUse getCurrency() function for currency retrieval
Eileen McNaughton [Thu, 23 Nov 2023 21:46:53 +0000 (10:46 +1300)]
Use getCurrency() function for currency retrieval

12 months agoMerge pull request #28308 from eileenmcnaughton/discounts
Matthew Wire [Tue, 28 Nov 2023 19:45:33 +0000 (19:45 +0000)]
Merge pull request #28308 from eileenmcnaughton/discounts

Simplify handling of discount_id in participant form postProcess

12 months agoMerge pull request #28310 from eileenmcnaughton/billing
Matthew Wire [Tue, 28 Nov 2023 19:44:27 +0000 (19:44 +0000)]
Merge pull request #28310 from eileenmcnaughton/billing

Deprecate passing `billingID`to `mapParams`

12 months agoRemove unused _tempClause
Bradley Taylor [Tue, 28 Nov 2023 19:38:08 +0000 (19:38 +0000)]
Remove unused _tempClause

12 months ago[REF][PHP8.2] Remove unused property from CRM_Contact_Selector
Bradley Taylor [Tue, 28 Nov 2023 19:30:12 +0000 (19:30 +0000)]
[REF][PHP8.2] Remove unused property from CRM_Contact_Selector

12 months agoMerge pull request #28340 from colemanw/suppertime
demeritcowboy [Tue, 28 Nov 2023 17:45:51 +0000 (12:45 -0500)]
Merge pull request #28340 from colemanw/suppertime

Go to bed without supper ðŸ¥ªðŸš«

12 months agoGo to bed without supper
colemanw [Tue, 28 Nov 2023 15:47:55 +0000 (10:47 -0500)]
Go to bed without supper

12 months agoMerge pull request #28314 from demeritcowboy/php8-page
colemanw [Tue, 28 Nov 2023 15:02:47 +0000 (10:02 -0500)]
Merge pull request #28314 from demeritcowboy/php8-page

[php8] undeclared property action and id in Page

12 months agoMerge pull request #28262 from eileenmcnaughton/strings
colemanw [Tue, 28 Nov 2023 14:00:43 +0000 (09:00 -0500)]
Merge pull request #28262 from eileenmcnaughton/strings

Replace a few sub_str with str_contains

12 months agoMerge pull request #28337 from eileenmcnaughton/ref
colemanw [Tue, 28 Nov 2023 13:59:20 +0000 (08:59 -0500)]
Merge pull request #28337 from eileenmcnaughton/ref

Remove unnecessary pass-by-reference

12 months agoMerge pull request #28307 from eileenmcnaughton/part_amount
colemanw [Tue, 28 Nov 2023 12:49:14 +0000 (07:49 -0500)]
Merge pull request #28307 from eileenmcnaughton/part_amount

Use form property rather than passing mode

12 months agoMerge pull request #28335 from eileenmcnaughton/event_car
colemanw [Tue, 28 Nov 2023 12:46:30 +0000 (07:46 -0500)]
Merge pull request #28335 from eileenmcnaughton/event_car

Fix eventcart to not interact with _tpl_vars directly

12 months agoMerge pull request #28334 from eileenmcnaughton/merge_screen
colemanw [Tue, 28 Nov 2023 12:45:41 +0000 (07:45 -0500)]
Merge pull request #28334 from eileenmcnaughton/merge_screen

Fix Smarty3 notices on merge screen

12 months agoRemove unnecessary pass-by-referenc
Eileen McNaughton [Tue, 28 Nov 2023 12:32:51 +0000 (01:32 +1300)]
Remove unnecessary pass-by-referenc

12 months agoFix eventcart to not interact with _tpl_vars directly
Eileen McNaughton [Tue, 28 Nov 2023 10:05:45 +0000 (23:05 +1300)]
Fix eventcart to not interact with _tpl_vars directly

12 months agoFix Smarty3 notices on merge screen
Eileen McNaughton [Tue, 28 Nov 2023 09:22:54 +0000 (22:22 +1300)]
Fix Smarty3 notices on merge screen

12 months agoMerge pull request #28330 from eileenmcnaughton/location_check
Eileen McNaughton [Tue, 28 Nov 2023 06:55:39 +0000 (19:55 +1300)]
Merge pull request #28330 from eileenmcnaughton/location_check

Add system check for if people disabled default location type

12 months agoMerge pull request #28331 from colemanw/getViewOnlyActivityTypeIDs
Yashodha Chaku [Tue, 28 Nov 2023 06:39:04 +0000 (12:09 +0530)]
Merge pull request #28331 from colemanw/getViewOnlyActivityTypeIDs

Activity - Fix backwards logic in getViewOnlyActivityTypeIDs

12 months agoUpdate CRM/Contribute/Form/Contribution/Confirm.php
Eileen McNaughton [Tue, 28 Nov 2023 04:06:23 +0000 (17:06 +1300)]
Update CRM/Contribute/Form/Contribution/Confirm.php

Co-authored-by: colemanw <coleman@civicrm.org>
12 months agoMerge pull request #28327 from eileenmcnaughton/data_test
Eileen McNaughton [Tue, 28 Nov 2023 04:05:46 +0000 (17:05 +1300)]
Merge pull request #28327 from eileenmcnaughton/data_test

Fix dataSource test to test permissions

12 months agoActivity - Fix backwards logic in getViewOnlyActivityTypeIDs
colemanw [Tue, 28 Nov 2023 03:02:27 +0000 (22:02 -0500)]
Activity - Fix backwards logic in getViewOnlyActivityTypeIDs

12 months agoAdd system check for if people disabled default location type
Eileen McNaughton [Tue, 28 Nov 2023 02:27:48 +0000 (15:27 +1300)]
Add system check for if people disabled default location type

12 months agoMerge pull request #28329 from colemanw/addSelectWhereClauseUser
Eileen McNaughton [Tue, 28 Nov 2023 00:32:24 +0000 (13:32 +1300)]
Merge pull request #28329 from colemanw/addSelectWhereClauseUser

BAO - Handle hypothetical userId in addSelectWhereClause

12 months agoBAO - Handle hypothetical userId in addSelectWhereClause
colemanw [Mon, 27 Nov 2023 23:42:02 +0000 (18:42 -0500)]
BAO - Handle hypothetical userId in addSelectWhereClause

This is aspirational - CiviCRM doesn't fully support checking permissions for anyone other than the current user,
but this nudges us a bit closer to what that support would look like.

12 months agoMerge pull request #28328 from civicrm/5.68
Eileen McNaughton [Mon, 27 Nov 2023 22:54:55 +0000 (11:54 +1300)]
Merge pull request #28328 from civicrm/5.68

5.68 to master

12 months agoMerge pull request #28325 from colemanw/userJobClause
Eileen McNaughton [Mon, 27 Nov 2023 22:45:04 +0000 (11:45 +1300)]
Merge pull request #28325 from colemanw/userJobClause

UserJob - Fix deprecated syntax in addSelectWhereClause

12 months agoFix dataSource test to test permissions
Eileen McNaughton [Mon, 27 Nov 2023 22:34:55 +0000 (11:34 +1300)]
Fix dataSource test to test permissions

12 months agoReplace a few sub_str with str_contains
Eileen McNaughton [Tue, 21 Nov 2023 19:27:24 +0000 (08:27 +1300)]
Replace a few sub_str with str_contains

use our more recent functions

12 months agoMerge pull request #28323 from colemanw/strstr
Eileen McNaughton [Mon, 27 Nov 2023 22:36:55 +0000 (11:36 +1300)]
Merge pull request #28323 from colemanw/strstr

[REF] Switch strstr to str_contains

12 months agoMerge pull request #28324 from eileenmcnaughton/comment
Eileen McNaughton [Mon, 27 Nov 2023 22:12:43 +0000 (11:12 +1300)]
Merge pull request #28324 from eileenmcnaughton/comment

Update comment todos to referred to preferred method

12 months agoUserJob - Fix deprecated syntax in addSelectWhereClause
colemanw [Mon, 27 Nov 2023 21:10:58 +0000 (16:10 -0500)]
UserJob - Fix deprecated syntax in addSelectWhereClause

12 months agoUpdate comment todos to referred to preferred method
Eileen McNaughton [Mon, 27 Nov 2023 20:42:01 +0000 (09:42 +1300)]
Update comment todos to referred to preferred method

12 months agoMerge pull request #28322 from MegaphoneJon/price-field-shutup
Eileen McNaughton [Mon, 27 Nov 2023 20:12:20 +0000 (09:12 +1300)]
Merge pull request #28322 from MegaphoneJon/price-field-shutup

don't warn users about invalid financial types on unused price sets

12 months agoSwitch strstr to str_contains
colemanw [Mon, 27 Nov 2023 18:54:21 +0000 (13:54 -0500)]
Switch strstr to str_contains

When cast to boolean by a conditional, these 2 functions behave identically, but str_contains is more readable

12 months agodon't warn users about invalid financial types on unused price sets
Jon Goldberg [Mon, 27 Nov 2023 16:55:56 +0000 (11:55 -0500)]
don't warn users about invalid financial types on unused price sets

12 months agoMerge pull request #28298 from eileenmcnaughton/lines
colemanw [Mon, 27 Nov 2023 00:31:05 +0000 (19:31 -0500)]
Merge pull request #28298 from eileenmcnaughton/lines

Remove code cruft which is now ignored

12 months agoRemove now-unused handling for amount, line items
Eileen McNaughton [Sun, 26 Nov 2023 20:07:37 +0000 (09:07 +1300)]
Remove now-unused handling for amount, line items

12 months agoMerge pull request #28285 from eileenmcnaughton/renew_notice
colemanw [Sun, 26 Nov 2023 19:56:01 +0000 (14:56 -0500)]
Merge pull request #28285 from eileenmcnaughton/renew_notice

Fix notice on membership online main page

12 months agoMerge pull request #28312 from eileenmcnaughton/amount_level
colemanw [Sun, 26 Nov 2023 19:31:22 +0000 (14:31 -0500)]
Merge pull request #28312 from eileenmcnaughton/amount_level

Move getAmountLevel() to Order class

12 months agoMerge pull request #28315 from eileenmcnaughton/prem
colemanw [Sun, 26 Nov 2023 19:31:14 +0000 (14:31 -0500)]
Merge pull request #28315 from eileenmcnaughton/prem

Copy buildPremiumsBlock back to contribution page base

12 months agoMerge pull request #28317 from eileenmcnaughton/tax
colemanw [Sun, 26 Nov 2023 19:31:01 +0000 (14:31 -0500)]
Merge pull request #28317 from eileenmcnaughton/tax

Fix tax when selection a contribution with the membership, test

12 months agoMerge pull request #28318 from eileenmcnaughton/requires
Eileen McNaughton [Sun, 26 Nov 2023 19:02:34 +0000 (08:02 +1300)]
Merge pull request #28318 from eileenmcnaughton/requires

Make financialacls require civi-contribute

12 months agoMerge pull request #28319 from omarabuhussein/fix-priceset-single-line
Eileen McNaughton [Sun, 26 Nov 2023 18:59:28 +0000 (07:59 +1300)]
Merge pull request #28319 from omarabuhussein/fix-priceset-single-line

Set correct financial type when creating membership using price set with single line item

12 months agoComponents - Disable reverse dependencies when disabling
colemanw [Sun, 26 Nov 2023 17:21:50 +0000 (12:21 -0500)]
Components - Disable reverse dependencies when disabling

12 months agoSet correct financial type when creating membership using price set with single line...
Omar Hussein [Sun, 26 Nov 2023 10:56:25 +0000 (12:56 +0200)]
Set correct financial type when creating membership using price set with single line item

12 months agoMake financialacls require civi-contribute
Eileen McNaughton [Sun, 26 Nov 2023 05:28:14 +0000 (18:28 +1300)]
Make financialacls require civi-contribute

12 months agoFix tax when selection a contribution with the membership, test
Eileen McNaughton [Sun, 26 Nov 2023 04:40:06 +0000 (17:40 +1300)]
Fix tax when selection a contribution with the membership, test

12 months agoMerge pull request #28309 from eileenmcnaughton/notice_stand
demeritcowboy [Sun, 26 Nov 2023 04:06:29 +0000 (23:06 -0500)]
Merge pull request #28309 from eileenmcnaughton/notice_stand

Notice fix

12 months agoUpdate CRM/Contribute/Form/AbstractEditPayment.php
Eileen McNaughton [Sun, 26 Nov 2023 03:15:39 +0000 (16:15 +1300)]
Update CRM/Contribute/Form/AbstractEditPayment.php

Co-authored-by: demeritcowboy <demeritcowboy@hotmail.com>
12 months agoMerge pull request #28306 from eileenmcnaughton/currency_test
colemanw [Sat, 25 Nov 2023 23:35:05 +0000 (18:35 -0500)]
Merge pull request #28306 from eileenmcnaughton/currency_test

dev/core#4802 Fix amount truncation with non-English formatting

12 months agoCopy buildPremiumsBlock back to contribution page base
Eileen McNaughton [Sat, 25 Nov 2023 20:47:33 +0000 (09:47 +1300)]
Copy buildPremiumsBlock back to contribution page base

12 months agoMerge pull request #28176 from mattwire/downloader
demeritcowboy [Sat, 25 Nov 2023 16:07:17 +0000 (11:07 -0500)]
Merge pull request #28176 from mattwire/downloader

Log extension download errors

12 months agoMerge pull request #28313 from demeritcowboy/regen
demeritcowboy [Sat, 25 Nov 2023 15:33:34 +0000 (10:33 -0500)]
Merge pull request #28313 from demeritcowboy/regen

Regen after 28268

12 months agophp notices
demeritcowboy [Sat, 25 Nov 2023 15:29:14 +0000 (10:29 -0500)]
php notices

12 months agoregen
demeritcowboy [Sat, 25 Nov 2023 14:53:08 +0000 (09:53 -0500)]
regen

12 months agoMerge pull request #28268 from eileenmcnaughton/no_online_cont
demeritcowboy [Sat, 25 Nov 2023 14:47:19 +0000 (09:47 -0500)]
Merge pull request #28268 from eileenmcnaughton/no_online_cont

Blank out text version of online_contribution_receipt

12 months agoMerge pull request #28295 from eileenmcnaughton/confirm_notice
demeritcowboy [Sat, 25 Nov 2023 14:29:51 +0000 (09:29 -0500)]
Merge pull request #28295 from eileenmcnaughton/confirm_notice

Add some assigns to prevent notices on Confirm

12 months agoMove getAmountLevel() to Order class
Eileen McNaughton [Sat, 25 Nov 2023 01:14:35 +0000 (14:14 +1300)]
Move getAmountLevel() to Order class

12 months agoDeprecate passing billingID to mapParams
Eileen McNaughton [Sat, 25 Nov 2023 00:24:24 +0000 (13:24 +1300)]
Deprecate passing billingID to mapParams

12 months agoNotice fix
Eileen McNaughton [Sat, 25 Nov 2023 00:20:07 +0000 (13:20 +1300)]
Notice fix

12 months agoSimplify handling of discount_id
Eileen McNaughton [Sat, 25 Nov 2023 00:07:15 +0000 (13:07 +1300)]
Simplify handling of discount_id

12 months agoStop passing form in previously shared function
Eileen McNaughton [Fri, 24 Nov 2023 23:58:28 +0000 (12:58 +1300)]
Stop passing form in previously shared function

12 months agoUse form property rather than passing mode
Eileen McNaughton [Fri, 24 Nov 2023 23:54:52 +0000 (12:54 +1300)]
Use form property rather than passing mode

12 months agodev/core#4802 Fix amount truncation with non-English formatting
Eileen McNaughton [Fri, 24 Nov 2023 22:21:52 +0000 (11:21 +1300)]
dev/core#4802 Fix amount truncation with non-English formatting

12 months agoAssign line items consistently
Eileen McNaughton [Fri, 24 Nov 2023 06:54:46 +0000 (19:54 +1300)]
Assign line items consistently

12 months agoAdd test for money format handling on Online Contribution flow
Eileen McNaughton [Fri, 24 Nov 2023 22:15:23 +0000 (11:15 +1300)]
Add test for money format handling on Online Contribution flow

12 months agoMerge pull request #28305 from civicrm/5.68
Eileen McNaughton [Fri, 24 Nov 2023 22:11:21 +0000 (11:11 +1300)]
Merge pull request #28305 from civicrm/5.68

5.68 to master

12 months agoMerge pull request #28302 from alifrumin/rn5.68
Eileen McNaughton [Fri, 24 Nov 2023 22:10:48 +0000 (11:10 +1300)]
Merge pull request #28302 from alifrumin/rn5.68

[NFC] 5.68 release notes

12 months agoMerge pull request #28304 from braders/bao-badge
Eileen McNaughton [Fri, 24 Nov 2023 22:10:21 +0000 (11:10 +1300)]
Merge pull request #28304 from braders/bao-badge

[REF][PHP8.2] Tidy up properties in CRM_Badge_BAO_Badge

12 months ago[REF][PHP8.2] Tidy up properties in CRM_Badge_BAO_Badge
Bradley Taylor [Fri, 24 Nov 2023 20:14:33 +0000 (20:14 +0000)]
[REF][PHP8.2] Tidy up properties in CRM_Badge_BAO_Badge

12 months agoMerge pull request #28282 from eileenmcnaughton/568
colemanw [Fri, 24 Nov 2023 14:56:38 +0000 (09:56 -0500)]
Merge pull request #28282 from eileenmcnaughton/568

dev/core#4795 fix regression on other amount on main contribution page

12 months agoMerge pull request #28283 from colemanw/optionValueAutocomplete
colemanw [Fri, 24 Nov 2023 14:35:18 +0000 (09:35 -0500)]
Merge pull request #28283 from colemanw/optionValueAutocomplete

Autocomplete - Fix incorrect matching on id instead of value

12 months ago[NFC] 5.68 release notes first pass
Alice Frumin [Tue, 21 Nov 2023 18:54:27 +0000 (13:54 -0500)]
[NFC] 5.68 release notes first pass

12 months agoMerge pull request #28300 from eileenmcnaughton/order_l
colemanw [Fri, 24 Nov 2023 13:29:39 +0000 (08:29 -0500)]
Merge pull request #28300 from eileenmcnaughton/order_l

Fix Main Contribution form to identify money fields

12 months agoMerge pull request #28297 from eileenmcnaughton/show_tax
colemanw [Fri, 24 Nov 2023 13:17:21 +0000 (08:17 -0500)]
Merge pull request #28297 from eileenmcnaughton/show_tax

Fix master-only-regression- tax not visible on contribution view page

12 months agoFix Main Contribution form to identify money fields
Eileen McNaughton [Fri, 24 Nov 2023 07:58:33 +0000 (20:58 +1300)]
Fix Main Contribution form to identify money fields

12 months agoFix master-only-regression- tax not visible on contribution view page
Eileen McNaughton [Fri, 24 Nov 2023 04:52:22 +0000 (17:52 +1300)]
Fix master-only-regression- tax not visible on contribution view page

12 months agoMerge pull request #28296 from eileenmcnaughton/tax
Eileen McNaughton [Fri, 24 Nov 2023 04:04:47 +0000 (17:04 +1300)]
Merge pull request #28296 from eileenmcnaughton/tax

Fix notice on unassigned tax

12 months agoMerge pull request #28292 from eileenmcnaughton/main_am
colemanw [Fri, 24 Nov 2023 02:55:04 +0000 (21:55 -0500)]
Merge pull request #28292 from eileenmcnaughton/main_am

Clean up `getMainContributionAmount()` function

12 months agoFix notice on unassigned tax
Eileen McNaughton [Fri, 24 Nov 2023 02:25:06 +0000 (15:25 +1300)]
Fix notice on unassigned tax

12 months agoAdd some assigns to prevent notices on Confirm
Eileen McNaughton [Fri, 24 Nov 2023 02:02:37 +0000 (15:02 +1300)]
Add some assigns to prevent notices on Confirm

12 months agoMerge pull request #28281 from eileenmcnaughton/part
colemanw [Fri, 24 Nov 2023 01:36:41 +0000 (20:36 -0500)]
Merge pull request #28281 from eileenmcnaughton/part

Use local variable rather than undefined property to build array

12 months agoMerge pull request #28284 from eileenmcnaughton/renew
colemanw [Fri, 24 Nov 2023 01:34:57 +0000 (20:34 -0500)]
Merge pull request #28284 from eileenmcnaughton/renew

Minor consolidation on `isTest()`

12 months agoAutocomplete - Fix incorrect matching on id instead of value
colemanw [Thu, 23 Nov 2023 20:07:58 +0000 (15:07 -0500)]
Autocomplete - Fix incorrect matching on id instead of value

Fixes https://lab.civicrm.org/dev/core/-/issues/4799
Custom fields of type Autocomplete-Select were incorrectly using the id of the optionValue.
This fixes it to use the value, and also show the value in the autocomplete results.

12 months agoMerge pull request #28290 from braders/loaded-mapping-id
Eileen McNaughton [Fri, 24 Nov 2023 00:19:50 +0000 (13:19 +1300)]
Merge pull request #28290 from braders/loaded-mapping-id

[REF][PHP8.2] Remove unused property $_loadedMappingId

12 months agoClean up getMainContributionAmount() function
Eileen McNaughton [Thu, 23 Nov 2023 23:40:16 +0000 (12:40 +1300)]
Clean up getMainContributionAmount() function

12 months agoMerge pull request #28287 from eileenmcnaughton/current_membership
Eileen McNaughton [Thu, 23 Nov 2023 22:48:50 +0000 (11:48 +1300)]
Merge pull request #28287 from eileenmcnaughton/current_membership

Extract code that defines the renewal membership

12 months ago[REF][PHP8.2] Remove unused property $_loadedMappingId
Bradley Taylor [Thu, 23 Nov 2023 21:46:52 +0000 (21:46 +0000)]
[REF][PHP8.2] Remove unused property $_loadedMappingId

12 months agoMerge pull request #28288 from eileenmcnaughton/address_opps
Matthew Wire [Thu, 23 Nov 2023 21:36:06 +0000 (21:36 +0000)]
Merge pull request #28288 from eileenmcnaughton/address_opps

Fix recently-merged typo

12 months agoMerge pull request #28166 from eileenmcnaughton/part_send
Matthew Wire [Thu, 23 Nov 2023 21:35:08 +0000 (21:35 +0000)]
Merge pull request #28166 from eileenmcnaughton/part_send

Update send_receipt once actually sent, rather than predicting

12 months agoFix recently-merged typo
Eileen McNaughton [Thu, 23 Nov 2023 21:34:45 +0000 (10:34 +1300)]
Fix recently-merged typo

12 months agoExtract code that defines the renewal membership
Eileen McNaughton [Thu, 23 Nov 2023 21:16:27 +0000 (10:16 +1300)]
Extract code that defines the renewal membership

12 months agoMerge pull request #28021 from colemanw/afformErrorMsg
Matthew Wire [Thu, 23 Nov 2023 21:04:27 +0000 (21:04 +0000)]
Merge pull request #28021 from colemanw/afformErrorMsg

Afform - improve display of error messages

12 months agoMerge pull request #28115 from colemanw/chainSelectFix
Matthew Wire [Thu, 23 Nov 2023 21:03:01 +0000 (21:03 +0000)]
Merge pull request #28115 from colemanw/chainSelectFix

dev/core#4702 - Fix country/state chainSelect validation when country is deselected

12 months agoMerge pull request #28226 from eileenmcnaughton/no_billing
Matthew Wire [Thu, 23 Nov 2023 20:58:01 +0000 (20:58 +0000)]
Merge pull request #28226 from eileenmcnaughton/no_billing

Stop passing billingID to `CRM_Utils_Address::getFormattedBillingAddressFieldsFromParameters`