summaryrefslogtreecommitdiff
path: root/httemplate
diff options
context:
space:
mode:
Diffstat (limited to 'httemplate')
-rw-r--r--httemplate/elements/menu.html3
-rw-r--r--httemplate/search/report_cust_event.html10
2 files changed, 7 insertions, 6 deletions
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index c385cb4c7..93bebb17a 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -320,7 +320,6 @@ tie my %report_ticketing, 'Tie::IxHash',
;
tie my %report_bill_event, 'Tie::IxHash',
- 'All billing events' => [ $fsurl.'search/report_cust_event.html', 'All billing events for a date range' ],
'Billing event errors' => [ $fsurl.'search/report_cust_event.html?failed=1', 'Failed credit cards, processor or printer problems, etc.' ],
;
@@ -404,7 +403,7 @@ tie my %report_payable, 'Tie::IxHash',
;
tie my %report_logs, 'Tie::IxHash';
-$report_logs{'Billing events'} = [ \%report_bill_event, 'Billing events' ]
+$report_logs{'Billing events'} = [ $fsurl.'search/report_cust_event.html', 'Search billing events by date and status' ]
if $curuser->access_right('Billing event reports');
$report_logs{'Credit limit incidents'} = [ $fsurl.'search/report_cust_main_credit_limit.html', '' ]
if $curuser->access_right('List rating data');
diff --git a/httemplate/search/report_cust_event.html b/httemplate/search/report_cust_event.html
index 6453500ad..7aa4ff9d7 100644
--- a/httemplate/search/report_cust_event.html
+++ b/httemplate/search/report_cust_event.html
@@ -36,16 +36,18 @@
% } else {
% # 'initial' is not on here, since nobody needs to see it. also,
-% # 'done_Y' and 'done_N' are shorthand for "done, and no_action
-% # is null" and "done, and no_action = 'Y'".
+% # '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_N failed new locked ) ],
- 'option_labels' => { done_Y => 'Completed',
+ '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',