Eileen McNaughton [Wed, 29 Nov 2023 11:49:45 +0000 (00:49 +1300)]
Fix a whole lot of conditional assignments on confirm & thank you pages
Eileen McNaughton [Wed, 29 Nov 2023 23:10:35 +0000 (12:10 +1300)]
Merge pull request #28376 from civicrm/5.68
5.68 to master
Eileen McNaughton [Wed, 29 Nov 2023 22:57:12 +0000 (11:57 +1300)]
Merge pull request #28375 from demeritcowboy/relimp
dev/core#4563 - fix related contact mapping fields on import
Eileen McNaughton [Wed, 29 Nov 2023 22:33:37 +0000 (11:33 +1300)]
Merge pull request #28374 from eileenmcnaughton/cont_page
Fix quotes causing function call to be in quotes (master only regression)
Eileen McNaughton [Wed, 29 Nov 2023 22:21:56 +0000 (11:21 +1300)]
Merge pull request #28361 from eileenmcnaughton/current_member
Fix master-only regression on Membership page, option not selected
Eileen McNaughton [Wed, 29 Nov 2023 22:12:41 +0000 (11:12 +1300)]
Merge pull request #28373 from eileenmcnaughton/bool
REF - Cleanup overly-verbose conditionals
Eileen McNaughton [Wed, 29 Nov 2023 22:12:24 +0000 (11:12 +1300)]
Merge pull request #28348 from Damilare1/master
Coworker create Searchkit over view of queue status
demeritcowboy [Wed, 29 Nov 2023 21:48:37 +0000 (16:48 -0500)]
fix related contact mapping fields
Eileen McNaughton [Wed, 29 Nov 2023 21:40:08 +0000 (10:40 +1300)]
Fix quotes causing function call to be in quotes
Eileen McNaughton [Wed, 29 Nov 2023 11:08:05 +0000 (00:08 +1300)]
Fix failure to set membership default to existing membership (master regression)
Eileen McNaughton [Wed, 29 Nov 2023 21:26:43 +0000 (10:26 +1300)]
REF - Cleanup overly-verbose conditionals
Eileen McNaughton [Wed, 29 Nov 2023 21:17:31 +0000 (10:17 +1300)]
Merge pull request #28372 from civicrm/5.68
5.68 to master
Eileen McNaughton [Wed, 29 Nov 2023 21:16:42 +0000 (10:16 +1300)]
Merge pull request #28371 from mlutfy/568fixNumericCaseCustom
Case Custom Data: fix non-US numeric decimals - 5.68
Eileen McNaughton [Wed, 29 Nov 2023 20:16:09 +0000 (09:16 +1300)]
Merge pull request #28339 from colemanw/inlineArray
[NFC] Array formatting cleanup
colemanw [Wed, 29 Nov 2023 20:10:23 +0000 (15:10 -0500)]
Merge pull request #28316 from eileenmcnaughton/prem_2
Check financial acls for product in extension
Mathieu Lu [Wed, 29 Nov 2023 19:39:39 +0000 (14:39 -0500)]
Case Custom Data: fix non-US numeric decimals
Adedoyin Damilare [Wed, 29 Nov 2023 19:40:22 +0000 (19:40 +0000)]
Update ext/civicrm_admin_ui/ang/afsearchCiviCRMQueues.aff.php
Co-authored-by: colemanw <coleman@civicrm.org>
colemanw [Wed, 29 Nov 2023 18:13:12 +0000 (13:13 -0500)]
Merge pull request #28332 from eileenmcnaughton/import_ug
dev/core#4726 Set field to do-not-import if not configured
colemanw [Tue, 28 Nov 2023 15:27:22 +0000 (10:27 -0500)]
Array formatting cleanup
Multiline arrays aren't always the most readable.
These were all done by an autoformatting tool which got a little too zealous
about breaking every array into multiple lines. They are especially silly within if() statements.
colemanw [Wed, 29 Nov 2023 15:21:42 +0000 (10:21 -0500)]
Merge pull request #28336 from eileenmcnaughton/part_form
Remove handling from previously shared code
colemanw [Wed, 29 Nov 2023 15:20:25 +0000 (10:20 -0500)]
Merge pull request #28365 from eileenmcnaughton/confirm_notices
Ensure onBehalfEmail always assigned to prevent notices
Damilare Adedoyin [Tue, 28 Nov 2023 16:26:48 +0000 (16:26 +0000)]
Coworker create Searchkit over view of queue status
colemanw [Wed, 29 Nov 2023 14:21:13 +0000 (09:21 -0500)]
Merge pull request #28360 from eileenmcnaughton/code
Remove unreachable code
Eileen McNaughton [Tue, 28 Nov 2023 12:30:46 +0000 (01:30 +1300)]
Remove handling from previously shared code
Eileen McNaughton [Wed, 29 Nov 2023 12:22:25 +0000 (01:22 +1300)]
Ensure onBehalfEmail always assigned to prevent notices
Yashodha Chaku [Wed, 29 Nov 2023 11:24:48 +0000 (16:54 +0530)]
Merge pull request #28362 from eileenmcnaughton/notices
Add notice fix for Confirm & thank you pages
Eileen McNaughton [Wed, 29 Nov 2023 11:22:24 +0000 (00:22 +1300)]
Merge pull request #28358 from eileenmcnaughton/thank_notice
Thank you page notice - ensure friendText & linkText is assigned
Eileen McNaughton [Wed, 29 Nov 2023 11:22:09 +0000 (00:22 +1300)]
Merge pull request #28359 from eileenmcnaughton/social
Notice fix - specify emailMode is false when including SocialNetwork.tpl
Eileen McNaughton [Wed, 29 Nov 2023 11:17:48 +0000 (00:17 +1300)]
Add notice fix for Confirm & thank you pages
Eileen McNaughton [Wed, 29 Nov 2023 10:27:31 +0000 (23:27 +1300)]
Remove unreachable code
Eileen McNaughton [Wed, 29 Nov 2023 10:03:06 +0000 (23:03 +1300)]
Notice fix - specify emailMode is false when including SocialNetwork.tpl
Eileen McNaughton [Wed, 29 Nov 2023 09:58:26 +0000 (22:58 +1300)]
Move the pre-assign of pcpBlock further up
This is assigned false, & then assigned again if there is a value to prevent notices (already)
but the first assign isn't always done so we still have notices
Eileen McNaughton [Wed, 29 Nov 2023 09:38:29 +0000 (22:38 +1300)]
Thank you page notice - ensure friendText & linkText is assigned
Eileen McNaughton [Wed, 29 Nov 2023 09:33:52 +0000 (22:33 +1300)]
Merge pull request #28357 from eileenmcnaughton/price_get
Fix fatal adding price set on contribution page
Eileen McNaughton [Wed, 29 Nov 2023 09:30:27 +0000 (22:30 +1300)]
Fix fatal adding price set on contribution page
Eileen McNaughton [Wed, 29 Nov 2023 02:16:43 +0000 (15:16 +1300)]
Merge pull request #28353 from civicrm/5.68
Merge 5.68 to master
colemanw [Wed, 29 Nov 2023 02:01:31 +0000 (21:01 -0500)]
Merge pull request #28343 from artfulrobot/issue-core-4697
Update path for user profile page to avoid conflict #4697
colemanw [Wed, 29 Nov 2023 01:16:56 +0000 (20:16 -0500)]
Merge pull request #28352 from bsilvern/core-4761-5.68
dev/core#4761 - CRM\Core\DAO - Generate unique name, case-insensitive
Eileen McNaughton [Tue, 28 Nov 2023 23:27:11 +0000 (12:27 +1300)]
Merge pull request #28350 from eileenmcnaughton/currency
Get currency from the event for backoffice participant form
Matthew Wire [Tue, 28 Nov 2023 22:49:38 +0000 (22:49 +0000)]
Merge pull request #28346 from eileenmcnaughton/remove_deprecated
Remove unused functions noisily deprecated in 2021
Matthew Wire [Tue, 28 Nov 2023 22:45:31 +0000 (22:45 +0000)]
Merge pull request #28347 from eileenmcnaughton/main_form
PHP 8.x add getFromEmails() function, remove use of undeclared property
Matthew Wire [Tue, 28 Nov 2023 22:44:06 +0000 (22:44 +0000)]
Merge pull request #28345 from eileenmcnaughton/undefined
Make undefined property local variable
Bob Silvern [Tue, 28 Nov 2023 22:39:06 +0000 (14:39 -0800)]
dev/core#4761 - CRM\Core\DAO - Generate unique name, case-insensitve
This duplicates on the 5.68 branch changes made in PR-28168 to master.
Eileen McNaughton [Tue, 28 Nov 2023 22:03:02 +0000 (11:03 +1300)]
Get currency from the event
Matthew Wire [Tue, 28 Nov 2023 21:52:01 +0000 (21:52 +0000)]
Merge pull request #28276 from eileenmcnaughton/isset
dev/core#4798 Stop setting unused, undefined property `_lineItem` in contribution forms
Eileen McNaughton [Tue, 28 Nov 2023 21:42:15 +0000 (10:42 +1300)]
Consolidate fee preProcess into feeBuildForm
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
Eileen McNaughton [Tue, 28 Nov 2023 21:17:49 +0000 (10:17 +1300)]
PHP 8.x add getFromEmails() function, remove use of undeclared property
Eileen McNaughton [Tue, 28 Nov 2023 20:47:25 +0000 (09:47 +1300)]
Remove unused functions noisily deprecated in 2021
Matthew Wire [Tue, 28 Nov 2023 20:45:19 +0000 (20:45 +0000)]
Merge pull request #28342 from braders/remove-tempclause
Remove unused _tempClause
Eileen McNaughton [Tue, 28 Nov 2023 20:36:54 +0000 (09:36 +1300)]
Add deprecation notices
Eileen McNaughton [Tue, 28 Nov 2023 20:30:19 +0000 (09:30 +1300)]
Make undefined property local variable
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
Eileen McNaughton [Thu, 23 Nov 2023 22:00:43 +0000 (11:00 +1300)]
Consolidate getCurrency()
Eileen McNaughton [Thu, 23 Nov 2023 21:46:53 +0000 (10:46 +1300)]
Use getCurrency() function for currency retrieval
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
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`
Rich Lott / Artful Robot [Tue, 28 Nov 2023 19:43:13 +0000 (19:43 +0000)]
Update path for user profile page to avoid conflict #4697
Bradley Taylor [Tue, 28 Nov 2023 19:38:08 +0000 (19:38 +0000)]
Remove unused _tempClause
Bradley Taylor [Tue, 28 Nov 2023 19:30:12 +0000 (19:30 +0000)]
[REF][PHP8.2] Remove unused property from CRM_Contact_Selector
demeritcowboy [Tue, 28 Nov 2023 17:45:51 +0000 (12:45 -0500)]
Merge pull request #28340 from colemanw/suppertime
Go to bed without supper 🥪🚫
colemanw [Tue, 28 Nov 2023 15:47:55 +0000 (10:47 -0500)]
Go to bed without supper
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
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
colemanw [Tue, 28 Nov 2023 13:59:20 +0000 (08:59 -0500)]
Merge pull request #28337 from eileenmcnaughton/ref
Remove unnecessary pass-by-reference
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
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
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
Eileen McNaughton [Tue, 28 Nov 2023 12:32:51 +0000 (01:32 +1300)]
Remove unnecessary pass-by-referenc
Eileen McNaughton [Tue, 28 Nov 2023 10:05:45 +0000 (23:05 +1300)]
Fix eventcart to not interact with _tpl_vars directly
Eileen McNaughton [Tue, 28 Nov 2023 09:22:54 +0000 (22:22 +1300)]
Fix Smarty3 notices on merge screen
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
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
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>
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
Eileen McNaughton [Tue, 28 Nov 2023 03:14:48 +0000 (16:14 +1300)]
Set field to do-not-import if not configured
colemanw [Tue, 28 Nov 2023 03:02:27 +0000 (22:02 -0500)]
Activity - Fix backwards logic in getViewOnlyActivityTypeIDs
Eileen McNaughton [Tue, 28 Nov 2023 02:27:48 +0000 (15:27 +1300)]
Add system check for if people disabled default location type
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
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.
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
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
Eileen McNaughton [Mon, 27 Nov 2023 22:34:55 +0000 (11:34 +1300)]
Fix dataSource test to test permissions
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
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
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
colemanw [Mon, 27 Nov 2023 21:10:58 +0000 (16:10 -0500)]
UserJob - Fix deprecated syntax in addSelectWhereClause
Eileen McNaughton [Mon, 27 Nov 2023 20:42:01 +0000 (09:42 +1300)]
Update comment todos to referred to preferred method
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
Eileen McNaughton [Thu, 23 Nov 2023 08:50:22 +0000 (21:50 +1300)]
Stop setting unused, undefined property _lineItem
This removes the last reference to _lineItem in the Contribution flow.
However, magic methods are added to support most extension access to them
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
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
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
Eileen McNaughton [Sun, 26 Nov 2023 20:07:37 +0000 (09:07 +1300)]
Remove now-unused handling for amount, line items
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
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
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
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
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
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