option to force default queue for new tickets in cust_main, RT#8889

2 files changed, 22 insertions, 4 deletions

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index e18cff693..7898065b2 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -1148,6 +1148,12 @@ and customer address. Include units.',
     'type'        => 'select',
     'select_enum' => [ '', 'Payable upon receipt', 'Net 0', 'Net 10', 'Net 15', 'Net 20', 'Net 30', 'Net 45', 'Net 60' ],
   },
+  {
+    'key'         => 'invoice_print_pdf',
+    'section'     => 'invoicing',
+    'description' => 'Store postal invoices for download in PDF format rather than printing them directly.',
+    'type'        => 'checkbox',
+  },
 
   { 
     'key'         => 'invoice_show_prior_due_date',
@@ -2237,7 +2243,12 @@ and customer address. Include units.',
                            }
                          },
   },
-
+  {
+    'key'         => 'ticket_system-force_default_queueid',
+    'section'     => '',
+    'description' => 'Disallow queue selection when creating new tickets from customer view.',
+    'type'        => 'checkbox',
+  },
   {
     'key'         => 'ticket_system-selfservice_queueid',
     'section'     => '',
diff --git a/httemplate/view/cust_main/tickets.html b/httemplate/view/cust_main/tickets.html
index 7a511a962..e90ae5276 100644
--- a/httemplate/view/cust_main/tickets.html
+++ b/httemplate/view/cust_main/tickets.html
@@ -9,10 +9,15 @@ 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
-<SELECT NAME="Queue" id="Queue" onchange="updateTicketLink()">
 % my %queues = FS::TicketSystem->queues();
+% 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()">
 % 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 %>"
@@ -20,8 +25,9 @@ function updateTicketLink() {
     ><% $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 +93,7 @@ function updateTicketLink() {
 
 <%init>
 
+my( $conf ) = new FS::Conf;
 my( $cust_main ) = @_;
 my( @tickets )  = $cust_main->tickets;