Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4-oracle.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4-oracle.xql	3 Aug 2005 22:45:46 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4-oracle.xql	25 Aug 2005 07:54:48 -0000	1.2
@@ -190,4 +190,12 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="return_to_scholarship_fund">
+    <querytext>
+      update scholarship_fund_grants
+      set grant_amount = grant_amount - least(to_number(grant_amount), least(to_number(:certificate_amount_to_reinstate), to_number(:reinstateable_amount)))
+      where grant_id = :grant_id
+    </querytext>
+  </fullquery>
+
 </queryset>
Index: openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4-postgresql.xql,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4-postgresql.xql	18 Aug 2005 15:19:54 -0000	1.4
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4-postgresql.xql	25 Aug 2005 07:54:48 -0000	1.5
@@ -235,4 +235,12 @@
     </querytext>
   </fullquery>
 
+  <fullquery name="return_to_scholarship_fund">
+    <querytext>
+      update scholarship_fund_grants
+      set grant_amount = grant_amount - least(grant_amount::numeric, least(:certificate_amount_to_reinstate, :reinstateable_amount))
+      where grant_id = :grant_id
+    </querytext>
+  </fullquery>
+
 </queryset>
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.11 -r1.12
--- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl	23 Aug 2005 04:00:09 -0000	1.11
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl	25 Aug 2005 07:54:48 -0000	1.12
@@ -223,7 +223,6 @@
 	and i.item_id = :item_id
     }] } {
 	if { [acs_object_type $participant_id] == "group" } {
-	    ns_log notice "DEBUG:: Removing one member of group $participant_id"
 	    # Remove one enrolled user from the group		
 	    if { [db_0or1row one_user {
 		select user_id as one_participant_id
@@ -235,11 +234,9 @@
 		
 		limit 1
 	    }] } {
-		ns_log notice "DEBUG:: Removing group member $one_participant_id"
 		dotlrn_community::remove_user $community_id $one_participant_id
 	    }
 	} else {
-	    ns_log notice "DEBUG:: Removing user $participant_id"
 	    if { [dotlrn_community::member_p $community_id $participant_id] } {
 		dotlrn_community::remove_user $community_id $participant_id
 	    }
@@ -486,13 +483,24 @@
 	order by expires desc, gift_certificate_id desc" {
 
 	if {$certificate_amount_to_reinstate > 0} {
-	    db_dml reinstate_gift_certificate "
+	    # Return the amount to the scholarship fund
+	    if { [db_0or1row scholarship_fund {
+		select grant_id
+		from scholarship_fund_grants
+		where gift_certificate_id = :gift_certificate_id
+	    }] } {
+		db_dml return_to_scholarship_fund { }
+	    } else {
+		# Don't reinstate gift certificate given via scholarship
+		db_dml reinstate_gift_certificate "
 		insert into ec_gift_certificate_usage
 		(gift_certificate_id, order_id, amount_reinstated, reinstated_date)
 		values
 		(:gift_certificate_id, :order_id, least(to_number(:certificate_amount_to_reinstate), to_number(:reinstateable_amount)) , sysdate)"
-	    set $certificate_amount_to_reinstate [expr $certificate_amount_to_reinstate - \
-						      [expr ($certificate_amount_to_reinstate > $reinstateable_amount) ? $reinstateable_amount : $certificate_amount_to_reinstate]]
+	    }
+
+	    set certificate_amount_to_reinstate [expr $certificate_amount_to_reinstate - \
+						     [expr ($certificate_amount_to_reinstate > $reinstateable_amount) ? $reinstateable_amount : $certificate_amount_to_reinstate]]
 	}
     }
 }
@@ -560,14 +568,14 @@
 	}
     } if_no_rows {
 	set page_title "No credit card refund needed."
-	set results_explanation "No credit card refund was necessary because the entire amount was refunded to the gift certificates the customer used when purchasing the order."
+	set results_explanation "<p>No credit card refund was necessary because the entire amount was refunded to the gift certificates the customer used when purchasing the order.</p>"
     }
 } elseif { $cash_amount_to_refund_manually > 0 } {
     set page_title "Refund results"
     append results_explanation "<p>The amount [ec_pretty_price $cash_amount_to_refund_manually] is to be refunded manually</p>";# 
 } else {
 	set page_title "No credit card refund needed."
-	set results_explanation "No credit card refund was necessary because the entire amount was refunded to the gift certificates the customer used when purchasing the order."
+	set results_explanation "<p>No credit card refund was necessary because the entire amount was refunded to the gift certificates the customer used when purchasing the order.</p>"
 }
 
 append doc_body "