Index: openacs-4/packages/ecommerce/www/account.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/account.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/account.tcl	31 Jan 2002 22:43:54 -0000	1.2
+++ openacs-4/packages/ecommerce/www/account.tcl	26 May 2002 04:36:50 -0000	1.3
@@ -1,128 +1,110 @@
-#  www/ecommerce/account.tcl
 ad_page_contract {
     @param usca_p User session set or not
 
     @author
     @creation-date
-    @cvs-id account.tcl,v 3.4.2.7 2000/08/18 21:46:31 stevenp Exp
     @author ported by Jerry Asher (jerry@theashergroup.com)
+    @author revised by Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
+    @revision-date March 2002
+
 } {
     usca_p:optional
 }
 
-
 set user_id [ad_verify_and_get_user_id]
-
 if {$user_id == 0} {
-    
     set return_url "[ad_conn url]"
-
     ad_returnredirect "/register?[export_url_vars return_url]"
     return
 }
 
 set user_session_id [ec_get_user_session_id]
-
-
 ec_create_new_session_if_necessary
-# type1
-
 ec_log_user_as_user_id_for_this_session
 
 set past_orders ""
-db_foreach get_orders "select order_id, confirmed_date from ec_orders
-where user_id=:user_id
-and order_state not in ('in_basket','void','expired')
-order by order_id" {
+db_foreach get_orders "
+    select order_id, confirmed_date from ec_orders
+    where user_id=:user_id
+    and order_state not in ('in_basket','void','expired')
+    order by order_id" {
 
-
-    append past_orders "<li><a href=\"order?[export_url_vars order_id]\">$order_id</a>; [util_AnsiDatetoPrettyDate $confirmed_date]; [ec_order_status $order_id]\n"
+    append past_orders "
+	<li><a href=\"order?[export_url_vars order_id]\">$order_id</a>; [util_AnsiDatetoPrettyDate $confirmed_date]; [ec_order_status $order_id]</li>"
 } if_no_rows {
-
     append past_orders "You have no orders."
 }
 set purchased_gift_certificates ""
+
 # Gift Certificates
-# One Entry for each gift certificate
-# and the title only, if there is at least one
-db_foreach get_gift_certificates "select 
-gift_certificate_id, issue_date, amount
-from ec_gift_certificates
-where purchased_by=:user_id
-and gift_certificate_state in ('authorized','authorized_plus_avs','authorized_minus_avs', 'confirmed')" {
+# One Entry for each gift certificate and the title only, if there is
+# at least one
 
+db_foreach get_gift_certificates "
+    select gift_certificate_id, issue_date, amount
+    from ec_gift_certificates
+    where purchased_by=:user_id
+    and gift_certificate_state in ('authorized', 'confirmed')" {
 
-
-
-    append purchased_gift_certificates "<li><a href=\"gift-certificate?[export_url_vars gift_certificate_id]\">$gift_certificate_id</a>; [util_AnsiDatetoPrettyDate $issue_date]; [ec_pretty_price $amount]; [ec_gift_certificate_status $gift_certificate_id]\n"
+    append purchased_gift_certificates "
+	<li><a href=\"gift-certificate?[export_url_vars gift_certificate_id]\">$gift_certificate_id</a>; 
+	  [util_AnsiDatetoPrettyDate $issue_date]; [ec_pretty_price $amount]; [ec_gift_certificate_status $gift_certificate_id]"
 }
 
 if { ![empty_string_p $purchased_gift_certificates] } {
-    set purchased_gift_certificates "<h3>Gift Certificates Purchased by You for Others</h3>\n <ul> \n$purchased_gift_certificates\n</ul>"
+    set purchased_gift_certificates "
+	<h3>Gift Certificates Purchased by You for Others</h3> 
+	<ul>
+	  $purchased_gift_certificates
+	</ul>"
 }
 
-set gift_certificate_balance "[db_string get_gift_certificate_balance "select ec_gift_certificate_balance(:user_id) from dual"]"
+set gift_certificate_balance [db_string get_gift_certificate_balance "
+    select ec_gift_certificate_balance(:user_id) 
+    from dual"]
 
 if { $gift_certificate_balance > 0 } {
-    set gift_certificate_sentence_if_nonzero_balance "<li>You have [ec_pretty_price $gift_certificate_balance] in your gift certificate account!"
+    set gift_certificate_sentence_if_nonzero_balance "
+	<li>You have [ec_pretty_price $gift_certificate_balance] in your gift certificate account!</li>"
 } else {
     set gift_certificate_sentence_if_nonzero_balance ""
 }
 
-# User Classes: this section will only show up if the user is allowed to view them and
-# if any user classes exist
-set user_classes ""
+# User Classes: this section will only show up if the user is allowed
+# to view them and if any user classes exist
 
-if { [ad_parameter -package_id [ec_id] UserClassUserViewP ecommerce] == 1 && ![empty_string_p [db_string  get_user_view_classes "select 1 from dual where exists (select 1 from ec_user_classes)" -default ""]]} {
-
+set user_classes ""
+if { [ad_parameter -package_id [ec_id] UserClassUserViewP ecommerce] == 1 && \
+	 ![empty_string_p [db_string  get_user_view_classes "select 1 from dual where exists (select 1 from ec_user_classes)" -default ""]]} {
     set user_classes_to_display [ec_user_class_display $user_id]
-
     append user_classes "<p><li>User Classes: $user_classes_to_display"
-
     if { [ad_parameter -package_id [ec_id] UserClassAllowSelfPlacement ecommerce] } {
 	append user_classes " (<a href=\"update-user-classes\">[ec_decode $user_classes_to_display "" "sign up for one" "update"]</a>)"
     }
-
-    append user_classes "\n"
 }
 
 # Mailing Lists
+
 set mailing_lists ""
 
-db_foreach get_mailing_lists "select 
- ml.category_id, 
- c.category_name,
- ml.subcategory_id, 
- s.subcategory_name, 
- ml.subsubcategory_id,
- ss.subsubcategory_name
-from ec_cat_mailing_lists ml, 
- ec_categories c,
- ec_subcategories s,
- ec_subsubcategories ss
-where ml.user_id = :user_id
-and ml.category_id = c.category_id(+)
-and ml.subcategory_id = s.subcategory_id(+)
-and ml.subsubcategory_id = ss.subsubcategory_id(+)" {
+db_foreach get_mailing_lists "
+    select ml.category_id, c.category_name, ml.subcategory_id, s.subcategory_name, ml.subsubcategory_id, ss.subsubcategory_name
+    from ec_cat_mailing_lists ml, ec_categories c, ec_subcategories s, ec_subsubcategories ss
+    where ml.user_id = :user_id
+    and ml.category_id = c.category_id(+)
+    and ml.subcategory_id = s.subcategory_id(+)
+    and ml.subsubcategory_id = ss.subsubcategory_id(+)" {
 
-
-
-    append mailing_lists "<li>$category_name [ec_decode $subcategory_name "" "" ": $subcategory_name"] [ec_decode $subsubcategory_name "" "" ": $subsubcategory_name"] (<a href=\"mailing-list-remove?[export_url_vars category_id subcategory_id subsubcategory_id]\">remove me</a>)"
+    append mailing_lists "
+	<li>$category_name [ec_decode $subcategory_name "" "" ": $subcategory_name"] [ec_decode $subsubcategory_name "" "" ": $subsubcategory_name"] 
+	  (<a href=\"mailing-list-remove?[export_url_vars category_id subcategory_id subsubcategory_id]\">remove me</a>)</li>"
 } if_no_rows {
-
     set mailing_lists "<i>You are not currently subscribed to any mailing lists.</i>"
 }
-set mailing_lists "<h3>Mailing Lists</h3><ul>$mailing_lists</ul>\n"
-db_release_unused_handles
+set mailing_lists "
+    <h3>Mailing Lists</h3>
+    <ul>
+      $mailing_lists
+    </ul>"
 
-ec_return_template
-
-
-
-
-
-
-
-
-
-
+db_release_unused_handles