Fixed bug that causes options to not show in some places.

This removes the checks for the o_enable field in the master options table
record which we no longer write to the table for new options from etc/report,
etc/receipt.html and etc/mail_receipt.  The check has been replaced with a check
for the option_type field in the products table.  Note that option_type is
actually hard-coded in this instance rather than checking
$Config->{OptionsEnable} as the hard coding is much more efficient.  It might
pay to set this field name in a catalog variable, though, instead.

WHATSNEW-5.7

@@ -8,6 +8,19 @@
 See UPGRADE document for a list of incompatible changes.
 
 
+Interchange 5.7.3 not yet released.
+
+
+Standard Demo
+-------------
+
+* Fixed bug that causes options to not show up on the checkout reciept, or the
+  order report, or the mail reciept for most or all items.
+
+
+------------------------------------------------------------------------------
+
+
 Interchange 5.7.2 released 2009-09-17.
 
 

dist/standard/etc/mail_receipt

@@ -40,11 +40,11 @@ Quan  Item No.    Description                            Price        Extension
 [column width=15 gutter=1 align=r]  [item-price] [/column]
 [column width=17 gutter=1 align=r] [item-subtotal] [/column]
 [/row]
-[if-item-data options o_enable][if-item-data !options o_modular][row 82]
+[if-item-field option_type][row 82]
     [column width=5 align=right][/column]
     [column width=12 gutter=1][/column]
     [column width=32 wrap=1 gutter=1][filter op="tabbed decode_entities compress_space strip"][item-options type=display report=1][/filter][/column]
-[/row][/if-item-data][/if-item-data]
+[/row][/if-item-field]
 [if-item-param pay_cert_code]
 [row 120]
 	[column width=82]URL:[area

dist/standard/etc/receipt.html

@@ -221,13 +221,11 @@
 	<td>
 	[item-data products description]
 	[if-modifier size]<BR>SIZE-->[item-modifier size][/if-modifier][if-modifier color] COLOR-->[item-modifier color][/if-modifier]
-	[if-item-data options o_enable]
-		[if-item-data !options o_modular]
+	[if-item-field option_type]
 			[table-organize cols=4 table=' ' font="size=1" pretty=1]
 				[item-options td=1 label=1 bold=1 price=1 type=display]
 			[/table-organize]
-		[/if-item-data]
-	[/if-item-data]
+	[/if-item-field]
 
 	[if-item-param pay_cert_code]
 		[tmp gc_url][area href="pay_cert/redeem"

dist/standard/etc/report

@@ -48,11 +48,11 @@ Quan  Item No.    Description                            Price       Extension
 [column width=14 align=right gutter=1][item-price display=text][/column]   
 [column width=15 align=right gutter=0][item-subtotal display=text][/column]
 [/row]
-[if-item-data options o_enable][if-item-data !options o_modular][row 82]
+[if-item-field option_type][row 82]
     [column width=5 gutter=1 align=right][/column]
     [column width=12 gutter=1] [item-code] [/column]
     [column width=32 wrap=1 gutter=1][filter op="tabbed decode_entities compress_space strip"][item-options report=1][/filter][/column]
-[/row][/if-item-data][/if-item-data]
+[/row][/if-item-field]
 [if-item-modifier mv_ad]
 [row 82]
 [column width=5             gutter=1 align=right] [/column]