Index: openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl	18 Sep 2002 21:33:49 -0000	1.5
+++ openacs-4/packages/ecommerce/www/admin/customer-service/email-send-2.tcl	18 Aug 2008 11:02:23 -0000	1.6
@@ -19,7 +19,7 @@
     action_id
     issue_id
     customer_service_rep
-    email_to_use
+    email_to_use:notnull
     cc_to
     bcc_to
     subject
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.5 -r1.6
--- openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl	24 Feb 2005 13:33:14 -0000	1.5
+++ openacs-4/packages/ecommerce/www/admin/customer-service/index.tcl	18 Aug 2008 11:02:23 -0000	1.6
@@ -92,7 +92,7 @@
 append doc_body "</table><p>add <a href=\"interaction-add\">New Interaction</a></p>"
 
 if { [llength $issue_type_list] == 0 } {
-    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 "<p>If you want to see issues separated out by commonly used issue types, then add those issue types to the issue type in <a href=\"picklists\">Picklist Management</a>.</p>" 
 }
 
 append doc_body "<h3>Search for customer</h3>
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.7 -r1.8
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl	24 Feb 2005 13:33:14 -0000	1.7
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-2.tcl	18 Aug 2008 11:02:22 -0000	1.8
@@ -125,7 +125,7 @@
     <p>
     Here's what we could determine about the customer given the information you typed
     into the previous form:
-    <ul>
+    </p><ul>
     "
     
     set positively_identified_p 0
@@ -135,7 +135,7 @@
     set location [ec_location_based_on_zip_code $postal_code]
 
     if { ![empty_string_p $location] } {
-	append doc_body "<li>They live in $location.\n"
+	append doc_body "<li>They live in $location.</li>"
     }
 
     
@@ -256,7 +256,7 @@
 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>
+<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\">"
@@ -278,7 +278,7 @@
 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>
+    <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>
@@ -287,7 +287,7 @@
     </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>
+    <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>
@@ -312,7 +312,7 @@
 }
 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>
+<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>
@@ -322,23 +322,23 @@
 <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>
+&nbsp;&nbsp;&nbsp;&nbsp;Please elaborate:<textarea wrap name=\"follow_up_required\" rows=\"2\" cols=\"45\"></textarea>
 
 </td>
 </tr>
 <tr>
 
-<td bgcolor=\"\#99ccff\" valign=\"top\"><input type=radio name=close_issue_p value=\"t\">no (resolved)</td>
+<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\">
+<input type=\"submit\" name=\"submit\" value=\"Interaction complete\">
+<input type=\"submit\" name=\"submit\" value=\"Add another issue as part of this interaction\">
 </center>
-
+</form>
 [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.7 -r1.8
--- openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl	24 Feb 2005 13:33:14 -0000	1.7
+++ openacs-4/packages/ecommerce/www/admin/customer-service/interaction-add-3.tcl	18 Aug 2008 11:02:23 -0000	1.8
@@ -135,7 +135,7 @@
     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.</li>"
         ad_script_abort
     }
     
@@ -153,19 +153,19 @@
 		<hr>
 		Issue ID $issue_id belongs to the registered user <a href=\"[ec_acs_admin_url]users/one?user_id=$issue_user_id\">[db_string get_full_name "select first_names || ' ' || last_name from cc_users where user_id=:issue_user_id"]</a>.
 		
-		<p>
+		</p><p>
 		
 		However, you haven't selected that user as the customer involved in this interaction.
 		
-		<p>
+		</p><p>
 		
 		Would you like to make this user be the owner of this interaction?  (If not, push Back and fix the issue ID.)
-		
-		<form method=post action=interaction-add-3>
+		</p>
+		<form method=\"post\" action=\"interaction-add-3\">
 		[ec_hidden_input "d_user_id" $issue_user_id]
 		[ec_export_entire_form_except d_user_id d_user_identification_id]
 		<center>
-		<input type=submit value=\"Yes\">
+		<input type=\"submit\" value=\"Yes\">
 		</center>
 		</form>
 		
@@ -183,21 +183,21 @@
 	    [ad_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] "New Interaction"]
 	    
 	    <hr>
-	    Issue ID $issue_id belongs to the the non-registered person who has had a previous interaction with us: [ec_user_identification_summary $issue_user_identification_id]
+ 	    <p>Issue ID $issue_id belongs to the the non-registered person who has had a previous interaction with us: [ec_user_identification_summary $issue_user_identification_id]
 	    
-	    <p>
+	    </p><p>
 	    
 	    However, you haven't selected that user as the customer involved in this interaction.
 	    
-	    <p>
+	    </p><p>
 	    
 	    Would you like to make this user be the owner of this interaction?  (If not, push Back and fix the issue ID.)
-	    
-	    <form method=post action=interaction-add-3>
+	    </p>
+	    <form method=\"post\" action=\"interaction-add-3\">
 	    [ec_hidden_input "d_user_identification_id" $issue_user_identification_id]
 	    [ec_export_entire_form_except d_user_id d_user_identification_id]
 	    <center>
-	    <input type=submit value=\"Yes\">
+	    <input type=\"submit\" value=\"Yes\">
 	    </center>
 	    </form>
 	    
@@ -235,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 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_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.</li>"
         ad_script_abort
     }
     
@@ -251,21 +251,21 @@
 		[ad_context_bar [list "../index.tcl" "Ecommerce([ec_system_name])"] [list "index.tcl" "Customer Service Administration"] "New Interaction"]
 		
 		<hr>
-		Order ID $order_id belongs to the registered user <a href=\"[ec_acs_admin_url]users/one?user_id=$order_user_id\">[db_string get_user_name "select first_names || ' ' || last_name from cc_users where user_id=:order_user_id"]</a>.
-		
+		<p>Order ID $order_id belongs to the registered user <a href=\"[ec_acs_admin_url]users/one?user_id=$order_user_id\">[db_string get_user_name "select first_names || ' ' || last_name from cc_users where user_id=:order_user_id"]</a>.
+		</p>
 		<p>
 		
 		However, you haven't selected that user as the customer involved in this interaction.
-		
+		</p>
 		<p>
 		
 		Would you like to make this user be the owner of this interaction?  (If not, push Back and fix the order ID.)
-		
-		<form method=post action=interaction-add-3>
+		</p>
+		<form method=\"post\" action=\"interaction-add-3\">
 		[ec_hidden_input "d_user_id" $order_user_id]
 		[ec_export_entire_form_except d_user_id d_user_identification_id]
 		<center>
-		<input type=submit value=\"Yes\">
+		<input type=\"submit\" value=\"Yes\">
 		</center>
 		</form>
 		
@@ -394,7 +394,7 @@
 #     F. closed_by (=null if close_issue_p=f, =customer_service_rep if close_issue_p=t)
 #   2. Have to insert into ec_cs_issue_type_map:
 #     issue_id & issue_type for each issue_type in issue_type_list
-
+#ns_log Notice "issue_type [value_if_exists issue_type], create_new_issue_p $create_new_issue_p "
 if { $create_new_issue_p == "t" } {
     if { $close_issue_p == "t" } {
 	set customer_service_rep_bit :customer_service_rep
@@ -408,7 +408,8 @@
     values
     (:issue_id, :uiid_to_insert, :order_id, $date_string, $close_date, $customer_service_rep_bit)
     "
-    
+    set issue_type_list [concat $issue_type_list $issue_type]
+
     foreach issue_type $issue_type_list {
 	db_dml insert_into_issue_tm "insert into ec_cs_issue_type_map
 	(issue_id, issue_type)
Index: openacs-4/packages/ecommerce/www/admin/customer-service/picklists.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/customer-service/picklists.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/customer-service/picklists.tcl	9 Mar 2004 00:59:47 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/customer-service/picklists.tcl	18 Aug 2008 11:02:23 -0000	1.4
@@ -64,10 +64,10 @@
     }
     
     if { $picklist_item_counter != 0 } {
-	append doc_body "<td> &nbsp;&nbsp;<font face=\"MS Sans Serif, arial,helvetica\"  size=1><a href=\"picklist-item-add?prev_sort_key=$old_sort_key&next_sort_key=[expr $old_sort_key + 2]&picklist_name=[ns_urlencode [lindex $picklist 0]]\">insert after</a></font></td></tr>
+	append doc_body "<td> &nbsp;&nbsp;<font face=\"MS Sans Serif, arial,helvetica\"  size=1><a href=\"picklist-item-add?prev_sort_key=$old_sort_key&next_sort_key=[expr $old_sort_key + 512]&picklist_name=[ns_urlencode [lindex $picklist 0]]\">insert after</a></font></td></tr>
 	"
     } else {
-	append doc_body "You haven't added any items.  <a href=\"picklist-item-add?prev_sort_key=1&next_sort_key=2&picklist_name=[ns_urlencode [lindex $picklist 0]]\">Add a picklist item.</a>\n"
+	append doc_body "You haven't added any items.  <a href=\"picklist-item-add?prev_sort_key=1&next_sort_key=512&picklist_name=[ns_urlencode [lindex $picklist 0]]\">Add a picklist item.</a>\n"
     }
 
     incr picklist_counter