X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Freport_cust_event.html;h=7aa4ff9d723412d52fdbb1ce591ec8e7cc16e733;hp=e0d6242b2f23983791363f2e745ddccad1295f62;hb=ff27c3f36240aee48ed50153dd5d8fe3ac3f2443;hpb=fb4ab1073f0d15d660c6cdc4e07afebf68ef3924

diff --git a/httemplate/search/report_cust_event.html b/httemplate/search/report_cust_event.html
index e0d6242b2..7aa4ff9d7 100644
--- a/httemplate/search/report_cust_event.html
+++ b/httemplate/search/report_cust_event.html
@@ -5,7 +5,6 @@
 %>
 
     <FORM ACTION="cust_event.html" METHOD="GET">
-    <INPUT TYPE="hidden" NAME="failed" VALUE="<% $cgi->param('failed') ? 1 : 0 %>">
     <TABLE BGCOLOR="#cccccc" CELLSPACING=0>
 
       <TR>
@@ -15,15 +14,8 @@
       <% include( '/elements/tr-select-agent.html', 'disable_empty'=>0 ) %>
 
       <% include( '/elements/tr-select-cust_main-status.html',
-                    'label' => 'Status'
-                )
-      %>
-
-      <% include( '/elements/tr-select-payby.html',
-                    'label'        => 'Customer payment type',
-                    'payby_type'   => 'cust',
-                    'multiple'     => 1,
-                    'all_selected' => 1,
+                    'label' => 'Customer status',
+                    # this field is just called 'status'
                 )
       %>
 
@@ -34,6 +26,36 @@
                 )
       %>
 
+%     if ( $cgi->param('failed') ) {
+      <& /elements/tr-fixed.html,
+        'label'         => 'Event status',
+        'field'         => 'event_status',
+        'curr_value'    => 'failed',
+        'formatted_value' => 'Failed',
+      &>
+%     } else {
+
+% # 'initial' is not on here, since nobody needs to see it. also,
+% # 'done_Y' = "done, and no_action is null, and statustext is null"
+% # 'done_S' = "done, and no_action is null, and statustext is not null"
+% # 'done_N' = "done, and no_action = 'Y'".
+      <& /elements/tr-select.html,
+        'label'         => 'Event status',
+        'field'         => 'event_status',
+        'multiple'      => 1,
+        'all_selected'  => 1,
+        'size'          => 5,
+        'options'       => [ qw( done_Y done_S done_N failed new locked ) ],
+        'option_labels' => { done_Y => 'Completed normally',
+                             done_S => 'Completed, with an error',
+                             done_N => 'Completed, no action taken',
+                             failed => 'Failed',
+                             new    => 'Not yet processed',
+                             locked => 'Running',
+                           },
+      &>
+%     }
+
       <% include( '/elements/tr-input-beginning_ending.html' ) %>
 
     </TABLE>