[freeside-commits] freeside/FS/FS svc_acct_rt_transaction.pm, NONE, 1.1 AccessRight.pm, 1.22, 1.23 Conf.pm, 1.203, 1.204 Schema.pm, 1.63, 1.64 cust_main.pm, 1.296, 1.297
Jeff Finucane,420,,
jeff at wavetail.420.am
Thu Aug 16 06:40:45 PDT 2007
Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv28263/FS/FS
Modified Files:
AccessRight.pm Conf.pm Schema.pm cust_main.pm
Added Files:
svc_acct_rt_transaction.pm
Log Message:
support hours 'usage' tracking for our own internal use (#1733)
Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- Schema.pm 10 Aug 2007 07:01:02 -0000 1.63
+++ Schema.pm 16 Aug 2007 13:40:43 -0000 1.64
@@ -988,6 +988,19 @@
'index' => [ ['username'], ['domsvc'] ],
},
+ 'svc_acct_rt_transaction' => {
+ 'columns' => [
+ 'svcrtid', 'int', '', '', '', '',
+ 'svcnum', 'int', '', '', '', '',
+ 'transaction_id', 'int', '', '', '', '',
+ '_date', @date_type, '', '',
+ 'seconds', 'int', '', '', '', '', #uhhhh
+ ],
+ 'primary_key' => 'svcrtid',
+ 'unique' => [],
+ 'index' => [ ['svcnum', 'transaction_id'] ],
+ },
+
#'svc_charge' => {
# 'columns' => [
# 'svcnum', 'int', '', '',
Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- Conf.pm 1 Aug 2007 22:24:36 -0000 1.203
+++ Conf.pm 16 Aug 2007 13:40:43 -0000 1.204
@@ -2047,6 +2047,13 @@
'type' => 'checkbox',
},
+ {
+ 'key' => 'support_packages',
+ 'section' => '',
+ 'description' => 'A list of packages eligible for RT ticket time transfer',
+ 'type' => 'textarea',
+ },
+
);
1;
Index: AccessRight.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/AccessRight.pm,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- AccessRight.pm 1 Aug 2007 22:24:35 -0000 1.22
+++ AccessRight.pm 16 Aug 2007 13:40:43 -0000 1.23
@@ -203,6 +203,7 @@
###
'Miscellaneous rights' => [
{ rightname=>'Job queue', global=>1 },
+ { rightname=>'Time queue', global=>1 },
{ rightname=>'Process batches', global=>1 },
{ rightname=>'Reprocess batches', global=>1 },
{ rightname=>'Import', global=>1 }, #some of these are ag-virt'ed now? give em their own ACLs
Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -d -r1.296 -r1.297
--- cust_main.pm 16 Aug 2007 00:09:47 -0000 1.296
+++ cust_main.pm 16 Aug 2007 13:40:43 -0000 1.297
@@ -4620,6 +4620,52 @@
$statuscolor{$self->cust_status};
}
+=item tickets
+
+Returns an array of hashes representing the customer's RT tickets.
+
+=cut
+
+sub tickets {
+ my $self = shift;
+
+ my $num = $conf->config('cust_main-max_tickets') || 10;
+ my @tickets = ();
+
+ unless ( $conf->config('ticket_system-custom_priority_field') ) {
+
+ @tickets = @{ FS::TicketSystem->customer_tickets($self->custnum, $num) };
+
+ } else {
+
+ foreach my $priority (
+ $conf->config('ticket_system-custom_priority_field-values'), ''
+ ) {
+ last if scalar(@tickets) >= $num;
+ push @tickets,
+ @{ FS::TicketSystem->customer_tickets( $self->custnum,
+ $num - scalar(@tickets),
+ $priority,
+ )
+ };
+ }
+ }
+ (@tickets);
+}
+
+# Return services representing svc_accts in customer support packages
+sub support_services {
+ my $self = shift;
+ my %packages = map { $_ => 1 } $conf->config('support_packages');
+
+ grep { $_->pkg_svc && $_->pkg_svc->primary_svc eq 'Y' }
+ grep { $_->part_svc->svcdb eq 'svc_acct' }
+ map { $_->cust_svc }
+ grep { exists $packages{ $_->pkgpart } }
+ $self->ncancelled_pkgs;
+
+}
+
=back
=head1 CLASS METHODS
--- NEW FILE: svc_acct_rt_transaction.pm ---
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;
More information about the freeside-commits
mailing list