Index: openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs-oracle.xql	10 Jul 2001 20:38:43 -0000	1.1
+++ openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs-oracle.xql	22 Jul 2001 06:13:37 -0000	1.2
@@ -34,16 +34,4 @@
 </fullquery>
 
  
-<fullquery name="ec_customer_service_simple_issue.customer_service_issue_insert">      
-      <querytext>
-      
-        insert into ec_customer_service_issues
-	(issue_id, user_identification_id, order_id, open_date, close_date, closed_by, gift_certificate_id)
-        values
-	(:issue_id, :user_identification_id, :order_id, sysdate, sysdate, :customer_service_rep, :gift_certificate_id)
-    
-      </querytext>
-</fullquery>
-
- 
 </queryset>
Index: openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs-postgresql.xql	10 Jul 2001 20:38:43 -0000	1.1
+++ openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs-postgresql.xql	22 Jul 2001 06:13:37 -0000	1.2
@@ -34,16 +34,4 @@
 </fullquery>
 
  
-<fullquery name="ec_customer_service_simple_issue.customer_service_issue_insert">      
-      <querytext>
-      
-        insert into ec_customer_service_issues
-	(issue_id, user_identification_id, order_id, open_date, close_date, closed_by, gift_certificate_id)
-        values
-	(:issue_id, :user_identification_id, :order_id, current_timestamp, current_timestamp, :customer_service_rep, :gift_certificate_id)
-    
-      </querytext>
-</fullquery>
-
- 
 </queryset>
Index: openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.tcl	18 Jul 2001 18:19:01 -0000	1.2
+++ openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.tcl	22 Jul 2001 06:13:37 -0000	1.3
@@ -93,7 +93,7 @@
     
     set action_id [db_nextval "ec_action_id_sequence"]
 
-    db_dml customer_service_issue_insert {
+    db_dml customer_service_action_insert {
         insert into ec_customer_service_actions
 	(action_id, issue_id, interaction_id, action_details)
         values
Index: openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.xql	10 Jul 2001 20:38:43 -0000	1.1
+++ openacs-4/packages/ecommerce/tcl/ecommerce-customer-service-procs.xql	22 Jul 2001 06:13:37 -0000	1.2
@@ -33,5 +33,17 @@
       </querytext>
 </fullquery>
 
+
+<fullquery name="ec_customer_service_simple_issue.customer_service_action_insert">
+      <querytext>
+
+      insert into ec_customer_service_actions
+      (action_id, issue_id, interaction_id, action_details)
+      values
+      (:action_id, :issue_id, :interaction_id, :action_details)
+
+      </querytext>
+</fullquery>
+
  
 </queryset>
Index: openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-oracle.xql	18 Jul 2001 23:46:14 -0000	1.2
+++ openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-oracle.xql	22 Jul 2001 06:13:37 -0000	1.3
@@ -3,7 +3,7 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="email_info_select">      
+<fullquery name="ec_email_new_order.email_info_select">      
       <querytext>
       
 	select u.email,
@@ -17,7 +17,7 @@
 </fullquery>
 
  
-<fullquery name="email_log_insert_1">      
+<fullquery name="ec_email_new_order.email_log_insert_1">      
       <querytext>
       
 	    insert into ec_automatic_email_log
@@ -29,7 +29,7 @@
 </fullquery>
 
 
-<fullquery name="email_log_insert_2">      
+<fullquery name="ec_email_order_shipped.email_log_insert_2">      
       <querytext>
       
           insert into ec_automatic_email_log
@@ -41,7 +41,7 @@
 </fullquery>
 
  
-<fullquery name="email_log_insert_3">      
+<fullquery name="ec_email_delayed_credit_denied.email_log_insert_3">      
       <querytext>
       
 	  insert into ec_automatic_email_log
@@ -53,7 +53,7 @@
 </fullquery>
 
 
-<fullquery name="email_log_insert_4">      
+<fullquery name="ec_email_new_gift_certificate_order.email_log_insert_4">      
       <querytext>
       
           insert into ec_automatic_email_log
@@ -66,7 +66,7 @@
 </fullquery>
 
 
-<fullquery name="email_log_insert_5">      
+<fullquery name="ec_email_gift_certificate_recipient.email_log_insert_5">      
       <querytext>
       
           insert into ec_automatic_email_log
@@ -78,7 +78,7 @@
 </fullquery>
 
 
-<fullquery name="email_log_insert_6">      
+<fullquery name="ec_email_gift_certificate_order_failure.email_log_insert_6">      
       <querytext>
       
           insert into ec_automatic_email_log
@@ -90,7 +90,7 @@
 </fullquery>
 
 
-<fullquery name="user_identification_id_seq">
+<fullquery name="ec_email_gift_certificate_recipient.user_identification_id_seq">
       <querytext>
 
         select ec_user_ident_id_sequence.nextval from dual
Index: openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-postgresql.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-postgresql.xql	18 Jul 2001 23:46:14 -0000	1.2
+++ openacs-4/packages/ecommerce/tcl/ecommerce-email-procs-postgresql.xql	22 Jul 2001 06:13:37 -0000	1.3
@@ -3,7 +3,7 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="email_info_select">      
+<fullquery name="ec_email_new_order.email_info_select">      
       <querytext>
       
 	select u.email,
@@ -17,7 +17,7 @@
 </fullquery>
 
  
-<fullquery name="email_log_insert_1">
+<fullquery name="ec_email_new_order.email_log_insert_1">
       <querytext>
 
             insert into ec_automatic_email_log
@@ -29,7 +29,7 @@
 </fullquery>
 
 
-<fullquery name="email_log_insert_2">
+<fullquery name="ec_email_order_shipped.email_log_insert_2">
       <querytext>
 
           insert into ec_automatic_email_log
@@ -41,7 +41,7 @@
 </fullquery>
 
 
-<fullquery name="email_log_insert_3">
+<fullquery name="ec_email_delayed_credit_denied.email_log_insert_3">
       <querytext>
 
           insert into ec_automatic_email_log
@@ -53,7 +53,7 @@
 </fullquery>
 
 
-<fullquery name="email_log_insert_4">
+<fullquery name="ec_email_new_gift_certificate_order.email_log_insert_4">
       <querytext>
 
           insert into ec_automatic_email_log
@@ -66,7 +66,7 @@
 </fullquery>
 
 
-<fullquery name="email_log_insert_5">
+<fullquery name="ec_email_gift_certificate_recipient.email_log_insert_5">
       <querytext>
 
           insert into ec_automatic_email_log
@@ -78,7 +78,7 @@
 </fullquery>
 
 
-<fullquery name="email_log_insert_6">
+<fullquery name="ec_email_gift_certificate_order_failure.email_log_insert_6">
       <querytext>
 
           insert into ec_automatic_email_log
@@ -90,7 +90,7 @@
 </fullquery>
  
 
-<fullquery name="user_identification_id_seq">
+<fullquery name="ec_email_gift_certificate_recipient.user_identification_id_seq">
       <querytext>
 
 	select ec_user_ident_id_seq.nextval 
Index: openacs-4/packages/ecommerce/tcl/ecommerce-state-changes-procs-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-state-changes-procs-oracle.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/ecommerce/tcl/ecommerce-state-changes-procs-oracle.xql	22 Jul 2001 04:51:03 -0000	1.2
+++ openacs-4/packages/ecommerce/tcl/ecommerce-state-changes-procs-oracle.xql	22 Jul 2001 06:13:37 -0000	1.3
@@ -16,6 +16,12 @@
       </querytext>
 </fullquery>
 
+
+<fullquery name="ec_update_state_to_authorized.order_state_update">
+      <querytext>
+      update ec_orders set order_state=:new_state, authorized_date=sysdate where order_id=:order_id                                                                   </querytext>
+</fullquery>
+
  
 <fullquery name="ec_update_state_to_authorized.authorized_date_update">      
       <querytext>
Index: openacs-4/packages/ecommerce/tcl/ecommerce-state-changes-procs-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/tcl/ecommerce-state-changes-procs-postgresql.xql,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/tcl/ecommerce-state-changes-procs-postgresql.xql	22 Jul 2001 04:51:03 -0000	1.3
+++ openacs-4/packages/ecommerce/tcl/ecommerce-state-changes-procs-postgresql.xql	22 Jul 2001 06:13:37 -0000	1.4
@@ -19,6 +19,13 @@
 </fullquery>
 
  
+<fullquery name="ec_update_state_to_authorized.order_state_update">
+      <querytext>
+      update ec_orders set order_state=:new_state, authorized_date=current_timestamp where order_id=:order_id
+      </querytext>
+</fullquery>
+
+
 <fullquery name="ec_update_state_to_authorized.authorized_date_update">      
       <querytext>
       update ec_financial_transactions set authorized_date=current_timestamp where transaction_id=:transaction_id