Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.tcl,v
diff -u -r1.16 -r1.17
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.tcl	30 Jul 2005 22:17:00 -0000	1.16
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.tcl	3 Aug 2005 22:46:40 -0000	1.17
@@ -582,6 +582,8 @@
 	    lappend method_options [list "Invoice" invoice]
 	}
 	scholarship {
+	    # Purchasing via scholarships should only be available to
+	    # admins by logic, but this can be set in the param
 	    lappend method_options [list "Scholarship" scholarship]
 	}
     }
@@ -673,14 +675,27 @@
 	set method check
     } elseif { [lsearch $payment_methods internal_account] != -1 } {
 	set method internal_account
+    } elseif { [lsearch $payment_methods cash] != -1 } {
+	set method internal_account
+    } elseif { [lsearch $payment_methods invoice] != -1 } {
+	set method internal_account
+    } elseif { [lsearch $payment_methods scholarship] != -1 } {
+	set method internal_account
     }
 
 } -on_submit {
 
     set form [rp_getform]
     set submit_url [ad_return_url]
+
     regsub -nocase checkout-one-form $submit_url checkout-one-form-2 submit_url
 
+    if { $method == "scholarship" } {
+	# Go to page where one can select scholarships to purchase from
+	ad_returnredirect [export_vars -base checkout-scholarships { user_id {return_url $submit_url} }]
+	ad_script_abort
+    }
+
     ad_returnredirect $submit_url
     ad_script_abort
 }