Index: openacs-4/packages/ecommerce/www/admin/orders/creditcard-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/creditcard-add-3.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/www/admin/orders/creditcard-add-3.tcl	29 Jan 2002 00:11:46 -0000	1.2
+++ openacs-4/packages/ecommerce/www/admin/orders/creditcard-add-3.tcl	26 May 2002 04:36:50 -0000	1.3
@@ -1,37 +1,38 @@
-#  www/[ec_url_concat [ec_url] /admin]/orders/creditcard-add-3.tcl
 ad_page_contract {
 
-  @author Eve Andersson (eveander@arsdigita.com)
-  @creation-date Summer 1999
-  @cvs-id creditcard-add-3.tcl,v 3.1.6.3 2000/08/16 18:49:04 seb Exp
-  @author ported by Jerry Asher (jerry@theashergroup.com)
+    @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:insert,notnull
-  creditcard_number:notnull
-  creditcard_type:notnull
-  creditcard_expire_1
-  creditcard_expire_2
-  billing_zip_code
+    address_id
+    order_id:notnull
+    creditcard_number:notnull
+    creditcard_type:notnull
+    creditcard_expire_1
+    creditcard_expire_2
 }
 
 ad_require_permission [ad_conn package_id] admin
 
 db_transaction {
-
-  set user_id [db_string user_id_select "select user_id from ec_orders where order_id=:order_id"]
-
-  set creditcard_id [db_nextval ec_creditcard_id_sequence]
-
-  set creditcard_last_four [string range $creditcard_number [expr [string length $creditcard_number] -4] [expr [string length $creditcard_number] -1]]
-  set creditcard_expire "$creditcard_expire_1/$creditcard_expire_2"
-
-  db_dml creditcard_insert_select "insert into ec_creditcards
-  (creditcard_id, user_id, creditcard_number, creditcard_last_four, creditcard_type, creditcard_expire, billing_zip_code)
-  values
-  (:creditcard_id, :user_id, :creditcard_number, :creditcard_last_four, :creditcard_type, :creditcard_expire, :billing_zip_code)
-  "
-
-  db_dml ec_orders_update "update ec_orders set creditcard_id=:creditcard_id where order_id=:order_id"
+    set user_id [db_string user_id_select "
+	select user_id 
+	from ec_orders 
+	where order_id = :order_id"]
+    set creditcard_id [db_nextval ec_creditcard_id_sequence]
+    set creditcard_last_four [string range $creditcard_number [expr [string length $creditcard_number] -4] [expr [string length $creditcard_number] -1]]
+    set creditcard_expire "$creditcard_expire_1/$creditcard_expire_2"
+    db_dml creditcard_insert_select "
+	insert into ec_creditcards
+  	(creditcard_id, user_id, creditcard_number, creditcard_last_four, creditcard_type, creditcard_expire, billing_address)
+  	values
+  	(:creditcard_id, :user_id, :creditcard_number, :creditcard_last_four, :creditcard_type, :creditcard_expire, :address_id)"
+    db_dml ec_orders_update "
+	update ec_orders 
+	set creditcard_id = :creditcard_id 
+	where order_id = :order_id"
 }
-
 ad_returnredirect "one?[export_url_vars order_id]"