Eileen McNaughton [Sun, 26 Nov 2023 03:18:08 +0000 (16:18 +1300)]
Check financial acls for product in extension
demeritcowboy [Sat, 25 Nov 2023 16:07:17 +0000 (11:07 -0500)]
Merge pull request #28176 from mattwire/downloader
Log extension download errors
demeritcowboy [Sat, 25 Nov 2023 15:33:34 +0000 (10:33 -0500)]
Merge pull request #28313 from demeritcowboy/regen
Regen after 28268
demeritcowboy [Sat, 25 Nov 2023 14:53:08 +0000 (09:53 -0500)]
regen
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
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
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
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
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
Bradley Taylor [Fri, 24 Nov 2023 20:14:33 +0000 (20:14 +0000)]
[REF][PHP8.2] Tidy up properties in CRM_Badge_BAO_Badge
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
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
Alice Frumin [Tue, 21 Nov 2023 18:54:27 +0000 (13:54 -0500)]
[NFC] 5.68 release notes first pass
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
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
Eileen McNaughton [Fri, 24 Nov 2023 07:58:33 +0000 (20:58 +1300)]
Fix Main Contribution form to identify money fields
Eileen McNaughton [Fri, 24 Nov 2023 04:52:22 +0000 (17:52 +1300)]
Fix master-only-regression- tax not visible on contribution view page
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
colemanw [Fri, 24 Nov 2023 02:55:04 +0000 (21:55 -0500)]
Merge pull request #28292 from eileenmcnaughton/main_am
Clean up `getMainContributionAmount()` function
Eileen McNaughton [Fri, 24 Nov 2023 02:25:06 +0000 (15:25 +1300)]
Fix notice on unassigned tax
Eileen McNaughton [Fri, 24 Nov 2023 02:02:37 +0000 (15:02 +1300)]
Add some assigns to prevent notices on Confirm
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
colemanw [Fri, 24 Nov 2023 01:34:57 +0000 (20:34 -0500)]
Merge pull request #28284 from eileenmcnaughton/renew
Minor consolidation on `isTest()`
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.
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
Eileen McNaughton [Thu, 23 Nov 2023 23:40:16 +0000 (12:40 +1300)]
Clean up getMainContributionAmount() function
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
Bradley Taylor [Thu, 23 Nov 2023 21:46:52 +0000 (21:46 +0000)]
[REF][PHP8.2] Remove unused property $_loadedMappingId
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
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
Eileen McNaughton [Thu, 23 Nov 2023 21:34:45 +0000 (10:34 +1300)]
Fix recently-merged typo
Eileen McNaughton [Thu, 23 Nov 2023 21:16:27 +0000 (10:16 +1300)]
Extract code that defines the renewal membership
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
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
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`
Matthew Wire [Thu, 23 Nov 2023 20:55:29 +0000 (20:55 +0000)]
Merge pull request #28280 from eileenmcnaughton/billing
Use function for getBillingID() rather than relying on form property
Matthew Wire [Thu, 23 Nov 2023 20:54:15 +0000 (20:54 +0000)]
Merge pull request #28279 from mlutfy/recurringRequired
Recurring Activity: avoid validation if the fieldset is visible but not used
Matthew Wire [Thu, 23 Nov 2023 20:53:16 +0000 (20:53 +0000)]
Merge pull request #28235 from eileenmcnaughton/test_clean
Minor test clean up
Matthew Wire [Thu, 16 Nov 2023 23:24:07 +0000 (23:24 +0000)]
Log extension download errors
Eileen McNaughton [Thu, 23 Nov 2023 20:28:24 +0000 (09:28 +1300)]
Minor consolidation on isTest()
I think this makes sense as a publicly supported function we should consolidate in as many forms
as possible
Seamus Lee [Thu, 23 Nov 2023 20:23:45 +0000 (07:23 +1100)]
Merge pull request #28261 from eileenmcnaughton/prod
Add Premium Product v4 api
demeritcowboy [Thu, 23 Nov 2023 20:17:31 +0000 (15:17 -0500)]
Merge pull request #28270 from colemanw/civiCaseCleanup
CiviCase - Clear value before reusing editCaseRoleDialog
Eileen McNaughton [Thu, 23 Nov 2023 19:49:35 +0000 (08:49 +1300)]
dev/core#4795 fix regression on other amount on main contribution page
colemanw [Thu, 23 Nov 2023 19:31:07 +0000 (14:31 -0500)]
Merge pull request #28221 from eileenmcnaughton/price_set
Fix always present parameter
Eileen McNaughton [Thu, 23 Nov 2023 19:04:14 +0000 (08:04 +1300)]
Add pseudoconstant look up for entity tables
Per the code comment only contribution page
colemanw [Wed, 22 Nov 2023 20:09:07 +0000 (15:09 -0500)]
CiviCase - Simplify overcomplicated code that hides inactive roles
Eileen McNaughton [Tue, 21 Nov 2023 20:47:55 +0000 (09:47 +1300)]
Add premium api
Eileen McNaughton [Tue, 21 Nov 2023 08:01:38 +0000 (21:01 +1300)]
Add Premium Product v4 api
Eileen McNaughton [Thu, 23 Nov 2023 18:41:35 +0000 (07:41 +1300)]
Use local variable rather than undefined property to build array
This variable is specific to the function it lives in
Eileen McNaughton [Thu, 23 Nov 2023 18:36:13 +0000 (07:36 +1300)]
Use function for getBillingID() rather than relying on form property
demeritcowboy [Thu, 23 Nov 2023 17:27:36 +0000 (12:27 -0500)]
Merge pull request #28229 from sunilpawar/dev_contactID_reminder
Pass contact id to sendmail function
Mathieu Lu [Thu, 23 Nov 2023 16:44:35 +0000 (11:44 -0500)]
Recurring Activity: avoid validation if the fieldset is visible but not used
Sunil Pawar [Thu, 23 Nov 2023 16:13:54 +0000 (21:43 +0530)]
Correct contact ID name
Aidan Saunders [Thu, 23 Nov 2023 09:45:08 +0000 (09:45 +0000)]
Merge pull request #28254 from eileenmcnaughton/premium_deduct_more
Unshare toxic function `getContributionParams()`
Aidan Saunders [Thu, 23 Nov 2023 09:37:39 +0000 (09:37 +0000)]
Merge pull request #28275 from colemanw/isDeleted
AdminUI - Remove deleted contacts from group count
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:14:44 +0000 (22:14 -0500)]
AdminUI - Remove deleted contacts from group count
Fixes https://lab.civicrm.org/dev/core/-/issues/4792
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:35:25 +0000 (14:35 -0500)]
CiviCase - Clear value before reusing editCaseRoleDialog
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:41:27 +0000 (11:41 +1300)]
Blank out text version of online_contribution_receipt
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:37:55 +0000 (18:37 +1300)]
Unshare another toxic function
Eileen McNaughton [Tue, 21 Nov 2023 05:29:07 +0000 (18:29 +1300)]
Unshared toxic function getNonDeductibleAmount