From 5a82bb68cb20ff32898e085fba67c557eaf6747a Mon Sep 17 00:00:00 2001 From: iprosoft Date: Tue, 21 Jun 2022 10:41:11 +0200 Subject: [PATCH] New domain token base_url Change url retrival method for base_url token Change base url token title. Fix test error PHPUnit TokenConsCRM_Utils_TokenConsistencyTest update --- CRM/Core/DomainTokens.php | 2 ++ api/v3/examples/Mailing/GetTokens.ex.php | 1 + tests/phpunit/CRM/Utils/TokenConsistencyTest.php | 1 + 3 files changed, 4 insertions(+) diff --git a/CRM/Core/DomainTokens.php b/CRM/Core/DomainTokens.php index 65b36e7d05..d28f1862c7 100644 --- a/CRM/Core/DomainTokens.php +++ b/CRM/Core/DomainTokens.php @@ -56,6 +56,7 @@ class CRM_Core_DomainTokens extends AbstractTokenSubscriber { 'id' => ts('Domain ID'), 'description' => ts('Domain Description'), 'now' => ts('Current time/date'), + 'base_url' => ts('Domain absolute base url'), 'tax_term' => ts('Sales tax term (e.g VAT)'), ]; } @@ -125,6 +126,7 @@ class CRM_Core_DomainTokens extends AbstractTokenSubscriber { $email = reset($loc['email']); $tokens['phone'] = $phone['phone'] ?? ''; $tokens['email'] = $email['email'] ?? ''; + $tokens['base_url'] = Civi::paths()->getVariable('cms.root', 'url'); $tokens['tax_term'] = (string) Civi::settings()->get('tax_term'); Civi::cache('metadata')->set($cacheKey, $tokens); } diff --git a/api/v3/examples/Mailing/GetTokens.ex.php b/api/v3/examples/Mailing/GetTokens.ex.php index d5f75dea9e..e14c23409b 100644 --- a/api/v3/examples/Mailing/GetTokens.ex.php +++ b/api/v3/examples/Mailing/GetTokens.ex.php @@ -73,6 +73,7 @@ function mailing_gettokens_expectedresult() { '{domain.id}' => 'Domain ID', '{domain.description}' => 'Domain Description', '{domain.now}' => 'Current time/date', + '{domain.base_url}' => 'Domain absolute base url', '{domain.tax_term}' => 'Sales tax term (e.g VAT)', '{contact.checksum}' => 'Checksum', '{contact.current_employer}' => 'Current Employer', diff --git a/tests/phpunit/CRM/Utils/TokenConsistencyTest.php b/tests/phpunit/CRM/Utils/TokenConsistencyTest.php index 4ce4a08752..52a5b3dc32 100644 --- a/tests/phpunit/CRM/Utils/TokenConsistencyTest.php +++ b/tests/phpunit/CRM/Utils/TokenConsistencyTest.php @@ -798,6 +798,7 @@ United States', $tokenProcessor->getRow(0)->render('message')); '{domain.id}' => ts('Domain ID'), '{domain.description}' => ts('Domain Description'), '{domain.now}' => 'Current time/date', + '{domain.base_url}' => 'Domain absolute base url', '{domain.tax_term}' => 'Sales tax term (e.g VAT)', '{domain.street_address}' => 'Domain (Organization) Street Address', '{domain.supplemental_address_1}' => 'Domain (Organization) Supplemental Address', -- 2.25.1