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 -N -r1.2 -r1.3
--- openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.adp	28 Jun 2005 03:27:40 -0000	1.2
+++ openacs-4/packages/dotlrn-ecommerce/www/ecommerce/checkout-one-form.adp	4 Jul 2005 12:06:44 -0000	1.3
@@ -21,138 +21,4 @@
 <hr>
 <p>2. Complete this information.</p>
 
-<table border="0" bgcolor="#eeeeee"><form method="post" action="checkout-one-form-2">
-@hidden_vars;noquote@
-<tr><td colspan="2"><h2>Bill to:</h2></td>
-<if @shipping_required@ true><td bgcolor="#ffffff">&nbsp;</td><td colspan="2"><h2>Ship to (if different):</h2></td> </if>
-</tr><tr>
-
-<td align="right">First name(s):</td><td><input type="text" name="bill_to_first_names" size="27" value="@bill_to_first_names@" tabindex="1"></td>
-<if @shipping_required@ true><td bgcolor="#ffffff">&nbsp;</td><td align="right">First name(s):</td><td><input type="text" name="ship_to_first_names" size="27" value="@ship_to_first_names@" tabindex="21"></td></if>
-</tr><tr>
-
-<td align="right">Last name:</td><td><input type="text" name="bill_to_last_name" size="27" value="@bill_to_last_name@" tabindex="2"></td>
-<if @shipping_required@ true><td bgcolor="#ffffff">&nbsp;</td><td align="right">Last name:</td><td><input type="text" name="ship_to_last_name" size="27" value="@ship_to_last_name@" tabindex="22"></td></if>
-</tr><tr>
-
-<td align="right">Telephone:</td><td><input type="text" name="bill_to_phone" size="20" value="@bill_to_phone@" tabindex="3"></td>
-<if @shipping_required@ true><td bgcolor="#ffffff">&nbsp;</td><td align="right">Telephone:</td><td><input type="text" name="ship_to_phone" size="20" value="@ship_to_phone@" tabindex="23"></td></if>
-</tr><tr>
-
-<td align="right">Best time to call:</td><td> <input type="radio" tabindex="4" name="bill_to_phone_time" value="d"<if @bill_to_phone_time@ nil or @bill_to_phone_time@ not eq "e"> checked</if>>day&nbsp;&nbsp;&nbsp;<input type="radio" name="bill_to_phone_time" tabindex="4" value="e"<if @bill_to_phone_time@ not nil and @bill_to_phone_time@ eq "e"> checked</if>>evening</td>
-<if @shipping_required@ true><td bgcolor="#ffffff">&nbsp;</td><td align="right">Best time to call:</td><td> <input type="radio" name="ship_to_phone_time" tabindex="24" value="d"<if @ship_to_phone_time@ nil or @ship_to_phone_time@ not eq "e"> checked</if>>day&nbsp;&nbsp;&nbsp;<input type="radio" name="ship_to_phone_time" tabindex="24" value="e"<if @ship_to_phone_time@ not nil and @ship_to_phone_time@ eq "e"> checked</if>>evening</td></if>
-</tr><tr>
-           
-<td align="right">Address:</td><td><input type="text" name="bill_to_line1" size="27" value="@bill_to_line1@" tabindex="5"></td>
-<if @shipping_required@ true><td bgcolor="#ffffff">&nbsp;</td><td align="right">Address:</td><td><input type="text" name="ship_to_line1" size="27" value="@ship_to_line1@" tabindex="25"></td></if>
-</tr><tr>
-
-<td align="right">Address line 2<br>(optional):</td><td><input type="text" name="bill_to_line2" size="27" value="@bill_to_line2@" tabindex="6"></td>
-<if @shipping_required@ true><td bgcolor="#ffffff">&nbsp;</td><td align="right">Address line 2<br>(optional):</td><td><input type="text" name="ship_to_line2" size="27" value="@ship_to_line2@" tabindex="26"></td></if>
-</tr><tr>
-
-<td align="right">City:</td><td><input type="text" name="bill_to_city" size="20" value="@bill_to_city@" tabindex="7"></td>
-<if @shipping_required@ true><td bgcolor="#ffffff">&nbsp;</td><td align="right">City:</td><td><input type="text" name="ship_to_city" size="20" value="@ship_to_city@" tabindex="27"></td></if>
-</tr><tr>
-
-<td align="right">State/Province:</td><td>@bill_to_state_widget;noquote@</td>
-<if @shipping_required@ true><td bgcolor="#ffffff">&nbsp;</td><td align="right">State/Province:</td><td>@ship_to_state_widget;noquote@</td></if>
-</tr><tr>
-
-<td align="right">Other province or region:</td><td><input type="text" name="bill_to_full_state_name" size="20" value="@bill_to_full_state_name@" tabindex="8"></td>
-<if @shipping_required@ true><td bgcolor="#ffffff">&nbsp;</td><td align="right">Other province or region:</td><td><input type="text" name="ship_to_full_state_name" size="20" value="@ship_to_full_state_name@" tabindex="28"></td></if>
-</tr><tr>
-
-<td align="right">ZIP/Postal code:</td><td><input type="text" name="bill_to_zip_code" size="10" maxlength="10" value="@bill_to_zip_code@" tabindex="9"></td>
-<if @shipping_required@ true><td bgcolor="#ffffff">&nbsp;</td><td align="right">ZIP/Postal code:</td><td><input type="text" name="ship_to_zip_code" size="10" maxlength="10" value="@ship_to_zip_code@" tabindex="29"></td></if>
-</tr><tr>
-
-<td colspan="2">Country:<br>@bill_to_country_code;noquote@</td>
-<if @shipping_required@ true><td bgcolor="#ffffff">&nbsp;</td><td colspan="2">Country:<br>@ship_to_country_code;noquote@</td></if>
-</tr>
- <tr><td colspan="2">
-   @tax_exempt_options;noquote@
-  </td>
-  <td bgcolor="#ffffff">&nbsp;</td>
- <td colspan="2">&nbsp;</td></tr>
-</table>
-<if @shipping_required@ true>
-<table border="0" width="75%"> <tr>
-  <td>
-  <!-- gather shipping method info -->
-<h2>Shipping information</h2>
-<!-- consider adding a summary of your shipping policy here -->
-    @shipping_options;noquote@
- </td></tr></table>
-</if>
-
-
-<! -- following from payment.adp --->
-
-<h2>Payment information</h2>
-<table border="0" width="60%"><tr><td>
-<if @tax_exempt_status@ true>
-    @tax_exempt_options;noquote@
-</if>
-<if @gift_certificate_covers_whole_order@ true> 
-  <p>Your gift certificate balance covers the total cost of your
-  order. No need to enter any payment information!</p>
-</if>
-<else>
-  <if @gift_certificate_covers_part_of_order@ true>
-    <p>Your gift certificate balance takes care of
-     @certificate_amount@ of your order! Please enter credit card
-     information to pay for the rest.</p>
-  </if>
-</else>
-
-</td></tr></table>
-
-<if @gift_certificate_covers_whole_order@ false>
-  
-  <if @customer_can_use_old_credit_cards@ true>
-    <p>Since we already have a credit card on file for you, you
-    can just click on the button next to it to use it for this
-    order.</p>
-    <p>@old_cards_to_choose_from;noquote@</p>
-    <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>
-
-      <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 />
-      </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
-      </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>
-   <tr>
-    <td align="right">Credit card number:</td>
-    <td><input type="text" name="creditcard_number" size="21" tabindex="41"></td>
-   </tr>
-   <tr>
-    <td align="right">Type:</td>
-	  <td><select name="creditcard_type">
-	      <option value="">Please select one</option><option value="v">VISA</option><option value="m">MasterCard</option><option value="a">American Express</option></select></td>
-	</tr>
-  <tr>
-    <td align="right">Expires:</td>
-    <td>@ec_expires_widget;noquote@</td>
-  </tr>
-  </table>
-</if>
-</if>
-
- <p align="center"><input type="submit" value="Continue"></p>
-
-  </form>
-
+<formtemplate id="checkout"></formtemplate>
\ No newline at end of file