diff options
| author | mark <mark> | 2011-03-04 02:26:15 +0000 |
|---|---|---|
| committer | mark <mark> | 2011-03-04 02:26:15 +0000 |
| commit | bd4cf157ffed8f1191724c1975866c3d21fb30df (patch) | |
| tree | 69c671672da4d5ddccc05de5a392bd8cb10da786 | |
| parent | 93ccbad65ffe1726adc038d8e4e05c4100b0c11c (diff) | |
option to override requestor in new tickets, #7777
| -rw-r--r-- | FS/FS/Conf.pm | 7 | ||||
| -rw-r--r-- | FS/FS/TicketSystem/RT_External.pm | 6 | ||||
| -rw-r--r-- | httemplate/elements/dashboard-toplist.html | 4 | ||||
| -rw-r--r-- | httemplate/view/cust_main/tickets.html | 10 |
4 files changed, 19 insertions, 8 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index d42956bf2..00b0cec3c 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -2570,6 +2570,13 @@ and customer address. Include units.', }, { + 'key' => 'ticket_system-requestor', + 'section' => '', + 'description' => 'Email address to use as the requestor for new tickets. If blank, the customer\'s invoicing address(es) will be used.', + 'type' => 'text', + }, + + { 'key' => 'ticket_system-priority_reverse', 'section' => '', 'description' => 'Enable this to consider lower numbered priorities more important. A bad habit we picked up somewhere. You probably want to avoid it and use the default.', diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm index 2995b88a4..8a8c3ffb4 100644 --- a/FS/FS/TicketSystem/RT_External.pm +++ b/FS/FS/TicketSystem/RT_External.pm @@ -285,6 +285,12 @@ sub href_params_new_ticket { $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } ); } + # explicit $requestors > config option > invoicing_list + $requestors = $conf->config('ticket_system-requestor') + if !$requestors; + $requestors = $cust_main->invoicing_list_emailonly_scalar + if (!$requestors) and defined($cust_main); + my %param = ( 'Queue' => ($cust_main->agent->ticketing_queueid || $default_queueid), 'new-MemberOf'=> "freeside://freeside/cust_main/$custnum", diff --git a/httemplate/elements/dashboard-toplist.html b/httemplate/elements/dashboard-toplist.html index d8cd7f306..6e250b6a3 100644 --- a/httemplate/elements/dashboard-toplist.html +++ b/httemplate/elements/dashboard-toplist.html @@ -27,7 +27,9 @@ <% include('/elements/mcp_lint.html', 'cust_main'=>$cust_main) %> </TD> <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ALIGN="right"> - <FONT SIZE="-1"><A HREF="<% FS::TicketSystem->href_new_ticket($cust_main, join(', ', grep { $_ !~ /^(POST|FAX)$/ } $cust_main->invoicing_list ) ) %>">(new ticket)</A></FONT> + <FONT SIZE="-1"> + <A HREF="<% FS::TicketSystem->href_new_ticket($cust_main) %>">(new ticket)</A> + </FONT> </TD> % foreach my $priority ( @custom_priorities, '' ) { diff --git a/httemplate/view/cust_main/tickets.html b/httemplate/view/cust_main/tickets.html index eea5a7f98..064f51147 100644 --- a/httemplate/view/cust_main/tickets.html +++ b/httemplate/view/cust_main/tickets.html @@ -106,13 +106,9 @@ my $res_link = FS::TicketSystem->href_customer_tickets( { 'statuses' => [ 'resolved' ] } ); -my( $new_base, %new_param ) = FS::TicketSystem->href_params_new_ticket( - $cust_main, - join(', ', $cust_main->invoicing_list_emailonly ) ); +my( $new_base, %new_param ) = + FS::TicketSystem->href_params_new_ticket( $cust_main ); -my $new_link = FS::TicketSystem->href_new_ticket( - $cust_main, - join(', ', $cust_main->invoicing_list_emailonly ) - ); +my $new_link = FS::TicketSystem->href_new_ticket( $cust_main ); </%init> |