X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=templates%2FCRM%2FEvent%2FForm%2FEventFees.tpl;h=09d92e517b9322e1246791e11caa3a03a5006918;hb=28a39166963513aed5b93a91af4aedd0452109f7;hp=002f24e41b98c0c19c46c38ffb1737dc3cef4722;hpb=26336401ed4ec1e986af5087d9d8a994f07d3615;p=civicrm-core.git diff --git a/templates/CRM/Event/Form/EventFees.tpl b/templates/CRM/Event/Form/EventFees.tpl index 002f24e41b..09d92e517b 100644 --- a/templates/CRM/Event/Form/EventFees.tpl +++ b/templates/CRM/Event/Form/EventFees.tpl @@ -88,7 +88,6 @@ {include file="CRM/common/jcalendar.tpl" elementName=receive_date} {$form.payment_instrument_id.label} *{$form.payment_instrument_id.html} {help id="payment_instrument_id" file="CRM/Contribute/Page/Tab.hlp"} - {$form.check_number.label}{$form.check_number.html|crmAddClass:six} {if $showTransactionId } {$form.trxn_id.label}{$form.trxn_id.html} {/if} @@ -97,26 +96,15 @@ - - {* Record contribution field only present if we are NOT in submit credit card mode (! participantMode). *} - {include file="CRM/common/showHideByFieldValue.tpl" - trigger_field_id ="record_contribution" - trigger_value ="" - target_element_id ="payment_information" - target_element_type ="table-row" - field_type ="radio" - invert = 0 - } {/if} {/if} -{* credit card block when it is live or test mode*} -{if $participantMode and $paid} -
+{if $action neq 2} {include file='CRM/Core/BillingBlockWrapper.tpl'} {/if} + {if ($email OR $batchEmail) and $outBound_option != 2}
{if $paid}{ts}Registration Confirmation and Receipt{/ts}{else}{ts}Registration Confirmation{/ts}{/if} @@ -190,17 +178,6 @@ } {/if} -{if $paid and ($action eq 1 or ( $action eq 2 and !$hasPayment) ) and !$participantMode} -{include file="CRM/common/showHideByFieldValue.tpl" - trigger_field_id ="payment_instrument_id" - trigger_value = '4' - target_element_id ="checkNumber" - target_element_type ="table-row" - field_type ="select" - invert = 0 -} -{/if} - {if $context eq 'standalone' and $outBound_option != 2 }