Index: openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl	9 Mar 2004 00:59:47 -0000	1.4
+++ openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl	12 Feb 2005 23:07:10 -0000	1.4.2.1
@@ -12,37 +12,31 @@
 
 append doc_body "[ad_admin_header "Customer Service Administration"]
 
-<h2>Customer Service Administration</h2>
+<h2>Customer Service Issues</h2>
 
-[ad_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] "Customer Service Administration"]
+[ad_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] "Customer Service"]
 
-<hr>
+<hr noshade>
 
-<ul>
-<li>Insert <a href=\"interaction-add\">New Interaction</a>
-</ul>
 
-<h3>Customer Service Issues</h3>
-
-<ul>
-<b><li>uncategorized</b> :
+<table border=\"0\" cellspacing=\"0\" cellpadding=\"2\" bgcolor=\"\#cccccc\" align=\"right\">
+<tr><td><p>type</p></td><td><p>open</p></td><td><p> closed</p></td></tr>
+<tr><td align=\"right\">uncategorized </td><td>
 "
 
-
-
 set num_open_issues [db_string get_open_issues "select count(*) 
 from ec_customer_service_issues issues, ec_user_identification id
 where issues.user_identification_id = id.user_identification_id
 and close_date is NULL 
 and deleted_p = 'f'
 and 0 = (select count(*) from ec_cs_issue_type_map map where map.issue_id=issues.issue_id)"]
 
-append doc_body "<a href=\"issues\">open</a> <font size=-1>($num_open_issues)</font> | 
-<a href=\"issues?view_status=closed\">closed</a>
+if {$num_open_issues > 0 } {
+    append doc_body "<a href=\"issues\">$num_open_issues open</a> </td><td><a href=\"issues?view_status=closed\">closed</a></td></tr>"
+} else {
+    append doc_body "<a href=\"issues\">none</a></td><td><a href=\"issues?view_status=closed\">closed</a></td></tr>"
+}
 
-<p>
-"
-
 # only want to show issue types in the issue type widget, and then clump all others under
 # "other"
 set issue_type_list [db_list get_issue_type_list "select picklist_item from ec_picklist_items where picklist_name='issue_type' order by sort_key"]
@@ -56,13 +50,17 @@
 and deleted_p = 'f'
 and 1 <= (select count(*) from ec_cs_issue_type_map map where map.issue_id=issues.issue_id and map.issue_type=:issue_type)"]
 
-append doc_body "<b><li>$issue_type</b> : 
+if {$num_open_issues > 0 } {
+    append doc_body "<tr><td align=\"right\">$issue_type </td><td> 
+<a href=\"issues?view_issue_type=[ns_urlencode $issue_type]\">$num_open_issues open</a> </td><td> <a href=\"issues?view_issue_type=[ns_urlencode $issue_type]&view_status=closed\">closed</a>
+</td></tr>"
+} else {
+    append doc_body "<tr><td align=\"right\">$issue_type </td><td> 
+<a href=\"issues?view_issue_type=[ns_urlencode $issue_type]\">none</a></td><td> <a href=\"issues?view_issue_type=[ns_urlencode $issue_type]&view_status=closed\">closed</a>
+</td></tr>"
+}
 
-<a href=\"issues?view_issue_type=[ns_urlencode $issue_type]\">open</a> <font size=-1>($num_open_issues)</font> | <a href=\"issues?view_issue_type=[ns_urlencode $issue_type]&view_status=closed\">closed</a>
 
-<p>
-"
-
 }
 
 # same query for issues that aren't in issue_type_list
@@ -82,56 +80,52 @@
 and deleted_p = 'f'
 $last_bit_of_query"]
 
-append doc_body "<b><li>all others</b> :
-<a href=\"issues?view_issue_type=[ns_urlencode "all others"]\">open</a> <font size=-1>($num_open_issues)</font> |
-<a href=\"issues?view_issue_type=[ns_urlencode "all others"]&view_status=closed\">closed</a>
-</ul>
-<p>
-"
+if { $num_open_issues > 0 } {
+    append doc_body "<tr><td align=\"right\">all others </td><td>
+<a href=\"issues?view_issue_type=[ns_urlencode "all others"]\">$num_open_issues open</a> </td><td>
+<a href=\"issues?view_issue_type=[ns_urlencode "all others"]&view_status=closed\">closed</a>"
+} else {
+    append doc_body "<tr><td align=\"right\">all others </td><td>
+<a href=\"issues?view_issue_type=[ns_urlencode "all others"]\">none</a> </td><td>
+<a href=\"issues?view_issue_type=[ns_urlencode "all others"]&view_status=closed\">closed</a>"
+}
+append doc_body "</table><p>add <a href=\"interaction-add\">New Interaction</a></p>"
 
 if { [llength $issue_type_list] == 0 } {
-    append doc_body "<b>If you want to see issues separated out by commonly used issue types, then add those issue types to the issue type picklist below in Picklist Management.</b>" 
+    append doc_body "<p>If you want to see issues separated out by commonly used issue types, then add those issue types to the issue type in Picklist Management.</p>" 
 }
 
-append doc_body "</ul>
-<p>
+append doc_body "<h3>Search for customer</h3>
 
-<h3>Customers</h3>
-
-<ul>
 <FORM METHOD=get ACTION=[ec_acs_admin_url]users/search>
 <input type=hidden name=target value=\"one.tcl\">
-<li>Quick search for registered users: <input type=text size=15 name=keyword>
+<tr><td>Search for <b>registered</b> users: <input type=text size=15 name=keyword>
 </FORM>
 
-<p>
-
 <form method=post action=user-identification-search>
-<li>Quick search for unregistered users with a customer service history:
+<tr><td>Search for <b>unregistered</b> users with a customer service history:
 <input type=text size=15 name=keyword>
 </form>
 
-<p>
-
 <form method=post action=customer-search>
-<li>Customers who have spent over
+<tr><td>Customers who have spent over
 <input type=text size=5 name=amount>
 ([ad_parameter -package_id [ec_id] Currency ecommerce])
-in the last <input type=text size=2 name=days> days
+in the last <input type=text size=2 name=days> days.
 <input type=submit value=\"Go\">
 </form>
-</ul>
 
+
 <h3>Administrative Actions</h3>
 
 <ul>
-<li><a href=\"spam\">Spam Users</a>
-<li><a href=\"picklists\">Picklist Management</a>
-<li><a href=\"canned-responses\">Canned Responses</a>
+<!---
+<tr><td><a href=\"spam\">Spam Users</a>
+<tr><td><a href=\"picklists\">Picklist Management</a>
+<tr><td><a href=\"canned-responses\">Canned Responses</a>
+--->
 
-<p>
-
-<li><a href=\"statistics\">Statistics and Reports</a>
+<tr><td><a href=\"statistics\">Statistics and Reports</a>
 </ul>
 
 [ad_admin_footer]
Index: openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl,v
diff -u -r1.6 -r1.6.2.1
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl	9 Mar 2004 00:59:47 -0000	1.6
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl	12 Feb 2005 23:07:10 -0000	1.6.2.1
@@ -87,7 +87,7 @@
 	append exception_text "<li>You forgot to specify the method of inquiry (phone/email/etc.).\n"
     } elseif { $interaction_type == "other" && (![info exists interaction_type_other] || [empty_string_p $interaction_type_other]) } {
 	incr exception_count
-	append exception_text "<li>You forgot to fill in the text box for Other.\n"
+	append exception_text "<li>You forgot to fill in the text box detail for Other.\n"
     } elseif { $interaction_type != "other" && ([info exists interaction_type_other] && ![empty_string_p $interaction_type_other]) } {
 	incr exception_count
 	append exception_text "<li>You selected \"Inquired via: [string toupper [string index $interaction_type 0]][string range $interaction_type 1 [expr [string length $interaction_type] -1]]\", but you also filled in something in the \"If Other, specify\" field.  This is inconsistent.\n"
@@ -113,102 +113,16 @@
 
 
 
-append doc_body "[ad_admin_header "One Issue"]
+append doc_body "[ad_admin_header "One Issue"] 
 <h2>One Issue</h2>
-
 [ad_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] "One Issue (part of New Interaction)"]
 
-<hr>
-A customer may discuss several issues during the course of one interaction.  Please
-enter the information about only one issue below:
+<hr noshade>"
 
-<form method=post action=interaction-add-3>
-[export_form_vars interaction_id c_user_identification_id action_id open_date_str interaction_type interaction_type_other interaction_originator first_names last_name email postal_code other_id_info return_to_issue insert_id]
-
-<table>
-"
-
-if { [info exists c_user_identification_id] } {
-    append doc_body "<tr>
-    <td>Customer:</td>
-    <td>[ec_user_identification_summary $c_user_identification_id "t"]"
-
-    if { [info exists postal_code] } {
-	append doc_body "<br>
-	[ec_location_based_on_zip_code $postal_code]
-	"
-    }
-
-    append doc_body "</td>
-    </tr>
-    "
-}
-
-if { ![info exists issue_id] } {
-    append doc_body "<tr>
-    <td>Issue ID:</td>
-    <td><input type=text size=4 name=issue_id>
-    If this is a new issue, please leave this blank (a new Issue ID will be generated)</td>
-    </tr>
-    <tr>
-    <td>Order ID:</td>
-    <td><input type=text size=7 name=order_id>
-    Fill this in if this inquiry is about a specific order.
-    </td>
-    </tr>
-    <tr>
-    <td>Issue Type: (leave blank if based on an existing issue):</td>
-    <td>[ec_issue_type_widget]</td>
-    </tr>
-    "
-} else {
-    set order_id [db_string get_order_id "select order_id from ec_customer_service_issues where issue_id=:issue_id"]
-    set issue_type_list [db_list get_issue_type_list "select issue_type from ec_cs_issue_type_map where issue_id=:issue_id"]
-
-    append doc_body "<tr>
-    <td>Issue ID:</td>
-    <td>$issue_id[export_form_vars issue_id]</td>
-    </tr>
-    <tr>
-    <td>Order ID:</td>
-    <td>[ec_decode $order_id "" "none" $order_id]</td>
-    </tr>
-    <tr>
-    <td>Issue Type</td>
-    <td>[join $issue_type_list ", "]</td>
-    </tr>
-    "
-}
-append doc_body "<tr>
-<td>Details:</td>
-<td><textarea wrap name=action_details rows=6 cols=45></textarea></td>
-</tr>
-<tr>
-<td>Information used to respond to inquiry:</td>
-<td>[ec_info_used_widget]</td>
-</tr>
-<tr>
-<td>If follow-up is required, please specify:</td>
-<td><textarea wrap name=follow_up_required rows=2 cols=45></textarea></td>
-</tr>
-<tr>
-<td>Close this issue?</td>
-<td>
-<input type=radio name=close_issue_p value=\"f\" checked>No (Issue requires follow-up)
-<input type=radio name=close_issue_p value=\"t\">Yes (Issue is resolved)
-</td>
-</tr>
-</table>
-"
-
 if { ![info exists c_user_identification_id] } {
     append doc_body "
+    <p><b>Customer identification:</b></p>
     <p>
-    
-    <b>Customer identification:</b>
-    
-    <p>
-    
     Here's what we could determine about the customer given the information you typed
     into the previous form:
     <ul>
@@ -247,25 +161,24 @@
 	
 	if { ![empty_string_p $first_names] || ![empty_string_p $last_name] } {
 	    if { ![empty_string_p $first_names] && ![empty_string_p $last_name] } {
-		set sql "select user_id as d_user_id from cc_users where upper(first_names)=upper (:first_names) and upper(last_name)=upper(:last_name)"
+		set sql "select email, user_id as d_user_id from cc_users where upper(first_names)=upper (:first_names) and upper(last_name)=upper(:last_name)"
 		db_foreach get_user_ids $sql {
-		    
-		    append doc_body "<li>This may be the registered user <a target=user_window href=\"[ec_acs_admin_url]users/one?user_id=$d_user_id\">$first_names $last_name</a> (check here <input type=checkbox name=d_user_id value=$d_user_id> if this is correct).\n"
+		    append doc_body "<li>This may be the registered user <a target=user_window href=\"customer-history?customer_type=user_id&customer_id=$d_user_id\">$first_names $last_name</a> $email (check here <input type=checkbox name=d_user_id value=$d_user_id> if this is correct).</li>"
 		}
 	    } elseif { ![empty_string_p $first_names] } {
-		set sql "select user_id as d_user_id, last_name as d_last_name from cc_users where upper(first_names)=upper(:first_names)"
+		set sql "select email, user_id as d_user_id, last_name as d_last_name from cc_users where upper(first_names)=upper(:first_names)"
 		
 		db_foreach get_user_id_and_lname $sql {
 		    
-		    append doc_body "<li>This may be the registered user <a target=user_window href=\"[ec_acs_admin_url]users/one?user_id=$d_user_id\">$first_names $d_last_name</a> (check here <input type=checkbox name=d_user_id value=$d_user_id> if this is correct).\n"
+		    append doc_body "<li>This may be the registered user <a target=user_window href=\"customer-history?customer_type=user_id&customer_id=$d_user_id\">$first_names $d_last_name</a> $email (check here <input type=checkbox name=d_user_id value=$d_user_id> if this is correct).\n</li>"
 		}
 		
 	    } elseif { ![empty_string_p $last_name] } {
-		set sql "select user_id as d_user_id, first_names as d_first_names from cc_users where upper(last_name)=upper(:last_name)"
+		set sql "select email, user_id as d_user_id, first_names as d_first_names from cc_users where upper(last_name)=upper(:last_name)"
 		
 		db_foreach get_user_id_and_names $sql {
 		    
-		    append doc_body "<li>This may be the registered user <a target=user_window href=\"[ec_acs_admin_url]users/one?user_id=$d_user_id\">$d_first_names $last_name</a> (check here <input type=checkbox name=d_user_id value=$d_user_id> if this is correct).\n"
+		    append doc_body "<li>This may be the registered user <a target=user_window href=\"customer-history?customer_type=user_id&customer_id=$d_user_id\">$d_first_names $last_name</a> $email (check here <input type=checkbox name=d_user_id value=$d_user_id> if this is correct).\n</li>"
 		}
 		
 	    }
@@ -280,7 +193,7 @@
 	    
 	    db_foreach get_user_identification $sql {
 		
-		append doc_body "<li>This may be the non-registered person who has had a previous interaction with us: [ec_user_identification_summary_sub $d_user_identification_id "t"] (check here <input type=checkbox name=d_user_identification_id value=$d_user_identification_id> if this is correct)."
+		append doc_body "<li>This may be the non-registered person who has had a previous interaction with us: [ec_user_identification_summary $d_user_identification_id "t"] (check here <input type=checkbox name=d_user_identification_id value=$d_user_identification_id> if this is correct).</li>"
 		lappend already_selected_user_identification_id_list $d_user_identification_id
 	    }
 	}
@@ -300,8 +213,10 @@
 	    }
 	    
 	    db_foreach get_user_identification_info $sql {
-		
-		append doc_body "<li>This may be the non-registered person who has had a previous interaction with us: [ec_user_identification_summary_sub $d_user_identification_id "t"] (check here <input type=checkbox name=d_user_identification_id value=$d_user_identification_id> if this is correct)."
+# need to add a db0or1row select ec_customer_service_issues.user_identification where ec_customer_service_issues.issue_id = ec_cs_issue_type_map.issue_id and ec_customer_service_issues.user_identification = $user_identification  *** actually, see if you can add the restriction to the loops query, and check if db_foreach skips if no hits, otherwise have to check for it first.
+# if exists then proceed with this iteration of the loop, otherwise ignore it as a false positive.		
+# the other possibility is to identify when the customer_service.issue_id is created, and why the map is not...
+		append doc_body "<li>This may be the non-registered person who has had a previous interaction with us: [ec_user_identification_summary $d_user_identification_id "t"] (check here <input type=checkbox name=d_user_identification_id value=$d_user_identification_id> if this is correct).</li>"
 		lappend already_selected_user_identification_id_list $d_user_identification_id
 	    }
 	}
@@ -315,7 +230,7 @@
 	    
 	    db_foreach get_user_identification_info $sql {
 		
-		append doc_body "<li>This may be the non-registered person who has had a previous interaction with us: [ec_user_identification_summary_sub $d_user_identification_id "t"] (check here <input type=checkbox name=d_user_identification_id value=$d_user_identification_id> if this is correct)."
+		append doc_body "<li>This may be the non-registered person who has had a previous interaction with us: [ec_user_identification_summary $d_user_identification_id "t"] (check here <input type=checkbox name=d_user_identification_id value=$d_user_identification_id> if this is correct).</li>"
 		lappend already_selected_user_identification_id_list $d_user_identification_id
 	    }
 	    
@@ -330,24 +245,101 @@
 	    
 	    db_foreach get_user_ids_by_postal_code $sql {
 		
-		append doc_body "<li>This may be the non-registered person who has had a previous interaction with us: [ec_user_identification_summary_sub $d_user_identification_id "t"] (check here <input type=checkbox name=d_user_identification_id value=$d_user_identification_id> if this is correct)."
+		append doc_body "<li>This may be the non-registered person who has had a previous interaction with us: [ec_user_identification_summary $d_user_identification_id "t"] (check here <input type=checkbox name=d_user_identification_id value=$d_user_identification_id> if this is correct).</li>"
 		lappend already_selected_user_identification_id_list $d_user_identification_id
 	    }
 	}
     }
-    append doc_body "</ul>
-    <p>
+    append doc_body "</ul>"
+}
+
+append doc_body "<h3>One issue</h3><p>A customer may discuss several issues during the course of one interaction.  Please
+enter the information about only one issue below:</p>
+
+<form method=post action=interaction-add-3>
+[export_form_vars interaction_id c_user_identification_id action_id open_date_str interaction_type interaction_type_other interaction_originator first_names last_name email postal_code other_id_info return_to_issue insert_id]
+
+<table cellspacing=\"1\" cellpadding=\"2\">"
+
+if { [info exists c_user_identification_id] } {
+    append doc_body "<tr>
+    <td bgcolor=\"\#cccccc\" valign=\"top\" align=\"right\">Customer:</td>
+    <td bgcolor=\"\#cccccc\" valign=\"top\">[ec_user_identification_summary $c_user_identification_id "t"]"
+
+    if { [info exists postal_code] } {
+	append doc_body "<br>
+	[ec_location_based_on_zip_code $postal_code]"
+    }
+
+    append doc_body "</td>
+    </tr>"
+}
+
+if { ![info exists issue_id] } {
+    append doc_body "<tr>
+    <td bgcolor=\"\#cccccc\" valign=\"top\" align=\"right\">Previous Issue ID:</td>
+    <td bgcolor=\"\#cccccc\" valign=\"top\"><input type=text size=4 name=issue_id>
+    If this is a new issue, please leave this blank (a new Issue ID will be generated)</td>
+    </tr>
+    <tr>
+    <td bgcolor=\"\#cccccc\" valign=\"top\" align=\"right\">New Issue Type:</td>
+    <td bgcolor=\"\#cccccc\" valign=\"top\"> (leave blank if based on an existing issue) [ec_issue_type_widget]</td>
+    </tr>
+    <tr>
+    <td bgcolor=\"\#99ccff\" valign=\"top\" align=\"right\">Order ID:</td>
+    <td bgcolor=\"\#99ccff\" valign=\"top\"><input type=text size=7 name=order_id>
+    Fill this in if this inquiry is about a specific order.
+    </td>
+    </tr>
     "
+} else {
+    set order_id [db_string get_order_id "select order_id from ec_customer_service_issues where issue_id=:issue_id"]
+    set issue_type_list [db_list get_is`<sue_type_list "select issue_type from ec_cs_issue_type_map where issue_id=:issue_id"]
+
+    append doc_body "<tr>
+    <td bgcolor=\"\#99ccff\" valign=\"top\" align=\"right\">Issue ID:</td>
+    <td bgcolor=\"\#99ccff\" valign=\"top\">$issue_id[export_form_vars issue_id]</td>
+    </tr>
+    <tr>
+    <td bgcolor=\"\#99ccff\" valign=\"top\" align=\"right\">Issue Type</td>
+    <td bgcolor=\"\#99ccff\" valign=\"top\">[join $issue_type_list ", "]</td>
+    </tr>
+    <tr>
+    <td bgcolor=\"\#99ccff\" valign=\"top\" align=\"right\">Order ID:</td>
+    <td bgcolor=\"\#99ccff\" valign=\"top\">[ec_decode $order_id "" "none" $order_id]</td>
+    </tr>
+"
 }
+append doc_body "<tr>
+<td bgcolor=\"\#99ccff\" valign=\"top\" align=\"right\">Issue details:<br>(action_details)</td>
+<td bgcolor=\"\#99ccff\" valign=\"top\"><textarea wrap name=action_details rows=6 cols=45></textarea></td>
+</tr>
+<tr>
+<td bgcolor=\"\#99ccff\" valign=\"top\" align=\"right\">Resources used:</td>
+<td bgcolor=\"\#99ccff\" valign=\"top\">Information used to respond to inquiry [ec_info_used_widget]</td>
+</tr>
+<tr>
+<td bgcolor=\"\#99ccff\" valign=\"top\" align=\"right\" rowspan=\"2\">Requires follow-up?</td>
+<td bgcolor=\"\#99ccff\" valign=\"top\">
+<input type=radio name=close_issue_p value=\"f\" checked>yes <b>requires follow-up</b><br>
+&nbsp;&nbsp;&nbsp;&nbsp;Please elaborate:<textarea wrap name=follow_up_required rows=2 cols=45></textarea>
 
-append doc_body "<center>
-<input type=submit name=submit value=\"Interaction Complete\">
-<input type=submit name=submit value=\"Enter Another Issue as part of this Interaction\">
-</center>
+</td>
+</tr>
+<tr>
 
-[ad_admin_footer]
+<td bgcolor=\"\#99ccff\" valign=\"top\"><input type=radio name=close_issue_p value=\"t\">no (resolved)</td>
+</tr>
+</table>
 "
 
 
+append doc_body "<center>Customer 
+<input type=submit name=submit value=\"Interaction complete\">
+<input type=submit name=submit value=\"Add another issue as part of this interaction\">
+</center>
+
+[ad_admin_footer]
+"
 doc_return  200 text/html $doc_body
 
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.6 -r1.6.2.1
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl	9 Mar 2004 00:59:47 -0000	1.6
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl	12 Feb 2005 23:07:10 -0000	1.6.2.1
@@ -25,7 +25,7 @@
     @param {follow_up_required "f"}
     @param {info_used_list ""}
     @param submit
-    @param  return_to_issue
+    @param return_to_issue
 
     @author
     @creation-date
@@ -56,15 +56,16 @@
     {follow_up_required "f"}
     {info_used_list ""}
     submit
+    issue_id:optional,naturalnum
 }
 
 ad_require_permission [ad_conn package_id] admin
 
 # doubleclick protection:
 if { [db_string get_service_action_count "select count(*) from ec_customer_service_actions where action_id=:action_id"] > 0 } {
-    if { $submit == "Interaction Complete" } {
-	ad_returnredirect interaction-add.tcl
-    } else {
+ns_log Notice "interaction-add-3.tcl: double click protection, line 65"
+    ad_returnredirect index
+} elseif { $submit != "Interaction complete" } {
 	# I have to use the action_id to figure out user_identification_id
 	# and interaction_id so that I can pass them to interaction-add-2.tcl
 	set row_exists_p [db_0or1row get_user_id_info "select i.user_identification_id as c_user_identification_id, a.interaction_id
@@ -73,8 +74,6 @@
 	and a.action_id=:action_id"]
 	set insert_id 1
 	ad_returnredirect "interaction-add-2.tcl?[export_url_vars interaction_id interaction_type postal_code c_user_identification_id insert_id interaction_originator]"
-    }
-    ad_script_abort
 }
 
 # the customer service rep must be logged on
@@ -111,11 +110,9 @@
 
 if { [info exists order_id] && [regexp "\[^0-9\]+" $order_id] } {
     incr exception_count
-    append exception_text "<li>The order ID should be numeric.\n"
+    append exception_text "<li>The Order ID should be numeric.\n"
 }
 
-
-
 if { $exception_count > 0 } {
     ad_return_complaint $exception_count $exception_text
     ad_script_abort
@@ -131,14 +128,14 @@
 # user with the interaction based on issue_id or order_id.
 # Otherwise, the user_identification_id is set, so they will just be
 # given an error message.
-if { ![empty_string_p $issue_id] } {
+if { [value_if_exists issue_id] > 0 } {
     # see who this issue belongs to
     if { [db_0or1row get_user_issue_id_info "select u.user_id as issue_user_id, u.user_identification_id as issue_user_identification_id
     from ec_user_identification u, ec_customer_service_issues i
     where u.user_identification_id = i.user_identification_id
     and i.issue_id=:issue_id"]==0 } {
 
-	ad_return_complaint 1 "<li>The issue ID that you specified is invalid.  Please go back and check the issue ID you entered.  If this is a new issue, please leave the issue ID blank.\n"
+	ad_return_complaint 1 "<li>The Issue ID that you specified is invalid.  Please go back and check the Issue ID you entered.  If this is a new issue, please leave the issue ID blank.\n"
         ad_script_abort
     }
     
@@ -238,7 +235,7 @@
     # 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 } {
-	ad_return_complaint 1 "<li>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"
+	ad_return_complaint 1 "<li>The shopping cart 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 online order, please leave the Order ID blank.\n"
         ad_script_abort
     }
     
@@ -447,9 +444,9 @@
 
 }
 
-if { $submit == "Interaction Complete" } {
-    if { ![info exists return_to_issue] } {
-	ad_returnredirect interaction-add
+if { $submit == "Interaction complete" } {
+    if {[value_if_exists return_to_issue] < 1 } {
+	ad_returnredirect index
     } else {
 	ad_returnredirect "issue?issue_id=$return_to_issue"
     }
@@ -461,7 +458,3 @@
     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"
 }
 
-
-
-
-