Index: in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl
===================================================================
diff -u -N
--- in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(revision 12930)
+++ in-commerce/elements/content_boxes/checkout/billing_options.elm.tpl	(revision 0)
@@ -1,194 +0,0 @@
-<inp2:m_DefineElement name="order_payment_credit_card">
-	<table width="100%" class="block-no-border">
-		<tr class="cart-header">
-			<td>
-
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-				<div class="sub-section-header"><inp2:ord_PaymentTypeDescription/></div>
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-				<br />
-
-			</td>
-		</tr>
-		<tr class="block-data">
-			<td>
-				<inp2:m_if check="ord_HasGatewayError">
-					<inp2:m_RenderElement name="error_message" />
-					<strong><inp2:ord_ShowGatewayError/></strong>
-				</inp2:m_if>
-				<br />
-				<strong><inp2:ord_PaymentTypeInstructions/></strong>
-				<br /><br />
-
-			</td>
-		</tr>
-	</table>
-
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
-	<table class="form-data fullwidth">
-		<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="PaymentCardType" title="lu_billing_CardType"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="lu_billing_CreditCardNumber" style="width: 200px;"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentNameOnCard" title="lu_billing_NameOnCard" style="width: 260px;"/>
-
-		<!-- credit card expiration -->
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCCExpDate" title="lu_billing_CardExpiration"/>
-			<td class="field-value">
-				<inp2:m_if check="ord_HasError" field="PaymentCCExpDate">
-					<span class="field-error"><inp2:ord_Error field="PaymentCCExpDate"/></span><br />
-				</inp2:m_if>
-				<select class="input-select" name="<inp2:ord_InputName field="PaymentCCExpMonth"/>">
-					<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="inp_option_item" selected="selected"/>
-				</select>
-				/
-				<select class="input-select" name="<inp2:ord_InputName field="PaymentCCExpYear"/>">
-					<option value=''></option>
-					<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="inp_option_item" selected="selected"/>
-				</select>
-			</td>
-		</tr>
-		<inp2:m_RenderElement name="inp_edit_field_separator" is_last="0"/>
-		<!-- // credit card expiration -->
-
-		<!-- credit card CVV2 -->
-		<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="ord" field="PaymentCVV2" title="lu_billing_CVV2"/>
-			<td class="field-value">
-				<inp2:m_if check="ord_HasError" field="PaymentCVV2">
-					<span class="field-error"><inp2:ord_Error field="PaymentCVV2"/></span><br />
-				</inp2:m_if>
-				<input type="text" class="input-text" name="<inp2:ord_InputName field="PaymentCVV2"/>" value="<inp2:ord_Field field="PaymentCVV2"/>" tabindex="<inp2:m_get param="tab_index"/>" style="width: 50px;">
-				&nbsp;&nbsp;<a href="javascript:showCVV2Help()"><inp2:m_Phrase label="lu_WhatIsThis" /></a>
-			</td>
-		</tr>
-		<!-- // credit card CVV2 -->
-
-		<inp2:m_RenderElement design="inp_edit_buttons">
-			<input type="hidden" name="check_credit_card" value="true"/>
-			<input type="hidden" name="preview_template" value="in-commerce/checkout/preview">
-
-			<input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_Phrase label="lu_btn_ProceedToPreview" no_editing="1"/>">
-		</inp2:m_RenderElement>
-	</table>
-	<br />
-
-	<script language="JavaScript">
-	function showCVV2Help(){
-		window.open('<inp2:m_Link template="in-commerce/checkout/cvv2help" />', null, 'scrollbars=no,menubar=no,toolbars=no,width=300,height=150');
-	}
-	</script>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_payment_type_default">
-	<table>
-		<tr class="cart-header">
-			<td>
-				<inp2:ord_PaymentTypeDescription/>
-			</td>
-		</tr>
-		<tr class="form-data">
-			<td>
-				<inp2:m_if check="ord_HasGatewayError">
-					<table class="warning">
-						<tr>
-							<td valign="top" align="left" class="block-data">
-								<img src="img/message.gif" alt="" width="19" height="19" />
-								<span class="warning-text"><inp2:m_Phrase label="lu_Warning"/></span><br />
-								<inp2:ord_ShowGatewayError/>
-							</td>
-						</tr>
-					</table>
-				</inp2:m_if>
-				<br/>
-				<inp2:ord_PaymentTypeInstructions/>
-			</td>
-		</tr>
-	</table>
-	<br/>
-	<input type="hidden" name="preview_template" value="in-commerce/checkout/preview">
-
-	<input class="button" type="submit" name="events[ord][OnProceedToPreview]" value="<inp2:m_Phrase label="lu_btn_ProceedToPreview" no_editing="1"/>">
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="products_total">
-		<tr>
-			<td><strong><inp2:m_Phrase label="lu_comm_ProductsTotal"/>:</strong></td>
-			<td><inp2:ord_Field name="SubTotal" currency="selected"/></td>
-		</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="shipping_total">
-		<tr>
-			<td><strong><inp2:m_Phrase label="lu_comm_ShippingCost"/> (<inp2:ord_ShippingType />):</strong></td>
-			<td><inp2:ord_Field name="ShippingCost" currency="selected"/></td>
-		</tr>
-		<tr>
-			<td><strong><inp2:m_Phrase label="lu_comm_Insurance_Fee"/>:</strong></td>
-			<td><inp2:ord_Field name="InsuranceFee" currency="selected"/></td>
-		</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="processing_total">
-		<tr>
-			<td><strong><inp2:m_Phrase label="lu_comm_ProcessingFee"/>: </strong></td>
-			<td><inp2:ord_Field name="ProcessingFee" currency="selected"/></td>
-		</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="sub_total">
-	<tr>
-		<td><strong><inp2:m_Phrase label="lu_comm_SubTotal"/>: </strong></td>
-		<td><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="vat_total">
-		<tr>
-			<td><strong><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%: </strong></td>
-			<td><inp2:ord_Field name="VAT" currency="selected"/></td>
-		</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_RenderElement design="content_box">
-	<inp2:m_Capture to_var="header">
-		<inp2:m_Phrase label="lu_comm_BillingOptions"/>
-	</inp2:m_Capture>
-
-	<inp2:m_RenderElement name="subsection" title="lu_section_CostSummary"/>
-
-	<table class="order-totals">
-		<inp2:ord_PrintTotals
-			products_render_as="products_total"
-			shipping_render_as="shipping_total"
-			processing_render_as="processing_total"
-			sub_total_render_as="sub_total"
-			vat_render_as="vat_total"/>
-
-			<inp2:m_if check="ord_Field" name="GiftCertificateId">
-			<tr>
-				<td><strong><inp2:m_Phrase label="lu_comm_Gift_Certificate"/>: </strong></td>
-				<td><inp2:ord_Field name="GiftCertificateDiscount" currency="selected"/></td>
-			</tr>
-			</inp2:m_if>
-
-		<tr class="order-grand-total">
-		  <td><inp2:m_Phrase label="lu_comm_GrandTotal"/>:</td>
-			<td><span class="price1"><inp2:ord_Field name="TotalAmount" currency="selected"/></span></td>
-		</tr>
-	</table>
-
-	<br />
-	<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1"  alt="" /><br /><br />
-	<br />
-
-
-	<br />
-	<strong><inp2:m_Phrase label="lu_comm_PaymentType"/>:</strong>
-	<select class="input-select" name="<inp2:ord_InputName field="PaymentType"/>" onchange="document.getElementById('events[ord][OnUpdate]').click();">
-		<inp2:ord_PredefinedOptions render_as="inp_option_item" field="PaymentType" selected="selected"/>
-	</select>
-	&nbsp;<input class="button" type="submit" value="<inp2:m_Phrase label="lu_btn_Select" no_editing="1"/>" name="events[ord][OnUpdate]" id="events[ord][OnUpdate]">
-	<br/><br/>
-
-	<inp2:ord_PaymentTypeForm cc_render_as="order_payment_credit_card" default_render_as="order_payment_type_default"/>
-</inp2:m_RenderElement>
\ No newline at end of file