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.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/orders/address-add-2.tcl	26 May 2002 04:36:50 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/orders/address-add-2.tcl	23 Sep 2002 22:25:29 -0000	1.3
@@ -18,7 +18,7 @@
     {usps_abbrev ""}
     {full_state_name ""}
     zip_code
-    {country_code "us"}
+    {country_code "US"}
     phone
     phone_time
 }
Index: openacs-4/packages/ecommerce/www/admin/orders/address-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/address-add-3.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/ecommerce/www/admin/orders/address-add-3.tcl	13 Sep 2002 10:44:00 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/orders/address-add-3.tcl	23 Sep 2002 22:25:29 -0000	1.5
@@ -10,22 +10,22 @@
 
 } {
     order_id:integer,notnull
-    creditcard_id:integer,optional
+    {creditcard_id:integer ""}
     attn
     line1
     line2
     city
     {usps_abbrev ""}
     {full_state_name ""}
     zip_code
-    {country_code "us"}
+    {country_code "US"}
     phone
     phone_time
 }
 
 ad_require_permission [ad_conn package_id] admin
 
-if {![info exists creditcard_id] || ([info exists creditcard_id] && [empty_string_p $creditcard_id])} {
+if {[empty_string_p $creditcard_id]} {
 
     # Insert the address into ec_addresses, update the address in
     # ec_orders