Index: openacs-4/packages/ecommerce/www/admin/orders/address-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/address-add-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/orders/address-add-2.tcl	20 Apr 2001 20:51:14 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/orders/address-add-2.tcl	26 May 2002 04:36:50 -0000	1.2
@@ -1,47 +1,48 @@
-#  /www/[ec_url_concat [ec_url] /admin]/orders/address-add-2.tcl
 ad_page_contract {
-  Confirm shipping address.
 
-  @author Eve Andersson (eveander@arsdigita.com)
-  @creation-date Summer 1999
-  @cvs-id address-add-2.tcl,v 3.1.6.3 2000/08/16 16:28:51 seb Exp
-  @author ported by Jerry Asher (jerry@theashergroup.com)
+    Confirm shipping address.
+
+    @author Eve Andersson (eveander@arsdigita.com)
+    @creation-date Summer 1999
+    @author ported by Jerry Asher (jerry@theashergroup.com)
+    @author revised by Bart Teeuwisse <bart.teeuwisse@7-sisters.com>
+    @revision-date April 2002
+
 } {
-  order_id:integer,notnull
-  attn
-  line1
-  line2
-  city
-  {usps_abbrev ""}
-  {full_state_name ""}
-  zip_code
-  {country_code "us"}
-  phone
-  phone_time
+    order_id:integer,notnull
+    creditcard_id:integer,optional
+    attn
+    line1
+    line2
+    city
+    {usps_abbrev ""}
+    {full_state_name ""}
+    zip_code
+    {country_code "us"}
+    phone
+    phone_time
 }
 
 ad_require_permission [ad_conn package_id] admin
 
-doc_body_append "[ad_admin_header "Confirm Shipping Address"]
+doc_body_append "
+    [ad_admin_header "Confirm Shipping Address"]
 
-<h2>Confirm Shipping Address</h2>
+    <h2>Confirm Shipping Address</h2>
 
-[ad_admin_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?[export_url_vars order_id]" "One Order"] "Confirm Shipping Address"]
+    [ad_admin_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?[export_url_vars order_id]" "One Order"] "Confirm Shipping Address"]
 
-<hr>
-Please confirm new address:
-<blockquote>
-"
+    <hr>
+    <p>Please confirm new address:</p>
+    <blockquote>"
 
 doc_body_append "
-
-[ec_display_as_html [ec_pretty_mailing_address_from_args $line1 $line2 $city $usps_abbrev $zip_code $country_code $full_state_name $attn $phone $phone_time]]
-
-</blockquote>
-<form method=post action=address-add-3>
-[export_entire_form]
-<center>
-<input type=submit value=\"Confirm\">
-</center>
-[ad_admin_footer]
-"
+      [ec_display_as_html [ec_pretty_mailing_address_from_args $line1 $line2 $city $usps_abbrev $zip_code $country_code $full_state_name $attn $phone $phone_time]]
+    </blockquote>
+    <form method=post action=address-add-3>
+      [export_entire_form]
+      <center>
+        <input type=submit value=\"Confirm\">
+      </center>
+    </form>
+    [ad_admin_footer]"