X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FTicketSystem%2FRT_External.pm;h=7dde8622814580be28b912ac61fa5d0dda5024fe;hb=8e3dfb380406e145494a5fffa7a0e4aab7b38253;hp=5424a71224cefedc01b27e5610a8e492f574ca64;hpb=c5c95d5ea9e8de64da701cf679a7a4fc2db6ccd3;p=freeside.git

diff --git a/FS/FS/TicketSystem/RT_External.pm b/FS/FS/TicketSystem/RT_External.pm
index 5424a7122..7dde86228 100644
--- a/FS/FS/TicketSystem/RT_External.pm
+++ b/FS/FS/TicketSystem/RT_External.pm
@@ -2,12 +2,16 @@ package FS::TicketSystem::RT_External;
 
 use strict;
 use vars qw( $conf $default_queueid
-             $priority_field $priority_field_queue $field );
-use FS::UID;
-
-install_callback FS::UID sub { 
-  my $conf = new FS::Conf;
-  my $default_queueid = $conf->config('ticket_system-default_queueid');
+             $priority_field $priority_field_queue $field
+	     $dbh $external_url );
+use URI::Escape;
+use FS::UID qw(dbh);
+use FS::Record qw(qsearchs);
+use FS::cust_main;
+
+FS::UID->install_callback( sub { 
+  $conf = new FS::Conf;
+  $default_queueid = $conf->config('ticket_system-default_queueid');
   $priority_field =
     $conf->config('ticket_system-custom_priority_field');
   if ( $priority_field ) {
@@ -20,16 +24,25 @@ install_callback FS::UID sub {
     $priority_field_queue = '';
     $field = '';
   }
-};
 
-sub num_customer_tickets {
-  my( $self, $custnum, $priority, $dbh ) = @_;
+  $external_url = '';
+  $dbh = dbh;
+  if ($conf->config('ticket_system') eq 'RT_External') {
+    my ($datasrc, $user, $pass) = $conf->config('ticket_system-rt_external_datasrc');
+    $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');
+  }
 
-  #$dbh ||= create one from some config options
+} );
+
+sub num_customer_tickets {
+  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";
 
@@ -38,13 +51,13 @@ sub num_customer_tickets {
 }
 
 sub customer_tickets {
-  my( $self, $custnum, $limit, $priority, $dbh ) = @_;
+  my( $self, $custnum, $limit, $priority ) = @_;
   $limit ||= 0;
 
-  #$dbh ||= create one from some config options
-
   my( $from_sql, @param) = $self->_from_customer( $custnum, $priority );
-  my $sql = "select * $from_sql order by priority desc limit $limit";
+  my $sql = "SELECT tickets.*, queues.name".
+            ( length($priority) ? ", objectcustomfieldvalues.content" : '' ).
+            " $from_sql ORDER BY priority, id DESC LIMIT $limit";
   my $sth = $dbh->prepare($sql) or die $dbh->errstr. "preparing $sql";
   $sth->execute(@param)         or die $sth->errstr. "executing $sql";
 
@@ -62,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 = "    
@@ -76,40 +103,36 @@ 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 ObjectCustomFieldValues.disabled != 1
+                 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 ( ". join(' OR ', map "status = '$_'", $self->statuses ). " )
+         AND target = 'freeside://freeside/cust_main/$custnum'
          $where
   ";
 
@@ -117,52 +140,124 @@ sub _from_customer {
 
 }
 
+sub statuses {
+  #my $self = shift;
+  my @statuses = grep { ! /^\s*$/ } $conf->config('cust_main-ticket_statuses');
+  @statuses = (qw( new open stalled )) unless scalar(@statuses);
+  @statuses;
+}
+
 sub href_customer_tickets {
   my( $self, $custnum, $priority ) = @_;
 
-  my $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'
+  #my $href = $self->baseurl;
+
+  #i snarfed this from an RT bookmarked search, then unescaped (some of) it with
+  #perl -npe 's/%([0-9A-F]{2})/pack('C', hex($1))/eg;'
+
+  my $href .= 
+    "Search/Results.html?Order=ASC&".
+    "Query= MemberOf = 'freeside://freeside/cust_main/$custnum' ".
+    #" AND ( Status = 'open'  OR Status = 'new'  OR Status = 'stalled' )"
+    " AND ( ". join(' OR ', map "Status = '$_'", $self->statuses ). " ) "
   ;
 
-  if ( $priority && $field && $priority_field_queue ) {
-    $href .= 'AND%20Queue%20%3D%20%27'. $priority_field_queue. '%27%20';
+  if ( defined($priority) && $field && $priority_field_queue ) {
+    $href .= " AND Queue = '$priority_field_queue' ";
   }
-  if ( $priority && $field ) {
-    $href .= '%20AND%20%27CF.'. $field. '%27%20%3D%20%27'. $priority. '%27%20';
+  if ( defined($priority) && $field ) {
+    $href .= " AND 'CF.$field' ";
+    if ( $priority ) {
+      $href .= "= '$priority' ";
+    } else {
+      $href .= "IS 'NULL' "; #this is "RTQL", not SQL
+    }
   }
 
+  #$href = 
+  uri_escape($href);
+  #eventually should unescape all of it...
+
   $href .= '&Rows=100'.
            '&OrderBy=id&Page=1'.
-           '&Format=%27%20%20%20%3Cb%3E%3Ca%20href%3D%22%2Ffreeside%2Frt%2FTicket%2FDisplay.html%3Fid%3D__id__%22%3E__id__%3C%2Fa%3E%3C%2Fb%3E%2FTITLE%3A%23%27%2C%20%0A%27%3Cb%3E%3Ca%20href%3D%22%2Ffreeside%2Frt%2FTicket%2FDisplay.html%3Fid%3D__id__%22%3E__Subject__%3C%2Fa%3E%3C%2Fb%3E%2FTITLE%3ASubject%27%2C%20%0A%27__Status__%27%2C%20';
+           '&Format=%27%20%20%20%3Cb%3E%3Ca%20href%3D%22'.
+	   $self->baseurl.
+	   'Ticket%2FDisplay.html%3Fid%3D__id__%22%3E__id__%3C%2Fa%3E%3C%2Fb%3E%2FTITLE%3A%23%27%2C%20%0A%27%3Cb%3E%3Ca%20href%3D%22'.
+	   $self->baseurl.
+	   'Ticket%2FDisplay.html%3Fid%3D__id__%22%3E__Subject__%3C%2Fa%3E%3C%2Fb%3E%2FTITLE%3ASubject%27%2C%20%0A%27__Status__%27%2C%20';
 
-  if ( $priority && $field ) {
+  if ( defined($priority) && $field ) {
     $href .= '%0A%27__CustomField.'. $field. '__%2FTITLE%3ASeverity%27%2C%20';
   }
 
   $href .= '%0A%27__QueueName__%27%2C%20%0A%27__OwnerName__%27%2C%20%0A%27__Priority__%27%2C%20%0A%27__NEWLINE__%27%2C%20%0A%27%27%2C%20%0A%27%3Csmall%3E__Requestors__%3C%2Fsmall%3E%27%2C%20%0A%27%3Csmall%3E__CreatedRelative__%3C%2Fsmall%3E%27%2C';
 
-  if ( $priority && $field ) {
+  if ( defined($priority) && $field ) {
     $href .=   '%20%0A%27__-__%27%2C';
   }
 
   $href .= '%20%0A%27%3Csmall%3E__ToldRelative__%3C%2Fsmall%3E%27%2C%20%0A%27%3Csmall%3E__LastUpdatedRelative__%3C%2Fsmall%3E%27%2C%20%0A%27%3Csmall%3E__TimeLeft__%3C%2Fsmall%3E%27';
 
-  $href;
-}
+  #$href =
+  #uri_escape($href);
 
+  $self->baseurl. $href;
+
+}
 
 sub href_new_ticket {
-  my( $self, $custnum ) = @_;
+  my( $self, $custnum_or_cust_main, $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".
-    "&new-MemberOf=freeside://freeside/cust_main/$custnum";
+    "Queue=$queueid".
+    "&new-MemberOf=freeside://freeside/cust_main/$custnum".
+    ( $requestors ? '&Requestors='. uri_escape($requestors) : '' )
+    ;
 }
 
 sub href_ticket {
   my($self, $ticketnum) = @_;
-  'Ticket/Display.html?id='.$ticketnum;
+  $self->baseurl. '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 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 {
+  #my $self = shift;
+  $external_url;
 }
 
 1;