Index: openacs-4/packages/ecommerce/www/admin/orders/void.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/void.adp,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/ecommerce/www/admin/orders/void.adp	17 Aug 2008 21:38:25 -0000	1.1
@@ -0,0 +1,33 @@
+<master>
+  <property name="doc(title)">@title;noquote@</property>
+  <property name="context">@context;noquote@</property>
+<h2>@title@</h2>
+
+<p>This action will cause all individual items in this order to be
+marked 'void'.</p>
+
+<if @n_shipped_items@ gt 0>
+<p><font color=red>Warning:</font> our records show that at least one item in this
+    order has already shipped, which means that the customer has already been charged
+    (for shipped items only).  
+    </p>
+</if>
+
+<p>Voiding is usually done if the customer cancels their order before
+anything ships.</p>
+<p>Voiding an order does not refund the customer's credit card. You can only apply a refund
+through the shopping basket by marking individual items "received back").</p>
+
+<form method=post action=void-2>
+@export_form_vars_html;noquote@
+<p>Please explain why you are voiding this order:</p>
+<blockquote>
+<textarea name=reason_for_void rows=5 cols=50 wrap>
+</textarea>
+</blockquote>
+<br>
+<center>
+<input type=submit value="Void It!">
+</center>
+</form>
+
Index: openacs-4/packages/ecommerce/www/admin/orders/void.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/orders/void.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/orders/void.tcl	9 Mar 2004 00:59:50 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/orders/void.tcl	17 Aug 2008 21:38:25 -0000	1.4
@@ -11,52 +11,10 @@
 
 ad_require_permission [ad_conn package_id] admin
 
-doc_body_append "[ad_admin_header "Void Order"]
+set title "Void"
+set context [list [list index "Orders / Shipments / Refunds"] $title]
 
-<h2>Void Order</h2>
-
-[ad_context_bar [list "../" "Ecommerce([ec_system_name])"] [list "index" "Orders"] [list "one?[export_url_vars order_id]" "One Order"] "Void"]
-
-<hr>
-"
-
 set n_shipped_items [db_string shipped_items_count "select count(*) from ec_items where order_id=:order_id and item_state in ('shipped', 'arrived', 'received_back')"]
 
-if { $n_shipped_items > 0 } {
-    doc_body_append "<font color=red>Warning:</font> our records show that at least one item in this
-    order has already shipped, which means that the customer has already been charged
-    (for shipped items only).  Voiding an order will not cause
-    the customer's credit card to be refunded (you can only do that by marking
-    individual items \"received back\").
-    <p>
-    Voiding is usually done if the customer cancels their order before it ships. 
-    <p>
-    "
-}
+set export_form_vars_html [export_form_vars order_id]
 
-doc_body_append "Note: this will cause all individual items in this order
-to be marked 'void'.
-<p>"
-
-doc_body_append "
-<form method=post action=void-2>
-[export_form_vars order_id]
-
-Please explain why you are voiding this order:
-
-<br>
-
-<blockquote>
-<textarea name=reason_for_void rows=5 cols=50 wrap>
-</textarea>
-</blockquote>
-
-<p>
-<center>
-<input type=submit value=\"Void It!\">
-</center>
-
-</form>
-
-[ad_admin_footer]
-"