agent option to select RT queue

4 files changed, 106 insertions, 30 deletions

diff --git a/httemplate/browse/agent.cgi b/httemplate/browse/agent.cgi
index e3c4022d4..05300d0bd 100755
--- a/httemplate/browse/agent.cgi
+++ b/httemplate/browse/agent.cgi
@@ -8,6 +8,8 @@
     %search = ( 'disabled' => '' );
   }
 
+  my $conf = new FS::Conf;
+
 %>
 <%= header('Agent Listing', menubar(
   'Main Menu'   => $p,
@@ -36,6 +38,9 @@ full offerings (via their type).<BR><BR>
   <TH>Reports</TH>
   <TH>Registration codes</TH>
   <TH>Prepaid cards</TH>
+  <% if ( $conf->config('ticket_system') ) { %>
+    <TH>Ticketing</TH>
+  <% } %>
   <TH><FONT SIZE=-1>Payment Gateway Overrides</FONT></TH>
   <TH><FONT SIZE=-1>Freq.</FONT></TH>
   <TH><FONT SIZE=-1>Prog.</FONT></TH>
@@ -175,6 +180,16 @@ foreach my $agent ( sort {
           <BR><A HREF="<%=$p%>edit/prepay_credit.cgi?agentnum=<%= $agent->agentnum %>">Generate cards</A>
         </TD>
 
+        <% if ( $conf->config('ticket_system') ) { %>
+
+          <TD>
+            <% if ( $agent->ticketing_queueid ) { %>
+              Queue: <%= $agent->ticketing_queueid %>: <%= $agent->ticketing_queue %><BR>
+            <% } %>
+          </TD>
+
+        <% } %>
+
         <TD>
           <TABLE CELLSPACING=0 CELLPADDING=0>
             <% foreach my $override (
diff --git a/httemplate/config/config-view.cgi b/httemplate/config/config-view.cgi
index 9a0006792..8011e7697 100644
--- a/httemplate/config/config-view.cgi
+++ b/httemplate/config/config-view.cgi
@@ -36,19 +36,35 @@
         <% foreach my $type ( ref($i->type) ? @{$i->type} : $i->type ) {
              my $n = 0; %>
           <% if ( $type eq '' ) { %>
-            <tr><td><font color="#ff0000">no type</font></td></tr>
+            <tr>
+              <td><font color="#ff0000">no type</font></td>
+            </tr>
           <% } elsif (   $type eq 'textarea'
                       || $type eq 'editlist'
                       || $type eq 'selectmultiple' ) { %>
-            <tr><td bgcolor="#ffffff">
+            <tr>
+              <td bgcolor="#ffffff">
 <pre>
 <%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
 </pre>
-            </td></tr>
+              </td>
+            </tr>
           <% } elsif ( $type eq 'checkbox' ) { %>
-            <tr><td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td></tr>
+            <tr>
+              <td bgcolor="#<%= $conf->exists($i->key) ? '00ff00">YES' : 'ff0000">NO' %></td>
+            </tr>
           <% } elsif ( $type eq 'text' || $type eq 'select' )  { %>
-            <tr><td bgcolor="#ffffff"><%= $conf->exists($i->key) ? $conf->config($i->key) : '' %></td></tr>
+            <tr>
+              <td bgcolor="#ffffff">
+                <%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>
+              </td></tr>
+          <% } elsif ( $type eq 'select-sub' ) { %>
+            <tr>
+              <td bgcolor="#ffffff">
+                <%= $conf->config($i->key) %>: 
+                <%= &{ $i->option_sub }( $conf->config($i->key) ) %>
+              </td>
+            </tr>
           <% } else { %>
             <tr><td>
               <font color="#ff0000">unknown type <%= $type %></font>
diff --git a/httemplate/config/config.cgi b/httemplate/config/config.cgi
index 409869e11..ff29d8578 100644
--- a/httemplate/config/config.cgi
+++ b/httemplate/config/config.cgi
@@ -73,6 +73,21 @@ function SafeOnsubmit() {
                 <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>
               <% } %>
             </select>
+          <% } elsif ( $type eq 'select-sub' ) { %>
+            <select name="<%= $i->key. $n %>">
+              <option value="">
+              <% my %options = &{$i->options_sub};
+                 my @options = sort { $a <=> $b } keys %options;
+                 my %saw;
+                 foreach my $value ( @options ) {
+                    local($^W)=0; next if $saw{$value}++;
+              %>
+                <option value="<%= $value %>"<%= $value eq $conf->config($i->key) ? ' SELECTED' : '' %>><%= $value %>: <%= $options{$value} %>
+              <% } %>
+              <% if ( $conf->exists($i->key) && $conf->config($i->key) && ! exists $options{$conf->config($i->key)} ) { %>
+                <option value=<%= $conf->config($i->key) %> SELECTED><%= $conf->config($i->key) %>: <%= &{ $i->option_sub }( $conf->config($i->key) ) %>
+              <% } %>
+            </select>
           <% } elsif ( $type eq 'editlist' )  { %>
             <script>
               function doremove<%= $i->key. $n %>() {
diff --git a/httemplate/edit/agent.cgi b/httemplate/edit/agent.cgi
index 8a1cb2ae1..f8d0edc1a 100755
--- a/httemplate/edit/agent.cgi
+++ b/httemplate/edit/agent.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my $agent;
@@ -16,6 +15,8 @@ if ( $cgi->param('error') ) {
 my $action = $agent->agentnum ? 'Edit' : 'Add';
 my $hashref = $agent->hashref;
 
+my $conf = new FS::Conf;
+
 %>
 
 <%= header("$action Agent", menubar(
@@ -32,45 +33,74 @@ my $hashref = $agent->hashref;
 Agent #<%= $hashref->{agentnum} ? $hashref->{agentnum} : "(NEW)" %>
 
 <%= &ntable("#cccccc", 2, '') %>
+
 <TR>
   <TH ALIGN="right">Agent</TH>
   <TD><INPUT TYPE="text" NAME="agent" SIZE=32 VALUE="<%= $hashref->{agent} %>"></TD>
 </TR>
-<TR>
-  <TH ALIGN="right">Agent type</TH>
-  <TD><SELECT NAME="typenum" SIZE=1>
-
-<% foreach my $agent_type (qsearch('agent_type',{})) { %>
-  <OPTION VALUE="<%= $agent_type->typenum %>"<%= ( $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum ) ) ? ' SELECTED' : '' %>>
-  <%= $agent_type->getfield('typenum') %>: <%= $agent_type->getfield('atype') %>
-<% } %>
 
-</SELECT></TD>
-</TR>
-<% if ( dbdef->table('agent')->column('disabled') ) { %>
+  <TR>
+    <TH ALIGN="right">Agent type</TH>
+    <TD><SELECT NAME="typenum" SIZE=1>
+  
+  <% foreach my $agent_type (qsearch('agent_type',{})) { %>
+    <OPTION VALUE="<%= $agent_type->typenum %>"<%= ( $hashref->{typenum} && ( $hashref->{typenum} == $agent_type->typenum ) ) ? ' SELECTED' : '' %>>
+    <%= $agent_type->getfield('typenum') %>: <%= $agent_type->getfield('atype') %>
+  <% } %>
+  
+  </SELECT></TD>
+  </TR>
+  
   <TR>
     <TD ALIGN="right">Disable</TD>
     <TD><INPUT TYPE="checkbox" NAME="disabled" VALUE="Y"<%= $hashref->{disabled} eq 'Y' ? ' CHECKED' : '' %>></TD>
   </TR>
-<% } %>
-<TR>
-  <TD ALIGN="right"><!--Frequency--></TD>
-  <TD><INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>"></TD>
-</TR>
-<TR>
-  <TD ALIGN="right"><!--Program--></TD>
-  <TD><INPUT TYPE="hidden" NAME="prog" VALUE="<%= $hashref->{prog} %>"></TD>
-</TR>
-<% if ( dbdef->table('agent')->column('username') ) { %>
+  
+  <TR>
+    <TD ALIGN="right"><!--Frequency--></TD>
+    <TD><INPUT TYPE="hidden" NAME="freq" VALUE="<%= $hashref->{freq} %>"></TD>
+  </TR>
+  
+  <TR>
+    <TD ALIGN="right"><!--Program--></TD>
+    <TD><INPUT TYPE="hidden" NAME="prog" VALUE="<%= $hashref->{prog} %>"></TD>
+  </TR>
+
+  <% if ( $conf->config('ticket_system') ) {
+    my $default_queueid = $conf->config('ticket_system-default_queueid');
+    my $default_queue = FS::TicketSystem->queue($default_queueid);
+    $default_queue = "(default) $default_queueid: $default_queue"
+      if $default_queueid;
+    my %queues = FS::TicketSystem->queues();
+    my @queueids = sort { $a <=> $b } keys %queues;
+  %>
+    <TR>
+      <TD ALIGN="right">Ticketing</TD>
+      <TD>
+        <SELECT NAME="ticketing_queueid">
+          <OPTION VALUE=""><%= $default_queue %>
+          <% foreach my $queueid ( @queueids ) { %>
+            <OPTION VALUE="<%= $queueid %>" <%= $agent->ticketing_queueid == $queueid ? ' SELECTED' : '' %>><%= $queueid %>: <%= $queues{$queueid} %>
+          <% } %>
+        </SELECT>
+      </TD>
+    </TR>
+  <% } %>
+  
   <TR>
     <TD ALIGN="right">Agent interface username</TD>
-    <TD><INPUT TYPE="text" NAME="username" VALUE="<%= $hashref->{username} %>"></TD>
+    <TD>
+      <INPUT TYPE="text" NAME="username" VALUE="<%= $hashref->{username} %>">
+    </TD>
   </TR>
+  
   <TR>
     <TD ALIGN="right">Agent interface password</TD>
-    <TD><INPUT TYPE="text" NAME="_password" VALUE="<%= $hashref->{_password} %>"></TD>
+    <TD>
+      <INPUT TYPE="text" NAME="_password" VALUE="<%= $hashref->{_password} %>">
+    </TD>
   </TR>
-<% } %>
+
 </TABLE>
 
 <BR><INPUT TYPE="submit" VALUE="<%= $hashref->{agentnum} ? "Apply changes" : "Add agent" %>">