From 7f7fa13a44da9f82cea342e822ed258c2f09e73d Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 29 Oct 2014 15:07:09 +1300 Subject: [PATCH] remove tabs, trailing spaces --- CRM/Contribute/Form/Contribution/Main.php | 12 +- .../payment_or_refund_notification_html.tpl | 180 ++-- ...sive Design Newsletter - Single Column.tpl | 784 +++++++++--------- .../Incremental/sql/4.5.alpha2.mysql.tpl | 20 +- sql/civicrm_generated.mysql | 2 +- templates/CRM/Activity/Form/Search/Common.tpl | 34 +- templates/CRM/Admin/Form/Job.tpl | 4 +- .../CRM/Admin/Form/Preferences/Display.tpl | 2 +- .../CRM/Admin/Form/ScheduleReminders.tpl | 1 - templates/CRM/Case/Form/Activity.tpl | 4 +- templates/CRM/Case/Form/ActivityTab.tpl | 4 +- .../Form/Edit/Address/street_address.tpl | 18 +- .../CRM/Contribute/Form/Contribution.tpl | 20 +- .../CRM/Contribute/Form/Contribution/Main.tpl | 24 +- .../Form/Contribution/OnBehalfOf.tpl | 8 +- .../Form/ContributionPage/AddProduct.tpl | 5 +- templates/CRM/Contribute/Form/Selector.tpl | 12 +- .../CRM/Contribute/Page/ContributionSoft.tpl | 2 +- .../CRM/Contribute/Page/UserDashboard.tpl | 26 +- .../CRM/Custom/Import/Form/DataSource.tpl | 2 +- .../Event/Form/ManageEvent/Registration.tpl | 4 +- templates/CRM/Event/Page/EventInfo.tpl | 8 +- templates/CRM/Member/Form/Membership.tpl | 8 +- templates/CRM/Price/Form/Calculate.tpl | 2 +- templates/CRM/Report/Form.tpl | 2 +- templates/CRM/Report/Form/Criteria.tpl | 6 +- .../CRM/Report/Form/Grant/Statistics.tpl | 15 +- templates/CRM/SMS/Form/Provider.tpl | 10 +- templates/CRM/UF/Form/Group.tpl | 2 +- templates/CRM/Widget/Page/Inline/Example.tpl | 4 +- templates/CRM/common/contactFooter.tpl | 2 +- .../contribution_invoice_receipt_html.tpl | 590 ++++++------- .../event_offline_receipt_html.tpl | 8 +- .../event_online_receipt_html.tpl | 8 +- .../payment_or_refund_notification_html.tpl | 180 ++-- 35 files changed, 1005 insertions(+), 1008 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php index 9e1be76b73..288867e28b 100644 --- a/CRM/Contribute/Form/Contribution/Main.php +++ b/CRM/Contribute/Form/Contribution/Main.php @@ -798,8 +798,8 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu if ($membershipIsActive) { $is_test = $self->_mode != 'live' ? 1 : 0; $memContactID = $self->_membershipContactID; - - // For anonymous user check using dedupe rule + + // For anonymous user check using dedupe rule // if user has Cancelled Membership if (!$memContactID) { $dedupeParams = CRM_Dedupe_Finder::formatParams($fields, 'Individual'); @@ -811,19 +811,19 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu $currentMemberships = CRM_Member_BAO_Membership::getContactsCancelledMembership($memContactID, $is_test ); - + $errorText = 'Your %1 membership was previously cancelled and can not be renewed online. Please contact the site administrator for assistance.'; foreach ($self->_values['fee'] as $fieldKey => $fieldValue) { if ($fieldValue['html_type'] != 'Text' && CRM_Utils_Array::value('price_' . $fieldKey, $fields)) { if (!is_array($fields['price_' . $fieldKey])) { - if (array_key_exists('membership_type_id', $fieldValue['options'][$fields['price_' . $fieldKey]]) + if (array_key_exists('membership_type_id', $fieldValue['options'][$fields['price_' . $fieldKey]]) && in_array($fieldValue['options'][$fields['price_' . $fieldKey]]['membership_type_id'], $currentMemberships)) { $errors['price_' . $fieldKey] = ts($errorText, array(1 => CRM_Member_PseudoConstant::membershipType($fieldValue['options'][$fields['price_' . $fieldKey]]['membership_type_id']))); } } else { foreach ($fields['price_' . $fieldKey] as $key => $ignore) { - if (array_key_exists('membership_type_id', $fieldValue['options'][$key]) + if (array_key_exists('membership_type_id', $fieldValue['options'][$key]) && in_array($fieldValue['options'][$key]['membership_type_id'], $currentMemberships)) { $errors['price_' . $fieldKey] = ts($errorText, array(1 => CRM_Member_PseudoConstant::membershipType($fieldValue['options'][$key]['membership_type_id']))); } @@ -832,7 +832,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu } } } - + // CRM-12233 if ($membershipIsActive && !$self->_membershipBlock['is_required'] && $self->_values['amount_block_is_active']) { diff --git a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_html.tpl b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_html.tpl index 450cacdb81..56d344d311 100644 --- a/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_html.tpl +++ b/CRM/Upgrade/4.5.alpha1.msg_template/message_templates/payment_or_refund_notification_html.tpl @@ -71,26 +71,26 @@ - {ts}{if $component eq 'event'}Total Fees{/if}{/ts} + {ts}{if $component eq 'event'}Total Fees{/if}{/ts} - {$totalAmount|crmMoney} + {$totalAmount|crmMoney} - {ts}This Payment Amount{/ts} + {ts}This Payment Amount{/ts} - {$paymentAmount|crmMoney} + {$paymentAmount|crmMoney} - {ts}Balance Owed{/ts} + {ts}Balance Owed{/ts} - {$amountOwed|crmMoney} + {$amountOwed|crmMoney} {* This will be zero after final payment. *} @@ -98,7 +98,7 @@ {if $paymentsComplete} - {ts}Thank-you. This completes your payment for {if $component eq 'event'}{$event.event_title}{/if}.{/ts} + {ts}Thank-you. This completes your payment for {if $component eq 'event'}{$event.event_title}{/if}.{/ts} {/if} @@ -106,17 +106,17 @@ {if $receive_date} - {ts}Transaction Date{/ts} + {ts}Transaction Date{/ts} - {$receive_date|crmDate} + {$receive_date|crmDate} {/if} {if $trxn_id} - {ts}Transaction #{/ts} + {ts}Transaction #{/ts} {$trxn_id} @@ -148,117 +148,117 @@ - - {if $contributeMode eq 'direct' and !$isAmountzero} +
+ {if $contributeMode eq 'direct' and !$isAmountzero} - {/if} - {if $contributeMode eq'direct' and !$isAmountzero} + {/if} + {if $contributeMode eq'direct' and !$isAmountzero} - {/if} - {if $component eq 'event'} - - - - - - + {/if} + {if $component eq 'event'} + + + + + + - {if $event.participant_role neq 'Attendee' and $defaultRole} - - - - - {/if} + {if $event.participant_role neq 'Attendee' and $defaultRole} + + + + + {/if} - {if $isShowLocation} - - - - {/if} + {if $isShowLocation} + + + + {/if} - {if $location.phone.1.phone || $location.email.1.email} - - - - {foreach from=$location.phone item=phone} - {if $phone.phone} + {if $location.phone.1.phone || $location.email.1.email} + + + + {foreach from=$location.phone item=phone} + {if $phone.phone} - {/if} - {/foreach} - {foreach from=$location.email item=eventEmail} - {if $eventEmail.email} + {/if} + {/foreach} + {foreach from=$location.email item=eventEmail} + {if $eventEmail.email} - {/if} - {/foreach} - {/if} {*phone block close*} - {/if} -
- {ts}Billing Name and Address{/ts} + {ts}Billing Name and Address{/ts}
- {$billingName}
- {$address|nl2br} + {$billingName}
+ {$address|nl2br}
- {ts}Credit Card Information{/ts} + {ts}Credit Card Information{/ts}
- {$credit_card_type}
- {$credit_card_number}
- {ts}Expires:{/ts} {$credit_card_exp_date|truncate:7:''|crmDate} + {$credit_card_type}
+ {$credit_card_number}
+ {ts}Expires:{/ts} {$credit_card_exp_date|truncate:7:''|crmDate}
- {ts}Event Information and Location{/ts} -
- {$event.event_title}
- {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} -
+ {ts}Event Information and Location{/ts} +
+ {$event.event_title}
+ {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} +
- {ts}Participant Role{/ts} - - {$event.participant_role} -
+ {ts}Participant Role{/ts} + + {$event.participant_role} +
- {if $location.address.1.name} - {$location.address.1.name}
- {/if} - {if $location.address.1.street_address} - {$location.address.1.street_address}
- {/if} - {if $location.address.1.supplemental_address_1} - {$location.address.1.supplemental_address_1}
- {/if} - {if $location.address.1.supplemental_address_2} - {$location.address.1.supplemental_address_2}
- {/if} - {if $location.address.1.city} - {$location.address.1.city} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
- {/if} -
+ {if $location.address.1.name} + {$location.address.1.name}
+ {/if} + {if $location.address.1.street_address} + {$location.address.1.street_address}
+ {/if} + {if $location.address.1.supplemental_address_1} + {$location.address.1.supplemental_address_1}
+ {/if} + {if $location.address.1.supplemental_address_2} + {$location.address.1.supplemental_address_2}
+ {/if} + {if $location.address.1.city} + {$location.address.1.city} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
+ {/if} +
- {ts}Event Contacts:{/ts} -
+ {ts}Event Contacts:{/ts} +
- {if $phone.phone_type} - {$phone.phone_type_display} - {else} - {ts}Phone{/ts} - {/if} + {if $phone.phone_type} + {$phone.phone_type_display} + {else} + {ts}Phone{/ts} + {/if} - {$phone.phone} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} + {$phone.phone} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}
- {ts}Email{/ts} + {ts}Email{/ts} - {$eventEmail.email} + {$eventEmail.email}
+ {/if} + {/foreach} + {/if} {*phone block close*} + {/if} + diff --git a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl b/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl index bddc84c855..86ffc2351d 100644 --- a/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl +++ b/CRM/Upgrade/4.5.beta2.msg_template/message_templates/sample/Sample Responsive Design Newsletter - Single Column.tpl @@ -74,422 +74,422 @@ - - - + + +
- - - - + + + + + + + +
- - - - - - - - + + - - + + +
 
- - - - - - -
Organization or Program Name Here
+
+ + + + - - -
+ + + + + + + + - - - - - - - -
 
+ + + + + + +
Organization or Program Name Here
- - - +
+ + - - -
Month and Year
-
 
-
-
+
 
+
+ + + - - - + +
- - - - + + +
- - - - + + + + + +
- - - + + + - - + + + + + + +
+ + + + - - -
+ + + + - - - - - -
+ + + - - - - - - -
Replace with your own logo -
 
-
-
 
-
-
- - - - - - -
- - - - - - - - - - -
Headline Here
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
 
Your Heading Here
 
-

{contact.email_greeting},

-

Replace with your text and images, and remember to link the facebook and twitter links in the footer to your pages. Have fun!

-
Read More
 
-
-
-
-
-
+
 
+
+
 
+
+
+ + + + + + +
+ + + + + + + + + + +
Headline Here
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
 
Your Heading Here
 
+

{contact.email_greeting},

+

Replace with your text and images, and remember to link the facebook and twitter links in the footer to your pages. Have fun!

+
Read More
 
+
+
+
+
+
- - - - - + + + + +
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
 
Your Heading Here
 
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna

-
Read More
 
-
-
-
-
-
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
 
Your Heading Here
 
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna

+
Read More
 
+
+
+
+
+
- - - - - + + + + +
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - -
-
-
 
-

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna

-
-
-
-
-
-
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + +
+
+
 
+

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna

+
+
+
+
+
+
- - - - - + + + + +
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - -
- - - - - - - - - - - - - - - - - - - -
-
-
 
-

Remember to link the facebook and twitter links below to your pages!

-
Read More
-
-
-
-
-
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + +
+
+
 
+

Remember to link the facebook and twitter links below to your pages!

+
Read More
+
+
+
+
+
- - - + + +
- - - - + + + + + + + +
- - - - - - - - + + - - +
 
- - - - - - - - - - - -
 Unsubscribe | Subscribe | Opt out
 {domain.address}
- +
+ + + + - - -
+ + + + + + + + - - - - - - - -
 
+ + + + + + + + + + + +
 Unsubscribe | Subscribe | Opt out
 {domain.address}
+ - - - - - - - - - -
-
- 		  -
- 		 
-
 
-
-
+ + + + + + + + +
+
+ 		  +
+ 		 
+
 
+
+ + + diff --git a/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl index 4c82fb2782..d315558c61 100644 --- a/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl +++ b/CRM/Upgrade/Incremental/sql/4.5.alpha2.mysql.tpl @@ -1,26 +1,26 @@ UPDATE civicrm_dashboard - SET civicrm_dashboard.url = CONCAT(SUBSTRING(url FROM 1 FOR LOCATE('&', url) - 1), '?', SUBSTRING(url FROM LOCATE('&', url) + 1)) - WHERE civicrm_dashboard.url LIKE "%&%" AND civicrm_dashboard.url NOT LIKE "%?%"; + SET civicrm_dashboard.url = CONCAT(SUBSTRING(url FROM 1 FOR LOCATE('&', url) - 1), '?', SUBSTRING(url FROM LOCATE('&', url) + 1)) + WHERE civicrm_dashboard.url LIKE "%&%" AND civicrm_dashboard.url NOT LIKE "%?%"; UPDATE civicrm_dashboard - SET civicrm_dashboard.fullscreen_url = CONCAT(SUBSTRING(fullscreen_url FROM 1 FOR LOCATE('&', fullscreen_url) - 1), '?', SUBSTRING(fullscreen_url FROM LOCATE('&', fullscreen_url) + 1)) - WHERE civicrm_dashboard.fullscreen_url LIKE "%&%" AND civicrm_dashboard.fullscreen_url NOT LIKE "%?%"; + SET civicrm_dashboard.fullscreen_url = CONCAT(SUBSTRING(fullscreen_url FROM 1 FOR LOCATE('&', fullscreen_url) - 1), '?', SUBSTRING(fullscreen_url FROM LOCATE('&', fullscreen_url) + 1)) + WHERE civicrm_dashboard.fullscreen_url LIKE "%&%" AND civicrm_dashboard.fullscreen_url NOT LIKE "%?%"; -- CRM-14843 Added States for Chile and Modify Santiago Metropolitan for consistency INSERT IGNORE INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES - (NULL, 1044, "LR", "Los Rios"), - (NULL, 1044, "AP", "Arica y Parinacota"), - (NULL, 1169, "AMA", "Amazonas"); + (NULL, 1044, "LR", "Los Rios"), + (NULL, 1044, "AP", "Arica y Parinacota"), + (NULL, 1169, "AMA", "Amazonas"); UPDATE civicrm_state_province - SET name = "Santiago Metropolitan", abbreviation = "SM" - WHERE name = "Region Metropolitana de Santiago" AND abbreviation = "RM"; + SET name = "Santiago Metropolitan", abbreviation = "SM" + WHERE name = "Region Metropolitana de Santiago" AND abbreviation = "RM"; -- CRM-14879 contact fields for scheduled reminders INSERT INTO civicrm_action_mapping (entity, entity_value, entity_value_label, entity_status, entity_status_label, entity_date_start, entity_date_end, entity_recipient) VALUES - ( 'civicrm_contact', 'civicrm_contact', 'Date Field', 'contact_date_reminder_options', 'Annual Options', 'date_field', NULL, NULL); + ( 'civicrm_contact', 'civicrm_contact', 'Date Field', 'contact_date_reminder_options', 'Annual Options', 'date_field', NULL, NULL); INSERT INTO `civicrm_option_group` (`name`, {localize field='title'}`title`{/localize}, `is_reserved`, `is_active`, `is_locked`) VALUES diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index 3c9338c4a6..1474007a81 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -2,7 +2,7 @@ -- -- Host: localhost Database: civicrm_45 -- ------------------------------------------------------ --- Server version 5.5.34-log +-- Server version 5.5.34-log /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; diff --git a/templates/CRM/Activity/Form/Search/Common.tpl b/templates/CRM/Activity/Form/Search/Common.tpl index a2e32dcc68..41ccce815c 100644 --- a/templates/CRM/Activity/Form/Search/Common.tpl +++ b/templates/CRM/Activity/Form/Search/Common.tpl @@ -65,16 +65,16 @@
{if $form.parent_id} - -
- {$form.parent_id.html} + +
+ {$form.parent_id.html} {/if}
- {if $form.followup_parent_id} - -
- {$form.followup_parent_id.html} + {if $form.followup_parent_id} + +
+ {$form.followup_parent_id.html} {/if}
@@ -118,17 +118,17 @@ {if $buildSurveyResult } - - -
- {$form.activity_result.html} - - {include file="CRM/common/Tagset.tpl" tagsetType='activity'} - + + +
+ {$form.activity_result.html} + + {include file="CRM/common/Tagset.tpl" tagsetType='activity'} + {else} - - {include file="CRM/common/Tagset.tpl" tagsetType='activity'} - + + {include file="CRM/common/Tagset.tpl" tagsetType='activity'} + {/if} {* campaign in activity search *} diff --git a/templates/CRM/Admin/Form/Job.tpl b/templates/CRM/Admin/Form/Job.tpl index 6faa276abd..0dbb1b12c3 100644 --- a/templates/CRM/Admin/Form/Job.tpl +++ b/templates/CRM/Admin/Form/Job.tpl @@ -99,11 +99,11 @@ CRM.$(function($) { {/literal} - + {$form.parameters.label}
{docURL page="Managing Scheduled Jobs" resource="wiki"} - {$form.parameters.html} + {$form.parameters.html} {$form.is_active.html} {$form.is_active.label} diff --git a/templates/CRM/Admin/Form/Preferences/Display.tpl b/templates/CRM/Admin/Form/Preferences/Display.tpl index b3c4d51f8e..e0212781bc 100644 --- a/templates/CRM/Admin/Form/Preferences/Display.tpl +++ b/templates/CRM/Admin/Form/Preferences/Display.tpl @@ -257,7 +257,7 @@ $('#user_dashboard_options_' + invoicesKey).attr("disabled", true); } $("#invoice_help").insertAfter("label[for='user_dashboard_options_" + invoicesKey + "']"); - + $("#contactEditBlocks, #contactEditOptions").sortable({ placeholder: 'ui-state-highlight', update: getSorting diff --git a/templates/CRM/Admin/Form/ScheduleReminders.tpl b/templates/CRM/Admin/Form/ScheduleReminders.tpl index e406e35c08..9ab8fbf2ab 100644 --- a/templates/CRM/Admin/Form/ScheduleReminders.tpl +++ b/templates/CRM/Admin/Form/ScheduleReminders.tpl @@ -177,7 +177,6 @@ $('#relativeDate, #relativeDateRepeat', $form).show(); } }); - if ($('#absolute_date_display', $form).val()) { $('#relativeDate, #relativeDateRepeat, #repeatFields', $form).hide(); } diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl index fb222caf2b..8c766b0a4d 100644 --- a/templates/CRM/Case/Form/Activity.tpl +++ b/templates/CRM/Case/Form/Activity.tpl @@ -82,7 +82,7 @@ {ts}Client{/ts} - + {foreach from=$client_names item=client name=clients key=id} {foreach from=$client_names.$id item=client1} @@ -245,7 +245,7 @@ {$form.followup_activity_subject.label} {$form.followup_activity_subject.html|crmAddClass:huge} - + {$form.followup_assignee_contact_id.label} {edit} diff --git a/templates/CRM/Case/Form/ActivityTab.tpl b/templates/CRM/Case/Form/ActivityTab.tpl index 8429111cb9..334bf842b7 100644 --- a/templates/CRM/Case/Form/ActivityTab.tpl +++ b/templates/CRM/Case/Form/ActivityTab.tpl @@ -49,12 +49,12 @@ - {assign var=activitylow value=activity_date_low_$caseID} + {assign var=activitylow value=activity_date_low_$caseID} {$form.$activitylow.label}
{include file="CRM/common/jcalendar.tpl" elementName=$activitylow} - {assign var=activityhigh value=activity_date_high_$caseID} + {assign var=activityhigh value=activity_date_high_$caseID} {$form.$activityhigh.label}
{include file="CRM/common/jcalendar.tpl" elementName=$activityhigh} diff --git a/templates/CRM/Contact/Form/Edit/Address/street_address.tpl b/templates/CRM/Contact/Form/Edit/Address/street_address.tpl index 9b51e38791..3d133cb6de 100644 --- a/templates/CRM/Contact/Form/Edit/Address/street_address.tpl +++ b/templates/CRM/Contact/Form/Edit/Address/street_address.tpl @@ -25,18 +25,18 @@ *} {if !empty($form.address.$blockId.street_address)} - - {$form.address.$blockId.street_address.label} {help id="id-street-address" file="CRM/Contact/Form/Contact.hlp"}
- {$form.address.$blockId.street_address.html} - {if $parseStreetAddress eq 1 && ($action eq 1 || $action eq 2)} + + {$form.address.$blockId.street_address.label} {help id="id-street-address" file="CRM/Contact/Form/Contact.hlp"}
+ {$form.address.$blockId.street_address.html} + {if $parseStreetAddress eq 1 && ($action eq 1 || $action eq 2)}   {ts}Edit Address Elements{/ts} {help id="id-edit-street-elements" file="CRM/Contact/Form/Contact.hlp"} {/if} - - + + {if $parseStreetAddress eq 1 && ($action eq 1 || $action eq 2)} - + {$form.address.$blockId.street_number.label}
{$form.address.$blockId.street_number.html} @@ -48,13 +48,13 @@ - {$form.address.$blockId.street_unit.label}
+ {$form.address.$blockId.street_unit.label}
{$form.address.$blockId.street_unit.html} {ts}Edit Complete Street Address{/ts} {help id="id-edit-complete-street" file="CRM/Contact/Form/Contact.hlp"} - {/if} + {/if} {if $parseStreetAddress eq 1} {literal} diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl index 65f818c0fd..490256c860 100644 --- a/templates/CRM/Contribute/Form/Contribution.tpl +++ b/templates/CRM/Contribute/Form/Contribution.tpl @@ -632,23 +632,23 @@ CRM.$(function($) { for(m = re.exec(currencySymbol); m; m = re.exec(currencySymbol)){ currencySymbol = m[1]; } - var taxRate = taxRates[financialType]; + var taxRate = taxRates[financialType]; if (!taxRate) { taxRate = 0; - } + } var totalAmount = $('#total_amount').val(); var thousandMarker = '{/literal}{$config->monetaryThousandSeparator}{literal}'; var seperator = '{/literal}{$config->monetaryDecimalPoint}{literal}'; // replace all thousandMarker and change the seperator to a dot - totalAmount = totalAmount.replace(thousandMarker,'').replace(seperator,'.'); + totalAmount = totalAmount.replace(thousandMarker,'').replace(seperator,'.'); - var totalTaxAmount = '{/literal}{$totalTaxAmount}{literal}'; - var taxAmount = (taxRate/100)*totalAmount; - taxAmount = isNaN (taxAmount) ? 0:taxAmount; - var totalTaxAmount = taxAmount + Number(totalAmount); - totalTaxAmount = formatMoney( totalTaxAmount, 2, seperator, thousandMarker ); + var totalTaxAmount = '{/literal}{$totalTaxAmount}{literal}'; + var taxAmount = (taxRate/100)*totalAmount; + taxAmount = isNaN (taxAmount) ? 0:taxAmount; + var totalTaxAmount = taxAmount + Number(totalAmount); + totalTaxAmount = formatMoney( totalTaxAmount, 2, seperator, thousandMarker ); - $("#totalTaxAmount" ).html('Amount with tax : ' + currencySymbol + ' '+ totalTaxAmount); + $("#totalTaxAmount" ).html('Amount with tax : ' + currencySymbol + ' '+ totalTaxAmount); } event.handled = true; } @@ -661,7 +661,7 @@ CRM.$(function($) { CRM.$(function($) { $('#price_set_id').click(function() { - if( $('#price_set_id').val() ) { + if( $('#price_set_id').val() ) { $('#totalAmountBlock').hide(); } else { diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl index 0c2d706647..ce37323ef4 100644 --- a/templates/CRM/Contribute/Form/Contribution/Main.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl @@ -156,10 +156,10 @@ {/if}
- {ts}Your recurring contribution will be processed automatically.{/ts} - {if $is_recur_installments} - {ts}You can specify the number of installments, or you can leave the number of installments blank if you want to make an open-ended commitment. In either case, you can choose to cancel at any time.{/ts} - {/if} + {ts}Your recurring contribution will be processed automatically.{/ts} + {if $is_recur_installments} + {ts}You can specify the number of installments, or you can leave the number of installments blank if you want to make an open-ended commitment. In either case, you can choose to cancel at any time.{/ts} + {/if} {if $is_email_receipt} {ts}You will receive an email receipt for each recurring contribution.{/ts} {/if} @@ -353,9 +353,9 @@ {/if} {literal} - cj('input[name="soft_credit_type_id"]').on('change', function() { - enableHonorType(); - }); + cj('input[name="soft_credit_type_id"]').on('change', function() { + enableHonorType(); + }); function enableHonorType( ) { var selectedValue = cj('input[name="soft_credit_type_id"]:checked'); @@ -367,9 +367,9 @@ } } - cj('input[id="is_recur"]').on('change', function() { - showRecurHelp(); - }); + cj('input[id="is_recur"]').on('change', function() { + showRecurHelp(); + }); function showRecurHelp( ) { var showHelp = cj('input[id="is_recur"]:checked'); @@ -435,8 +435,8 @@ CRM.$(function($) { toggleConfirmButton(); - enableHonorType(); - showRecurHelp(); + enableHonorType(); + showRecurHelp(); }); function showHidePayPalExpressOption() { diff --git a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl index b28925e8e7..bf3ea6d34f 100644 --- a/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl +++ b/templates/CRM/Contribute/Form/Contribution/OnBehalfOf.tpl @@ -24,7 +24,7 @@ +--------------------------------------------------------------------+ *} {** - * This file provides the HTML for the on-behalf-of form. + * This file provides the HTML for the on-behalf-of form. * Also used for related contact edit form. * FIXME: This is way more complex than it needs to be * FIXME: Why are we not just using the dynamic form tpl to display this profile? @@ -116,10 +116,10 @@ {if $form.onbehalf.$phone_ext_field.html}  {$form.onbehalf.$phone_ext_field.html} {/if} - {/if} - {if $onBehalfOfFields.$fieldName.data_type eq 'Date'} + {/if} + {if $onBehalfOfFields.$fieldName.data_type eq 'Date'} {assign var=elementName value=onbehalf[$fieldName]} - {include file="CRM/common/jcalendar.tpl" elementName=$elementName elementId=onbehalf_$fieldName} + {include file="CRM/common/jcalendar.tpl" elementName=$elementName elementId=onbehalf_$fieldName} {/if} {if $onBehalfOfFields.$fieldName.help_post}
{$onBehalfOfFields.$fieldName.help_post} diff --git a/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl b/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl index 6141e3f66e..bc817788aa 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl +++ b/templates/CRM/Contribute/Form/ContributionPage/AddProduct.tpl @@ -89,12 +89,11 @@ data = eval(data);//get json array if ( data != null ) { $("#financial_type_id").val(data); - } - + } }); - + } getFinancialType(); diff --git a/templates/CRM/Contribute/Form/Selector.tpl b/templates/CRM/Contribute/Form/Selector.tpl index d9532edd09..1e9032282e 100644 --- a/templates/CRM/Contribute/Form/Selector.tpl +++ b/templates/CRM/Contribute/Form/Selector.tpl @@ -40,14 +40,14 @@ {$sort->_response.$key.link} {else} {$header.name} - {/if} + {/if} - {if $header.name eq "Soft Credit For"} - {assign var='softCreditColumns' value=1} - {/if} + {if $header.name eq "Soft Credit For"} + {assign var='softCreditColumns' value=1} + {/if} {/foreach} - + {counter start=0 skip=1 print=false} {foreach from=$rows item=row} @@ -65,7 +65,7 @@ {else} {$row.total_amount|crmMoney:$row.currency} {if $row.amount_level }
({$row.amount_level}){/if} {if $row.contribution_recur_id} -
{ts}(Recurring Contribution){/ts} +
{ts}(Recurring Contribution){/ts} {/if} {/if} diff --git a/templates/CRM/Contribute/Page/ContributionSoft.tpl b/templates/CRM/Contribute/Page/ContributionSoft.tpl index 27f6200316..8be1c517e7 100644 --- a/templates/CRM/Contribute/Page/ContributionSoft.tpl +++ b/templates/CRM/Contribute/Page/ContributionSoft.tpl @@ -38,7 +38,7 @@ - + diff --git a/templates/CRM/Contribute/Page/UserDashboard.tpl b/templates/CRM/Contribute/Page/UserDashboard.tpl index ff2252623e..26d35b61b5 100644 --- a/templates/CRM/Contribute/Page/UserDashboard.tpl +++ b/templates/CRM/Contribute/Page/UserDashboard.tpl @@ -34,9 +34,9 @@ - {if $invoicing && $invoices} + {if $invoicing && $invoices} - {/if} + {/if} {foreach from=$contribute_rows item=row} @@ -53,21 +53,21 @@ {if $invoicing && $invoices} {if $row.contribution_status_name != 'Cancelled'} {else} - - {/if} - {/if} + + {/if} + {/if} {/foreach}
{ts}Contributor{/ts}{ts}Contributor{/ts} {ts}Amount{/ts} {ts}Type{/ts} {ts}Financial Type{/ts}{ts}Received date{/ts} {ts}Receipt Sent{/ts} {ts}Status{/ts}
- {assign var='id' value=$row.contribution_id} - {assign var='contact_id' value=$row.contact_id} - {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id"} - - {if $row.contribution_status != 'Refunded'} + {assign var='id' value=$row.contribution_id} + {assign var='contact_id' value=$row.contact_id} + {assign var='urlParams' value="reset=1&id=$id&cid=$contact_id"} + + {if $row.contribution_status != 'Refunded'} {ts}Print Invoice{/ts} - {else} - {ts}Print Invoice and Credit Note{/ts} - {/if} + {else} + {ts}Print Invoice and Credit Note{/ts} + {/if}
diff --git a/templates/CRM/Custom/Import/Form/DataSource.tpl b/templates/CRM/Custom/Import/Form/DataSource.tpl index 7ebacbe77c..64869fb67e 100644 --- a/templates/CRM/Custom/Import/Form/DataSource.tpl +++ b/templates/CRM/Custom/Import/Form/DataSource.tpl @@ -68,7 +68,7 @@ {$form.contactType.label} - {$form.contactType.html}
+ {$form.contactType.html}
{ts}Select 'Individual' if you are importing custom data for individual persons.{/ts} {ts}Select 'Organization' or 'Household' if you are importing custom data . (NOTE: Some built-in contact types may not be enabled for your site.){/ts} diff --git a/templates/CRM/Event/Form/ManageEvent/Registration.tpl b/templates/CRM/Event/Form/ManageEvent/Registration.tpl index cbc515ae9a..414e76f35f 100644 --- a/templates/CRM/Event/Form/ManageEvent/Registration.tpl +++ b/templates/CRM/Event/Form/ManageEvent/Registration.tpl @@ -148,7 +148,7 @@ {$form.custom_post_id.html}
{ts}Include additional fields on this registration form by selecting and configuring a CiviCRM Profile to be included at the bottom of the page.{/ts}
-    {ts}add another profile (bottom of page){/ts}
@@ -189,7 +189,7 @@ class="crm-hover-button crm-button-add-profile">{$form.additional_custom_post_id.html}
{ts}Change this if you want to use a different profile for additional participants.{/ts} -
+
 {ts}add another profile (bottom of page){/ts} diff --git a/templates/CRM/Event/Page/EventInfo.tpl b/templates/CRM/Event/Page/EventInfo.tpl index f1ae519c2f..777cc7b734 100644 --- a/templates/CRM/Event/Page/EventInfo.tpl +++ b/templates/CRM/Event/Page/EventInfo.tpl @@ -198,13 +198,13 @@ {$feeBlock.label.$idx} {if $isPriceSet & $feeBlock.isDisplayAmount.$idx} - + {if isset($feeBlock.tax_amount.$idx)} - {$feeBlock.value.$idx} + {$feeBlock.value.$idx} {else} - {$feeBlock.value.$idx|crmMoney} + {$feeBlock.value.$idx|crmMoney} {/if} - + {/if} {/if} diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl index d4caacae94..c24cb02f39 100644 --- a/templates/CRM/Member/Form/Membership.tpl +++ b/templates/CRM/Member/Form/Membership.tpl @@ -383,17 +383,17 @@ var feeTotal = allMemberships[memType]['total_amount_numeric'] * term; } else { - var feeTotal = Number((taxRate/100) * (allMemberships[memType]['total_amount_numeric'] * term))+Number(allMemberships[memType]['total_amount_numeric'] * term ); + var feeTotal = Number((taxRate/100) * (allMemberships[memType]['total_amount_numeric'] * term))+Number(allMemberships[memType]['total_amount_numeric'] * term ); } cj("#total_amount").val( feeTotal.toFixed(2) ); } else { - if (taxRate) { + if (taxRate) { var feeTotal = parseFloat(Number((taxRate/100) * allMemberships[memType]['total_amount'])+Number(allMemberships[memType]['total_amount_numeric'])).toFixed(2); - cj("#total_amount").val( feeTotal ); + cj("#total_amount").val( feeTotal ); } else { - cj("#total_amount").val( allMemberships[memType]['total_amount'] ); + cj("#total_amount").val( allMemberships[memType]['total_amount'] ); } } } diff --git a/templates/CRM/Price/Form/Calculate.tpl b/templates/CRM/Price/Form/Calculate.tpl index ac152854a2..3129059abc 100644 --- a/templates/CRM/Price/Form/Calculate.tpl +++ b/templates/CRM/Price/Form/Calculate.tpl @@ -28,7 +28,7 @@
diff --git a/templates/CRM/Report/Form.tpl b/templates/CRM/Report/Form.tpl index c7b63389ef..6460ef5b49 100644 --- a/templates/CRM/Report/Form.tpl +++ b/templates/CRM/Report/Form.tpl @@ -25,7 +25,7 @@ *} {if $outputMode neq 'print'} {include file="CRM/common/crmeditable.tpl"} -{/if} +{/if} {* this div is being used to apply special css *} {if $section eq 1}
diff --git a/templates/CRM/Report/Form/Criteria.tpl b/templates/CRM/Report/Form/Criteria.tpl index 2679bf054c..d7549294ae 100644 --- a/templates/CRM/Report/Form/Criteria.tpl +++ b/templates/CRM/Report/Form/Criteria.tpl @@ -133,10 +133,10 @@ } // hide and display the appropriate blocks as directed by the php code - on_load_init_blocks( showRows, hideBlocks, '' ); - + on_load_init_blocks( showRows, hideBlocks, ''); + cj('input[id^="order_by_section_"]').click(disPageBreak).each(disPageBreak); - + function disPageBreak() { if (!cj(this).prop('checked')) { cj(this).parent('td').next('td').children('input[id^="order_by_pagebreak_"]').prop({checked: false, disabled: true}); diff --git a/templates/CRM/Report/Form/Grant/Statistics.tpl b/templates/CRM/Report/Form/Grant/Statistics.tpl index eb4d353377..64125d1b0b 100644 --- a/templates/CRM/Report/Form/Grant/Statistics.tpl +++ b/templates/CRM/Report/Form/Grant/Statistics.tpl @@ -32,15 +32,14 @@
{include file="CRM/Report/Form/Fields.tpl" componentName='Grant'}
- +
{*include actions*} {include file="CRM/Report/Form/Actions.tpl"} {*include the graph*} {include file="CRM/Report/Form/Layout/Graph.tpl"} - - + {if $printOnly}

{$reportTitle}

{$reportDate}
@@ -63,7 +62,7 @@

{ts}Summary Statistics{/ts}

- + @@ -73,11 +72,11 @@ - + {/foreach}
Count Amount{$val.title} {$val.count} {$val.amount|crmMoney}
{/if} - + {if !empty($grantStatistics)}

{ts}Statistics Breakdown{/ts}

@@ -94,7 +93,7 @@ {if $row.unassigned_count} @@ -104,7 +103,7 @@ {/if} diff --git a/templates/CRM/SMS/Form/Provider.tpl b/templates/CRM/SMS/Form/Provider.tpl index 857130447f..e9e5206583 100644 --- a/templates/CRM/SMS/Form/Provider.tpl +++ b/templates/CRM/SMS/Form/Provider.tpl @@ -28,13 +28,13 @@
{include file="CRM/common/formButtons.tpl" location="top"}
{if $action eq 8} -
-
+
+
{ts}Do you want to continue?{/ts}
{elseif $action eq 128} -
-
+
+
{ts}Are you sure you would like to execute this job?{/ts}
{else} @@ -67,7 +67,7 @@
{foreach from=$row.currency key=fld item=val} {$val.value|crmMoney:$fld} ({$val.percentage}%)   - {/foreach} + {/foreach}
{foreach from=$row.unassigned_currency key=fld item=val} {$val.value|crmMoney:$fld} ({$val.percentage}%)   - {/foreach} + {/foreach}
{$form.is_default.html} {$form.is_default.label}
-{/if} +{/if}
{include file="CRM/common/formButtons.tpl" location="bottom"}
diff --git a/templates/CRM/UF/Form/Group.tpl b/templates/CRM/UF/Form/Group.tpl index 1eff42ddf2..5e89e407e7 100644 --- a/templates/CRM/UF/Form/Group.tpl +++ b/templates/CRM/UF/Form/Group.tpl @@ -52,7 +52,7 @@ {$form.description.label} {help id='id-description' file="CRM/UF/Form/Group.hlp"} - {$form.description.html} + {$form.description.html} {$form.uf_group_type.label} {help id='id-used_for' file="CRM/UF/Form/Group.hlp"} diff --git a/templates/CRM/Widget/Page/Inline/Example.tpl b/templates/CRM/Widget/Page/Inline/Example.tpl index 6d35fa3fb1..c8ab6aeeae 100644 --- a/templates/CRM/Widget/Page/Inline/Example.tpl +++ b/templates/CRM/Widget/Page/Inline/Example.tpl @@ -1,5 +1,5 @@

This is an example of a template you can call inline

-

If you call it from an ajax call, it's ready to be embeded in your page.

You can pass an id as param and access it in {ldelim}$id{rdelim}. +

If you call it from an ajax call, it's ready to be embeded in your page.

You can pass an id as param and access it in {ldelim}$id{rdelim}. {if $id}

Well done, you have an id as param ( {$id} )

{/if} @@ -33,7 +33,7 @@ CRM.$(function($) { alert ("one level of dialog is enough"); return false; }); - + }); {/literal} diff --git a/templates/CRM/common/contactFooter.tpl b/templates/CRM/common/contactFooter.tpl index da4f5ff7e2..c2126af865 100644 --- a/templates/CRM/common/contactFooter.tpl +++ b/templates/CRM/common/contactFooter.tpl @@ -36,6 +36,6 @@ » {ts}View Change Log{/ts} {/if} {/if} - {if !empty($created_date)}
{ts}Created{/ts}: {$created_date|crmDate}
{/if} + {if !empty($created_date)}
{ts}Created{/ts}: {$created_date|crmDate}
{/if}
{/strip} diff --git a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl index 910430fbe8..bb5cf90338 100644 --- a/xml/templates/message_templates/contribution_invoice_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_invoice_receipt_html.tpl @@ -12,12 +12,12 @@
- - + + - + - + {if $organization_name} @@ -26,56 +26,56 @@ {/if} - - + + - - + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + +
TAX INVOICE
TAX INVOICE Invoice Date:Invoice Date: {$domain_organization}
{$display_name} ({$organization_name}) {$invoice_date} - {if $domain_street_address } - {$domain_street_address} - {/if} - {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}
+ {if $domain_street_address } + {$domain_street_address} + {/if} + {if $domain_supplemental_address_1 }{$domain_supplemental_address_1}{/if}
{$street_address} {$supplemental_address_1} Incoice Number:{if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if} - {if $domain_state }{$domain_state}{/if}Incoice Number:{if $domain_supplemental_address_2 }{$domain_supplemental_address_2}{/if} + {if $domain_state }{$domain_state}{/if}
{$supplemental_address_2} {$stateProvinceAbbreviation} {$invoice_id}{if $domain_city} - {$domain_city} - {/if} - {if $domain_postal_code } - {$domain_postal_code} - {/if} -
{$city} {$postal_code}{if $domain_city} + {$domain_city} + {/if} + {if $domain_postal_code } + {$domain_postal_code} + {/if} +
{$city} {$postal_code} Reference: {if $domain_country} - {$domain_country} - {/if}
{$source} {if $domain_phone}{$domain_phone}{/if}
{if $domain_email} - {$domain_email} - {/if}
Reference: {if $domain_country} + {$domain_country} + {/if}
{$source} {if $domain_phone}{$domain_phone}{/if}
{if $domain_email} + {$domain_email} + {/if}
- - +
+ @@ -173,58 +173,58 @@
{* FIXME: style this table so that it looks like the text version (justification, etc.) *} @@ -86,84 +86,84 @@ {foreach from=$lineItem item=value key=priceset name=taxpricevalue} - {if $smarty.foreach.taxpricevalue.index eq 0} - - {else} - - {/if} + {if $smarty.foreach.taxpricevalue.index eq 0} + + {else} + + {/if} - - - {if $value.tax_amount != ''} - + {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}
{$value.description|truncate:30:"..."}
{/if} + + + + {if $value.tax_amount != ''} + {else} - - {/if} - - + + {/if} + + {/foreach} - - - - - - - {foreach from = $dataArray item = value key = priceset} - - - {if $priceset} - - + + + + + + + {foreach from = $dataArray item = value key = priceset} + + + {if $priceset} + + {elseif $priceset == 0} - {/if} - {/foreach} - - - - + {/if} + {/foreach} + + + + - - - - - + + + + + - {if $is_pay_later == 0} - - - - - - - - - - - - + {if $is_pay_later == 0} + + + + + + + + + + + + - - {/if} -


- - - - - - - + + {/if} +


+ + + + + + +
Amount {$defaultCurrency}
- {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}
{$value.description|truncate:30:"..."}
{/if} - 		{$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}% {$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%No {$taxTerm}{$value.subTotal|crmMoney:$currency}
No {$taxTerm}{$value.subTotal|crmMoney:$currency}
Sub Total {$subTotal|crmMoney:$currency}
TOTAL {$taxTerm} {$priceset}%{$value|crmMoney:$currency}
Sub Total {$subTotal|crmMoney:$currency}
TOTAL {$taxTerm} {$priceset}%{$value|crmMoney:$currency} TOTAL NO {$taxTerm} {$value|crmMoney:$currency}
TOTAL {$defaultCurrency}{$amount|crmMoney:$currency}
TOTAL {$defaultCurrency}{$amount|crmMoney:$currency}
- {if $contribution_status_id == $refundedStatusId} - LESS Amount Credited - {else} - LESS Amount Paid - {/if} - {$amount|crmMoney:$currency}
AMOUNT DUE:
+ {if $contribution_status_id == $refundedStatusId} + LESS Amount Credited + {else} + LESS Amount Paid + {/if} + {$amount|crmMoney:$currency}
AMOUNT DUE: {$amountDue|crmMoney:$currency}
DUE DATE: {$dueDate}
DUE DATE: {$dueDate}
- - - - -
PAYMENT ADVICE

To:
- {$domain_organization}
- {$domain_street_address} {$domain_supplemental_address_1}
- {$domain_supplemental_address_2} {$domain_state}
- {$domain_city} {$domain_postal_code}
- {$domain_country}
- {$domain_phone}
- {$domain_email}
-

{$notes} + + +
PAYMENT ADVICE

To:
+ {$domain_organization}
+ {$domain_street_address} {$domain_supplemental_address_1}
+ {$domain_supplemental_address_2} {$domain_state}
+ {$domain_city} {$domain_postal_code}
+ {$domain_country}
+ {$domain_phone}
+ {$domain_email}
+

{$notes} 		- - - - - - - - - - - - - {if $is_pay_later == 1} - +
Customer: {$display_name}
Invoice Number: {$invoice_id}
+ + + + + + + + + + + + {if $is_pay_later == 1} + - - - - {else} - - - - - - {/if} - - - - - - + + + + {else} + + + + + + {/if} + + + + + + -
Customer: {$display_name}
Invoice Number: {$invoice_id}
Amount Due:{$amount|crmMoney:$currency}
Amount Due: {$amountDue|crmMoney:$currency}
Due Date: {$dueDate}
Amount Due:{$amount|crmMoney:$currency}
Amount Due: {$amountDue|crmMoney:$currency}
Due Date: {$dueDate}
+
- - + + + + {if $contribution_status_id == $refundedStatusId} @@ -232,14 +232,14 @@
- + - - + + - - - + + + {if $organization_name} @@ -247,67 +247,67 @@ {/if} - - - + + + - - + + + {$domain_supplemental_address_2} + {/if} + {if $domain_state } + {$domain_state} + {/if} + - - - - + + + + - - - - - + + + + - - - - - - - - - + + + + + + + + + +
CREDIT NOTE
CREDIT NOTE Date:{$domain_organization}
Date:{$domain_organization}
{$display_name} ({$organization_name}){$display_name}{$invoice_date} - {if $domain_street_address } - {$domain_street_address} - {/if} - {if $domain_supplemental_address_1 } - {$domain_supplemental_address_1} - {/if}
{$invoice_date} + {if $domain_street_address } + {$domain_street_address} + {/if} + {if $domain_supplemental_address_1 } + {$domain_supplemental_address_1} + {/if}
{$street_address} {$supplemental_address_1}Credit Note Number:Credit Note Number: {if $domain_supplemental_address_2 } - {$domain_supplemental_address_2} - {/if} - {if $domain_state } - {$domain_state} - {/if} -
{$supplemental_address_2} {$stateProvinceAbbreviation} {$creditnote_id}{if $domain_city} - {$domain_city} - {/if} - {if $domain_postal_code } - {$domain_postal_code} - {/if} -
{$city} {$postal_code}{if $domain_city} + {$domain_city} + {/if} + {if $domain_postal_code } + {$domain_postal_code} + {/if} +
{$city} {$postal_code} Reference: {if $domain_country} - {$domain_country} - {/if}
Reference: {if $domain_country} + {$domain_country} + {/if}
{$source} {if $domain_phone} - {$domain_phone} - {/if}
{if $domain_email} - {$domain_email} - {/if}
{$source} {if $domain_phone} + {$domain_phone} + {/if}
{if $domain_email} + {$domain_email} + {/if}
- + @@ -402,32 +402,32 @@
{* FIXME: style this table so that it looks like the text version (justification, etc.) *} @@ -318,79 +318,79 @@ {foreach from=$lineItem item=value key=priceset name=pricevalue} - {if $smarty.foreach.pricevalue.index eq 0} - - {else} - - {/if} + {if $smarty.foreach.pricevalue.index eq 0} + + {else} + + {/if} - - - {if $value.tax_amount != ''} - + {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}
{$value.description|truncate:30:"..."}
{/if} + + + + {if $value.tax_amount != ''} + {else} - - {/if} - - + + {/if} + + {/foreach} - - - - - - - {foreach from = $dataArray item = value key = priceset} - - - {if $priceset} - - + + + + + + + {foreach from = $dataArray item = value key = priceset} + + + {if $priceset} + + {elseif $priceset == 0} - {/if} - {/foreach} - - - - + {/if} + {/foreach} + + + + - - - - - + + + + + - {if $is_pay_later == 0} - - - - - - - - - - - - - - - - {/if} -


- - - - - - - + {if $is_pay_later == 0} + + + + + + + + + + + + + + + + {/if} +


+ + + + + + +
Amount {$defaultCurrency}
- {if $value.html_type eq 'Text'}{$value.label}{else}{$value.field_title} - {$value.label}{/if} {if $value.description}
{$value.description|truncate:30:"..."}
{/if} - 		{$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}% {$value.qty} {$value.unit_price|crmMoney:$currency} {$value.tax_rate}%No {$taxTerm}{$value.subTotal|crmMoney:$currency}
No {$taxTerm}{$value.subTotal|crmMoney:$currency}
Sub Total {$subTotal|crmMoney:$currency}
TOTAL {$taxTerm} {$priceset}%{$value|crmMoney:$currency}
Sub Total {$subTotal|crmMoney:$currency}
TOTAL {$taxTerm} {$priceset}%{$value|crmMoney:$currency} TOTAL NO {$taxTerm} {$value|crmMoney:$currency}
TOTAL {$defaultCurrency}{$amount|crmMoney:$currency}
TOTAL {$defaultCurrency}{$amount|crmMoney:$currency}
LESS Credit to invoice(s){$amount|crmMoney:$currency}
REMAINING CREDIT{$amountDue|crmMoney:$currency}
LESS Credit to invoice(s){$amount|crmMoney:$currency}
REMAINING CREDIT{$amountDue|crmMoney:$currency}
- - - +
CREDIT ADVICE

Please do not pay on this advice. Deduct the amount of this Credit Note + + + - - -
CREDIT ADVICE

Please do not pay on this advice. Deduct the amount of this Credit Note from your next payment to us

 + - - - - - - - - - - - - + + + + + + + + + + + + - - - + + +
Customer: {$display_name}
Credit Note#: {$creditnote_id}
Customer: {$display_name}
Credit Note#: {$creditnote_id}
Credit Amount:{$amount|crmMoney:$currency}
Credit Amount:{$amount|crmMoney:$currency}
+
{/if}
diff --git a/xml/templates/message_templates/event_offline_receipt_html.tpl b/xml/templates/message_templates/event_offline_receipt_html.tpl index 81a73f98b1..ca7d00dd45 100644 --- a/xml/templates/message_templates/event_offline_receipt_html.tpl +++ b/xml/templates/message_templates/event_offline_receipt_html.tpl @@ -130,8 +130,8 @@ registration process.{/ts}

{/if} {/foreach} {/if} - - {if $event.is_public} + + {if $event.is_public} {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} @@ -139,7 +139,7 @@ registration process.{/ts}

{/if} - + {if $email} @@ -243,7 +243,7 @@ registration process.{/ts}

{foreach from=$dataArray item=value key=priceset} {if $priceset || $priceset == 0} -  {$taxTerm} {$priceset|string_format:"%.2f"}% +  {$taxTerm} {$priceset|string_format:"%.2f"}%  {$value|crmMoney:$currency} {else}  {ts}No{/ts} {$taxTerm} diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl index d3e6f0790d..9cd8aecfa4 100644 --- a/xml/templates/message_templates/event_online_receipt_html.tpl +++ b/xml/templates/message_templates/event_online_receipt_html.tpl @@ -158,8 +158,8 @@ registration process.{/ts}

{/if} {/foreach} {/if} - - {if $event.is_public} + + {if $event.is_public} {capture assign=icalFeed}{crmURL p='civicrm/event/ical' q="reset=1&id=`$event.id`" h=0 a=1 fe=1}{/capture} @@ -167,7 +167,7 @@ registration process.{/ts}

{/if} - + {if $event.is_share} @@ -273,7 +273,7 @@ registration process.{/ts}

{foreach from=$dataArray item=value key=priceset} {if $priceset || $priceset == 0} -  {$taxTerm} {$priceset|string_format:"%.2f"}% +  {$taxTerm} {$priceset|string_format:"%.2f"}%  {$value|crmMoney:$currency} {else}  {ts}No{/ts} {$taxTerm} diff --git a/xml/templates/message_templates/payment_or_refund_notification_html.tpl b/xml/templates/message_templates/payment_or_refund_notification_html.tpl index 450cacdb81..56d344d311 100644 --- a/xml/templates/message_templates/payment_or_refund_notification_html.tpl +++ b/xml/templates/message_templates/payment_or_refund_notification_html.tpl @@ -71,26 +71,26 @@ - {ts}{if $component eq 'event'}Total Fees{/if}{/ts} + {ts}{if $component eq 'event'}Total Fees{/if}{/ts} - {$totalAmount|crmMoney} + {$totalAmount|crmMoney} - {ts}This Payment Amount{/ts} + {ts}This Payment Amount{/ts} - {$paymentAmount|crmMoney} + {$paymentAmount|crmMoney} - {ts}Balance Owed{/ts} + {ts}Balance Owed{/ts} - {$amountOwed|crmMoney} + {$amountOwed|crmMoney} {* This will be zero after final payment. *} @@ -98,7 +98,7 @@ {if $paymentsComplete} - {ts}Thank-you. This completes your payment for {if $component eq 'event'}{$event.event_title}{/if}.{/ts} + {ts}Thank-you. This completes your payment for {if $component eq 'event'}{$event.event_title}{/if}.{/ts} {/if} @@ -106,17 +106,17 @@ {if $receive_date} - {ts}Transaction Date{/ts} + {ts}Transaction Date{/ts} - {$receive_date|crmDate} + {$receive_date|crmDate} {/if} {if $trxn_id} - {ts}Transaction #{/ts} + {ts}Transaction #{/ts} {$trxn_id} @@ -148,117 +148,117 @@ - - {if $contributeMode eq 'direct' and !$isAmountzero} +
+ {if $contributeMode eq 'direct' and !$isAmountzero} - {/if} - {if $contributeMode eq'direct' and !$isAmountzero} + {/if} + {if $contributeMode eq'direct' and !$isAmountzero} - {/if} - {if $component eq 'event'} - - - - - - + {/if} + {if $component eq 'event'} + + + + + + - {if $event.participant_role neq 'Attendee' and $defaultRole} - - - - - {/if} + {if $event.participant_role neq 'Attendee' and $defaultRole} + + + + + {/if} - {if $isShowLocation} - - - - {/if} + {if $isShowLocation} + + + + {/if} - {if $location.phone.1.phone || $location.email.1.email} - - - - {foreach from=$location.phone item=phone} - {if $phone.phone} + {if $location.phone.1.phone || $location.email.1.email} + + + + {foreach from=$location.phone item=phone} + {if $phone.phone} - {/if} - {/foreach} - {foreach from=$location.email item=eventEmail} - {if $eventEmail.email} + {/if} + {/foreach} + {foreach from=$location.email item=eventEmail} + {if $eventEmail.email} - {/if} - {/foreach} - {/if} {*phone block close*} - {/if} -
- {ts}Billing Name and Address{/ts} + {ts}Billing Name and Address{/ts}
- {$billingName}
- {$address|nl2br} + {$billingName}
+ {$address|nl2br}
- {ts}Credit Card Information{/ts} + {ts}Credit Card Information{/ts}
- {$credit_card_type}
- {$credit_card_number}
- {ts}Expires:{/ts} {$credit_card_exp_date|truncate:7:''|crmDate} + {$credit_card_type}
+ {$credit_card_number}
+ {ts}Expires:{/ts} {$credit_card_exp_date|truncate:7:''|crmDate}
- {ts}Event Information and Location{/ts} -
- {$event.event_title}
- {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} -
+ {ts}Event Information and Location{/ts} +
+ {$event.event_title}
+ {$event.event_start_date|crmDate}{if $event.event_end_date}-{if $event.event_end_date|date_format:"%Y%m%d" == $event.event_start_date|date_format:"%Y%m%d"}{$event.event_end_date|crmDate:0:1}{else}{$event.event_end_date|crmDate}{/if}{/if} +
- {ts}Participant Role{/ts} - - {$event.participant_role} -
+ {ts}Participant Role{/ts} + + {$event.participant_role} +
- {if $location.address.1.name} - {$location.address.1.name}
- {/if} - {if $location.address.1.street_address} - {$location.address.1.street_address}
- {/if} - {if $location.address.1.supplemental_address_1} - {$location.address.1.supplemental_address_1}
- {/if} - {if $location.address.1.supplemental_address_2} - {$location.address.1.supplemental_address_2}
- {/if} - {if $location.address.1.city} - {$location.address.1.city} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
- {/if} -
+ {if $location.address.1.name} + {$location.address.1.name}
+ {/if} + {if $location.address.1.street_address} + {$location.address.1.street_address}
+ {/if} + {if $location.address.1.supplemental_address_1} + {$location.address.1.supplemental_address_1}
+ {/if} + {if $location.address.1.supplemental_address_2} + {$location.address.1.supplemental_address_2}
+ {/if} + {if $location.address.1.city} + {$location.address.1.city} {$location.address.1.postal_code}{if $location.address.1.postal_code_suffix} - {$location.address.1.postal_code_suffix}{/if}
+ {/if} +
- {ts}Event Contacts:{/ts} -
+ {ts}Event Contacts:{/ts} +
- {if $phone.phone_type} - {$phone.phone_type_display} - {else} - {ts}Phone{/ts} - {/if} + {if $phone.phone_type} + {$phone.phone_type_display} + {else} + {ts}Phone{/ts} + {/if} - {$phone.phone} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if} + {$phone.phone} {if $phone.phone_ext} {ts}ext.{/ts} {$phone.phone_ext}{/if}
- {ts}Email{/ts} + {ts}Email{/ts} - {$eventEmail.email} + {$eventEmail.email}
+ {/if} + {/foreach} + {/if} {*phone block close*} + {/if} + -- 2.25.1