Index: openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl,v
diff -u -N -r1.11 -r1.12
--- openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl	10 Dec 2002 20:06:32 -0000	1.11
+++ openacs-4/packages/ecommerce/tcl/ecommerce-scheduled-procs.tcl	8 Mar 2004 19:46:11 -0000	1.12
@@ -183,14 +183,14 @@
     db_foreach transactions_select "
 	select o.order_id, ec_order_cost(o.order_id) as total_order_price, 
 	    f.transaction_id, f.inserted_date, f.transaction_amount, c.creditcard_type as card_type, 
-	    p.first_names || ' ' || p.last_name as card_name, 
+	    a.attn as card_name, 
 	    c.creditcard_number as card_number, substring(creditcard_expire for 2) as card_exp_month, substring(creditcard_expire from 4 for 2) as card_exp_year, c.creditcard_type,
 	    a.zip_code as billing_zip,
             a.line1 as billing_address, 
             a.city as billing_city, 
             coalesce(a.usps_abbrev, a.full_state_name) as billing_state, 
             a.country_code as billing_country
-	from ec_orders o, ec_financial_transactions f, ec_creditcards c, persons p 
+	from ec_orders o, ec_financial_transactions f, ec_creditcards c, persons p, ec_addresses a 
 	where order_state = 'confirmed' 
 	and (sysdate - confirmed_date) > 1/96
 	and f.failed_p = 'f'
@@ -394,7 +394,7 @@
     db_foreach transactions_select "
 	select g.gift_certificate_id, f.transaction_id, f.transaction_amount, f.inserted_date, 
 	    c.creditcard_type, c.creditcard_number as card_number, substring(creditcard_expire for 2) as card_exp_month, substring(creditcard_expire from 4 for 2) as card_exp_year, 
-	    p.first_names || ' ' || p.last_name as card_name, 
+	    a.attn as card_name, 
             a.zip_code as billing_zip,
             a.line1 as billing_address, 
 	    a.city as billing_city, 
@@ -687,7 +687,7 @@
 
     db_foreach transactions_select "
         select f.transaction_id, f.order_id, f.transaction_amount, f.to_be_captured_date, 
-            p.first_names || ' ' || p.last_name as card_name, 
+            a.attn as card_name, 
             substring(creditcard_expire for 2) as card_exp_month, substring(creditcard_expire from 4 for 2) as card_exp_year, c.creditcard_number as card_number, c.creditcard_type,
             a.zip_code as billing_zip,
             a.line1 as billing_address, 
@@ -846,7 +846,7 @@
 
     db_foreach transactions_select "
         select f.transaction_id, f.order_id, f.transaction_amount, f.to_be_captured_date,
-            p.first_names || ' ' || p.last_name as card_name, 
+            a.attn as card_name, 
 	    c.creditcard_number as card_number,  c.creditcard_type, substring(creditcard_expire for 2) as card_exp_month, substring(creditcard_expire from 4 for 2) as card_exp_year,
             a.zip_code as billing_zip,
             a.line1 as billing_address, 
@@ -1012,7 +1012,7 @@
 
     db_foreach transactions_select "
         select f.transaction_id, f.order_id, f.transaction_amount, f.to_be_captured_date, c.creditcard_type as card_type, 
-            p.first_names || ' ' || p.last_name as card_name, c.creditcard_number as card_number, 
+            a.attn as card_name, c.creditcard_number as card_number, 
             c.creditcard_expire as card_expiration, c.creditcard_type
             a.zip_code as billing_zip,
 	    a.line1 as billing_address,