event refactor, landing on HEAD!

[freeside.git] / httemplate / misc / cancel_pkg.html

diff --git a/httemplate/misc/cancel_pkg.html b/httemplate/misc/cancel_pkg.html
index e610006..642f0c8 100755 (executable)
--- a/httemplate/misc/cancel_pkg.html
+++ b/httemplate/misc/cancel_pkg.html
@@ -23,9 +23,9 @@
 <% ucfirst($method) . " $pkgnum: " .$part_pkg->pkg. ' - ' .$part_pkg->comment %>
 <% ntable("#cccccc", 2) %>
 
-% if ($method eq 'expire') {
+% if ($method eq 'expire' || $method eq 'adjourn') {
 <TR>
-  <TD>Cancel package on </TD>
+  <TD><% $submit =~ /^(\w*)\s/ %> package on </TD>
     <TD><INPUT TYPE="text" NAME="date" ID="expire_date" VALUE="<% $date %>">
         <IMG SRC="<% $p %>images/calendar.png" ID="expire_button" STYLE="cursor:pointer" TITLE="Select date">
         <BR><I>m/d/y</I>
@@ -42,7 +42,14 @@
 %}
 %
 
-<% include('/elements/tr-select-reason.html', 'reasonnum', $class, '', '', '', 'document.sc_popup.submit' ) %>
+<% include('/elements/tr-select-reason.html',
+             'field'          => 'reasonnum',
+             'reason_class'   => $class,
+             #XXX these need to be sticky on errors too...
+             #'curr_value'     => '',
+             'control_button' => 'document.sc_popup.submit',
+          )
+%>
 
 </TABLE>
 
@@ -77,7 +84,10 @@ if ($method eq 'cancel') {
   $submit    = "Cancel Later";
 }elsif ($method eq 'suspend') {
   $class = 'S';
-  $submit    = "Suspend";
+  $submit    = "Suspend Now";
+}elsif ($method eq 'adjourn') {
+  $class = 'S';
+  $submit    = "Suspend Later";
 }else{
   die "illegal query ". $cgi->keywords;
 }