Index: openacs-4/packages/ecommerce/www/shopping-cart.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/shopping-cart.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/ecommerce/www/shopping-cart.adp	26 May 2002 05:09:57 -0000	1.1
+++ openacs-4/packages/ecommerce/www/shopping-cart.adp	5 Aug 2002 12:41:25 -0000	1.2
@@ -5,8 +5,94 @@
 <h2>Your Shopping Cart</h2>
 
 <blockquote>
-  <p>@cart_contents@</p>
+  <multiple name="in_cart">
+    <if @in_cart.rownum@ eq 1>
+       <form method=post action=shopping-cart-quantities-change>
+         <center>
+           <table border="0" cellspacing="0" cellpadding="5">
+             <tr bgcolor="cccccc">
+               <td>Shopping Cart Items</td>
+               <td>Options</td>
+               <td>Quantity</td>
+               <td>Price/Item</td>
+               <td>Action</td>
+             </tr>
+    </if>
+    <tr>
+      <td>
+        <a href="product?product_id=@in_cart.product_id@">@in_cart.product_name@</a>
+      </td>
+      <td>
+        <if @in_cart.color_choice@ not nil>
+	  Color: @in_cart.color_choice@
+	</if>
+        <if @in_cart.size_choice@ not nil>
+	  <br>Size: @in_cart.size_choice@
+	</if>
+        <if @in_cart.style_choice@ not nil>
+	  <br>Style: @in_cart.style_choice@
+	</if>
+      </td>
+      <td>
+        <input type="text" 
+	       name="quantity.@in_cart.product_id@ {@in_cart.color_choice@} {@in_cart.size_choice@} {@in_cart.style_choice@}" 
+	       value="@in_cart.quantity@" size=4 maxlength=4>
+      </td>
+      <td>
+        @price_line@
+      </td>
+      <td>
+        <a href="shopping-cart-delete-from?@delete_export_vars@">delete</a>
+      </td>
+    </tr>
+  </multiple>
+  
+  <if @product_counter@ ne 0>
+    <tr bgcolor="cccccc">
+      <td colspan="2">Total:</td>
+      <td>@product_counter@</td>
+      <td align="right">@pretty_total_price@</td>
+      <td><input type=submit value="update"></td>
+    </tr>
+    <multiple name="tax_entries">
+      <tr>
+        <td colspan="5">
+	  Residents of @tax_entries.state@, please add @tax_entries.pretty_tax@ tax.
+	</td>
+      </tr>
+    </multiple>
+    </table>
+    </center>
+    </form>
+
+    <center>
+      <form method=post action="checkout">
+        <input type=submit value="Proceed to Checkout"><br>
+      </form>
+    </center>
+  </if>
+  <else>
+    <center>Your Shopping Cart is empty.</center>
+  </else>
+
   <ul>
-    @bottom_links@
+    <if @previous_product_id_p@ eq 1>
+      <li> <a href="product?product_id=@previous_product_id@">Continue Shopping</a> </li>
+    </if>
+    <else>
+      <li> <a href="index">Continue Shopping</a> </li>
+    </else>
+    <if @user_id@ eq 0>
+      <li> <a href="/register/index?return_url=@return_url@>Log In</a> </li>
+    </if>
+    <else>
+      <if @saved_carts_p@ not nil>
+        <li><a href="shopping-cart-retrieve-2">Retrieve a Saved Cart</a> </li>
+      </if>
+    </else>
+
+    <if @product_counter@ ne 0>
+      <li><a href="shopping-cart-save">Save Your Cart for Later</a> </li>
+    </if>
   </ul>
 </blockquote>