rename svc_acct_rt_transaction to acct_rt_transaction, as it is not a service, its...

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index da264fa..e5ac696 100644 (file)
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -988,7 +988,7 @@ sub tables_hashref {
       'index' => [ ['username'], ['domsvc'] ],
     },
 
       'index' => [ ['username'], ['domsvc'] ],
     },
 

-    'svc_acct_rt_transaction' => {
+    'acct_rt_transaction' => {

       'columns' => [
         'svcrtid',   'int',    '',   '', '', '', 
         'svcnum',    'int',    '',   '', '', '', 
       'columns' => [
         'svcrtid',   'int',    '',   '', '', '', 
         'svcnum',    'int',    '',   '', '', '', 

diff --git a/FS/FS/acct_rt_transaction.pm b/FS/FS/acct_rt_transaction.pm
new file mode 100644 (file)
index 0000000..af959e4
--- /dev/null
+++ b/FS/FS/acct_rt_transaction.pm
@@ -0,0 +1,260 @@
+package FS::acct_rt_transaction;
+
+use strict;
+use vars qw( @ISA );
+use FS::Record qw( qsearch qsearchs dbh );
+
+@ISA = qw(FS::Record);
+
+=head1 NAME
+
+FS::acct_rt_transaction - Object methods for acct_rt_transaction records
+
+=head1 SYNOPSIS
+
+  use FS::acct_rt_transaction;
+
+  $record = new FS::acct_rt_transaction \%hash;
+  $record = new FS::acct_rt_transaction { 'column' => 'value' };
+
+  $error = $record->insert;
+
+  $error = $new_record->replace($old_record);
+
+  $error = $record->delete;
+
+  $error = $record->check;
+
+=head1 DESCRIPTION
+
+An FS::acct_rt_transaction object represents an application of time
+from a rt transaction to a svc_acct.  FS::acct_rt_transaction inherits from
+FS::Record.  The following fields are currently supported:
+
+=over 4
+
+=item svcrtid - primary key
+
+=item svcnum -  the svcnum of the svc_acct to which the time applies
+
+=item transaction_id -  the id of the rt transtaction from which the time applies
+
+=item seconds - the amount of time which applies
+
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=item new HASHREF
+
+Creates a new acct_rt_transaction.  To add the example to the database, see L<"insert">.
+
+Note that this stores the hash reference, not a distinct copy of the hash it
+points to.  You can ask the object for a copy with the I<hash> method.
+
+=cut
+
+sub table { 'acct_rt_transaction'; }
+
+=item insert
+
+Adds this record to the database.  If there is an error, returns the error,
+otherwise returns false.
+
+=cut
+
+sub insert {
+  my( $self, %options ) = @_;
+  
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::insert($options{options} ? %{$options{options}} : ());
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  my $svc_acct = qsearchs('svc_acct', {'svcnum' => $self->svcnum});
+  unless ($svc_acct) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Can't find svc_acct " . $self->svcnum;
+  }
+
+  my $error = $svc_acct->decrement_seconds($self->seconds);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Error incrementing service seconds: $error";
+  }
+  
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
+
+=item delete
+
+Delete this record from the database.
+
+=cut
+
+sub delete { 
+  my $self = shift;
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error = $self->SUPER::delete;
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return $error;
+  }
+
+  my $svc_acct = qsearchs('svc_acct', {'svcnum' => $self->svcnum});
+  unless ($svc_acct) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Can't find svc_acct " . $self->svcnum;
+  }
+
+  my $error = $svc_acct->increment_seconds($self->seconds);
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+    return "Error incrementing service seconds: $error";
+  }
+  
+  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  '';
+
+}
+
+=item replace OLD_RECORD
+
+Replaces the OLD_RECORD with this one in the database.  If there is an error,
+returns the error, otherwise returns false.
+
+=cut
+
+=item check
+
+Checks all fields to make sure this is a valid acct_rt_transaction.  If there is
+an error, returns the error, otherwise returns false.  Called by the insert
+and replace methods.
+
+=cut
+
+sub check {
+  my $self = shift;
+
+  my ($selfref) = $self->hashref;
+
+  my $error = 
+    $self->ut_numbern('svcrtid')
+    || $self->ut_numbern('svcnum')
+    || $self->ut_number('transaction_id')
+    || $self->ut_numbern('_date')
+    || $self->ut_snumber('seconds')
+  ;
+  return $error if $error;
+
+  $self->_date(time) unless $self->_date;
+
+  if ($selfref->{custnum}) {
+    my $conf = new FS::Conf;
+    my %packages = map { $_ => 1 } $conf->config('support_packages');
+    my $cust_main = qsearchs('cust_main',{ 'custnum' => $selfref->{custnum} } );
+    return "Invalid custnum: " . $selfref->{custnum} unless $cust_main;
+
+    my (@svcs) = map { $_->svcnum } $cust_main->support_services;
+    return "svcnum ". $self->svcnum. " invalid for custnum ".$selfref->{custnum}
+      unless (!$self->svcnum || scalar(grep { $_ == $self->svcnum } @svcs));
+
+    $self->svcnum($svcs[0]) unless $self->svcnum;
+    return "Can't find support service for custnum ".$selfref->{custnum}
+      unless $self->svcnum;
+  }
+
+  $self->SUPER::check;
+}
+
+=item batch_insert SVC_ACCT_RT_TRANSACTION_OBJECT, ...
+
+Class method which inserts multiple time applications.  Takes a list of
+FS::acct_rt_transaction objects.  If there is an error inserting any
+application, the entire transaction is rolled back, i.e. all time is applied
+or none is.
+
+For example:
+
+  my $errors = FS::acct_rt_transaction->batch_insert(@transactions);
+  if ( $error ) {
+    #success; all payments were inserted
+  } else {
+    #failure; no payments were inserted.
+  }
+
+=cut
+
+sub batch_insert {
+  my $self = shift; #class method
+
+  local $SIG{HUP} = 'IGNORE';
+  local $SIG{INT} = 'IGNORE';
+  local $SIG{QUIT} = 'IGNORE';
+  local $SIG{TERM} = 'IGNORE';
+  local $SIG{TSTP} = 'IGNORE';
+  local $SIG{PIPE} = 'IGNORE';
+
+  my $oldAutoCommit = $FS::UID::AutoCommit;
+  local $FS::UID::AutoCommit = 0;
+  my $dbh = dbh;
+
+  my $error;
+  foreach (@_) {
+    $error = $_->insert;
+    last if $error;
+  }
+
+  if ( $error ) {
+    $dbh->rollback if $oldAutoCommit;
+  } else {
+    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
+  }
+
+  $error;
+
+}
+
+=back
+
+=head1 BUGS
+
+Possibly the delete method or others.
+
+=head1 SEE ALSO
+
+L<FS::Record>, schema.html from the base documentation.
+
+=cut
+
+1;
+

diff --git a/FS/FS/svc_acct_rt_transaction.pm b/FS/FS/svc_acct_rt_transaction.pm
deleted file mode 100644 (file)
index 0fb6445..0000000
--- a/FS/FS/svc_acct_rt_transaction.pm
+++ /dev/null
@@ -1,260 +0,0 @@
-package FS::svc_acct_rt_transaction;
-
-use strict;
-use vars qw( @ISA );
-use FS::Record qw( qsearch qsearchs dbh );
-
-@ISA = qw(FS::Record);
-
-=head1 NAME
-
-FS::svc_acct_rt_transaction - Object methods for svc_acct_rt_transaction records
-
-=head1 SYNOPSIS
-
-  use FS::svc_acct_rt_transaction;
-
-  $record = new FS::svc_acct_rt_transaction \%hash;
-  $record = new FS::svc_acct_rt_transaction { 'column' => 'value' };
-
-  $error = $record->insert;
-
-  $error = $new_record->replace($old_record);
-
-  $error = $record->delete;
-
-  $error = $record->check;
-
-=head1 DESCRIPTION
-
-An FS::svc_acct_rt_transaction object represents an application of time
-from a rt transaction to a svc_acct.  FS::svc_acct_rt_transaction inherits from
-FS::Record.  The following fields are currently supported:
-
-=over 4
-
-=item svcrtid - primary key
-
-=item svcnum -  the svcnum of the svc_acct to which the time applies
-
-=item transaction_id -  the id of the rt transtaction from which the time applies
-
-=item seconds - the amount of time which applies
-
-
-=back
-
-=head1 METHODS
-
-=over 4
-
-=item new HASHREF
-
-Creates a new svc_acct_rt_transaction.  To add the example to the database, see L<"insert">.
-
-Note that this stores the hash reference, not a distinct copy of the hash it
-points to.  You can ask the object for a copy with the I<hash> method.
-
-=cut
-
-sub table { 'svc_acct_rt_transaction'; }
-
-=item insert
-
-Adds this record to the database.  If there is an error, returns the error,
-otherwise returns false.
-
-=cut
-
-sub insert {
-  my( $self, %options ) = @_;
-  
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::insert($options{options} ? %{$options{options}} : ());
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  my $svc_acct = qsearchs('svc_acct', {'svcnum' => $self->svcnum});
-  unless ($svc_acct) {
-    $dbh->rollback if $oldAutoCommit;
-    return "Can't find svc_acct " . $self->svcnum;
-  }
-
-  my $error = $svc_acct->decrement_seconds($self->seconds);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "Error incrementing service seconds: $error";
-  }
-  
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-
-=item delete
-
-Delete this record from the database.
-
-=cut
-
-sub delete { 
-  my $self = shift;
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error = $self->SUPER::delete;
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return $error;
-  }
-
-  my $svc_acct = qsearchs('svc_acct', {'svcnum' => $self->svcnum});
-  unless ($svc_acct) {
-    $dbh->rollback if $oldAutoCommit;
-    return "Can't find svc_acct " . $self->svcnum;
-  }
-
-  my $error = $svc_acct->increment_seconds($self->seconds);
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-    return "Error incrementing service seconds: $error";
-  }
-  
-  $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  '';
-
-}
-
-=item replace OLD_RECORD
-
-Replaces the OLD_RECORD with this one in the database.  If there is an error,
-returns the error, otherwise returns false.
-
-=cut
-
-=item check
-
-Checks all fields to make sure this is a valid svc_acct_rt_transaction.  If there is
-an error, returns the error, otherwise returns false.  Called by the insert
-and replace methods.
-
-=cut
-
-sub check {
-  my $self = shift;
-
-  my ($selfref) = $self->hashref;
-
-  my $error = 
-    $self->ut_numbern('svcrtid')
-    || $self->ut_numbern('svcnum')
-    || $self->ut_number('transaction_id')
-    || $self->ut_numbern('_date')
-    || $self->ut_snumber('seconds')
-  ;
-  return $error if $error;
-
-  $self->_date(time) unless $self->_date;
-
-  if ($selfref->{custnum}) {
-    my $conf = new FS::Conf;
-    my %packages = map { $_ => 1 } $conf->config('support_packages');
-    my $cust_main = qsearchs('cust_main',{ 'custnum' => $selfref->{custnum} } );
-    return "Invalid custnum: " . $selfref->{custnum} unless $cust_main;
-
-    my (@svcs) = map { $_->svcnum } $cust_main->support_services;
-    return "svcnum ". $self->svcnum. " invalid for custnum ".$selfref->{custnum}
-      unless (!$self->svcnum || scalar(grep { $_ == $self->svcnum } @svcs));
-
-    $self->svcnum($svcs[0]) unless $self->svcnum;
-    return "Can't find support service for custnum ".$selfref->{custnum}
-      unless $self->svcnum;
-  }
-
-  $self->SUPER::check;
-}
-
-=item batch_insert SVC_ACCT_RT_TRANSACTION_OBJECT, ...
-
-Class method which inserts multiple time applications.  Takes a list of
-FS::svc_acct_rt_transaction objects.  If there is an error inserting any
-application, the entire transaction is rolled back, i.e. all time is applied
-or none is.
-
-For example:
-
-  my $errors = FS::svc_acct_rt_transaction->batch_insert(@transactions);
-  if ( $error ) {
-    #success; all payments were inserted
-  } else {
-    #failure; no payments were inserted.
-  }
-
-=cut
-
-sub batch_insert {
-  my $self = shift; #class method
-
-  local $SIG{HUP} = 'IGNORE';
-  local $SIG{INT} = 'IGNORE';
-  local $SIG{QUIT} = 'IGNORE';
-  local $SIG{TERM} = 'IGNORE';
-  local $SIG{TSTP} = 'IGNORE';
-  local $SIG{PIPE} = 'IGNORE';
-
-  my $oldAutoCommit = $FS::UID::AutoCommit;
-  local $FS::UID::AutoCommit = 0;
-  my $dbh = dbh;
-
-  my $error;
-  foreach (@_) {
-    $error = $_->insert;
-    last if $error;
-  }
-
-  if ( $error ) {
-    $dbh->rollback if $oldAutoCommit;
-  } else {
-    $dbh->commit or die $dbh->errstr if $oldAutoCommit;
-  }
-
-  $error;
-
-}
-
-=back
-
-=head1 BUGS
-
-Possibly the delete method or others.
-
-=head1 SEE ALSO
-
-L<FS::Record>, schema.html from the base documentation.
-
-=cut
-
-1;
-

diff --git a/FS/MANIFEST b/FS/MANIFEST
index 07b1eab..559264c 100644 (file)
--- a/FS/MANIFEST
+++ b/FS/MANIFEST
@@ -388,5 +388,5 @@ FS/cust_pkg_option.pm
 t/cust_pkg_option.t
 FS/conf.pm
 t/conf.t
 t/cust_pkg_option.t
 FS/conf.pm
 t/conf.t

-FS/svc_acct_rt_transaction.pm
-t/svc_acct_rt_transaction.t
+FS/acct_rt_transaction.pm
+t/acct_rt_transaction.t

diff --git a/FS/t/acct_rt_transaction.t b/FS/t/acct_rt_transaction.t
new file mode 100644 (file)
index 0000000..552bdc8
--- /dev/null
+++ b/FS/t/acct_rt_transaction.t
@@ -0,0 +1,5 @@
+BEGIN { $| = 1; print "1..1\n" }
+END {print "not ok 1\n" unless $loaded;}
+use FS::acct_rt_transaction;
+$loaded=1;
+print "ok 1\n";

diff --git a/FS/t/svc_acct_rt_transaction.t b/FS/t/svc_acct_rt_transaction.t
deleted file mode 100644 (file)
index d995831..0000000
--- a/FS/t/svc_acct_rt_transaction.t
+++ /dev/null
@@ -1,5 +0,0 @@
-BEGIN { $| = 1; print "1..1\n" }
-END {print "not ok 1\n" unless $loaded;}
-use FS::svc_acct_rt_transaction;
-$loaded=1;
-print "ok 1\n";

diff --git a/htetc/handler.pl b/htetc/handler.pl
index c5873a8..1479145 100644 (file)
--- a/htetc/handler.pl
+++ b/htetc/handler.pl
@@ -169,7 +169,7 @@ sub handler
       use FS::session;
       use FS::svc_acct;
       use FS::svc_acct_pop qw(popselector);
       use FS::session;
       use FS::svc_acct;
       use FS::svc_acct_pop qw(popselector);

-      use FS::svc_acct_rt_transaction;
+      use FS::acct_rt_transaction;

       use FS::svc_domain;
       use FS::svc_forward;
       use FS::svc_www;
       use FS::svc_domain;
       use FS::svc_forward;
       use FS::svc_www;

diff --git a/httemplate/misc/process/timeworked.html b/httemplate/misc/process/timeworked.html
index b69c898..8e1a663 100644 (file)
--- a/httemplate/misc/process/timeworked.html
+++ b/httemplate/misc/process/timeworked.html
@@ -11,7 +11,7 @@ die "access denied"
 my %multipliers = map { /^custnum(\d+)$/; ($cgi->param("custnum$1") => $cgi->param("multiplier$1")); }
                       grep /^custnum\d+$/, $cgi->param;
 
 my %multipliers = map { /^custnum(\d+)$/; ($cgi->param("custnum$1") => $cgi->param("multiplier$1")); }
                       grep /^custnum\d+$/, $cgi->param;
 

-my @svc_acct_rt_transaction;
+my @acct_rt_transaction;

 foreach my $transaction (
   map { /^transactionid(\d+)$/; $1; } grep /^transactionid\d+$/, $cgi->param
 ) {
 foreach my $transaction (
   map { /^transactionid(\d+)$/; $1; } grep /^transactionid\d+$/, $cgi->param
 ) {


@@ -35,7 +35,7 @@ foreach my $transaction (
   }
 
   foreach my $customer ( grep {$seconds{$_}} keys %seconds ) {
   }
 
   foreach my $customer ( grep {$seconds{$_}} keys %seconds ) {

-    push @svc_acct_rt_transaction, new FS::svc_acct_rt_transaction {
+    push @acct_rt_transaction, new FS::acct_rt_transaction {

       'custnum'        => $customer,
       'transaction_id' => $transaction,
       'seconds'        => $seconds{$customer},
       'custnum'        => $customer,
       'transaction_id' => $transaction,
       'seconds'        => $seconds{$customer},


@@ -44,7 +44,7 @@ foreach my $transaction (
 
 }
 
 
 }
 

-my $error = FS::svc_acct_rt_transaction->batch_insert(@svc_acct_rt_transaction);
+my $error = FS::acct_rt_transaction->batch_insert(@acct_rt_transaction);

 $cgi->param('error', $error) if $error;
 
 </%init>
 $cgi->param('error', $error) if $error;
 
 </%init>

diff --git a/httemplate/search/timeworked.html b/httemplate/search/timeworked.html
index 18af746..858cc62 100644 (file)
--- a/httemplate/search/timeworked.html
+++ b/httemplate/search/timeworked.html
@@ -55,9 +55,9 @@ push @groupby, "newvalue";
 push @groupby, "oldvalue";
 push @groupby, "timetaken";
 
 push @groupby, "oldvalue";
 push @groupby, "timetaken";
 

-my $appliedtimeclause = "coalesce (sum(svc_acct_rt_transaction.seconds), 0)";
+my $appliedtimeclause = "coalesce (sum(acct_rt_transaction.seconds), 0)";

 
 

-my $appliedtimeselect = "SELECT sum(seconds) FROM svc_acct_rt_transaction where transaction_id = transactions.id";
+my $appliedtimeselect = "SELECT sum(seconds) FROM acct_rt_transaction where transaction_id = transactions.id";

 push @groupby, "transactions.id";
 
 my $wheretimeleft = "($transactiontime != ($appliedtimeselect) OR ($appliedtimeselect) is NULL)";
 push @groupby, "transactions.id";
 
 my $wheretimeleft = "($transactiontime != ($appliedtimeselect) OR ($appliedtimeselect) is NULL)";


@@ -68,7 +68,7 @@ push @groupby, "transactions.created";
 
 my $groupby = join(',', @groupby);
 
 
 my $groupby = join(',', @groupby);
 

-my $query = "SELECT tickets.id,tickets.subject,to_char(transactions.created, 'Dy Mon DD HH24:MI:SS YYYY'),$transactiontime-$appliedtimeclause,transactions.id FROM transactions JOIN tickets ON transactions.objectid = tickets.id LEFT JOIN svc_acct_rt_transaction on transactions.id = svc_acct_rt_transaction.transaction_id WHERE objecttype='RT::Ticket' AND ((transactions.type='Set' AND field='TimeWorked') OR transactions.type='Comment' OR transactions.type='Correspond') AND ($wheretimeleft) GROUP BY $groupby ORDER BY transactions.created";
+my $query = "SELECT tickets.id,tickets.subject,to_char(transactions.created, 'Dy Mon DD HH24:MI:SS YYYY'),$transactiontime-$appliedtimeclause,transactions.id FROM transactions JOIN tickets ON transactions.objectid = tickets.id LEFT JOIN acct_rt_transaction on transactions.id = acct_rt_transaction.transaction_id WHERE objecttype='RT::Ticket' AND ((transactions.type='Set' AND field='TimeWorked') OR transactions.type='Comment' OR transactions.type='Correspond') AND ($wheretimeleft) GROUP BY $groupby ORDER BY transactions.created";

 my $count_query = "SELECT count(*) FROM transactions WHERE objecttype='RT::Ticket' AND ((transactions.type='Set' AND field='TimeWorked') OR transactions.type='Comment' OR transactions.type='Correspond') AND ($wheretimeleft)";
 
 </%init>
 my $count_query = "SELECT count(*) FROM transactions WHERE objecttype='RT::Ticket' AND ((transactions.type='Set' AND field='TimeWorked') OR transactions.type='Comment' OR transactions.type='Correspond') AND ($wheretimeleft)";
 
 </%init>