diff options
author | ivan <ivan> | 2010-06-15 06:06:54 +0000 |
---|---|---|
committer | ivan <ivan> | 2010-06-15 06:06:54 +0000 |
commit | 4f25d34901fb6a358af5b5009608c5162e745042 (patch) | |
tree | 0111d0289fad66bc315f8ed47114fa88e27f9e1d /httemplate | |
parent | 0c54b74fc47304e2d6e70b604e15ef3827fa59d4 (diff) |
ticket # and account(customer) options for time worked report
Diffstat (limited to 'httemplate')
-rw-r--r-- | httemplate/search/report_rt_transaction.html | 32 | ||||
-rw-r--r-- | httemplate/search/rt_transaction.html | 4 |
2 files changed, 36 insertions, 0 deletions
diff --git a/httemplate/search/report_rt_transaction.html b/httemplate/search/report_rt_transaction.html index 9b7b7cbbb..61445bd1e 100644 --- a/httemplate/search/report_rt_transaction.html +++ b/httemplate/search/report_rt_transaction.html @@ -8,6 +8,24 @@ <% include ( '/elements/tr-select-otaker.html' ) %> + <% include ( '/elements/tr-input-text.html', + 'label' => 'Ticket #', + 'field' => 'ticketid', + ) + %> + + <TR> + <TD>Account</TD> + <TD> + <SELECT NAME="svcnum"> + <OPTION VALUE="">(all) +% foreach my $svc_acct (@svc_acct) { + <OPTION VALUE="<% $svc_acct->svcnum %>"><% $svc_acct->username %></OPTION> +% } + </SELECT> + </TD> + </TR> + </TABLE> <BR> @@ -21,4 +39,18 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('List rating data'); +my $conf = new FS::Conf; + +my @pkgparts = $conf->config('support_packages'); + +my @svc_acct = (); +if ( @pkgparts ) { + @svc_acct = qsearch({ + 'table' => 'svc_acct', + 'addl_from' => ' LEFT JOIN cust_svc USING ( svcnum ) '. + ' LEFT JOIN cust_pkg USING ( pkgnum ) ', + 'extra_sql' => 'WHERE pkgpart IN ('. join(',', @pkgparts). ')', + }); +} + </%init> diff --git a/httemplate/search/rt_transaction.html b/httemplate/search/rt_transaction.html index 67048cf35..34fb733a3 100644 --- a/httemplate/search/rt_transaction.html +++ b/httemplate/search/rt_transaction.html @@ -77,6 +77,10 @@ if ( $cgi->param('otaker') && $cgi->param('otaker') =~ /^([\w\.\-]+)$/ ) { $where .= " AND Users.name = '$1' "; } +if ( $cgi->param('ticketid') =~ /^\s*(\d+)\s*$/ ) { + $where .= " AND Tickets.ID = $1"; +} + my $query = { 'select' => "Transactions.*, Tickets.Id AS ticketid, Tickets.Subject, Users.name as otaker, $transactiontime AS transaction_time", #'table' => 'Transactions', |