[interchange-cvs] [SCM] Interchange branch, master, updated. REL_5_7_2-13-g52500fb

[Peter Ajamian]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Interchange".

The branch, master has been updated
       via  52500fbdd62f89bc666492d349bc0b97e304573c (commit)
      from  4d652fcb5a006229c610b009081cc4d9bf59db07 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 52500fbdd62f89bc666492d349bc0b97e304573c
Author: Peter Ajamian <peter at pajamian.dhs.org>
Date:   Fri Oct 23 07:37:26 2009 -0700

    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.

-----------------------------------------------------------------------

Summary of changes and diff:
 WHATSNEW-5.7                   |   13 +++++++++++++
 dist/standard/etc/mail_receipt |    4 ++--
 dist/standard/etc/receipt.html |    6 ++----
 dist/standard/etc/report       |    4 ++--
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/WHATSNEW-5.7 b/WHATSNEW-5.7
index 37286fd..94b3501 100644
--- a/WHATSNEW-5.7
+++ b/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.
 
 
diff --git a/dist/standard/etc/mail_receipt b/dist/standard/etc/mail_receipt
index 9397160..02e4100 100644
--- a/dist/standard/etc/mail_receipt
+++ b/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
diff --git a/dist/standard/etc/receipt.html b/dist/standard/etc/receipt.html
index de0df87..cd1517d 100644
--- a/dist/standard/etc/receipt.html
+++ b/dist/standard/etc/receipt.html
@@ -221,13 +221,11 @@ ui_template_name: noleft
 	<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"
diff --git a/dist/standard/etc/report b/dist/standard/etc/report
index 1ed45bc..75a06cb 100644
--- a/dist/standard/etc/report
+++ b/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]


hooks/post-receive
-- 
Interchange