Index: openacs-4/packages/ecommerce/www/admin/orders/items-return-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-return-3.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/admin/orders/items-return-3.adp	18 Aug 2008 09:53:32 -0000	1.1
+++ openacs-4/packages/ecommerce/www/admin/orders/items-return-3.adp	8 Sep 2008 12:56:26 -0000	1.2
@@ -19,14 +19,22 @@
          <td><input type="hidden" name="creditcard_id" value="@creditcard_id@"></td>
          <td> @creditcard_widget_html;noquote@ </td>
          <td><input type="text" name="creditcard_number" size="21" maxlength="17"></td>
+        
        </tr>
+<if @ask_for_card_code@ true>
+  <tr>
+    <td align="right">Card Security Code (cvv2/cvc2/cid):</td>
+    <td><input type="text" name="card_code" size="4" tabindex="42"</td>
+  </tr>
+</if>
+
 	<tr>
 	  <td>Ending in:</td>
 	  <td>xxxxxxxxxxxx@creditcard_last_four@</td>
-       <tr>
+       </tr><tr>
          <td>Expires:</td>
          <td>@card_expiration@</td>
-       <tr>
+       </tr><tr>
          <td valign="top">Billing address:</td>
          <td>@billing_street@<br>
 	     @billing_city@, @billing_state@ @billing_zip@<br>
Index: openacs-4/packages/ecommerce/www/admin/orders/items-return-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-return-3.tcl,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/ecommerce/www/admin/orders/items-return-3.tcl	18 Aug 2008 09:53:32 -0000	1.7
+++ openacs-4/packages/ecommerce/www/admin/orders/items-return-3.tcl	8 Sep 2008 12:56:26 -0000	1.8
@@ -194,11 +194,12 @@
 # Request the credit card number to be re-entered if it is no longer
 # on file, yet there is money to refund.
 set request_creditcard [expr { [empty_string_p $creditcard_number] && $cash_amount_to_refund > 0 } ] 
-if { $request_credit_card } {
+if { $request_creditcard } {
     set creditcard_widget_html [ec_creditcard_widget $creditcard_type disabled]
 } else {
     set export_form_vars_2_html [export_form_vars creditcard_id creditcard_number]
 }
 
 set export_form_vars_cc_type_html [export_form_vars creditcard_type]
 set export_form_vars_last_4_html [export_form_vars creditcard_last_four]
+set ask_for_card_code [parameter::get -package_id [ec_id] -parameter PaymentCardCodeAsk -default 0]
Index: openacs-4/packages/ecommerce/www/admin/orders/items-return-4.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/items-return-4.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/ecommerce/www/admin/orders/items-return-4.tcl	18 Aug 2008 09:53:32 -0000	1.9
+++ openacs-4/packages/ecommerce/www/admin/orders/items-return-4.tcl	8 Sep 2008 12:56:26 -0000	1.10
@@ -42,6 +42,7 @@
     creditcard_type:optional
     creditcard_number:optional
     creditcard_last_four:optional
+    {card_code ""}
 }
 
 # The customer service rep must be logged on and have admin
@@ -112,7 +113,7 @@
         # Make sure the credit card number matches the credit card
         # type # and that the number has the right number of digits.
 
-        set additional_count_and_text [ec_creditcard_precheck $creditcard_number $creditcard_type]
+        set additional_count_and_text [ec_creditcard_precheck $creditcard_number $creditcard_type $card_code]
     
         set exception_count [expr $exception_count + [lindex $additional_count_and_text 0]]
         append exception_text [lindex $additional_count_and_text 1]
@@ -216,7 +217,7 @@
         # 24 hours after they have been marked for settlement.
 
         # make sure date does not choke on decimal times
-        regsub -- {\.[0-9]+$} $marked_date "" marked_date
+        regsub -- {\.[0-9]+} $marked_date "" marked_date
         set 24hr [expr 24 * 60 * 60]
         set time_since_marking [expr [clock seconds] - [clock scan $marked_date]]
         if { $time_since_marking > $24hr } {