summaryrefslogtreecommitdiff
path: root/FS/FS
diff options
context:
space:
mode:
authorivan <ivan>2005-10-15 11:29:54 +0000
committerivan <ivan>2005-10-15 11:29:54 +0000
commit4b4b3ca9cb0b7336293b759549b78fc903a7d8c8 (patch)
tree1d918dfa12d8d494c7f29d4a8357523a4a0206db /FS/FS
parenta040f91fa563ceae73bfd84bd39d07a0a7961298 (diff)
agent option to select RT queue
Diffstat (limited to 'FS/FS')
-rw-r--r--FS/FS/Conf.pm12
-rw-r--r--FS/FS/Schema.pm1
-rw-r--r--FS/FS/TicketSystem.pm4
-rw-r--r--FS/FS/TicketSystem/RT_External.pm78
-rw-r--r--FS/FS/TicketSystem/RT_Internal.pm10
-rw-r--r--FS/FS/agent.pm15
6 files changed, 75 insertions, 45 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 30aa1e7..5f2c3b3 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 bffcafc..12a4fd5 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 9d961fc..a80a827 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 63eee86..e1aec58 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 6f28faf..8fce918 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 0a0e4f7..83f0ce5 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<ticketing_queueid>
+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