colemanw [Tue, 21 Nov 2023 13:39:07 +0000 (08:39 -0500)]
Merge pull request #28253 from eileenmcnaughton/premium_deduct
Unshared toxic function `getNonDeductibleAmount()`
colemanw [Tue, 21 Nov 2023 13:14:28 +0000 (08:14 -0500)]
Merge pull request #28215 from eileenmcnaughton/amount_level
Stop setting unused key
colemanw [Tue, 21 Nov 2023 13:14:12 +0000 (08:14 -0500)]
Merge pull request #28234 from eileenmcnaughton/line_pass
Reduce passing of `lineItems`
colemanw [Tue, 21 Nov 2023 13:13:40 +0000 (08:13 -0500)]
Merge pull request #28211 from eileenmcnaughton/smarty3
Use token to avoid breaky-smarty3-maths
colemanw [Tue, 21 Nov 2023 13:13:11 +0000 (08:13 -0500)]
Merge pull request #28214 from eileenmcnaughton/message_improve
Improve test output message
colemanw [Tue, 21 Nov 2023 13:12:50 +0000 (08:12 -0500)]
Merge pull request #28222 from eileenmcnaughton/current_member
Replace undefined property `_currentMemberships` with a define
colemanw [Tue, 21 Nov 2023 13:11:53 +0000 (08:11 -0500)]
Merge pull request #28227 from eileenmcnaughton/express
Declare property from paypal express as public
colemanw [Tue, 21 Nov 2023 13:11:39 +0000 (08:11 -0500)]
Merge pull request #28233 from eileenmcnaughton/second
Clarify which line items are passed in` processSecondaryMembership`
colemanw [Tue, 21 Nov 2023 13:11:17 +0000 (08:11 -0500)]
Merge pull request #28232 from eileenmcnaughton/assign
Remove assignments for template that are not needed for updated template
colemanw [Tue, 21 Nov 2023 13:09:41 +0000 (08:09 -0500)]
Merge pull request #28252 from eileenmcnaughton/thank_notice
Extend line item notice fix from Confirm to Thank you page
Eileen McNaughton [Tue, 21 Nov 2023 06:05:24 +0000 (19:05 +1300)]
Merge pull request #28247 from civicrm/5.68
5.68
Eileen McNaughton [Tue, 21 Nov 2023 05:29:07 +0000 (18:29 +1300)]
Unshared toxic function getNonDeductibleAmount
Eileen McNaughton [Tue, 21 Nov 2023 05:22:32 +0000 (18:22 +1300)]
Extend line item notice fix from Confirm to Thank you page
Eileen McNaughton [Tue, 21 Nov 2023 05:16:04 +0000 (18:16 +1300)]
Merge pull request #28251 from eileenmcnaughton/fix_regress
Fix regression on line item display on thank you
Eileen McNaughton [Tue, 21 Nov 2023 05:15:13 +0000 (18:15 +1300)]
Fix regression on line item display on thank you
demeritcowboy [Tue, 21 Nov 2023 04:03:02 +0000 (23:03 -0500)]
Merge pull request #28244 from eileenmcnaughton/568
Fix reference to wrong value
Eileen McNaughton [Tue, 21 Nov 2023 02:13:10 +0000 (15:13 +1300)]
Merge pull request #28243 from demeritcowboy/lost-time
dev/financial#221 - Bring back missing time field
Eileen McNaughton [Tue, 21 Nov 2023 01:37:20 +0000 (14:37 +1300)]
Fix reference to wrong value
Eileen McNaughton [Tue, 21 Nov 2023 01:33:33 +0000 (14:33 +1300)]
Merge pull request #28241 from civicrm/5.68
5.68
demeritcowboy [Tue, 21 Nov 2023 01:18:10 +0000 (20:18 -0500)]
bring back time field
demeritcowboy [Tue, 21 Nov 2023 00:54:14 +0000 (19:54 -0500)]
Merge pull request #28239 from eileenmcnaughton/568_prod
Fix regression in 5.68 on selecting a premium (when at least one is unavailable)
demeritcowboy [Tue, 21 Nov 2023 00:42:51 +0000 (19:42 -0500)]
Merge pull request #28237 from eileenmcnaughton/568
Add weight to premium config (tab on contribution page edit)
Eileen McNaughton [Mon, 20 Nov 2023 23:07:27 +0000 (12:07 +1300)]
Fix regression in 5.68 on premium
Eileen McNaughton [Mon, 20 Nov 2023 22:33:40 +0000 (11:33 +1300)]
Add weight to premium config (tab on contribution page edit)
Eileen McNaughton [Mon, 20 Nov 2023 22:25:29 +0000 (11:25 +1300)]
Merge pull request #28236 from civicrm/5.68
5.68 to master
Eileen McNaughton [Mon, 20 Nov 2023 22:05:38 +0000 (11:05 +1300)]
Merge pull request #28231 from agh1/5.68.0-releasenotes-initial
5.68.0 release notes initial run
Eileen McNaughton [Mon, 20 Nov 2023 21:29:51 +0000 (10:29 +1300)]
Reduce passing of lineItems
The get() function is called when setting the order line items so calling getLineItems()
will return the same thing. The value passed as formLineItems is simply the value
from getLineItems() so rather than pass it get it at the point where it is needed
Eileen McNaughton [Mon, 20 Nov 2023 21:14:33 +0000 (10:14 +1300)]
Clarify which line items are passed in processSecondaryMembership
It has traditionally been very confusing what the line items are when they get to
this point - but now we have a function that gets them so call it at the point when needed rather than
pass the array around
Eileen McNaughton [Mon, 20 Nov 2023 21:08:36 +0000 (10:08 +1300)]
Remove more assignments & create some noise
Eileen McNaughton [Mon, 20 Nov 2023 21:02:21 +0000 (10:02 +1300)]
Remove assignments for template that are not needed for updated template
colemanw [Mon, 20 Nov 2023 20:54:37 +0000 (15:54 -0500)]
Merge pull request #28212 from eileenmcnaughton/test_separate_2
Further test consolidation
colemanw [Mon, 20 Nov 2023 20:52:17 +0000 (15:52 -0500)]
Merge pull request #28219 from eileenmcnaughton/cont_tax
Fix master-only regression - tax term not assigned
colemanw [Mon, 20 Nov 2023 20:52:00 +0000 (15:52 -0500)]
Merge pull request #28228 from eileenmcnaughton/order_less
Add helper functions to contribution page
colemanw [Mon, 20 Nov 2023 17:12:51 +0000 (12:12 -0500)]
Merge pull request #28156 from colemanw/autocompleteFix
APIv4 - Fix autocomplete filters for multi-record custom groups
Andie Hunt [Mon, 20 Nov 2023 15:27:38 +0000 (10:27 -0500)]
5.68.0 release notes: added boilerplate
Andie Hunt [Mon, 20 Nov 2023 15:24:11 +0000 (10:24 -0500)]
5.68.0 release notes: raw from script
colemanw [Mon, 20 Nov 2023 14:58:50 +0000 (09:58 -0500)]
Merge pull request #28205 from eileenmcnaughton/lines
Cleanup notices around line Item display on Contribution Confirm Page
Eileen McNaughton [Mon, 20 Nov 2023 12:13:59 +0000 (01:13 +1300)]
Add helper functions to contribution page
Eileen McNaughton [Mon, 20 Nov 2023 11:58:13 +0000 (00:58 +1300)]
Declare property from paypal express as public
Rich Lott [Mon, 20 Nov 2023 09:10:38 +0000 (09:10 +0000)]
Merge pull request #28213 from mlutfy/core4787
dev/core#4787 Standalone: add viewport meta to improve mobile support
Eileen McNaughton [Sun, 19 Nov 2023 22:32:02 +0000 (11:32 +1300)]
Move Zero amount test
Eileen McNaughton [Sun, 19 Nov 2023 22:19:59 +0000 (11:19 +1300)]
Combine 2 tests into one, they differ only by an additional check
Eileen McNaughton [Mon, 20 Nov 2023 05:54:41 +0000 (18:54 +1300)]
Replace undefined property _currentMemberships with a define
Eileen McNaughton [Mon, 20 Nov 2023 02:42:41 +0000 (15:42 +1300)]
Fix master-only regression - tax term not assigned
Typo in just merged code
Eileen McNaughton [Mon, 20 Nov 2023 01:50:18 +0000 (14:50 +1300)]
Stop setting unused key
Since this function does not use this key & params is not passed by reference the value is set & discarded
Eileen McNaughton [Mon, 20 Nov 2023 01:38:59 +0000 (14:38 +1300)]
Improve test output message
Eileen McNaughton [Mon, 20 Nov 2023 01:33:22 +0000 (14:33 +1300)]
Merge pull request #28208 from eileenmcnaughton/no_assign
Remove assignment of now-unused membership_assign variable
Mathieu Lu [Mon, 20 Nov 2023 01:28:44 +0000 (20:28 -0500)]
dev/core#4787 Standalone: add viewport meta to improve mobile support
Eileen McNaughton [Mon, 20 Nov 2023 01:08:15 +0000 (14:08 +1300)]
Use token to avoid breaky-smarty3-maths
Mathieu Lu [Mon, 20 Nov 2023 00:51:06 +0000 (19:51 -0500)]
Merge pull request #28209 from totten/master-langtpl
Add xml/templates/languages_setup.tpl
Eileen McNaughton [Mon, 20 Nov 2023 00:45:30 +0000 (13:45 +1300)]
Assign lineItems consistently in Confirm & ThankYou
Eileen McNaughton [Sun, 19 Nov 2023 21:44:59 +0000 (10:44 +1300)]
Remove always-true membership_assign
The combination of membership_assign and useForMember toggles whether the membership
information shows up. It shows up when we are not showing line items - in
which case it shows in the line item block instead - see
https://github.com/civicrm/civicrm-core/pull/28181
membership_assign is Always assigned when this receipt
is sent - hence it can go
useForMember winds up being a pseudonym of isShowLineItems
so this instance is replaced with that
- #28181 replaces some further instances
Eileen McNaughton [Mon, 20 Nov 2023 00:35:09 +0000 (13:35 +1300)]
Merge pull request #28210 from eileenmcnaughton/master
Re-run regen
Eileen McNaughton [Mon, 20 Nov 2023 00:33:40 +0000 (13:33 +1300)]
Re-run regen
Eileen McNaughton [Mon, 20 Nov 2023 00:26:14 +0000 (13:26 +1300)]
Merge pull request #28184 from eileenmcnaughton/data_array
Finally remove `dataArray` , some notice fixes
Eileen McNaughton [Mon, 20 Nov 2023 00:25:47 +0000 (13:25 +1300)]
Merge pull request #28183 from eileenmcnaughton/mem_info
Show membership info on pay later receipts
Tim Otten [Mon, 20 Nov 2023 00:05:53 +0000 (16:05 -0800)]
Add xml/templates/languages_setup.tpl
Eileen McNaughton [Fri, 17 Nov 2023 06:13:42 +0000 (19:13 +1300)]
Show Membership Info on membership pay later receipt
Eileen McNaughton [Sun, 19 Nov 2023 22:44:49 +0000 (11:44 +1300)]
Merge pull request #28132 from colemanw/customValueAutocomplete
APIv4 - Add autocomplete & fix joins in CustomValue entities
Eileen McNaughton [Fri, 17 Nov 2023 06:40:21 +0000 (19:40 +1300)]
Fully remove the dataArray assign, notify via system check if still in use
These were already removed from all templates except membership_online_receipt
which has just seen the back of them
Eileen McNaughton [Fri, 17 Nov 2023 20:34:00 +0000 (09:34 +1300)]
Fix pay_later to be more accurate & less noticey in membership online receipt
Eileen McNaughton [Sun, 19 Nov 2023 00:57:17 +0000 (13:57 +1300)]
Cleanup notices around line Item display on Contribution Confirm Page
colemanw [Sun, 19 Nov 2023 22:39:35 +0000 (17:39 -0500)]
Merge pull request #28207 from eileenmcnaughton/test_separate_2
Fix tests to use full form flow, more reliable data
colemanw [Sun, 19 Nov 2023 22:36:26 +0000 (17:36 -0500)]
Merge pull request #28206 from colemanw/afformAdminLinks
Afform - Improve admin links to include search displays
colemanw [Sun, 19 Nov 2023 22:32:42 +0000 (17:32 -0500)]
Merge pull request #28181 from eileenmcnaughton/membership_lines
Align online membership receipt with other templates for line items, tax
Eileen McNaughton [Sun, 19 Nov 2023 21:26:29 +0000 (10:26 +1300)]
Move & improve test for Membership only, not separate payment
Eileen McNaughton [Sat, 18 Nov 2023 06:23:32 +0000 (19:23 +1300)]
Improve test cover for full form flow of separate payment
colemanw [Sun, 19 Nov 2023 20:15:46 +0000 (15:15 -0500)]
Afform - Improve admin links to include search displays
Fixes https://lab.civicrm.org/dev/core/-/issues/4786
colemanw [Sun, 19 Nov 2023 03:46:31 +0000 (22:46 -0500)]
Merge pull request #28167 from eileenmcnaughton/part_set
Remove extraneous set from previously shared code
colemanw [Sun, 19 Nov 2023 03:45:35 +0000 (22:45 -0500)]
Merge pull request #28041 from mlutfy/cleanupStateProvincesXml
Cleanup SQL in xml/templates/civicrm_state_province.tpl
demeritcowboy [Sun, 19 Nov 2023 02:56:41 +0000 (21:56 -0500)]
Merge pull request #28196 from eileenmcnaughton/notice_event
Notice fix on payment block
Eileen McNaughton [Sat, 18 Nov 2023 23:45:55 +0000 (12:45 +1300)]
Merge pull request #28200 from braders/selector-context
[REF][PHP8.2] Declare _context in CRM_Contact_Selector
Eileen McNaughton [Sat, 18 Nov 2023 23:41:11 +0000 (12:41 +1300)]
Merge pull request #28204 from braders/donor-properties
[REF][PHP8.2] Declare donorEmail and donorDisplayName properties
demeritcowboy [Sat, 18 Nov 2023 17:56:17 +0000 (12:56 -0500)]
Merge pull request #28203 from braders/opencase-allowmulticlient
[REF][PHP8.2] Remove need for _allowMultiClient property
demeritcowboy [Sat, 18 Nov 2023 17:07:01 +0000 (12:07 -0500)]
Merge pull request #28201 from braders/php8-emailtest
[REF][PHP8.2] Remove unused property usage from test
Bradley Taylor [Sat, 18 Nov 2023 17:03:36 +0000 (17:03 +0000)]
[REF][PHP8.2] Declare donorEmail and donorDisplayName properties
Bradley Taylor [Sat, 18 Nov 2023 16:51:11 +0000 (16:51 +0000)]
[REF][PHP8.2] Remove need for _allowMultiClient property
demeritcowboy [Sat, 18 Nov 2023 16:38:56 +0000 (11:38 -0500)]
Merge pull request #28199 from braders/_redactionRegexRules
[REF][PHP8.2] Declare _redactionRegexRules property
Bradley Taylor [Sat, 18 Nov 2023 16:19:43 +0000 (16:19 +0000)]
[REF][PHP8.2] Remove unused property usage from test
Bradley Taylor [Sat, 18 Nov 2023 16:08:08 +0000 (16:08 +0000)]
[REF][PHP8.2] Declare _context in CRM_Contact_Selector
Bradley Taylor [Sat, 18 Nov 2023 13:48:37 +0000 (13:48 +0000)]
[REF][PHP8.2] Declare _redactionRegexRules property
Tim Otten [Sat, 18 Nov 2023 05:49:24 +0000 (22:49 -0700)]
Merge pull request #28197 from eileenmcnaughton/test_clean
Minor standardisation in test class
Eileen McNaughton [Sat, 18 Nov 2023 04:03:56 +0000 (17:03 +1300)]
Minor standardisation in test class
Refer to the payment processor in a way that is more consistent with other classes
Eileen McNaughton [Sat, 18 Nov 2023 04:17:09 +0000 (17:17 +1300)]
Notice fix on payment block
We don't need to check if we are dealing with a multiple participant event because that
is the only scenario where the field additional_participants is present
& it will fail gracefully if it is not present. This has been causing notices across
all flows that include the payment block
Eileen McNaughton [Sat, 18 Nov 2023 03:35:14 +0000 (16:35 +1300)]
Merge pull request #28174 from eileenmcnaughton/mem_online_2
Fix membership online preview to display subject (using token)
Eileen McNaughton [Fri, 17 Nov 2023 23:16:18 +0000 (12:16 +1300)]
Update CRM/Member/WorkflowMessage/Membership/Membership.php
Co-authored-by: colemanw <coleman@civicrm.org>
Tim Otten [Fri, 17 Nov 2023 22:33:16 +0000 (15:33 -0700)]
Merge pull request #28169 from demeritcowboy/l10ndir-check
System check for multiple l10n dirs
demeritcowboy [Thu, 16 Nov 2023 19:02:24 +0000 (14:02 -0500)]
system check for multiple l10n dirs
Eileen McNaughton [Fri, 17 Nov 2023 20:40:37 +0000 (09:40 +1300)]
Merge pull request #28193 from civicrm/5.68
5.68
Eileen McNaughton [Fri, 17 Nov 2023 20:39:30 +0000 (09:39 +1300)]
Merge pull request #28192 from lcdservices/civicrm-core-4780b
dev/core#4780 handle bounce processing when verp unverified
demeritcowboy [Fri, 17 Nov 2023 19:57:20 +0000 (14:57 -0500)]
Merge pull request #28187 from colemanw/groupConcatUiFix
SearchKit - Fix missing label on group concat distinct dropdown
demeritcowboy [Fri, 17 Nov 2023 19:27:21 +0000 (14:27 -0500)]
trying again to fix conflict
demeritcowboy [Fri, 17 Nov 2023 19:25:56 +0000 (14:25 -0500)]
try to fix merge conflict
Aidan Saunders [Fri, 17 Nov 2023 18:58:01 +0000 (18:58 +0000)]
Merge pull request #28164 from colemanw/groupFirst
APIv4 - Add GROUP_FIRST aggregate function
demeritcowboy [Fri, 17 Nov 2023 18:37:17 +0000 (13:37 -0500)]
Merge pull request #28189 from aydun/adminui_cp_fix_rc
dev/core#4783 Fix ability to clone and delete Contribution Pages when AdminUI enabled
Brian Shaughnessy [Fri, 17 Nov 2023 18:23:38 +0000 (13:23 -0500)]
dev/core#4780 handle bounce processing when verp unverified
Aidan Saunders [Thu, 16 Nov 2023 21:46:41 +0000 (21:46 +0000)]
Move civicrm/contribute/manage to civicrm/admin/contribute/manage
Update one reference to old path
Change Contribution Page clone and delete to use new path
colemanw [Fri, 17 Nov 2023 14:04:37 +0000 (09:04 -0500)]
SearchKit - Fix wrong flags shown when switching field functions
colemanw [Fri, 17 Nov 2023 01:15:59 +0000 (20:15 -0500)]
SearchKit - Support ORDER BY with aggregate functions
colemanw [Thu, 16 Nov 2023 01:12:18 +0000 (20:12 -0500)]
APIv4 - Add GROUP_FIRST aggregate function
This fills a gap in the MySql spec. It returns the first result of a GROUP_CONCAT set.