Aidan Saunders [Thu, 23 Nov 2023 09:33:52 +0000 (09:33 +0000)]
Merge pull request #28274 from colemanw/searchBuilderNotice
SearchBuilder - Add deprecation notice to users
Aidan Saunders [Thu, 23 Nov 2023 09:24:18 +0000 (09:24 +0000)]
Merge pull request #28256 from eileenmcnaughton/get_tax_details
Fix getTaxDetails notices on Confirm page
Eileen McNaughton [Thu, 23 Nov 2023 08:18:19 +0000 (21:18 +1300)]
Merge pull request #28271 from eileenmcnaughton/payment_function
dev/core#4798 Fixes to functions to determine if isMembership, isSeparatePayment
Eileen McNaughton [Thu, 23 Nov 2023 00:22:35 +0000 (13:22 +1300)]
Fix test to have correct input params
The test was exploiting a code gremlin which did not
require the right submitted values to be set to trigger
a secondary contribution - this fixed.
other_amount is not a real field as the presented field is always price_x
demeritcowboy [Thu, 23 Nov 2023 03:24:06 +0000 (22:24 -0500)]
Merge pull request #28257 from wmortada/core#4791
dev/core#4791 - Set cache folder for dompdf
colemanw [Thu, 23 Nov 2023 03:08:51 +0000 (22:08 -0500)]
SearchBuilder - Add deprecation notice to users
Eileen McNaughton [Wed, 22 Nov 2023 22:49:13 +0000 (11:49 +1300)]
Fixes to functions to determine if isMembership, isSeparatePayment
In the case of isSeparatePayment we have a function to determine if the form
supports separate payments - but are using this interchangeably with whether the
user has selected more than one option (if they only selected 1 there is only 1 payment)
colemanw [Wed, 22 Nov 2023 20:04:29 +0000 (15:04 -0500)]
Merge pull request #28264 from eileenmcnaughton/lines
[LineItem cleanup] Standardise a couple of calls to get values from the line items
colemanw [Wed, 22 Nov 2023 19:12:25 +0000 (14:12 -0500)]
Merge pull request #28269 from eileenmcnaughton/thank
Superficial cleanup in Contribution Thank You form
colemanw [Wed, 22 Nov 2023 14:07:08 +0000 (09:07 -0500)]
Merge pull request #28266 from eileenmcnaughton/line_member
[LineItem cleanup] Clean up & clarify code splitting line items in Contribution page membership flow
Mathieu Lu [Wed, 22 Nov 2023 13:46:50 +0000 (08:46 -0500)]
Merge pull request #28258 from christianwach/lab-core-4735
Use currentPath method to build QuickForm post URL
William Mortada [Tue, 21 Nov 2023 10:22:52 +0000 (10:22 +0000)]
Set cache folder for dompdf
colemanw [Wed, 22 Nov 2023 00:19:46 +0000 (19:19 -0500)]
Merge pull request #28240 from eileenmcnaughton/standardise
Online membership receipt simplification
colemanw [Wed, 22 Nov 2023 00:19:08 +0000 (19:19 -0500)]
Merge pull request #28267 from eileenmcnaughton/property
Replace ref to undeclared property with tax-inclusive lookup
Eileen McNaughton [Tue, 21 Nov 2023 21:53:46 +0000 (10:53 +1300)]
Clean up & clarify code splitting line items in Contribution page membership flow
It was really confusing - but now it is separated into a function which explains it
Note there is specic test cover in
testSubmitMembershipComplexPriceSetPaymentPaymentProcessorRecurInstantPayment
and the changes to that test reflects the fact that the order in which
the line items are created changes slightly (in a fundamentally neutral way
Eileen McNaughton [Tue, 21 Nov 2023 23:35:07 +0000 (12:35 +1300)]
Superficial cleanup in Contribution THank You form
Eileen McNaughton [Tue, 21 Nov 2023 22:31:10 +0000 (11:31 +1300)]
Replace ref to undeclared property with tax-inclusive lookup
Eileen McNaughton [Tue, 21 Nov 2023 19:52:23 +0000 (08:52 +1300)]
Standardise a couple of calls to get values from the line items
Eileen McNaughton [Tue, 21 Nov 2023 21:32:35 +0000 (10:32 +1300)]
Merge pull request #28265 from civicrm/5.68
5.68
Mathieu Lu [Tue, 21 Nov 2023 21:29:30 +0000 (16:29 -0500)]
Merge pull request #28220 from eileenmcnaughton/membership_log
Add Membership log entity
Mathieu Lu [Tue, 21 Nov 2023 21:24:44 +0000 (16:24 -0500)]
Merge pull request #28238 from eileenmcnaughton/premium
[Premiums] Fix access to undeclared property, remove unreachable code
Mathieu Lu [Tue, 21 Nov 2023 21:18:15 +0000 (16:18 -0500)]
Merge pull request #28250 from eileenmcnaughton/premium_2
Fix notices on manage premiums page
demeritcowboy [Tue, 21 Nov 2023 20:35:34 +0000 (15:35 -0500)]
Merge pull request #28246 from eileenmcnaughton/profile
dev/core#4766 Fix event merging profiles together
colemanw [Tue, 21 Nov 2023 19:25:33 +0000 (14:25 -0500)]
Merge pull request #28224 from eileenmcnaughton/remove_unused
Remove unused property from previously shared code `_membershipTypeValues`
Eileen McNaughton [Tue, 21 Nov 2023 00:15:11 +0000 (13:15 +1300)]
A couple more minor fixes
Eileen McNaughton [Tue, 21 Nov 2023 00:13:15 +0000 (13:13 +1300)]
Online membership receipt simplification
Rather than having one section in an IF for the scenario where we have a separate payment situation
but there is no contribution payment, consolidate this scenario with the general 'we
have a membership but no contribution in the receipt
Eileen McNaughton [Tue, 21 Nov 2023 02:37:01 +0000 (15:37 +1300)]
Fix event merging profiles together
https://lab.civicrm.org/dev/core/-/issues/4766
Christian Wach [Tue, 21 Nov 2023 14:22:28 +0000 (14:22 +0000)]
Use currentPath method to build QuickForm post URL
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:26:55 +0000 (19:26 +1300)]
Fix getTaxDetails notices on Confirm 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
Eileen McNaughton [Tue, 21 Nov 2023 04:55:36 +0000 (17:55 +1300)]
Fix notices on manage premiums page
This addresses notices at
https://dmaster.localhost:32353/civicrm/admin/contribute/managePremiums?reset=1
These are probably also addressed by the admin ui / sk conversion but note that this also
covers the tab on the contribution page
Note that combined with https://github.com/civicrm/civicrm-core/pull/28238
this fixes most of the issues I encountered trying to configure a premimum
but there are still a bunch of notices when I attempt to use one.
Also, having switched to using apiv4 I have added some tpl escaping
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:59:19 +0000 (11:59 +1300)]
Single appears to be never true on this form too
Eileen McNaughton [Mon, 20 Nov 2023 22:39:34 +0000 (11:39 +1300)]
Fix access to undeclared property, remove unreachable code
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 [Mon, 20 Nov 2023 08:43:26 +0000 (21:43 +1300)]
Remove unused property from previously shared code
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:57:46 +0000 (15:57 +1300)]
Add Membership log entity
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