X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Ftickets.html;h=064f511472405f35acfd778d67ca5c1ef10bf392;hb=b748d0884d194ec36fe10fbcc3f2f6322c4c0490;hp=7a511a962d516ec85978fce13ed9d5e8e500c4be;hpb=9414a814e49a86a832e4f56ec1a6bcc927f55e6b;p=freeside.git

diff --git a/httemplate/view/cust_main/tickets.html b/httemplate/view/cust_main/tickets.html
index 7a511a962..064f51147 100644
--- a/httemplate/view/cust_main/tickets.html
+++ b/httemplate/view/cust_main/tickets.html
@@ -9,19 +9,26 @@ function updateTicketLink() {
     keys %new_param),'Queue=') %>" + selector.options[selector.selectedIndex].value;
 }
 </SCRIPT>
-<A id="CreateTicketLink" HREF="">Create new ticket</A>
+<A id="CreateTicketLink" HREF="<% $new_link %>">Create new ticket</A>
  in queue
+%# fetch list of queues in which the user can create tickets
+% my $session = FS::TicketSystem->session();
+% my %queues = FS::TicketSystem->queues($session, 'CreateTicket');
+% if( $conf->exists('ticket_system-force_default_queueid') ) {
+<B><% $queues{$new_param{'Queue'}} %></B>
+<INPUT TYPE="hidden" NAME="Queue" VALUE="<% $new_param{'Queue'} %>">
+% }
+% else {
 <SELECT NAME="Queue" id="Queue" onchange="updateTicketLink()">
-% my %queues = FS::TicketSystem->queues();
 % foreach my $queueid ( sort { $queues{$a} cmp $queues{$b} } keys %queues ) {
-%   #should consider whether the user has ACL to create ticket in each queue
     <OPTION VALUE="<% $queueid %>"
             <% $queueid == $new_param{'Queue'} ? 'SELECTED' : '' %>
     ><% $queues{$queueid} |h %>
 % }
 </SELECT>
-</FORM>
 <SCRIPT DEFER TYPE="text/javascript">updateTicketLink();</SCRIPT>
+% }
+</FORM>
 <BR>
 
 (<A HREF="<% $open_link %>">View <% $openlabel %> tickets for this customer</A>)
@@ -87,6 +94,7 @@ function updateTicketLink() {
 
 <%init>
 
+my( $conf ) = new FS::Conf;
 my( $cust_main ) = @_;
 my( @tickets )  = $cust_main->tickets;
 
@@ -98,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>