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.19 -r1.20
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.tcl	5 Aug 2005 13:06:02 -0000	1.19
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.tcl	10 Aug 2005 21:17:47 -0000	1.20
@@ -150,7 +150,11 @@
 	and i.product_id = p.product_id
 	group by p.product_name, p.one_line_description, p.product_id, i.price_name, i.price_charged, i.color_choice, i.size_choice, i.style_choice, c.offer_code" {
 	    if {$product_id != $last_product_id} {
-	        set lowest_price [lindex [ec_lowest_price_and_price_name_for_an_item $product_id $user_id $offer_code] 0]
+		if { ! [empty_string_p $price_charged] } {
+		    set lowest_price $price_charged
+		} else {
+		    set lowest_price [lindex [ec_lowest_price_and_price_name_for_an_item $product_id $user_id $offer_code] 0]
+		}
 	    }
             set option_list [list]
 	    if { ![empty_string_p $color_choice] } {
@@ -586,6 +590,9 @@
 	    # admins by logic, but this can be set in the param
 	    lappend method_options [list "[_ dotlrn-ecommerce.Scholarship]" scholarship]
 	}
+	lockbox {
+	    lappend method_options [list "[_ dotlrn-ecommerce.Lock_Box]" lockbox]
+	}
     }
     incr method_count
 }
@@ -676,11 +683,13 @@
     } elseif { [lsearch $payment_methods internal_account] != -1 } {
 	set method internal_account
     } elseif { [lsearch $payment_methods cash] != -1 } {
-	set method internal_account
+	set method cash
     } elseif { [lsearch $payment_methods invoice] != -1 } {
-	set method internal_account
+	set method invoice
     } elseif { [lsearch $payment_methods scholarship] != -1 } {
-	set method internal_account
+	set method scholarship
+    } elseif { [lsearch $payment_methods lockbox] != -1 } {
+	set method lockbox
     }
 
 } -on_submit {