Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3-oracle.xql 10 Jul 2001 20:33:53 -0000 1.1
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3-oracle.xql 26 Aug 2001 23:03:42 -0000 1.2
@@ -30,5 +30,41 @@
+
+
+
+
+ to_date(:open_date_str,'YYYY-MM-DD HH24:MI:SS')
+
+
+
+
+
+
+
+
+ null
+
+
+
+
+
+
+
+ null
+
+
+
+
+
+
+ insert into ec_customer_service_issues
+ (issue_id, user_identification_id, order_id, open_date, close_date, closed_by)
+ values
+ (:issue_id, :uiid_to_insert, :order_id, $date_string, $close_date, $customer_service_rep_bit)
+
+
+
+
Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3-postgresql.xql 10 Jul 2001 20:33:53 -0000 1.1
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3-postgresql.xql 26 Aug 2001 23:03:42 -0000 1.2
@@ -30,5 +30,43 @@
+
+
+
+
+ to_timestamp(:open_date_str,'YYYY-MM-DD HH24:MI:SS')
+
+
+
+
+
+
+
+
+ null
+
+
+
+
+
+
+
+
+ null
+
+
+
+
+
+
+
+ insert into ec_customer_service_issues
+ (issue_id, user_identification_id, order_id, open_date, close_date, closed_by)
+ values
+ (:issue_id, :uiid_to_insert, :order_id, $date_string, $close_date, $customer_service_rep_bit)
+
+
+
+
Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl 20 Apr 2001 20:51:14 -0000 1.1
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl 26 Aug 2001 23:03:42 -0000 1.2
@@ -237,7 +237,7 @@
if { [info exists order_id] && ![empty_string_p $order_id] } {
# see who the order belongs to
set row_exists_p [db_0or1row get_order_owner "select user_id as order_user_id from ec_orders where order_id=:order_id"]
- if { { $row_exists_p==0 } } {
+ if { $row_exists_p==0 } {
ad_return_complaint 1 "
The order ID that you specified is invalid. Please go back and check the order ID you entered. If this issue is not about a specific order, please leave the order ID blank.\n"
return
}
@@ -311,7 +311,8 @@
}
# create the sql string for inserting open_date
-set date_string "to_date(:open_date_str,'YYYY-MM-DD HH24:MI:SS')"
+#set date_string "to_date(:open_date_str,'YYYY-MM-DD HH24:MI:SS')"
+set date_string [db_map date_string_sql]
if { [info exists interaction_id] } {
set create_new_interaction_p "f"
@@ -398,10 +399,17 @@
# issue_id & issue_type for each issue_type in issue_type_list
if { $create_new_issue_p == "t" } {
+ if { $close_issue_p == "t" } {
+ set customer_service_rep_bit :customer_service_rep
+ set close_date $date_string
+ } else {
+ set customer_service_rep_bit [db_map customer_service_rep_bit_null_sql]
+ set close_date [db_map close_date_null_sql]
+ }
db_dml insert_new_ec_cs_issue "insert into ec_customer_service_issues
(issue_id, user_identification_id, order_id, open_date, close_date, closed_by)
values
- (:issue_id, :uiid_to_insert, :order_id, $date_string, [ec_decode $close_issue_p "t" ":date_string" "''"], [ec_decode $close_issue_p "t" ":customer_service_rep" "''"])
+ (:issue_id, :uiid_to_insert, :order_id, $date_string, $close_date, $customer_service_rep_bit)
"
foreach issue_type $issue_type_list {
@@ -441,16 +449,16 @@
db_release_unused_handles
if { $submit == "Interaction Complete" } {
if { ![info exists return_to_issue] } {
- ad_returnredirect interaction-add.tcl
+ ad_returnredirect interaction-add
} else {
- ad_returnredirect "issue.tcl?issue_id=$return_to_issue"
+ ad_returnredirect "issue?issue_id=$return_to_issue"
}
} else {
# (in c_user_identification_id, "c" stands for "confirmed" meaning
# that they've been through interaction-add-3.tcl and now they cannot change
# the user_identification_id)
set insert_id 1
- ad_returnredirect "interaction-add-2.tcl?[export_url_vars interaction_id interaction_type postal_code return_to_issue insert_id interaction_originator]&c_user_identification_id=$uiid_to_insert"
+ ad_returnredirect "interaction-add-2?[export_url_vars interaction_id interaction_type postal_code return_to_issue insert_id interaction_originator]&c_user_identification_id=$uiid_to_insert"
}
Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.xql 10 Jul 2001 20:33:53 -0000 1.1
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.xql 26 Aug 2001 23:03:42 -0000 1.2
@@ -99,17 +99,6 @@
-
-
- insert into ec_customer_service_issues
- (issue_id, user_identification_id, order_id, open_date, close_date, closed_by)
- values
- (:issue_id, :uiid_to_insert, :order_id, $date_string, [ec_decode $close_issue_p "t" ":date_string" "''"], [ec_decode $close_issue_p "t" ":customer_service_rep" "''"])
-
-
-
-
-
insert into ec_cs_issue_type_map
Index: openacs-4/packages/ecommerce/www/admin/customer-service/issue-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/issue-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/customer-service/issue-oracle.xql 10 Jul 2001 20:33:53 -0000 1.1
+++ openacs-4/packages/ecommerce/www/admin/customer-service/issue-oracle.xql 26 Aug 2001 23:03:42 -0000 1.2
@@ -12,5 +12,16 @@
+
+
+
+select a.action_id, a.interaction_id, a.action_details, a.follow_up_required, i.customer_service_rep, i.interaction_date, to_char(i.interaction_date,'YYYY-MM-DD HH24:MI:SS') as full_interaction_date, i.interaction_originator, i.interaction_type, m.info_used
+from ec_customer_service_actions a, ec_customer_serv_interactions i, ec_cs_action_info_used_map m
+where a.interaction_id=i.interaction_id
+and a.action_id=m.action_id(+)
+and a.issue_id=:issue_id
+order by a.action_id desc
+
+
Index: openacs-4/packages/ecommerce/www/admin/customer-service/issue-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/issue-postgresql.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/customer-service/issue-postgresql.xql 10 Jul 2001 20:33:53 -0000 1.1
+++ openacs-4/packages/ecommerce/www/admin/customer-service/issue-postgresql.xql 26 Aug 2001 23:03:42 -0000 1.2
@@ -12,5 +12,15 @@
-
+
+
+select a.action_id, a.interaction_id, a.action_details, a.follow_up_required, i.customer_service_rep, i.interaction_date, to_char(i.interaction_date,'YYYY-MM-DD HH24:MI:SS') as full_interaction_date, i.interaction_originator, i.interaction_type, m.info_used
+from ec_customer_service_actions a
+ JOIN ec_customer_serv_interactions i on (a.interaction_id=i.interaction_id)
+ LEFT JOIN ec_cs_action_info_used_map m on (a.action_id=m.action_id)
+where a.issue_id=:issue_id
+order by a.action_id desc
+
+
+