Index: in-commerce/elements/order_details.elm.tpl
===================================================================
diff -u -N
--- in-commerce/elements/order_details.elm.tpl	(revision 12930)
+++ in-commerce/elements/order_details.elm.tpl	(revision 0)
@@ -1,362 +0,0 @@
-<inp2:m_include template="in-commerce/elements/options_blocks.elm"/>
-
-<!--## PRODUCT IMAGE ELEMENT ##-->
-<inp2:m_DefineElement name="product_image">
-	<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> border="0" /><br/>
-</inp2:m_DefineElement>
-<!--## /PRODUCT IMAGE ELEMENT ##-->
-
-<!--## ORDER DETAILS ELEMENTS ##-->
-<!--## THIS SECTION IS USED BY myaccount/my_order_details.tpl ##-->
-<inp2:m_DefineElement name="orderitem_elem">
-	<tr class="order-padding-left">
-		<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">
-			<td width="120">
-				<inp2:p_Image render_as="product_image" thumbnail="1" DefaultImage="platform/img/no_picture.gif" MaxWidth="120" MaxHeight="120" DefaultWidth="120" />
-			</td>
-		</inp2:m_if>
-
-		<td valign="top">
-			<inp2:m_if check="ProductExists">
-				<inp2:m_if check="FieldEquals" field="Virtual" value="0">
-					<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="ProductName" /></a>
-				<inp2:m_else/>
-					<inp2:Field name="ProductName" />
-				</inp2:m_if>
-			<inp2:m_else/>
-				<inp2:Field field="ProductName"/>
-			</inp2:m_if>
-			<inp2:m_if check="HasOptions">
-				<br/>
-				<span>
-				<inp2:m_if check="DisplayOptionsPricing"> <!-- selectable options or overriding combination -->
-					<inp2:PrintOptions render_as="option_element" currency="selected"/>
-				<inp2:m_else/> <!-- listed combinations -->
-					<inp2:PrintOptions render_as="option_element_no_price"/>
-				</inp2:m_if>
-				</span>
-				<br/>
-			</inp2:m_if>
-			<inp2:m_if check="HasDiscount">
-				<br />
-				<inp2:m_Phrase label="lu_comm_RegularPrice" />: <inp2:Field name="FlatPrice" currency="selected"/><br />
-				<inp2:m_Phrase label="lu_comm_Discount" />: <span>- <inp2:Field name="ItemDiscount" currency="selected" negative="1"/></span>
-			</inp2:m_if>
-		</td>
-		<td valign="top"><strong><inp2:Field field="Price" currency="selected"/></strong></td>
-		<td valign="top"><inp2:Field field="Quantity"/></td>
-		<td valign="top"><strong><inp2:Field field="ExtendedPrice" currency="selected"/></strong></td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_form_shipping">
-	<!-- shipping -->
-	<table width="100%" cellpadding="0" cellspacing="0">
-		<tr>
-			<td colspan="2">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-		<tr class="sub-section-header">
-			<td colspan="2"><inp2:m_Phrase label="lu_section_ShippingInfo"/></td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-		<tr class="order-padding-left">
-			<td width="150"><strong><inp2:m_Phrase label="lu_Name"/></strong>:</td>
-			<td><inp2:Field field="ShippingTo"/></td>
-		</tr>
-		<inp2:m_if check="Field" name="ShippingCompany">
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_Company"/></strong>:</td>
-			<td><inp2:Field field="ShippingCompany"/></td>
-		</tr>
-		</inp2:m_if>
-		<inp2:m_if check="Field" name="ShippingEmail">
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_EmailAddress"/></strong>:</td>
-			<td><inp2:Field field="ShippingEmail"/></td>
-		</tr>
-		</inp2:m_if>
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_PhoneNumber"/></strong>:</td>
-			<td><inp2:Field field="ShippingPhone"/></td>
-		</tr>
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_FaxNumber"/></strong>:</td>
-			<td><inp2:Field field="ShippingFax"/></td>
-		</tr>
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_Address"/></strong>:</td>
-			<td>
-				<inp2:m_if check="FieldEquals" field="ShippingAddress1" value="" inverse="inverse">
-					<inp2:Field field="ShippingAddress1"/><br>
-				</inp2:m_if>
-
-				<inp2:m_if check="FieldEquals" field="ShippingAddress2" value="" inverse="inverse">
-					<inp2:Field field="ShippingAddress2"/><br>
-				</inp2:m_if>
-				<inp2:PrintLocation type="Shipping"/>
-			</td>
-		</tr>
-
-		<inp2:m_if check="Field" name="ShippingTracking">
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_ShippingTracking"/></strong>:</td>
-			<td><inp2:Field field="ShippingTracking"/></td>
-		</tr>
-		</inp2:m_if>
-
-	</table>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_form_billing">
-	<!-- billing -->
-	<table width="100%" cellpadding="0" cellspacing="0">
-		<tr>
-			<td colspan="2">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-		<tr class="sub-section-header">
-			<td colspan="2"><inp2:m_Phrase label="lu_section_BillingInfo"/></td>
-		</tr>
-		<tr>
-			<td colspan="2">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-		<tr class="order-padding-left">
-			<td width="150"><strong><inp2:m_Phrase label="lu_Name"/></strong>:</td>
-			<td><inp2:Field field="BillingTo"/></td>
-		</tr>
-		<inp2:m_if check="Field" name="BillingCompany">
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_Company"/></strong>:</td>
-			<td><inp2:Field field="BillingCompany"/></td>
-		</tr>
-		</inp2:m_if>
-		<inp2:m_if check="Field" name="BillingEmail">
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_EmailAddress"/></strong>:</td>
-			<td><inp2:Field field="BillingEmail"/></td>
-		</tr>
-		</inp2:m_if>
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_PhoneNumber"/></strong>:</td>
-			<td><inp2:Field field="BillingPhone"/></td>
-		</tr>
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_FaxNumber"/></strong>:</td>
-			<td><inp2:Field field="BillingFax"/></td>
-		</tr>
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_Address"/></strong>:</td>
-			<td>
-				<inp2:m_if check="FieldEquals" field="BillingAddress1" value="" inverse="inverse">
-					<inp2:Field field="BillingAddress1"/><br>
-				</inp2:m_if>
-
-				<inp2:m_if check="FieldEquals" field="BillingAddress2" value="" inverse="inverse">
-					<inp2:Field field="BillingAddress2"/><br>
-				</inp2:m_if>
-				<inp2:PrintLocation type="Billing"/>
-			</td>
-		</tr>
-
-		<tr class="order-padding-left">
-			<td><strong><inp2:m_Phrase label="lu_comm_PaymentType"/>:</strong></td>
-			<td><inp2:Field name="PaymentType" /></td>
-		</tr>
-
-		<inp2:m_if check="UsingCreditCard">
-			<tr class="order-padding-left">
-				<td><strong><inp2:m_Phrase label="lu_comm_NameOnCard"/>:</strong></td>
-				<td><inp2:Field name="PaymentNameOnCard"/></td>
-			</tr>
-			<tr class="order-padding-left">
-				<td><strong><inp2:m_Phrase label="lu_comm_CardType"/>:</strong></td>
-				<td><inp2:Field name="PaymentCardType" /></td>
-			</tr>
-			<tr class="order-padding-left">
-				<td><strong><inp2:m_Phrase label="lu_comm_CardNumber"/>:</strong></td>
-				<td><inp2:Field name="PaymentAccount" masked="masked"/></td>
-			</tr>
-			<tr class="order-padding-left">
-				<td><strong><inp2:m_Phrase label="lu_comm_Exp"/>:</strong></td>
-				<td><inp2:Field name="PaymentCCExpDate"/></td>
-			</tr>
-		</inp2:m_if>
-	</table>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="order_form">
-	<table>
-		<tr>
-			<td>
-				<strong><inp2:m_Phrase label="lu_comm_OrderNumber"/><inp2:Field field="OrderNumber"/>&nbsp;&nbsp;(<inp2:Field field="Status"/>)</strong>
-			</td>
-		</tr>
-	</table>
-
-	<inp2:m_if check="FieldEquals" field="IsRecurringBilling" value="1">
-		<table>
-			<tr>
-				<td valign="top" align="left">
-					<strong><inp2:m_Phrase label="lu_recurring_notice"/></strong> <inp2:m_Phrase label="lu_recurring_next_charge"/> <inp2:Field name="NextCharge" format="_regional_DateFormat"/> <inp2:m_Phrase label="lu_or"/> <inp2:m_GetConfig var="Comm_RecurringChargeInverval"/> <inp2:m_Phrase label="lu_recurring_charge_advance"/><br>
-					<a href="<inp2:m_link template="in-commerce/my_account/cancel_recurring" pass="ord"/>"><inp2:m_Phrase label="lu_recurring_cancel"/></a>
-				</td>
-			</tr>
-		</table>
-	</inp2:m_if>
-
-	<br />
-
-
-	<inp2:m_if check="OrderHasTangibleItems">
-		<table class="fullwidth">
-			<tr>
-				<td valign="top" width="49%">
-					<inp2:m_RenderElement name="order_form_shipping" PrefixSpecial="ord"/>
-				</td>
-				<td>&nbsp;</td>
-				<td valign="top" width="49%">
-					<inp2:m_RenderElement name="order_form_billing" PrefixSpecial="ord"/>
-				</td>
-			</tr>
-		</table>
-	<inp2:m_else />
-		<table class="fullwidth">
-			<tr>
-				<td>
-					<inp2:m_RenderElement name="order_form_billing" PrefixSpecial="ord"/>
-				</td>
-			</tr>
-		</table>
-	</inp2:m_if>
-
-
-
-	<br /><br />
-
-
-
-	<table class="fullwidth">
-		<tr>
-			<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">5<inp2:m_else/>4</inp2:m_if>">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-		<tr class="sub-section-header">
-			<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">
-				<td colspan="2"><inp2:m_Phrase label="lu_comm_ProductDescription"/></td>
-			<inp2:m_else/>
-				<td><inp2:m_Phrase label="lu_comm_ProductDescription"/></td>
-			</inp2:m_if>
-
-			<td><inp2:m_Phrase label="lu_comm_Price"/></td>
-
-			<td><inp2:m_Phrase label="lu_comm_Qty"/>.</td>
-			<td><inp2:m_Phrase label="lu_comm_Total"/></td>
-		</tr>
-		<tr>
-			<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">5<inp2:m_else/>4</inp2:m_if>">
-				<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-			</td>
-		</tr>
-
-		<inp2:ord_ListOrderItems render_as="orderitem_elem"/>
-
-		<tr class="order-padding-left">
-			<tr>
-				<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">5<inp2:m_else/>4</inp2:m_if>">
-					<br />
-					<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
-				</td>
-			</tr>
-			<td>
-				<inp2:m_if check="ord_HasDiscount">
-					<inp2:m_Phrase label="lu_comm_TotalSavings" />: <span><inp2:ord_Field name="DiscountTotal" currency="selected" /></span><br />
-				</inp2:m_if>&nbsp;
-			</td>
-			<td colspan="<inp2:m_if check="m_GetConfig" name="ShowProductImagesInOrders">5<inp2:m_else/>4</inp2:m_if>" align="right">
-				<div class="subtotal"><inp2:m_Phrase label="lu_comm_SubTotal"/>: <inp2:Field field="SubTotal" currency="selected"/><div>
-			</td>
-		</tr>
-	</table>
-
-
-	<br /><br />
-
-	<inp2:m_RenderElement name="subsection" title="lu_section_OrderTotal"/>
-
-	<table class="fullwidth">
-		<inp2:ord_PrintTotals
-			shipping_render_as="shipping_total"
-			processing_render_as="processing_total"
-			sub_total_render_as="sub_total"
-			vat_render_as="vat_total"
-			return_render_as="return_total"/>
-
-		<inp2:m_if check="ord_Field" name="GiftCertificateId">
-			<tr class="order-padding-left">
-				<td align="right"><inp2:m_Phrase label="lu_comm_Gift_Certificate"/>:</td>
-				<td align="right"><inp2:ord_Field name="GiftCertificateDiscount" currency="selected"/></td>
-			</tr>
-		</inp2:m_if>
-
-		<tr class="order-padding-left grand-total-blue">
-		    <td align="right"><inp2:m_Phrase label="lu_comm_GrandTotal"/>:</td>
-			<td align="right"><inp2:Field name="TotalAmount" currency="selected"/></td>
-		</tr>
-	</table>
-
-	<br />
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="shipping_total">
-	<tr class="order-padding-left">
-		<td align="right"><inp2:m_Phrase label="lu_comm_ShippingCost"/> (<inp2:ord_ShippingType />):</td>
-		<td align="right"><inp2:ord_Field name="ShippingCost" currency="selected"/></td>
-	</tr>
-	<tr class="order-padding-left">
-		<td align="right"><inp2:m_Phrase label="lu_comm_Insurance_Fee"/>:</td>
-		<td align="right"><inp2:ord_Field name="InsuranceFee" currency="selected"/></td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="processing_total">
-	<tr class="order-padding-left">
-		<td align="right"><inp2:m_Phrase label="lu_comm_ProcessingFee"/>: </td>
-		<td align="right"><inp2:ord_Field name="ProcessingFee" currency="selected"/></td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="sub_total">
-	<tr class="order-padding-left">
-		<td align="right"><inp2:m_Phrase label="lu_comm_SubTotal"/>: </td>
-		<td align="right"><inp2:ord_Field name="AmountWithoutVAT" currency="selected"/></td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="vat_total">
-	<tr class="order-padding-left">
-		<td align="right"><inp2:m_Phrase label="lu_comm_VAT"/> <inp2:ord_Field name="VATPercent"/>%: </td>
-		<td align="right"><inp2:ord_Field name="VAT" currency="selected"/></td>
-	</tr>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="return_total">
-	<tr class="order-padding-left">
-		<td align="right"><inp2:m_Phrase label="lu_fld_ReturnTotal"/> : </td>
-		<td align="right"><inp2:ord_Field name="ReturnTotal" currency="selected"/></td>
-	</tr>
-</inp2:m_DefineElement>
-<!--## /ORDER DETAILS ELEMENTS ##-->
-
-<!--## SHOW ORDER DETAILS TAG! ##-->
-<inp2:ord_ShowOrder render_as="order_form" />
-<!--## /SHOW ORDER DETAILS TAG! ##-->
\ No newline at end of file