diff options
Diffstat (limited to 'httemplate')
| -rwxr-xr-x | httemplate/edit/cust_pay.cgi | 4 | ||||
| -rw-r--r-- | httemplate/search/cust_event.html | 8 | ||||
| -rw-r--r-- | httemplate/search/report_cust_event.html | 32 |
3 files changed, 39 insertions, 5 deletions
diff --git a/httemplate/edit/cust_pay.cgi b/httemplate/edit/cust_pay.cgi index 5d74365e7..116eeebd6 100755 --- a/httemplate/edit/cust_pay.cgi +++ b/httemplate/edit/cust_pay.cgi @@ -12,7 +12,7 @@ <% small_custview($custnum, $conf->config('countrydefault')) %> % } -<FORM NAME="PaymentForm" ACTION="<% popurl(1) %>process/cust_pay.cgi" METHOD=POST onSubmit="document.PaymentForm.submit.disabled=true"> +<FORM NAME="PaymentForm" ACTION="<% popurl(1) %>process/cust_pay.cgi" METHOD=POST onSubmit="document.PaymentForm.submitButton.disabled=true"> <INPUT TYPE="hidden" NAME="link" VALUE="<% $link %>"> <INPUT TYPE="hidden" NAME="linknum" VALUE="<% $linknum %>"> <INPUT TYPE="hidden" NAME="payby" VALUE="<% $payby %>"> @@ -114,7 +114,7 @@ </TABLE> <BR> -<INPUT TYPE="submit" VALUE="<% mt('Post payment') |h %>"> +<INPUT NAME="submitButton" TYPE="submit" VALUE="<% mt('Post payment') |h %>"> </FORM> diff --git a/httemplate/search/cust_event.html b/httemplate/search/cust_event.html index f1b99510a..95e46d7a8 100644 --- a/httemplate/search/cust_event.html +++ b/httemplate/search/cust_event.html @@ -152,7 +152,12 @@ die "access denied" || $cgi->param('pkgnum') =~ /^(\d+)$/ ); -my $title = $cgi->param('failed') ? 'Failed billing events' : 'Billing events'; +my @statuses = $cgi->param('event_status'); +my $title = 'Billing events'; +if ( $statuses[0] eq 'failed' and !defined($statuses[1]) ) { + # tweak the title if we're showing only failed events + $title = 'Failed billing events'; +} my %search = (); @@ -161,6 +166,7 @@ for my $param (@scalars) { $search{$param} = scalar( $cgi->param($param) ) if $cgi->param($param); } +$search{event_status} = \@statuses; #lists my @lists = qw( payby eventpart ); diff --git a/httemplate/search/report_cust_event.html b/httemplate/search/report_cust_event.html index e0d6242b2..465a391a8 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,7 +14,8 @@ <% include( '/elements/tr-select-agent.html', 'disable_empty'=>0 ) %> <% include( '/elements/tr-select-cust_main-status.html', - 'label' => 'Status' + 'label' => 'Customer status', + # this field is just called 'status' ) %> @@ -34,6 +34,34 @@ ) %> +% 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' and 'done_N' are shorthand for "done, and no_action +% # is null" and "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', + done_N => 'Completed, no action taken', + failed => 'Failed', + new => 'Not yet processed', + locked => 'Running', + }, + &> +% } + <% include( '/elements/tr-input-beginning_ending.html' ) %> </TABLE> |