Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.tcl	3 Aug 2005 22:45:46 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-2.tcl	5 Aug 2005 05:57:43 -0000	1.2
@@ -103,9 +103,8 @@
 	<tr>
 	  <td>$product_name</td>
 	   <td><input type=text name=\"price_to_refund.${item_id}\" value=\"[format "%0.2f" $price_charged]\" size=\"5\"> (out of [ec_pretty_price $price_charged])</td>
- 	   <td><input type=text name=\"shipping_to_refund.${item_id}\" value=\"[format "%0.2f" [expr $shipping_charged * $shipping_refund_percent]]\" size=\"5\"> 
-	       (out of [ec_pretty_price $shipping_charged])</td>
-	</tr>"
+	</tr>
+ 	   <input type=hidden name=\"shipping_to_refund.${item_id}\" value=\"[format "%0.2f" [expr $shipping_charged * $shipping_refund_percent]]\" size=\"5\">"
 }
 
 append doc_body "
@@ -114,7 +113,7 @@
       <blockquote>
         <table border=0 cellspacing=0 cellpadding=10>
           <tr>
-            <th>Item</th><th>Price to Refund</th><th>Shipping to Refund</th>
+            <th>Item</th><th>Price to Refund</th>
          </tr>
          $items_to_print
        </table>"
@@ -129,9 +128,7 @@
     where order_id=:order_id"]
 
 append doc_body "
-      <p>Base shipping charge to refund: 
-      <input type=text name=base_shipping_to_refund value=\"[format "%0.2f" [expr $base_shipping * $shipping_refund_percent]]\" size=\"5\"> 
-      (out of [ec_pretty_price $base_shipping])</p>
+      <input type=hidden name=base_shipping_to_refund value=\"[format "%0.2f" [expr $base_shipping * $shipping_refund_percent]]\" size=\"5\"> 
     </blockquote>
 
     <center><input type=submit value=\"Continue\"></center>
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl	5 Aug 2005 02:52:53 -0000	1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl	5 Aug 2005 05:57:43 -0000	1.3
@@ -204,6 +204,17 @@
 	set item_state='received_back', received_back_date=to_date(:received_back_datetime,'YYYY-MM-DD HH12:MI:SSAM'), price_refunded=:price_bind_variable,
 	shipping_refunded=:shipping_bind_variable, price_tax_refunded=:price_tax_to_refund, shipping_tax_refunded=:shipping_tax_to_refund, refund_id=:refund_id
 	where item_id=:item_id"
+
+    # Remove the participant from the community
+    if { [db_0or1row community {
+	select s.community_id, o.participant_id
+	from dotlrn_ecommerce_section s, ec_items i, dotlrn_ecommerce_orders o
+	where s.product_id = i.product_id
+	and i.item_id = o.item_id
+	and i.item_id = :item_id
+    }] } {
+	dotlrn_community::remove_user $community_id $participant_id
+    }
 }
 
 set base_shipping_tax_charged [db_string get_base_shipping_tax "