Index: branches/1.0.x/receipt.tpl
===================================================================
diff -u -N -r14829 -r15019
--- branches/1.0.x/receipt.tpl	(.../receipt.tpl)	(revision 14829)
+++ branches/1.0.x/receipt.tpl	(.../receipt.tpl)	(revision 15019)
@@ -15,7 +15,7 @@
 
 <inp2:m_DefineElement name="orderitem_elem">
 	<tr>
-		<td class="item-img">
+		<td class="item-img"<inp2:m_if check="HasOptions"> rowspan="2"</inp2:m_if>>
 			<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="58" DefaultWidth="58" DefaultImage="img/no_picture.gif"/>
 		</td>
 		<td class="item-title">
@@ -31,6 +31,18 @@
 		<td><inp2:Field name="Price" currency="selected"/></td>
 		<td><inp2:Field name="ExtendedPrice" currency="selected"/></td>
 	</tr>
+
+	<inp2:m_if check="HasOptions">
+		<tr>
+			<td class="options-td" colspan="5">
+				<inp2:m_if check="DisplayOptionsPricing">
+					<inp2:PrintOptions render_as="ro_option_element" currency="selected"/>
+				<inp2:m_else/>
+					<inp2:PrintOptions render_as="ro_option_element_no_price" currency="selected"/>
+				</inp2:m_if>
+			</td>
+		</tr>
+	</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="order_form_shipping">
@@ -170,6 +182,7 @@
 
 <!--## MAIN CONTENT ##-->
 <inp2:m_DefineElement name="content">
+	<inp2:m_Include template="elements/options.elm" strip_nl="2"/>
 
 	<ul class="steps">
 		<li class="step1"><span><i></i>Shopping Cart</span></li>