From 4b4b3ca9cb0b7336293b759549b78fc903a7d8c8 Mon Sep 17 00:00:00 2001 From: ivan Date: Sat, 15 Oct 2005 11:29:54 +0000 Subject: [PATCH] agent option to select RT queue --- FS/FS/Conf.pm | 12 +++++- FS/FS/Schema.pm | 1 + FS/FS/TicketSystem.pm | 4 +- FS/FS/TicketSystem/RT_External.pm | 78 +++++++++++++++++++++++--------------- FS/FS/TicketSystem/RT_Internal.pm | 10 ----- FS/FS/agent.pm | 15 +++++++- httemplate/browse/agent.cgi | 15 ++++++++ httemplate/config/config-view.cgi | 26 ++++++++++--- httemplate/config/config.cgi | 15 ++++++++ httemplate/edit/agent.cgi | 80 +++++++++++++++++++++++++++------------ 10 files changed, 181 insertions(+), 75 deletions(-) diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 30aa1e7ab..5f2c3b355 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -1472,8 +1472,16 @@ httemplate/docs/config.html { 'key' => 'ticket_system-default_queueid', 'section' => '', - 'description' => 'Default queue number used when creating new customer tickets.', - 'type' => 'text', + 'description' => 'Default queue used when creating new customer tickets.', + 'type' => 'select-sub', + 'options_sub' => sub { eval "use FS::TicketSystem;"; + die $@ if $@; + FS::TicketSystem->queues(); + }, + 'option_sub' => sub { eval "use FS::TicketSystem;"; + die $@ if $@; + FS::TicketSystem->queue(shift); + }, }, { diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index bffcafcd5..12a4fd5d2 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -247,6 +247,7 @@ sub tables_hashref { 'disabled', 'char', 'NULL', 1, 'username', 'varchar', 'NULL', $char_d, '_password','varchar', 'NULL', $char_d, + 'ticketing_queueid', 'int', 'NULL', '', ], 'primary_key' => 'agentnum', 'unique' => [], diff --git a/FS/FS/TicketSystem.pm b/FS/FS/TicketSystem.pm index 9d961fc47..a80a82789 100644 --- a/FS/FS/TicketSystem.pm +++ b/FS/FS/TicketSystem.pm @@ -5,10 +5,10 @@ use vars qw( $conf $system $AUTOLOAD ); use FS::Conf; use FS::UID; -install_callback FS::UID sub { +FS::UID->install_callback( sub { $conf = new FS::Conf; $system = $conf->config('ticket_system'); -}; +} ); sub AUTOLOAD { my $self = shift; diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm index 63eee867b..e1aec582a 100644 --- a/FS/FS/TicketSystem/RT_External.pm +++ b/FS/FS/TicketSystem/RT_External.pm @@ -3,11 +3,13 @@ package FS::TicketSystem::RT_External; use strict; use vars qw( $conf $default_queueid $priority_field $priority_field_queue $field - $external_dbh $external_url ); + $dbh $external_url ); use URI::Escape; -use FS::UID; +use FS::UID qw(dbh); +use FS::Record qw(qsearchs); +use FS::cust_main; -install_callback FS::UID sub { +FS::UID->install_callback( sub { my $conf = new FS::Conf; $default_queueid = $conf->config('ticket_system-default_queueid'); $priority_field = @@ -24,20 +26,19 @@ install_callback FS::UID sub { } $external_url = ''; + $dbh = dbh; if ($conf->config('ticket_system') eq 'RT_External') { my ($datasrc, $user, $pass) = $conf->config('ticket_system-rt_external_datasrc'); - $external_dbh = DBI->connect($datasrc, $user, $pass, { 'ChopBlanks' => 1 }) + $dbh = DBI->connect($datasrc, $user, $pass, { 'ChopBlanks' => 1 }) or die "RT_External DBI->connect error: $DBI::errstr\n"; $external_url = $conf->config('ticket_system-rt_external_url'); } -}; +} ); sub num_customer_tickets { - my( $self, $custnum, $priority, $dbh ) = @_; - - $dbh ||= $external_dbh; + my( $self, $custnum, $priority ) = @_; my( $from_sql, @param) = $self->_from_customer( $custnum, $priority ); @@ -50,11 +51,9 @@ sub num_customer_tickets { } sub customer_tickets { - my( $self, $custnum, $limit, $priority, $dbh ) = @_; + my( $self, $custnum, $limit, $priority ) = @_; $limit ||= 0; - $dbh ||= $external_dbh; - my( $from_sql, @param) = $self->_from_customer( $custnum, $priority ); my $sql = "select tickets.*, queues.name". ( length($priority) ? ", ticketcustomfieldvalues.content" : '' ). @@ -131,12 +130,14 @@ sub _from_customer { } -sub _href_customer_tickets { +sub href_customer_tickets { my( $self, $custnum, $priority ) = @_; + my $href = $self->baseurl; + #i snarfed this from an RT bookmarked search, it could be unescaped in the #source for readability and run through uri_escape - my $href = + $href .= 'Search/Results.html?Order=ASC&Query=%20MemberOf%20%3D%20%27freeside%3A%2F%2Ffreeside%2Fcust_main%2F'. $custnum. '%27%20%20AND%20%28%20Status%20%3D%20%27open%27%20%20OR%20Status%20%3D%20%27new%27%20%20OR%20Status%20%3D%20%27stalled%27%20%29%20' @@ -178,35 +179,52 @@ sub _href_customer_tickets { } -sub href_customer_tickets { - my $self = shift; - $self->baseurl. $self->_href_customer_tickets(@_); -} - +sub href_new_ticket { + my( $self, $custnum_or_cust_main, $requestors ) = @_; -sub _href_new_ticket { - my( $self, $custnum, $requestors ) = @_; + my( $custnum, $cust_main ); + if ( ref($custnum_or_cust_main) ) { + $cust_main = $custnum_or_cust_main; + $custnum = $cust_main->custnum; + } else { + $custnum = $custnum_or_cust_main; + $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } ); + } + my $queueid = $cust_main->agent->ticketing_queueid || $default_queueid; + $self->baseurl. 'Ticket/Create.html?'. - "Queue=$default_queueid". + "Queue=$queueid". "&new-MemberOf=freeside://freeside/cust_main/$custnum". ( $requestors ? '&Requestors='. uri_escape($requestors) : '' ) ; } -sub href_new_ticket { - my $self = shift; - $self->baseurl. $self->_href_new_ticket(@_); +sub href_ticket { + my($self, $ticketnum) = @_; + $self->baseurl. 'Ticket/Display.html?id='.$ticketnum; } -sub _href_ticket { - my($self, $ticketnum) = @_; - 'Ticket/Display.html?id='.$ticketnum; +sub queues { + my($self) = @_; + + my $sql = "select id, name from queues where disabled = 0"; + my $sth = $dbh->prepare($sql) or die $dbh->errstr. " preparing $sql"; + $sth->execute() or die $sth->errstr. " executing $sql"; + + map { $_->[0] => $_->[1] } @{ $sth->fetchall_arrayref([]) }; + } -sub href_ticket { - my $self = shift; - $self->baseurl. $self->_href_ticket(@_); +sub queue { + my($self, $queueid) = @_; + + my $sql = "select name from queues where id = ?"; + my $sth = $dbh->prepare($sql) or die $dbh->errstr. " preparing $sql"; + $sth->execute($queueid) or die $sth->errstr. " executing $sql"; + + $sth->fetchrow_arrayref->[0]; + } sub baseurl { diff --git a/FS/FS/TicketSystem/RT_Internal.pm b/FS/FS/TicketSystem/RT_Internal.pm index 6f28faf0f..8fce918e0 100644 --- a/FS/FS/TicketSystem/RT_Internal.pm +++ b/FS/FS/TicketSystem/RT_Internal.pm @@ -16,16 +16,6 @@ sub sql_num_customer_tickets { )"; } -sub num_customer_tickets { - my( $self, $custnum, $priority ) = ( shift, shift, shift ); - $self->SUPER::num_customer_tickets( $custnum, $priority, dbh ); -} - -sub customer_tickets { - my( $self, $custnum, $limit, $priority ) = ( shift, shift, shift, shift ); - $self->SUPER::customer_tickets( $custnum, $limit, $priority, dbh ); -} - sub baseurl { #my $self = shift; if ( $RT::URI::freeside::URL ) { diff --git a/FS/FS/agent.pm b/FS/FS/agent.pm index 0a0e4f7ba..83f0ce5b5 100644 --- a/FS/FS/agent.pm +++ b/FS/FS/agent.pm @@ -2,12 +2,13 @@ package FS::agent; use strict; use vars qw( @ISA ); +#use Crypt::YAPassGen; use FS::Record qw( dbh qsearch qsearchs ); use FS::cust_main; use FS::cust_pkg; use FS::agent_type; use FS::reg_code; -#use Crypt::YAPassGen; +use FS::TicketSystem; @ISA = qw( FS::Record ); @@ -167,6 +168,18 @@ sub pkgpart_hashref { $self->agent_type->pkgpart_hashref; } +=item ticketing_queue + +Returns the queue name corresponding with the id from the I +field, or the empty string. + +=cut + +sub ticketing_queue { + my $self = shift; + FS::TicketSystem->queue($self->ticketing_queueid); +}; + =item num_prospect_cust_main Returns the number of prospects (customers with no packages ever ordered) for 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).

Reports Registration codes Prepaid cards + <% if ( $conf->config('ticket_system') ) { %> + Ticketing + <% } %> Payment Gateway Overrides Freq. Prog. @@ -175,6 +180,16 @@ foreach my $agent ( sort {
Generate cards + <% if ( $conf->config('ticket_system') ) { %> + + + <% if ( $agent->ticketing_queueid ) { %> + Queue: <%= $agent->ticketing_queueid %>: <%= $agent->ticketing_queue %>
+ <% } %> + + + <% } %> + <% 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 '' ) { %> - + + + <% } elsif ( $type eq 'textarea' || $type eq 'editlist' || $type eq 'selectmultiple' ) { %> - + + + <% } elsif ( $type eq 'checkbox' ) { %> - + + + <% } elsif ( $type eq 'text' || $type eq 'select' ) { %> - + + + <% } elsif ( $type eq 'select-sub' ) { %> + + + <% } else { %>
no type
no type
+ 
 <%= encode_entities(join("\n", $conf->config($i->key) ) ) %>
-
YES' : 'ff0000">NO' %>
YES' : 'ff0000">NO' %>
<%= $conf->exists($i->key) ? $conf->config($i->key) : '' %>
+ <%= $conf->exists($i->key) ? $conf->config($i->key) : '' %> +
+ <%= $conf->config($i->key) %>: + <%= &{ $i->option_sub }( $conf->config($i->key) ) %> +
unknown type <%= $type %> 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() {