Index: openacs.org-dev/packages/ecommerce/www/shopping-cart-retrieve-3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/ecommerce/www/shopping-cart-retrieve-3.adp,v
diff -u -r1.1.1.1 -r1.1.1.2
--- openacs.org-dev/packages/ecommerce/www/shopping-cart-retrieve-3.adp	9 Jul 2002 17:35:05 -0000	1.1.1.1
+++ openacs.org-dev/packages/ecommerce/www/shopping-cart-retrieve-3.adp	8 Oct 2002 15:47:06 -0000	1.1.1.2
@@ -1,11 +1,13 @@
-<master src="default-ec-master">
-<property name="title">@page_title@</property>
+<master>
+  <property name="title">@page_title@</property>
+  <property name="context_bar">@context_bar@</property>
+  <property name="signatory">@ec_system_owner@</property>
 
-<h2><@page_title@</h2>
+  <include src="toolbar" current_location="shopping-cart">
 
 <blockquote>
   <if @page_function@ eq "view">
-    <form method=post action="shopping-cart-retrieve-3.tcl">
+    <form method=post action="shopping-cart-retrieve-3">
       @hidden_form_variables@
       <input type=submit name=submit value="Retrieve">
       <input type=submit name=submit value="Discard">
@@ -22,7 +24,7 @@
   </if>
 
   <if @page_function@ eq "retrieve">
-    <form method=post action="shopping-cart-retrieve-3.tcl">
+    <form method=post action="shopping-cart-retrieve-3">
       <%= [export_form_vars order_id] %>
       <p>You currently already have a shopping cart. Would you like to
       merge your current shopping cart with the shopping cart you are
@@ -36,7 +38,7 @@
   </if>
 
   <if @page_function@ eq "discard">
-    <form method=post action="shopping-cart-retrieve-3.tcl">
+    <form method=post action="shopping-cart-retrieve-3">
     @hidden_form_variables@
     <p>If you discard this shopping cart, it will never be
     retrievable.  Are you sure you want to discard it?</p>
@@ -47,4 +49,10 @@
     </form>
   </if>
 
-</blockquote>
\ No newline at end of file
+  <if @page_function@ eq "invalid_order">
+     <p>The order you have selected either does not exist or does not
+       belong to you.  Please contact <a href="mailto@ec_system_owner@">@ec_system_owner@</a> 
+       if this is incorrect.</p>
+  </if>
+
+</blockquote>