From 737fd6e14eec1b796afad85632c0fea935632f2f Mon Sep 17 00:00:00 2001 From: colemanw Date: Thu, 31 Aug 2023 16:06:11 -0400 Subject: [PATCH] Delete probably-unused TrackingFields.tpl Was added for this issue: https://issues.civicrm.org/jira/browse/CRM-4493 With this rationale: http://civicrm.org/node/562 In this svn commit: https://github.com/civicrm/civicrm-svn/commit/4ea717 The proposal was to add a "CiviTracker" module that would take advantage of this template. However, 14 years later the "CiviTracker" extension was never developed, and if it were made today it would not need this template. --- .../Cart/Form/Checkout/ConferenceEvents.tpl | 2 -- .../Form/Checkout/ParticipantsAndPrices.tpl | 2 -- .../CRM/Event/Cart/Form/Checkout/Payment.tpl | 2 -- .../CRM/Event/Cart/Form/Checkout/ThankYou.tpl | 2 -- .../Contribute/Form/Contribution/Confirm.tpl | 2 -- .../CRM/Contribute/Form/Contribution/Main.tpl | 1 - .../Contribute/Form/Contribution/ThankYou.tpl | 2 -- .../Registration/AdditionalParticipant.tpl | 2 -- .../CRM/Event/Form/Registration/Confirm.tpl | 2 -- .../CRM/Event/Form/Registration/Register.tpl | 2 -- .../CRM/Event/Form/Registration/ThankYou.tpl | 2 -- templates/CRM/common/TrackingFields.tpl | 23 ------------------- .../contribution_online_receipt_html.tpl | 6 ----- .../contribution_online_receipt_html.tpl | 4 ---- .../contribution_online_receipt_text.tpl | 4 ---- .../event_offline_receipt_html.tpl | 4 ---- .../event_offline_receipt_text.tpl | 8 ++----- .../event_online_receipt_html.tpl | 6 +---- .../event_online_receipt_text.tpl | 4 ---- .../membership_online_receipt_html.tpl | 2 -- .../membership_online_receipt_text.tpl | 4 ---- 21 files changed, 3 insertions(+), 83 deletions(-) delete mode 100644 templates/CRM/common/TrackingFields.tpl diff --git a/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl b/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl index 6069f6a1b2..9e952522c6 100644 --- a/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl +++ b/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/ConferenceEvents.tpl @@ -1,5 +1,3 @@ -{include file="CRM/common/TrackingFields.tpl"} -

{ts 1=$mer_participant->display_name 2=$mer_participant->email}Choose Events For %1 (%2){/ts}

{foreach from=$slot_fields key=slot_name item=field_name} diff --git a/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.tpl b/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.tpl index 5b465d625a..0d7dd4d033 100644 --- a/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.tpl +++ b/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/ParticipantsAndPrices.tpl @@ -1,5 +1,3 @@ -{include file="CRM/common/TrackingFields.tpl"} -
{if $contact} diff --git a/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl b/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl index 60d841abc3..3c7dd1d3e6 100644 --- a/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl +++ b/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl @@ -1,5 +1,3 @@ -{include file="CRM/common/TrackingFields.tpl"} - diff --git a/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/ThankYou.tpl b/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/ThankYou.tpl index f149c2247b..d8c21fe709 100644 --- a/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/ThankYou.tpl +++ b/ext/eventcart/templates/CRM/Event/Cart/Form/Checkout/ThankYou.tpl @@ -1,5 +1,3 @@ -{include file="CRM/common/TrackingFields.tpl"} -

{ts}This is your receipt of payment made for the following event registration.{/ts} diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl index 3bd4ebf4fd..7675fb3e67 100644 --- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl @@ -11,8 +11,6 @@ {include file="CRM/Contribute/Form/Contribution/PreviewHeader.tpl"} {/if} -{include file="CRM/common/TrackingFields.tpl"} -

{ts}Please verify the information below carefully. Click Go Back if you need to make changes.{/ts} diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl index c847f4ea8e..b7f75bb871 100644 --- a/templates/CRM/Contribute/Form/Contribution/Main.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl @@ -55,7 +55,6 @@ {crmButton target="_blank" p="civicrm/admin/contribute/settings" q="reset=1&action=update&id=`$contributionPageID`" fb=1 title="$buttonTitle" icon="fa-wrench"}{ts}Configure{/ts}{/crmButton}

{/if} - {include file="CRM/common/TrackingFields.tpl"}
diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl index 8502f4f293..d6a296764b 100644 --- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl +++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl @@ -11,8 +11,6 @@ {include file="CRM/Contribute/Form/Contribution/PreviewHeader.tpl"} {/if} -{include file="CRM/common/TrackingFields.tpl"} -
{if $thankyou_text}
diff --git a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl index 1c00dbfcc6..3a6523f621 100644 --- a/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl +++ b/templates/CRM/Event/Form/Registration/AdditionalParticipant.tpl @@ -14,8 +14,6 @@ {include file="CRM/Event/Form/Registration/PreviewHeader.tpl"} {/if} -{include file="CRM/common/TrackingFields.tpl"} - {*CRM-4320*} {if $statusMessage}
diff --git a/templates/CRM/Event/Form/Registration/Confirm.tpl b/templates/CRM/Event/Form/Registration/Confirm.tpl index 07987cb835..1f10fcc25d 100644 --- a/templates/CRM/Event/Form/Registration/Confirm.tpl +++ b/templates/CRM/Event/Form/Registration/Confirm.tpl @@ -11,8 +11,6 @@ {include file="CRM/Event/Form/Registration/PreviewHeader.tpl"} {/if} -{include file="CRM/common/TrackingFields.tpl"} -

{if $isOnWaitlist} diff --git a/templates/CRM/Event/Form/Registration/Register.tpl b/templates/CRM/Event/Form/Registration/Register.tpl index 660bdd0f66..769b35276d 100644 --- a/templates/CRM/Event/Form/Registration/Register.tpl +++ b/templates/CRM/Event/Form/Registration/Register.tpl @@ -17,8 +17,6 @@ {include file="CRM/Event/Form/Registration/PreviewHeader.tpl"} {/if} - {include file="CRM/common/TrackingFields.tpl"} -

{* moved to tpl since need to show only for primary participant page *} diff --git a/templates/CRM/Event/Form/Registration/ThankYou.tpl b/templates/CRM/Event/Form/Registration/ThankYou.tpl index f1c854b0f7..139f2f05e5 100644 --- a/templates/CRM/Event/Form/Registration/ThankYou.tpl +++ b/templates/CRM/Event/Form/Registration/ThankYou.tpl @@ -11,8 +11,6 @@ {include file="CRM/Event/Form/Registration/PreviewHeader.tpl"} {/if} -{include file="CRM/common/TrackingFields.tpl"} -
{* Don't use "normal" thank-you message for Waitlist and Approval Required registrations - since it will probably not make sense for those situations. dgg *} {if $event.thankyou_text AND (not $isOnWaitlist AND not $isRequireApproval)} diff --git a/templates/CRM/common/TrackingFields.tpl b/templates/CRM/common/TrackingFields.tpl deleted file mode 100644 index fa20918aac..0000000000 --- a/templates/CRM/common/TrackingFields.tpl +++ /dev/null @@ -1,23 +0,0 @@ -{* - +--------------------------------------------------------------------+ - | Copyright CiviCRM LLC. All rights reserved. | - | | - | This work is published under the GNU AGPLv3 license with some | - | permitted exceptions and without any warranty. For full license | - | and copyright information, see https://civicrm.org/licensing | - +--------------------------------------------------------------------+ -*} -{if $trackingFields and ! empty($trackingFields)} -{literal} - -{/literal} -{/if} diff --git a/tests/templates/message_templates/contribution_online_receipt_html.tpl b/tests/templates/message_templates/contribution_online_receipt_html.tpl index 019fd67e01..79ab58d53d 100644 --- a/tests/templates/message_templates/contribution_online_receipt_html.tpl +++ b/tests/templates/message_templates/contribution_online_receipt_html.tpl @@ -172,12 +172,6 @@ customPost: customValue:::$customValue {/foreach} {/if} - {if !empty($trackingFields)} - {foreach from=$trackingFields item=trackingValue key=trackingName} - trackingName:::$trackingName - trackingValue:::$trackingValue - {/foreach} - {/if} diff --git a/xml/templates/message_templates/contribution_online_receipt_html.tpl b/xml/templates/message_templates/contribution_online_receipt_html.tpl index 127b8082a7..33c4b8d9e7 100644 --- a/xml/templates/message_templates/contribution_online_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_online_receipt_html.tpl @@ -407,7 +407,6 @@
{foreach from=$customPre item=customValue key=customName} - {if (!empty($trackingFields) and ! in_array($customName, $trackingFields)) or empty($trackingFields)} - {/if} {/foreach} {/if} @@ -427,7 +425,6 @@ {foreach from=$customPost item=customValue key=customName} - {if (!empty($trackingFields) and ! in_array($customName, $trackingFields)) or empty($trackingFields)} - {/if} {/foreach} {/if} diff --git a/xml/templates/message_templates/contribution_online_receipt_text.tpl b/xml/templates/message_templates/contribution_online_receipt_text.tpl index fc41c039d6..59aad06780 100644 --- a/xml/templates/message_templates/contribution_online_receipt_text.tpl +++ b/xml/templates/message_templates/contribution_online_receipt_text.tpl @@ -187,9 +187,7 @@ =========================================================== {foreach from=$customPre item=customValue key=customName} -{if ( !empty($trackingFields) and ! in_array( $customName, $trackingFields ) ) or empty($trackingFields)} {$customName}: {$customValue} -{/if} {/foreach} {/if} @@ -200,8 +198,6 @@ =========================================================== {foreach from=$customPost item=customValue key=customName} -{if ( !empty($trackingFields) and ! in_array( $customName, $trackingFields ) ) or empty($trackingFields)} {$customName}: {$customValue} -{/if} {/foreach} {/if} diff --git a/xml/templates/message_templates/event_offline_receipt_html.tpl b/xml/templates/message_templates/event_offline_receipt_html.tpl index 08d91e8946..90d7655a56 100644 --- a/xml/templates/message_templates/event_offline_receipt_html.tpl +++ b/xml/templates/message_templates/event_offline_receipt_html.tpl @@ -435,7 +435,6 @@ {foreach from=$customPre item=value key=customName} - {if ( !empty($trackingFields) and ! in_array( $customName, $trackingFields ) ) or empty($trackingFields)} - {/if} {/foreach} {/if} @@ -455,7 +453,6 @@ {foreach from=$customPost item=value key=customName} - {if ( !empty($trackingFields) and ! in_array( $customName, $trackingFields ) ) or empty($trackingFields)} - {/if} {/foreach} {/if} diff --git a/xml/templates/message_templates/event_offline_receipt_text.tpl b/xml/templates/message_templates/event_offline_receipt_text.tpl index 440432dde7..a92de26188 100644 --- a/xml/templates/message_templates/event_offline_receipt_text.tpl +++ b/xml/templates/message_templates/event_offline_receipt_text.tpl @@ -226,9 +226,7 @@ ==========================================================={if !empty($pricesetFieldsCount) }===================={/if} {foreach from=$customPre item=value key=customName} -{if ( !empty($trackingFields) and ! in_array( $customName, $trackingFields ) ) or empty($trackingFields)} -{$customName}: {$value} -{/if} + {$customName}: {$value} {/foreach} {/if} @@ -239,9 +237,7 @@ ==========================================================={if !empty($pricesetFieldsCount) }===================={/if} {foreach from=$customPost item=value key=customName} -{if ( !empty($trackingFields) and ! in_array( $customName, $trackingFields ) ) or empty($trackingFields)} -{$customName}: {$value} -{/if} + {$customName}: {$value} {/foreach} {/if} {if !empty($customProfile)} diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl index 5ddb938e77..4dd5ec640a 100644 --- a/xml/templates/message_templates/event_online_receipt_html.tpl +++ b/xml/templates/message_templates/event_online_receipt_html.tpl @@ -422,12 +422,10 @@ {foreach from=$customPre item=customPr key=i} {foreach from=$customPr item=customValue key=customName} - {if ( !empty($trackingFields) and ! in_array( $customName, $trackingFields ) ) or empty($trackingFields)} - {/if} {/foreach} {/foreach} {/if} @@ -436,13 +434,11 @@ {foreach from=$customPost item=customPos key=j} {foreach from=$customPos item=customValue key=customName} - {if (!empty($trackingFields) and ! in_array( $customName, $trackingFields ) ) or empty($trackingFields)} -{/if} -{/foreach} + {/foreach} {/foreach} {/if} diff --git a/xml/templates/message_templates/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl index cc2d528b8a..11479589ea 100644 --- a/xml/templates/message_templates/event_online_receipt_text.tpl +++ b/xml/templates/message_templates/event_online_receipt_text.tpl @@ -229,9 +229,7 @@ You were registered by: {$payer.name} ==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {foreach from=$customPr item=customValue key=customName} -{if ( !empty($trackingFields) and ! in_array( $customName, $trackingFields ) ) or empty($trackingFields)} {$customName}: {$customValue} -{/if} {/foreach} {/foreach} {/if} @@ -244,9 +242,7 @@ You were registered by: {$payer.name} ==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {foreach from=$customPos item=customValue key=customName} -{if ( !empty($trackingFields) and ! in_array( $customName, $trackingFields ) ) or empty($trackingFields)} {$customName}: {$customValue} -{/if} {/foreach} {/foreach} {/if} diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl index e995bbc2b0..61dc61912d 100644 --- a/xml/templates/message_templates/membership_online_receipt_html.tpl +++ b/xml/templates/message_templates/membership_online_receipt_html.tpl @@ -512,7 +512,6 @@ {foreach from=$customPre item=customValue key=customName} - {if (!empty($trackingFields) and ! in_array($customName, $trackingFields)) or empty($trackingFields)} - {/if} {/foreach} {/if} diff --git a/xml/templates/message_templates/membership_online_receipt_text.tpl b/xml/templates/message_templates/membership_online_receipt_text.tpl index 1d4b977232..50c8c03663 100644 --- a/xml/templates/message_templates/membership_online_receipt_text.tpl +++ b/xml/templates/message_templates/membership_online_receipt_text.tpl @@ -221,9 +221,7 @@ =========================================================== {foreach from=$customPre item=customValue key=customName} -{if ( !empty($trackingFields) and ! in_array( $customName, $trackingFields ) ) or empty($trackingFields)} {$customName}: {$customValue} -{/if} {/foreach} {/if} @@ -234,8 +232,6 @@ =========================================================== {foreach from=$customPost item=customValue key=customName} -{if ( !empty($trackingFields) and ! in_array( $customName, $trackingFields ) ) or empty($trackingFields)} {$customName}: {$customValue} -{/if} {/foreach} {/if} -- 2.25.1
{$customName} @@ -416,7 +415,6 @@ {$customValue}
{$customName} @@ -436,7 +433,6 @@ {$customValue}
{$customName} @@ -444,7 +443,6 @@ {$value}
{$customName} @@ -464,7 +461,6 @@ {$value}
{$customPre_grouptitle.$i}
{$customName} {$customValue}
{$customPost_grouptitle.$j}
{$customName} {$customValue}
{$customName} @@ -521,7 +520,6 @@ {$customValue}