Eileen McNaughton [Mon, 19 Jun 2023 10:40:59 +0000 (22:40 +1200)]
Update online_event_template to use workflow message
This updates the default online event template to use the variables assigned by
the workflow template
This works to standardise the variables previously in dataArray
, lineItem, totalAmount, taxAmount to reflect the
approach in other templates per
https://docs.civicrm.org/user/en/latest/email/message-templates/#variables-and-tokens-in-workflow-message-templates
However, for participants, per the helpful discussion at
https://github.com/civicrm/civicrm-core/pull/24576
the expectation is that the primaryParticipant gets the values for
all participants whereas the others only get line items,
tax breakdowns, totals that relate to them.
Hence I have assigned an array participants that holds detials for all participants
and the template iterates through them showing all or just the
one that relates to the assigned participant id depending on
whether it is primary.
This allows the template to display in the Message preview and should
also mean that those values that I have addressed will always reflect
the participantID being used. This also addresses some notices
and incompatibility with secure smarty.
However, there are still values I haven't made sense of, or otherwise left
out of the scope of this PR in the template.
Also note I updated the taxBreakdown in the contribution trait - I decided it
was cloberring the amount as it iterated through the line items - rather than
doing a running total.
Seamus Lee [Sat, 24 Jun 2023 00:20:24 +0000 (17:20 -0700)]
Merge pull request #26635 from eileenmcnaughton/test_tidy
Very minor test cleanup
Seamus Lee [Sat, 24 Jun 2023 00:20:05 +0000 (17:20 -0700)]
Merge pull request #26633 from eileenmcnaughton/cont_status
Contribution WorkflowTrait updates to support event template changes
Eileen McNaughton [Fri, 23 Jun 2023 23:45:21 +0000 (16:45 -0700)]
Very minor test cleanup
Eileen McNaughton [Fri, 23 Jun 2023 23:41:27 +0000 (16:41 -0700)]
Contribution WorkflowTrait updates to support event template changes
Eileen McNaughton [Fri, 23 Jun 2023 23:21:04 +0000 (16:21 -0700)]
Merge pull request #26631 from totten/master-bump-standalone
standaloneusers - Update versioning
Tim Otten [Fri, 23 Jun 2023 22:47:19 +0000 (15:47 -0700)]
Standalone - Rerun 'civix upgrade'. Drop backports.
Tim Otten [Fri, 23 Jun 2023 22:43:54 +0000 (15:43 -0700)]
(Re-run) Set version to 5.64.alpha1 (with standaloneusers)
Tim Otten [Fri, 23 Jun 2023 22:44:08 +0000 (15:44 -0700)]
Add "standaloneusers" to list of "core-ext"s
This ensures that the `<ver>`sion tag will be incremented in parallel with the rest.
Eileen McNaughton [Fri, 23 Jun 2023 22:32:21 +0000 (15:32 -0700)]
Merge pull request #26618 from totten/bb
WorkflowMessage - Allow more dynamic-localized data. Unify language field.
Seamus Lee [Fri, 23 Jun 2023 22:27:17 +0000 (15:27 -0700)]
Merge pull request #26630 from civicrm/5.63
5.63
Seamus Lee [Fri, 23 Jun 2023 22:07:43 +0000 (15:07 -0700)]
Merge pull request #26621 from artfulrobot/artfulrobot-standalone-core-1
Move standalone classes and standaloneusers extension into core
Seamus Lee [Fri, 23 Jun 2023 21:52:34 +0000 (14:52 -0700)]
Merge pull request #26628 from agh1/5.63.0-releasenotes-initial
5.63.0 release notes initial run
Seamus Lee [Fri, 23 Jun 2023 21:38:47 +0000 (14:38 -0700)]
Merge pull request #26560 from eileenmcnaughton/paypal_2
Move recurring handling to recur function in PaypalIPN
Eileen McNaughton [Fri, 23 Jun 2023 21:32:21 +0000 (14:32 -0700)]
Merge pull request #26629 from larssandergreen/Group-count-NaN
Don't show filtered from NaN on Groups when 0 groups found
Tim Otten [Fri, 23 Jun 2023 21:32:20 +0000 (14:32 -0700)]
(NFC) Standalone
larssandergreen [Fri, 23 Jun 2023 21:27:57 +0000 (15:27 -0600)]
Don't show filtered NaN on Groups when 0 groups found
Andie Hunt [Fri, 23 Jun 2023 21:09:51 +0000 (17:09 -0400)]
5.63.0 release notes: added boilerplate
Andie Hunt [Fri, 23 Jun 2023 21:06:07 +0000 (17:06 -0400)]
5.63.0 release notes: raw from script
Seamus Lee [Fri, 23 Jun 2023 20:33:34 +0000 (13:33 -0700)]
Merge pull request #26626 from totten/master-mail-cleanup
CiviMail - Sundry cleanups
Rich Lott / Artful Robot [Fri, 23 Jun 2023 12:24:08 +0000 (13:24 +0100)]
standalone: civilint
Rich Lott / Artful Robot [Fri, 23 Jun 2023 12:06:26 +0000 (13:06 +0100)]
standalone: Update README
Rich Lott / Artful Robot [Fri, 23 Jun 2023 12:04:43 +0000 (13:04 +0100)]
standalone: civix upgrade on standaloneusers
Rich Lott / Artful Robot [Fri, 23 Jun 2023 11:53:18 +0000 (12:53 +0100)]
update readme
Rich Lott / Artful Robot [Fri, 23 Jun 2023 11:21:46 +0000 (12:21 +0100)]
standalone: add mgmt:hidden tag to info.xml so this core ext is not offered in the UI
Rich Lott / Artful Robot [Fri, 23 Jun 2023 11:19:21 +0000 (12:19 +0100)]
standalone: commit users search
Rich Lott / Artful Robot [Fri, 23 Jun 2023 11:17:01 +0000 (12:17 +0100)]
standalone: initial incomplete import of standaloneusers ext
Tim Otten [Fri, 10 Mar 2023 09:32:13 +0000 (01:32 -0800)]
Migrate Standalone.civi-setup.php to civicrm-standalone.git
Rich Lott / Artful Robot [Mon, 20 Feb 2023 21:16:46 +0000 (21:16 +0000)]
standalone: don't cache class_exists
Rich Lott / Artful Robot [Mon, 20 Feb 2023 17:06:49 +0000 (17:06 +0000)]
standalone: remove absolute URL support (broke QF) - needs fix
Rich Lott / Artful Robot [Mon, 20 Feb 2023 13:46:04 +0000 (13:46 +0000)]
standalone: when users extension not available create fake user IDs in session
Rich Lott / Artful Robot [Mon, 20 Feb 2023 12:50:45 +0000 (12:50 +0000)]
standalone: correct detection of standalone security class
Rich Lott / Artful Robot [Mon, 20 Feb 2023 12:45:17 +0000 (12:45 +0000)]
standalone: reimplement permission check
Seamus Lee [Fri, 23 Jun 2023 20:25:18 +0000 (13:25 -0700)]
Merge pull request #26620 from eileenmcnaughton/anet
Switch to Payment.create & repeattransaction in Authorize.net
Tim Otten [Fri, 23 Jun 2023 20:24:55 +0000 (13:24 -0700)]
(Squash) Cleanup intra-PR conflicts
The original commits that are squashed here:
commit
1d6f386b6c4ddb8a21a09520d3326a72039b04bd
Merge:
bd969852b8 b0b92b3a5a
Author: Rich Lott / Artful Robot <code.commits@artfulrobot.uk>
Date: Mon Feb 20 12:02:41 2023 +0000
Merge remote-tracking branch 'origin/artfulrobot-standalone' into artfulrobot-standalone
commit
bd969852b808e599fccad7843dd8aa58ee3c28cd
Author: Rich Lott / Artful Robot <code.commits@artfulrobot.uk>
Date: Mon Feb 20 12:01:11 2023 +0000
standalone: delegate most of CRM_Utils_System_Standalone to extension
commit
b0b92b3a5a019561758ef894d43b1a8853b1dd5f
Author: Klaas Eikelboom <klaas.eikelboom@civicoop.org>
Date: Mon Feb 13 22:53:30 2023 +0100
Civilint
colemanw [Fri, 23 Jun 2023 20:18:09 +0000 (16:18 -0400)]
Merge pull request #26610 from seamuslee001/fix_prioritisation
Fix some missing places where prioritisation is not incorporated
colemanw [Fri, 23 Jun 2023 20:15:49 +0000 (16:15 -0400)]
Merge pull request #26627 from seamuslee001/everyone_option_value
Add Everyone acl role option value
Seamus Lee [Fri, 23 Jun 2023 19:36:41 +0000 (05:36 +1000)]
Add Everyone acl role option value
Tim Otten [Fri, 23 Jun 2023 18:53:39 +0000 (11:53 -0700)]
Flexmailer - Simplify conditionals
Some branches got swapped around in the past year. The resulting logic can be expressed more simply.
Eileen McNaughton [Fri, 23 Jun 2023 18:52:52 +0000 (11:52 -0700)]
Merge pull request #26623 from colemanw/secretGroup
Group BAO - Remove secret param that was breaking groupNesting
Tim Otten [Fri, 23 Jun 2023 18:45:12 +0000 (11:45 -0700)]
civicrm/mailing/queue - Remove hidden/obsolete sender
This route was an old-school, hidden way to send a mail-blast immediately.
Now-a-days, the same use-case would be addressed by something like:
1. Go to API Explorer and run `Job.process_mailing`
2. Go to CLI and run `Job.process_mailing`
Seamus Lee [Fri, 23 Jun 2023 00:17:27 +0000 (10:17 +1000)]
Retain the concept of an all groups rule == all contacts access
Tim Otten [Fri, 23 Jun 2023 18:41:14 +0000 (11:41 -0700)]
civicrm/mailing/browse/* - Fix warning
Seamus Lee [Thu, 22 Jun 2023 23:45:24 +0000 (09:45 +1000)]
Add in further unit tests and remove some duplicate custom fields and fix issue where an apply all for groups of contacts would override deny rules
Seamus Lee [Thu, 22 Jun 2023 21:34:56 +0000 (07:34 +1000)]
Fix some missing places where prioritisation is not incorporated
Seamus Lee [Fri, 23 Jun 2023 17:08:07 +0000 (10:08 -0700)]
Merge pull request #26615 from colemanw/aclTableNameFix
Fix ACLs to use the correct name of the civicrm_group table
Seamus Lee [Fri, 23 Jun 2023 16:53:32 +0000 (09:53 -0700)]
Merge pull request #26622 from colemanw/explorerFix
APIv4 Explorer - Fix regression in php generation
colemanw [Fri, 23 Jun 2023 16:29:35 +0000 (09:29 -0700)]
Group BAO - Remove secret param that was breaking groupNesting
Eileen McNaughton [Fri, 23 Jun 2023 16:15:22 +0000 (09:15 -0700)]
Merge pull request #26605 from samuelsov/lab2549
dev/core#2549
colemanw [Fri, 23 Jun 2023 16:11:49 +0000 (12:11 -0400)]
Merge pull request #26567 from eileenmcnaughton/templates
Do not generate unshared variable in shared `processMessageTemplate`
colemanw [Fri, 23 Jun 2023 15:10:07 +0000 (08:10 -0700)]
APIv4 Explorer - Fix regression in php generation
Rich Lott / Artful Robot [Fri, 10 Feb 2023 21:12:25 +0000 (21:12 +0000)]
standalone: provide empty cmsDb and db
Rich Lott / Artful Robot [Fri, 10 Feb 2023 20:41:30 +0000 (20:41 +0000)]
standalone: temporary error_log
Rich Lott / Artful Robot [Fri, 10 Feb 2023 14:08:38 +0000 (14:08 +0000)]
standalone: work on cmsBaseUrl
Rich Lott / Artful Robot [Fri, 10 Feb 2023 13:24:40 +0000 (13:24 +0000)]
standalone: tweak settings config
Rich Lott / Artful Robot [Fri, 10 Feb 2023 13:16:22 +0000 (13:16 +0000)]
standalone: strip out password stuff (it's in the standaloneusers authx class)
Rich Lott / Artful Robot [Fri, 10 Feb 2023 13:04:19 +0000 (13:04 +0000)]
standalone: WIP work with srcPath not our custom path to support cv
Rich Lott / Artful Robot [Fri, 10 Feb 2023 12:17:13 +0000 (12:17 +0000)]
standalone: WIP more
Rich Lott / Artful Robot [Fri, 10 Feb 2023 11:55:31 +0000 (11:55 +0000)]
standalone: WIP debugging print
Rich Lott / Artful Robot [Fri, 10 Feb 2023 11:23:06 +0000 (11:23 +0000)]
standalone: correct install paths
Rich Lott / Artful Robot [Fri, 10 Feb 2023 11:22:25 +0000 (11:22 +0000)]
standalone: improve docblock
Rich Lott / Artful Robot [Fri, 3 Feb 2023 14:22:11 +0000 (14:22 +0000)]
standalone: remove standaloneusers as core extn for now
Rich Lott / Artful Robot [Fri, 3 Feb 2023 14:15:02 +0000 (14:15 +0000)]
standalone: fix mgd file
Rich Lott / Artful Robot [Fri, 3 Feb 2023 14:03:21 +0000 (14:03 +0000)]
Merge remote-tracking branch 'origin/artfulrobot-standalone' into artfulrobot-standalone
Rich Lott / Artful Robot [Fri, 3 Feb 2023 14:03:06 +0000 (14:03 +0000)]
standalone: implement password check
Alain Benbassat [Fri, 3 Feb 2023 13:46:46 +0000 (14:46 +0100)]
Merge branch 'artfulrobot-standalone' of github.com:artfulrobot/civicrm-core into artfulrobot-standalone
Rich Lott / Artful Robot [Fri, 3 Feb 2023 13:09:28 +0000 (13:09 +0000)]
standalone: implement createUser
Alain Benbassat [Fri, 3 Feb 2023 13:33:41 +0000 (14:33 +0100)]
adds users search kit
Rich Lott / Artful Robot [Fri, 3 Feb 2023 12:45:33 +0000 (12:45 +0000)]
standalone: tentatively implement some CRM_Utils_System_Standalone methods
Rich Lott / Artful Robot [Fri, 3 Feb 2023 11:47:17 +0000 (11:47 +0000)]
standalone: comment log call in languageNegotiation
Rich Lott / Artful Robot [Fri, 3 Feb 2023 11:06:24 +0000 (11:06 +0000)]
standalone: make user.language an optiongroup
Rich Lott / Artful Robot [Fri, 3 Feb 2023 10:39:00 +0000 (10:39 +0000)]
standalone: add standaloneusers core extension
Rich Lott / Artful Robot [Fri, 3 Feb 2023 10:36:56 +0000 (10:36 +0000)]
remove comment
Rich Lott / Artful Robot [Thu, 2 Feb 2023 17:30:46 +0000 (17:30 +0000)]
standalone: merge other changes
Rich Lott / Artful Robot [Thu, 2 Feb 2023 17:23:42 +0000 (17:23 +0000)]
standalone: strip out lots of Drupal code from standalone system class
Rich Lott / Artful Robot [Thu, 2 Feb 2023 17:11:44 +0000 (17:11 +0000)]
standalone: Fix setting cmsBaseUrl and other paths in installer
Eileen McNaughton [Fri, 23 Jun 2023 04:54:35 +0000 (21:54 -0700)]
Switch to Payment.create & repeattransaction in Authorize.net
Tim Otten [Fri, 23 Jun 2023 05:45:08 +0000 (22:45 -0700)]
(REF) Move `loadTemplate()` from MsgTpl BAO to `TemplateTrait`
colemanw [Fri, 23 Jun 2023 06:17:55 +0000 (02:17 -0400)]
Merge pull request #26617 from seamuslee001/acl_urls
Add in paths and new menu routes to support converting ACL page scree…
Tim Otten [Fri, 23 Jun 2023 05:17:13 +0000 (22:17 -0700)]
MessageTemplate - Use $model to read+write locale+template
Seamus Lee [Fri, 23 Jun 2023 05:30:45 +0000 (22:30 -0700)]
Merge pull request #26616 from eileenmcnaughton/anet
Update Recurring end_date when setting status to completed
Seamus Lee [Fri, 23 Jun 2023 05:13:05 +0000 (15:13 +1000)]
Add in paths and new menu routes to support converting ACL page screen to search kit
Tim Otten [Fri, 23 Jun 2023 04:36:23 +0000 (21:36 -0700)]
(REF) MessageTemplate - Split apart loadTemplate() and alterMailContent()
Tim Otten [Fri, 23 Jun 2023 03:58:03 +0000 (20:58 -0700)]
(REF) Extract TestBanner as listener
To r-run this, I used the following procedure:
* Take an arbitrary `Contribution` from example DB (eg id=100)
* Update in SQL (`SET is_test=1 WHERE id=100`)
* Send mailing with `cv api Contribution.sendconfirmation id=100`
* Check email log
Tim Otten [Fri, 23 Jun 2023 00:17:47 +0000 (17:17 -0700)]
GenericWorkflowMessage - Add template-related properties (TemplateTrait)
Tim Otten [Fri, 23 Jun 2023 00:44:28 +0000 (17:44 -0700)]
(REF) MessageTemplate - Apply defaults sooner
There's no particular sense to this, except that it should help the next refactoring steps.
Tim Otten [Fri, 23 Jun 2023 00:41:10 +0000 (17:41 -0700)]
(NFC) MessageTemplate
Tim Otten [Thu, 22 Jun 2023 23:54:06 +0000 (16:54 -0700)]
MessageTemplate - Mark aliases: language<=>tokenContext.locale
Tim Otten [Thu, 22 Jun 2023 23:36:31 +0000 (16:36 -0700)]
MessageTemplate - Be more forgiving about order of loading explicit message-template content
While rejuggling the order of operations in `renderTemplateRaw()`, this
helped some tests (like `testRenderDefaultTemplate()`) pass.
Tim Otten [Thu, 22 Jun 2023 23:30:04 +0000 (16:30 -0700)]
WorkflowMessage - Add getWorkflowName() and getGroupName()
colemanw [Fri, 23 Jun 2023 05:01:28 +0000 (01:01 -0400)]
Merge pull request #26613 from eileenmcnaughton/query
dev/core#4112 Move utilities for full text search to the legacycustomsearches extension
Eileen McNaughton [Fri, 23 Jun 2023 04:45:10 +0000 (21:45 -0700)]
Update Recurring end_date when setting status to completed
This moves the logic from Authorize.net to the ContributionRecur function that is called
when a contribution is added to a recurring such that when it determines it is completed
it also sets the end_date
colemanw [Fri, 23 Jun 2023 00:42:59 +0000 (17:42 -0700)]
Fix ACLs to use the correct name of the civicrm_group table
For unknown historical reasons, group-based ACLs incorrectly used 'civicrm_saved_search'
as the value for 'object_table' when referencing a group id.
This updates all ACL records, tests, and adds legacy handling for hook subscribers with a noisy deprecation notice.
Yashodha Chaku [Fri, 23 Jun 2023 04:17:22 +0000 (09:47 +0530)]
Merge pull request #26607 from larssandergreen/Help-text-for-contact-imports-dedupe-option
dev/core#4389 Help text update for contact import dedupe option
Eileen McNaughton [Fri, 23 Jun 2023 00:18:08 +0000 (17:18 -0700)]
Move utilities for full text search to the legacycustomsearches extension
Seamus Lee [Fri, 23 Jun 2023 03:33:08 +0000 (20:33 -0700)]
Merge pull request #26612 from colemanw/aclBasic
Remove obsolete 'Basic ACLs'
colemanw [Fri, 23 Jun 2023 01:43:37 +0000 (21:43 -0400)]
Merge pull request #26614 from eileenmcnaughton/saved_searchsql
dev/core#4112 Move legacycustomsearch-only function to the extension-class `ContactIDSql`
Eileen McNaughton [Fri, 23 Jun 2023 00:46:17 +0000 (17:46 -0700)]
Remove function loop on contactIDsSQ
The only functions that call contactIDsSQl are 2 custom searches from my searching. One is disabled
I tested the Date Add search with calling the secondary function directly & it worked so the
contactIDsSql can go...
Tim Otten [Thu, 22 Jun 2023 22:00:58 +0000 (15:00 -0700)]
(NFC) Add test-group for "message templates" (msgtpl)
Seamus Lee [Fri, 23 Jun 2023 00:20:24 +0000 (10:20 +1000)]
Merge pull request #26600 from eileenmcnaughton/anet
[AuthorizeNetIPN] Use API for failure updates