Index: openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.adp	23 Jun 2005 12:28:22 -0000	1.1
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.adp	28 Jun 2005 03:27:40 -0000	1.2
@@ -118,11 +118,20 @@
     <p><b>Or enter a new credit card:</b></p>
     <p>If you're using a new card, please enter the full credit card number below.</p>
   </if>
-	<input type="radio" name="method" value="internal_account" /> Internal account number:
+
+      <if @internal_account_p@ defined>
+	<input type="radio" name="method" value="internal_account"<if @method_count@ eq 1 or @cc_p@ not defined> checked</if> /> Internal account number:
 	<input type="text" name="internal_account" /><p />
-	<input type="radio" name="method" value="check" /> User sends in a check<p />
+      </if>
+      <if @check_p@ defined>
+	<input type="radio" name="method" value="check"<if @method_count@ eq 1> checked</if> /> User sends in a check<p />
+      </if>
+      <if @payment_methods@ nil or @cc_p@ defined and @payment_methods@ ne "cc">
 	<input type="radio" name="method" value="cc" checked /> Pay via credit card
-  <table border="0">
+      </if>
+
+      <if @payment_methods@ nil or @cc_p@ defined>
+      <table border="0">
   <if @customer_can_use_old_credit_cards@ false>
     <tr><td colspan="2"><p><b>Credit card information</b></p></td></tr>
   </if>
@@ -141,6 +150,7 @@
   </tr>
   </table>
 </if>
+</if>
 
  <p align="center"><input type="submit" value="Continue"></p>