X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FTicketSystem%2FRT_External.pm;h=d951cc0e7a49e5aa76af3dec91eccd6d2dca26e2;hb=8f5c91d6c7a8dc85a8b6768a149b4c7b3e144c38;hp=63eee867b347220f3cdeac59753bed548875b809;hpb=e6af2112aae23d3d15a24e70978c3c277a93f2f9;p=freeside.git diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm index 63eee867b..d951cc0e7 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,24 +26,23 @@ 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 ); - my $sql = "select count(*) $from_sql"; + my $sql = "SELECT COUNT(*) $from_sql"; my $sth = $dbh->prepare($sql) or die $dbh->errstr. " preparing $sql"; $sth->execute(@param) or die $sth->errstr. " executing $sql"; @@ -50,15 +51,13 @@ 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" : '' ). - " $from_sql order by priority desc limit $limit"; + my $sql = "SELECT tickets.*, queues.name". + ( length($priority) ? ", objectcustomfieldvalues.content" : '' ). + " $from_sql ORDER BY priority DESC LIMIT $limit"; my $sth = $dbh->prepare($sql) or die $dbh->errstr. "preparing $sql"; $sth->execute(@param) or die $sth->errstr. "executing $sql"; @@ -76,9 +75,23 @@ sub _from_customer { my $where = ''; if ( defined($priority) ) { - my $queue_sql = " customfields.queue = ( select id from queues - where queues.name = ? ) - or ( ? = '' and customfields.queue = 0 )"; + my $queue_sql = " ObjectCustomFields.ObjectId = ( SELECT id FROM queues + WHERE queues.name = ? ) + OR ( ? = '' AND ObjectCustomFields.ObjectId = 0 )"; + + my $customfield_sql = + "customfield = ( + SELECT CustomFields.Id FROM CustomFields + JOIN ObjectCustomFields + ON ( CustomFields.id = ObjectCustomFields.CustomField ) + WHERE LookupType = 'RT::Queue-RT::Ticket' + AND name = ? + AND ( $queue_sql ) + )"; + + push @param, $priority_field, + $priority_field_queue, + $priority_field_queue; if ( length($priority) ) { #$where = " @@ -90,40 +103,35 @@ sub _from_customer { # ) # ) #"; - push @param, $priority; + unshift @param, $priority; - $join = "join TicketCustomFieldValues - on ( tickets.id = TicketCustomFieldValues.ticket )"; + $join = "JOIN ObjectCustomFieldValues + ON ( tickets.id = ObjectCustomFieldValues.ObjectId )"; - $where = "and content = ? - and customfield = ( select id from customfields - where name = ? - and ( $queue_sql ) - ) - "; + $where = " AND content = ? + AND ObjectType = 'RT::Ticket' + AND $customfield_sql"; + } else { + $where = - "and 0 = ( select count(*) from TicketCustomFieldValues - where ticket = tickets.id - and customfield = ( select id from customfields - where name = ? - and ( $queue_sql ) - ) + "AND 0 = ( SELECT count(*) FROM ObjectCustomFieldValues + WHERE ObjectId = tickets.id + AND ObjectType = 'RT::Ticket' + AND $customfield_sql ) "; } - push @param, $priority_field, - $priority_field_queue, - $priority_field_queue; + } my $sql = " - from tickets - join queues on ( tickets.queue = queues.id ) - join links on ( tickets.id = links.localbase ) + FROM tickets + JOIN queues ON ( tickets.queue = queues.id ) + JOIN links ON ( tickets.id = links.localbase ) $join - where ( status = 'new' or status = 'open' or status = 'stalled' ) - and target = 'freeside://freeside/cust_main/$custnum' + WHERE ( status = 'new' OR status = 'open' OR status = 'stalled' ) + AND target = 'freeside://freeside/cust_main/$custnum' $where "; @@ -131,12 +139,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 +188,54 @@ 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) = @_; + + return '' unless $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 {