From: Matthew Wire Date: Sat, 13 Jun 2020 12:05:35 +0000 (+0100) Subject: Formatting cleanup on contribution/recur templates X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=88a3b538f7e85514a6fc0c0adffcb53ce41cd59b;p=civicrm-core.git Formatting cleanup on contribution/recur templates --- diff --git a/templates/CRM/Contribute/Form/AdditionalInfo/Payment.tpl b/templates/CRM/Contribute/Form/AdditionalInfo/Payment.tpl index a6810dd89a..0a3921c8cf 100644 --- a/templates/CRM/Contribute/Form/AdditionalInfo/Payment.tpl +++ b/templates/CRM/Contribute/Form/AdditionalInfo/Payment.tpl @@ -1,51 +1,57 @@ - +{* + +--------------------------------------------------------------------+ + | 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 | + +--------------------------------------------------------------------+ +*} {* build recurring contribution block. *} {if $buildRecurBlock} {literal} diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl index 0df23f41bd..f3674420c1 100644 --- a/templates/CRM/Contribute/Form/Contribution.tpl +++ b/templates/CRM/Contribute/Form/Contribution.tpl @@ -16,245 +16,244 @@ {else} {include file="CRM/Contribute/Form/AdditionalInfo/Payment.tpl"} {if $contributionMode} -
- {if $contactId && $payNow} - {ts 1=$displayName 2=$contributionMode|upper}Use this form to edit a contribution on behalf of %1. A - %2 transaction will be submitted using the selected payment processor.{/ts} - {elseif $contactId} - {ts 1=$displayName 2=$contributionMode|upper}Use this form to submit a new contribution on behalf of %1. A - %2 transaction will be submitted using the selected payment processor.{/ts} - {else} - {ts 1=$displayName 2=$contributionMode|upper}Use this form to submit a new contribution. A %2 transaction will be submitted using the selected payment processor.{/ts} - {/if} -
+
+ {if $contactId && $payNow} + {ts 1=$displayName 2=$contributionMode|upper}Use this form to edit a contribution on behalf of %1. A + %2 transaction will be submitted using the selected payment processor.{/ts} + {elseif $contactId} + {ts 1=$displayName 2=$contributionMode|upper}Use this form to submit a new contribution on behalf of %1. A + %2 transaction will be submitted using the selected payment processor.{/ts} + {else} + {ts 1=$displayName 2=$contributionMode|upper}Use this form to submit a new contribution. A %2 transaction will be submitted using the selected payment processor.{/ts} + {/if} +
{/if}
- {if !$email and $action neq 8 and $context neq 'standalone'} -
-
 {ts}You will not be able to send an automatic email receipt for this contribution because there is no email address recorded for this contact. If you want a receipt to be sent when this contribution is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the contribution.{/ts} -
- {/if} - - {if $action eq 8} -
-
- {ts}WARNING: Deleting this contribution will result in the loss of the associated financial transactions (if any).{/ts} {ts}Do you want to continue?{/ts} -
- {else} - {if $newCredit AND $action EQ 1 AND $contributionMode EQ null} -
- {if $contactId} - {capture assign=ccModeLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=add&cid=`$contactId`&context=`$context`&mode=live"}{/capture} - {else} - {capture assign=ccModeLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=add&context=standalone&mode=live"}{/capture} - {/if} - {ts}submit credit card contribution{/ts} -
+ {if !$email and $action neq 8 and $context neq 'standalone'} +
+
 {ts}You will not be able to send an automatic email receipt for this contribution because there is no email address recorded for this contact. If you want a receipt to be sent when this contribution is recorded, click Cancel and then click Edit from the Summary tab to add an email address before recording the contribution.{/ts} +
{/if} -
- {include file="CRM/common/formButtons.tpl"} -
- {if $isOnline}{assign var=valueStyle value=" class='view-value'"}{else}{assign var=valueStyle value=""}{/if} - - - - - - - {$form.financial_type_id.html}  - {if $is_test} - {ts}(test){/ts} - {/if} {help id="id-financial_type"} - - - {if $action eq 2 and $lineItem and !$defaultContribution} - - - - + + {if $action eq 8} +
+
+ {ts}WARNING: Deleting this contribution will result in the loss of the associated financial transactions (if any).{/ts} {ts}Do you want to continue?{/ts} +
{else} - - - - - - - - - - - {/if} - {if $form.revenue_recognition_date && !$payNow} - - - - + {/if} + {/if} - {if $email and $outBound_option != 2} - - - - - {elseif $context eq 'standalone' and $outBound_option != 2 } - - - - - {/if} - - - - - - - - - {if $form.payment_processor_id} - + {if !$isUsePaymentBlock} + {include file='CRM/Core/BillingBlockWrapper.tpl'} {/if} -
{$form.contact_id.label}{$form.contact_id.html}
{$form.financial_type_id.label}
{ts}Contribution Amount{/ts}{include file="CRM/Price/Page/LineItem.tpl" context="Contribution"}
{$form.total_amount.label} - {$form.currency.html|crmAddClass:eight} {$form.total_amount.html|crmAddClass:eight} - {if $freezeFinancialType} - {help id="id-total_amount"} + {if $newCredit AND $action EQ 1 AND $contributionMode EQ null} +
+ {if $contactId} + {capture assign=ccModeLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=add&cid=`$contactId`&context=`$context`&mode=live"}{/capture} + {else} + {capture assign=ccModeLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=add&context=standalone&mode=live"}{/capture} {/if} - {if !$payNow} - {if $hasPriceSets} - {ts}OR{/ts} - {$form.price_set_id.html} -
- {/if} + {ts}submit credit card contribution{/ts} +
+ {/if} +
+ {include file="CRM/common/formButtons.tpl"} +
+ {if $isOnline}{assign var=valueStyle value=" class='view-value'"}{else}{assign var=valueStyle value=""}{/if} + + + + + + + {$form.financial_type_id.html}  + {if $is_test} + {ts}(test){/ts} + {/if} {help id="id-financial_type"} + + + {if $action eq 2 and $lineItem and !$defaultContribution} + + + + + {else} + + + - - - {if $buildRecurBlock && !$payNow} - - - + + + {if $buildRecurBlock && !$payNow} + + + - - {/if} + + + {/if} - - - - {/if} - {if $contributionMode && $processorSupportsFutureStartDate} - - - - - {/if} + + + + {/if} + {if $contributionMode && $processorSupportsFutureStartDate} + + + + + {/if} + + + + + - - - - - - {* CRM-7362 --add campaign to contributions *} - {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignTrClass="crm-contribution-form-block-campaign_id"} - - {if !$contributionMode || $payNow} - - - - + + + + + {/if} + + {if !$contributionMode} + {* Cancellation / Refunded fields are hidden unless contribution status is set to Cancelled or Refunded*} + + + + + + + + + {/if} + {if $form.revenue_recognition_date && !$payNow} + + + + {/if} - - - {/if} + + {if $email and $outBound_option != 2} + + + + + {elseif $context eq 'standalone' and $outBound_option != 2 } + + + + + {/if} + + + + + + + + + {if $form.payment_processor_id} + + {/if} +
{$form.contact_id.label}{$form.contact_id.html}
{$form.financial_type_id.label}
{ts}Contribution Amount{/ts}{include file="CRM/Price/Page/LineItem.tpl" context="Contribution"}
{$form.total_amount.label} + {$form.currency.html|crmAddClass:eight} {$form.total_amount.html|crmAddClass:eight} + {if $freezeFinancialType} + {help id="id-total_amount"} + {/if} + {if !$payNow} + {if $hasPriceSets} + {ts}OR{/ts} + {$form.price_set_id.html} +
+ {/if} - {if $ppID}{ts}adjust payment amount{/ts}{help id="adjust-payment-amount"}{/if} -
- {if $hasPriceSets}{ts}Alternatively, you can use a price set.{/ts}{/if} -
-
- {/if} -
- {$form.is_recur.html} {ts}every{/ts} -  {$form.frequency_interval.html} -  {$form.frequency_unit.html}  - {ts}for{/ts} -  {$form.installments.html} -  {$form.installments.label} - -
- + {if $ppID}{ts}adjust payment amount{/ts}{help id="adjust-payment-amount"}{/if} +
+ {if $hasPriceSets}{ts}Alternatively, you can use a price set.{/ts}{/if} +
+
+ {/if} +
+ {$form.is_recur.html} {ts}every{/ts} +  {$form.frequency_interval.html} +  {$form.frequency_unit.html}  + {ts}for{/ts} +  {$form.installments.html} +  {$form.installments.label} + +
+ {ts}Your recurring contribution will be processed automatically for the number of installments you specify. 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. You will receive an email receipt for each recurring contribution. The receipts will include a link you can use if you decide to modify or cancel your future contributions.{/ts} -
{$form.option_type.html}
{ts}Start Date{/ts}{if $hideCalender neq true}{$form.receive_date.html}{/if}
- {ts}You can set a start date for recurring contributions and the first payment will be on that date. For a single post-dated contribution you must select recurring and choose one installment{/ts} -
{$form.option_type.html}
{ts}Start Date{/ts}{if $hideCalender neq true}{$form.receive_date.html}{/if}
+ {ts}You can set a start date for recurring contributions and the first payment will be on that date. For a single post-dated contribution you must select recurring and choose one installment{/ts} +
{$form.source.label}{$form.source.html|crmAddClass:huge} {help id="id-contrib_source"} +
{$form.source.label}{$form.source.html|crmAddClass:huge} {help id="id-contrib_source"} -
{$form.contribution_status_id.label}{$form.contribution_status_id.html} - {if $contribution_status_id eq 2}{if $is_pay_later }: {ts}Pay Later{/ts} {else}: {ts}Incomplete Transaction{/ts}{/if}{/if} - - {if !$isUsePaymentBlock && $contactId && $contribID && $contributionMode EQ null && $contribution_status_id eq 2} - {capture assign=payNowLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=update&id=`$contribID`&cid=`$contactId`&context=`$context`&mode=live"}{/capture} - {ts}Pay with Credit Card{/ts} + {* CRM-7362 --add campaign to contributions *} + {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignTrClass="crm-contribution-form-block-campaign_id"} + + {if !$contributionMode || $payNow} +
{$form.contribution_status_id.label}{$form.contribution_status_id.html} + {if $contribution_status_id eq 2}{if $is_pay_later }: {ts}Pay Later{/ts} {else}: {ts}Incomplete Transaction{/ts}{/if}{/if} + + {if !$isUsePaymentBlock && $contactId && $contribID && $contributionMode EQ null && $contribution_status_id eq 2} + {capture assign=payNowLink}{crmURL p='civicrm/contact/view/contribution' q="reset=1&action=update&id=`$contribID`&cid=`$contactId`&context=`$context`&mode=live"}{/capture} + {ts}Pay with Credit Card{/ts} + {/if} +
 
{ts}Cancellation or Refund Information{/ts} + + + + + + + + + + + + + + + + + +
{$form.cancel_date.label} + {if $hideCalendar neq true} + {$form.cancel_date.html} + {else} + {$form.cancel_date.value|crmDate} + {/if} +
 {ts}Enter the cancellation or refunded date, or you can skip this field and the cancellation date or refunded date will be automatically set to TODAY.{/ts}
{$form.cancel_reason.label}{$form.cancel_reason.html}
{$form.refund_trxn_id.label}{$form.refund_trxn_id.html}
+
+
{$form.receive_date.label}{$form.receive_date.html}
+ {ts}The date this contribution was received.{/ts} +
{$form.revenue_recognition_date.label}{$form.revenue_recognition_date.html}
{$form.is_email_receipt.label}{$form.is_email_receipt.html}  + {ts 1=$email}Automatically email a receipt for this payment to %1?{/ts} +
{$form.receipt_date.label}{$form.receipt_date.html}
+ {ts}Date that a receipt was sent to the contributor.{/ts} +
{$form.payment_processor_id.label} * {$form.payment_processor_id.html}
{if !$contributionMode} - {* Cancellation / Refunded fields are hidden unless contribution status is set to Cancelled or Refunded*} -
 
{ts}Cancellation or Refund Information{/ts} - - - - - - - - +
+ + {ts}Payment Details{/ts} + + {if $isUsePaymentBlock} + {include file="CRM/Contribute/Form/PaymentInfoBlock.tpl"} + {else} +
{$form.cancel_date.label} - {if $hideCalendar neq true} - {$form.cancel_date.html} - {else} - {$form.cancel_date.value|crmDate} - {/if} -
 {ts}Enter the cancellation or refunded date, or you can skip this field and the cancellation date or refunded date will be automatically set to TODAY.{/ts}
+ + + - - - - - - - + + +
{$form.payment_instrument_id.label}{$form.payment_instrument_id.html} {help id="payment_instrument_id"}
{$form.cancel_reason.label}{$form.cancel_reason.html}
{$form.refund_trxn_id.label}{$form.refund_trxn_id.html}
{$form.trxn_id.label}{$form.trxn_id.html} {help id="id-trans_id"}
-
-
{$form.receive_date.label}{$form.receive_date.html}
- {ts}The date this contribution was received.{/ts} -
{$form.revenue_recognition_date.label}{$form.revenue_recognition_date.html}
{$form.is_email_receipt.label}{$form.is_email_receipt.html}  - {ts 1=$email}Automatically email a receipt for this payment to %1?{/ts} -
{$form.receipt_date.label}{$form.receipt_date.html}
- {ts}Date that a receipt was sent to the contributor.{/ts} -
{$form.payment_processor_id.label} * {$form.payment_processor_id.html}
- - {if !$contributionMode} -
- - {ts}Payment Details{/ts} - - {if $isUsePaymentBlock} - {include file="CRM/Contribute/Form/PaymentInfoBlock.tpl"} - {else} - - - - - - - - - - -
{$form.payment_instrument_id.label}{$form.payment_instrument_id.html} {help id="payment_instrument_id"}
{$form.trxn_id.label}{$form.trxn_id.html} {help id="id-trans_id"}
- {/if} -
- {/if} - - {if !$isUsePaymentBlock} - {include file='CRM/Core/BillingBlockWrapper.tpl'} - {/if} {if !$payNow} @@ -290,7 +289,7 @@
{ts}Search for the Personal Campaign Page by the fund-raiser's last name or email address.{/ts}
-
+
@@ -306,8 +305,7 @@
{$form.pcp_display_in_roll.label}{$form.pcp_personal_note.label} {$form.pcp_personal_note.html} -
{ts}Personal message submitted by contributor for display in the Honor Roll.{/ts}
+
{ts}Personal message submitted by contributor for display in the Honor Roll.{/ts}
@@ -321,116 +319,111 @@ {/if} - {if !$payNow} - {include file="CRM/common/customDataBlock.tpl"} - {/if} + {if !$payNow} + {include file="CRM/common/customDataBlock.tpl"} + {/if} - {literal} - - -
- {* Additional Detail / Honoree Information / Premium Information *} - {foreach from=$allPanes key=paneName item=paneValue} + {/literal} + {if $context eq 'standalone' and $outBound_option != 2} + {literal} + CRM.$(function($) { -
-
+ var $form = $("form.{/literal}{$form.formClass}{literal}"); + $("#contact_id", $form).change(checkEmail); + checkEmail(); - {$paneName} -
-
+ function checkEmail() { + var data = $("#contact_id", $form).select2('data'); + if (data && data.extra && data.extra.email && data.extra.email.length) { + $("#email-receipt", $form).show(); + $("#email-address", $form).html(data.extra.email); + } + else { + $("#email-receipt", $form).hide(); + } + } -
-
-
+ showHideByValue('is_email_receipt', '', 'receiptDate', 'table-row', 'radio', true); + showHideByValue('is_email_receipt', '', 'fromEmail', 'table-row', 'radio', false); + }); - {/foreach} + {/literal} + {/if} + + +
+ {* Additional Detail / Honoree Information / Premium Information *} + {foreach from=$allPanes key=paneName item=paneValue} +
+
+ {$paneName} +
+
+
+
+
+ {/foreach} +
+ {/if} +
+
{include file="CRM/common/formButtons.tpl" location="bottom"}
- {/if} -
-
{include file="CRM/common/formButtons.tpl" location="bottom"}
-
- - {literal} +{literal} - {/literal} +{/literal} {if $action neq 8} - {literal} + {literal} @@ -479,167 +472,167 @@ {literal} {/literal} diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl index 6077fe49fd..0b6a9443bb 100644 --- a/templates/CRM/Contribute/Form/Contribution/Main.tpl +++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl @@ -13,188 +13,188 @@ {include file="CRM/Contribute/Form/Contribution/OnBehalfOf.tpl" context="front-end"}
{else} - {literal} +{literal} - {/literal} +{/literal} {if $action & 1024} - {include file="CRM/Contribute/Form/Contribution/PreviewHeader.tpl"} + {include file="CRM/Contribute/Form/Contribution/PreviewHeader.tpl"} {/if} {if $displayCaptchaWarning} -
+
{ts}To display reCAPTCHA on form you must get an API key from
https://www.google.com/recaptcha/admin/create{/ts} -
+
{/if} {include file="CRM/common/TrackingFields.tpl"}
- {if $contact_id && !$ccid} -
- {ts 1=$display_name}Welcome %1{/ts}. ({ts 1=$display_name}Not %1, or want to do this for a different person{/ts}?) -
- {/if} - -
- {$intro_text} -
- {include file="CRM/common/cidzero.tpl"} - {if $islifetime or $ispricelifetime } -
{ts}You have a current Lifetime Membership which does not need to be renewed.{/ts}
- {/if} + {if $contact_id && !$ccid} +
+ {ts 1=$display_name}Welcome %1{/ts}. ({ts 1=$display_name}Not %1, or want to do this for a different person{/ts}?) +
+ {/if} - {if !empty($useForMember) && !$ccid} -
- {include file="CRM/Contribute/Form/Contribution/MembershipBlock.tpl" context="makeContribution"} +
+ {$intro_text}
- {elseif !empty($ccid)} - {if $lineItem && $priceSetID && !$is_quick_config} -
- {ts}Contribution Information{/ts}{if $display_name} – {$display_name}{/if} + {include file="CRM/common/cidzero.tpl"} + {if $islifetime or $ispricelifetime} +
{ts}You have a current Lifetime Membership which does not need to be renewed.{/ts}
+ {/if} + + {if !empty($useForMember) && !$ccid} +
+ {include file="CRM/Contribute/Form/Contribution/MembershipBlock.tpl" context="makeContribution"}
- {assign var="totalAmount" value=$pendingAmount} - {include file="CRM/Price/Page/LineItem.tpl" context="Contribution"} + {elseif !empty($ccid)} + {if $lineItem && $priceSetID && !$is_quick_config} +
+ {ts}Contribution Information{/ts}{if $display_name} – {$display_name}{/if} +
+ {assign var="totalAmount" value=$pendingAmount} + {include file="CRM/Price/Page/LineItem.tpl" context="Contribution"} + {else} +
+ {$form.total_amount.label} + {$form.total_amount.html|crmMoney}  {if $taxAmount}{ts 1=$taxTerm 2=$taxAmount|crmMoney}(includes %1 of %2){/ts}{/if} +
+ {/if} {else} -
- {$form.total_amount.label} - {$form.total_amount.html|crmMoney}  {if $taxAmount}{ts 1=$taxTerm 2=$taxAmount|crmMoney}(includes %1 of %2){/ts}{/if} +
+ {include file="CRM/Price/Form/PriceSet.tpl" extends="Contribution"}
{/if} - {else} -
- {include file="CRM/Price/Form/PriceSet.tpl" extends="Contribution"} -
- {/if} - {if !$ccid} - {crmRegion name='contribution-main-pledge-block'} - {if $pledgeBlock} - {if $is_pledge_payment} -
-
{$form.pledge_amount.label} *
-
{$form.pledge_amount.html}
-
-
- {else} -
+ {if !$ccid} + {crmRegion name='contribution-main-pledge-block'} + {if $pledgeBlock} + {if $is_pledge_payment} +
+
{$form.pledge_amount.label} *
+
{$form.pledge_amount.html}
+
+
+ {else} +
+
 
+
+ {$form.is_pledge.html}  + {if $is_pledge_interval} + {$form.pledge_frequency_interval.html}  + {/if} + {$form.pledge_frequency_unit.html} {ts}for{/ts} {$form.pledge_installments.html} {ts}installments.{/ts} +
+
+ {if $start_date_editable} + {if $is_date} +
{$form.start_date.label}
{$form.start_date.html}
+ {else} +
{$form.start_date.label}
{$form.start_date.html}
+ {/if} + {else} +
{$form.start_date.label}
+
{$start_date_display|date_format}
+ {/if} +
+
+ {/if} + {/if} + {/crmRegion} + + {if $form.is_recur} +
 
- {$form.is_pledge.html}  - {if $is_pledge_interval} - {$form.pledge_frequency_interval.html}  + {$form.is_recur.html} {$form.is_recur.label} {ts}every{/ts} + {if $is_recur_interval} + {$form.frequency_interval.html} {/if} - {$form.pledge_frequency_unit.html} {ts}for{/ts} {$form.pledge_installments.html} {ts}installments.{/ts} -
-
- {if $start_date_editable} - {if $is_date} -
{$form.start_date.label}
{$form.start_date.html}
+ {if $one_frequency_unit} + {$frequency_unit} {else} -
{$form.start_date.label}
{$form.start_date.html}
+ {$form.frequency_unit.html} {/if} - {else} -
{$form.start_date.label}
-
{$start_date_display|date_format}
- {/if} -
-
- {/if} - {/if} - {/crmRegion} - - {if $form.is_recur} -
-
 
-
- {$form.is_recur.html} {$form.is_recur.label} {ts}every{/ts} - {if $is_recur_interval} - {$form.frequency_interval.html} - {/if} - {if $one_frequency_unit} - {$frequency_unit} - {else} - {$form.frequency_unit.html} - {/if} - {if $is_recur_installments} - + {if $is_recur_installments} + {ts}for{/ts} {$form.installments.html} {$form.installments.label} - {/if} -
- {$recurringHelpText} + {/if} +
+ {$recurringHelpText} +
+
+
-
-
-
- {/if} - {if $pcpSupporterText} -
-
 
-
{$pcpSupporterText}
-
-
- {/if} - {if $showMainEmail} - {assign var=n value=email-$bltID} -
-
{$form.$n.label}
-
- {$form.$n.html} + {/if} + {if $pcpSupporterText} +
+
 
+
{$pcpSupporterText}
+
-
-
- {/if} + {/if} + {if $showMainEmail} + {assign var=n value=email-$bltID} +
+
{$form.$n.label}
+
+ {$form.$n.html} +
+
+
+ {/if} -
- {include file="CRM/Contribute/Form/Contribution/OnBehalfOf.tpl"} -
+
+ {include file="CRM/Contribute/Form/Contribution/OnBehalfOf.tpl"} +
- {* User account registration option. Displays if enabled for one of the profiles on this page. *} -
- {include file="CRM/common/CMSUser.tpl"} -
-
- {include file="CRM/Contribute/Form/Contribution/PremiumBlock.tpl" context="makeContribution"} -
+ {* User account registration option. Displays if enabled for one of the profiles on this page. *} +
+ {include file="CRM/common/CMSUser.tpl"} +
+
+ {include file="CRM/Contribute/Form/Contribution/PremiumBlock.tpl" context="makeContribution"} +
- {if $honoreeProfileFields && $honoreeProfileFields|@count} -
- {crmRegion name="contribution-soft-credit-block"} - {$honor_block_title} -
- {$honor_block_text} -
+ {if $honoreeProfileFields && $honoreeProfileFields|@count} +
+ {crmRegion name="contribution-soft-credit-block"} + {$honor_block_title} +
+ {$honor_block_text} +
{if $form.soft_credit_type_id.html}
@@ -203,198 +203,198 @@
{/if} - {/crmRegion} -
- {include file="CRM/UF/Form/Block.tpl" fields=$honoreeProfileFields mode=8 prefix='honor'} -
-
- {/if} + {/crmRegion} +
+ {include file="CRM/UF/Form/Block.tpl" fields=$honoreeProfileFields mode=8 prefix='honor'} +
+
+ {/if} -
- {include file="CRM/UF/Form/Block.tpl" fields=$customPre} -
+
+ {include file="CRM/UF/Form/Block.tpl" fields=$customPre} +
- {if $isHonor} -
-
-
-
- {$form.pcp_display_in_roll.html}   - {$form.pcp_display_in_roll.label} -
-
-
-
-
- {$form.pcp_is_anonymous.html} -
-
-
-
-
{$form.pcp_roll_nickname.label}
-
{$form.pcp_roll_nickname.html} -
{ts}Enter the name you want listed with this contribution. You can use a nick name like 'The Jones Family' or 'Sarah and Sam'.{/ts}
+ {if $isHonor} +
+
+
+
+ {$form.pcp_display_in_roll.html}   + {$form.pcp_display_in_roll.label} +
+
+
+
+
+ {$form.pcp_is_anonymous.html} +
+
+
+
+
{$form.pcp_roll_nickname.label}
+
{$form.pcp_roll_nickname.html} +
{ts}Enter the name you want listed with this contribution. You can use a nick name like 'The Jones Family' or 'Sarah and Sam'.{/ts}
+
+
+
+
+
{$form.pcp_personal_note.label}
+
+ {$form.pcp_personal_note.html} +
{ts}Enter a message to accompany this contribution.{/ts}
+
+
+
+
+ {/if} + + {* end of ccid loop *} + {/if} + + {if $form.payment_processor_id.label} + {* PP selection only works with JS enabled, so we hide it initially *} + + {/if} + + {if $is_pay_later} +
+ {ts}Payment Options{/ts} +
+
 
- {$form.pcp_personal_note.html} -
{ts}Enter a message to accompany this contribution.{/ts}
+ [x] {$pay_later_text}
-
-
+ {/if} - {* end of ccid loop *} - {/if} + {include file="CRM/Core/BillingBlockWrapper.tpl"} - {if $form.payment_processor_id.label} - {* PP selection only works with JS enabled, so we hide it initially *} - - {/if} - {if $is_pay_later} -
- {ts}Payment Options{/ts} -
-
 
-
- [x] {$pay_later_text} + {if $is_monetary and $form.bank_account_number} +
+
+ {ts}Agreement{/ts} + {ts}Your account data will be used to charge your bank account via direct debit. While submitting this form you agree to the charging of your bank account via direct debit.{/ts} +
-
-
-
- {/if} - - {include file="CRM/Core/BillingBlockWrapper.tpl"} + {/if} -
- {include file="CRM/UF/Form/Block.tpl" fields=$customPost} + {if $isCaptcha} + {include file='CRM/common/ReCAPTCHA.tpl'} + {/if} +
+ {include file="CRM/common/formButtons.tpl" location="bottom"} +
+ {if $footer_text} +
+

{$footer_text}

+
+ {/if}
+ + {/literal} + {/if} {include file="CRM/Form/validate.tpl"}