Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update template deprecation text, add one more string #29250

Merged
merged 1 commit into from
Feb 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CRM/Event/Form/Registration/Confirm.php
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,9 @@ public function buildQuickForm() {
[$taxAmount, $participantDetails, $individual, $amountArray] = $this->calculateAmounts();
$this->assign('totalTaxAmount', $taxAmount);
$this->_amount = $amountArray;

$this->assign('taxTerm', \Civi::settings()->get('tax_term'));
if (\Civi::settings()->get('invoicing')) {
$this->assign('taxTerm', \Civi::settings()->get('tax_term'));
// @todo - remove this - used to be for online event template but no longer used.
$this->assign('individual', $individual);
$this->set('individual', $individual);
}
Expand Down
17 changes: 9 additions & 8 deletions CRM/Utils/Token.php
Original file line number Diff line number Diff line change
Expand Up @@ -1748,34 +1748,34 @@ public static function getTokenDeprecations(): array {
'WorkFlowMessageTemplates' => [
'contribution_invoice_receipt' => [
'$display_name' => 'contact.display_name',
'$dataArray' => ts('found within $taxBreakDown'),
'$dataArray' => ts('see default template for how to show this'),
],
'contribution_online_receipt' => [
'$contributeMode' => ts('no longer available / relevant'),
'$first_name' => 'contact.first_name',
'$last_name' => 'contact.last_name',
'$displayName' => 'contact.display_name',
'$dataArray' => ts('found within $taxBreakDown'),
'$dataArray' => ts('see default template for how to show this'),
],
'membership_offline_receipt' => [
// receipt_text_renewal appears to be long gone.
'receipt_text_renewal' => 'receipt_text',
'$isAmountZero' => ts('no longer available / relevant'),
'$dataArray' => ts('found within $taxBreakDown'),
'$dataArray' => ts('see default template for how to show this'),
],
'membership_online_receipt' => [
'$dataArray' => ts('found within $taxBreakDown'),
'$dataArray' => ts('see default template for how to show this'),
'$mem_start_date' => 'membership.start_date',
'$mem_end_date' => 'membership.end_date',
'$mem_join_date' => 'membership.join_date',
],
'event_offline_receipt' => [
'$contributeMode' => ts('no longer available / relevant'),
'$isAmountZero' => ts('no longer available / relevant'),
'$dataArray' => ts('found within $participants'),
'$dataArray' => ts('see default template for how to show this'),
'$paidBy' => 'contribution.payment_instrument_id:label',
'$totalTaxAmount' => 'contribution.tax_amount',
'$amount' => ts('found within $participants'),
'$amount' => ts('see default template for how to show this'),
'$checkNumber' => 'contribution.check_number',
'$module' => ts('no longer available / relevant'),
'$register_date' => 'participant.register_date',
Expand All @@ -1785,7 +1785,7 @@ public static function getTokenDeprecations(): array {
'$location' => 'event.location',
'$isShowLocation' => 'event.is_show_location|boolean',
'$event.participant_role' => 'participant.role_id:label',
'$amount_level' => ts('found within $participants'),
'$amount_level' => ts('see default template for how to show this'),
'balanceAmount' => 'contribution.balance_amount',
'$financialTypeName' => 'contribution.financial_type_id:label',
'$contributionTypeName' => 'contribution.financial_type_id:label',
Expand All @@ -1795,7 +1795,8 @@ public static function getTokenDeprecations(): array {
],
'event_online_receipt' => [
'`$participant.id`' => 'participant.id',
'$dataArray' => ts('found within $taxBreakDown'),
'$dataArray' => ts('see default template for how to show this'),
'$individual' => ts('see default template for how to show this'),
],
'pledge_acknowledgement' => [
'$domain' => ts('no longer available / relevant'),
Expand Down