Index: openacs-4/packages/dotlrn-ecommerce/lib/financial-transactions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/financial-transactions.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn-ecommerce/lib/financial-transactions.adp	17 Aug 2005 16:37:20 -0000	1.4
+++ openacs-4/packages/dotlrn-ecommerce/lib/financial-transactions.adp	18 Aug 2005 15:19:54 -0000	1.5
@@ -68,16 +68,16 @@
       
       <multiple name="financial_transactions">
 	<tr>
-	  <td>@financial_transactions.transaction_id@</td>
-	  <td>@financial_transactions.inserted_date@</td>
-	  <td>@financial_transactions.creditcard_last_four@</td>
-	  <td>@financial_transactions.transaction_amount@</td>
-	  <td>@financial_transactions.transaction_type@</td>
-	  <td>@financial_transactions.to_be_captured_p@</td>
-	  <td>@financial_transactions.authorized_date@</td>
-	  <td>@financial_transactions.marked_date@</td>
-	  <td>@financial_transactions.refunded_date@</td>
-	  <td>@financial_transactions.failed_p@</td>
+	  <td>@financial_transactions.transaction_id;noquote@</td>
+	  <td>@financial_transactions.inserted_date;noquote@</td>
+	  <td>@financial_transactions.creditcard_last_four;noquote@</td>
+	  <td>@financial_transactions.transaction_amount;noquote@</td>
+	  <td>@financial_transactions.transaction_type;noquote@</td>
+	  <td>@financial_transactions.to_be_captured_p;noquote@</td>
+	  <td>@financial_transactions.authorized_date;noquote@</td>
+	  <td>@financial_transactions.marked_date;noquote@</td>
+	  <td>@financial_transactions.refunded_date;noquote@</td>
+	  <td>@financial_transactions.failed_p;noquote@</td>
 	</tr>
       </multiple>
     </table>
Index: openacs-4/packages/dotlrn-ecommerce/lib/refunds.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/lib/refunds.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/lib/refunds.adp	14 Aug 2005 05:00:14 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/lib/refunds.adp	18 Aug 2005 15:19:54 -0000	1.2
@@ -1,4 +1,4 @@
-  <h3>Returns</h3>
+  <h3>Refunds</h3>
   
   <blockquote>
     
@@ -21,7 +21,7 @@
     </ul>
     </if>
     <else>
-      No Returns Have Been Made
+      No Refunds Have Been Made
     </else>
     
   </blockquote>
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.3 -r1.4
--- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4-postgresql.xql	12 Aug 2005 10:10:14 -0000	1.3
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4-postgresql.xql	18 Aug 2005 15:19:54 -0000	1.4
@@ -8,7 +8,7 @@
       insert into ec_refunds
       (refund_id, order_id, refund_amount, refund_date, refunded_by, refund_reasons)
       values
-      (:refund_id, :order_id, :cash_amount_to_refund_cc, current_timestamp, :customer_service_rep,:reason_for_return)
+      (:refund_id, :order_id, :cash_amount_to_refund, current_timestamp, :customer_service_rep,:reason_for_return)
     </querytext>
   </fullquery>
 
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.6 -r1.7
--- openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl	18 Aug 2005 14:29:40 -0000	1.6
+++ openacs-4/packages/dotlrn-ecommerce/www/admin/ecommerce/items-return-4.tcl	18 Aug 2005 15:19:54 -0000	1.7
@@ -183,7 +183,7 @@
     insert into ec_refunds
     (refund_id, order_id, refund_amount, refund_date, refunded_by, refund_reasons)
     values
-    (:refund_id, :order_id, :cash_amount_to_refund_cc::float + :cash_amount_to_refund_manually::float, sysdate, :customer_service_rep,:reason_for_return)"
+    (:refund_id, :order_id, :cash_amount_to_refund, sysdate, :customer_service_rep,:reason_for_return)"
 
 foreach item_id $item_id_list {