From db18a813b59b8254ff19f77770750a781613d79e Mon Sep 17 00:00:00 2001 From: ivan Date: Thu, 13 Sep 2007 22:35:20 +0000 Subject: [PATCH] rename svc_acct_rt_transaction to acct_rt_transaction, as it is not a service, its something that hangs off of an svc_acct (like an acct_snarf). thank goodness was able to do this before its any sort of migration problem... --- FS/FS/Schema.pm | 2 +- ...ct_rt_transaction.pm => acct_rt_transaction.pm} | 24 +++++++++++----------- FS/MANIFEST | 4 ++-- ...acct_rt_transaction.t => acct_rt_transaction.t} | 2 +- htetc/handler.pl | 2 +- httemplate/misc/process/timeworked.html | 6 +++--- httemplate/search/timeworked.html | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) rename FS/FS/{svc_acct_rt_transaction.pm => acct_rt_transaction.pm} (86%) rename FS/t/{svc_acct_rt_transaction.t => acct_rt_transaction.t} (75%) diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index da264fa05..e5ac696d4 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -988,7 +988,7 @@ sub tables_hashref { 'index' => [ ['username'], ['domsvc'] ], }, - 'svc_acct_rt_transaction' => { + 'acct_rt_transaction' => { 'columns' => [ 'svcrtid', 'int', '', '', '', '', 'svcnum', 'int', '', '', '', '', diff --git a/FS/FS/svc_acct_rt_transaction.pm b/FS/FS/acct_rt_transaction.pm similarity index 86% rename from FS/FS/svc_acct_rt_transaction.pm rename to FS/FS/acct_rt_transaction.pm index 0fb64456b..af959e47f 100644 --- a/FS/FS/svc_acct_rt_transaction.pm +++ b/FS/FS/acct_rt_transaction.pm @@ -1,4 +1,4 @@ -package FS::svc_acct_rt_transaction; +package FS::acct_rt_transaction; use strict; use vars qw( @ISA ); @@ -8,14 +8,14 @@ use FS::Record qw( qsearch qsearchs dbh ); =head1 NAME -FS::svc_acct_rt_transaction - Object methods for svc_acct_rt_transaction records +FS::acct_rt_transaction - Object methods for acct_rt_transaction records =head1 SYNOPSIS - use FS::svc_acct_rt_transaction; + use FS::acct_rt_transaction; - $record = new FS::svc_acct_rt_transaction \%hash; - $record = new FS::svc_acct_rt_transaction { 'column' => 'value' }; + $record = new FS::acct_rt_transaction \%hash; + $record = new FS::acct_rt_transaction { 'column' => 'value' }; $error = $record->insert; @@ -27,8 +27,8 @@ FS::svc_acct_rt_transaction - Object methods for svc_acct_rt_transaction records =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 +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 @@ -50,14 +50,14 @@ FS::Record. The following fields are currently supported: =item new HASHREF -Creates a new svc_acct_rt_transaction. To add the example to the database, see L<"insert">. +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 method. =cut -sub table { 'svc_acct_rt_transaction'; } +sub table { 'acct_rt_transaction'; } =item insert @@ -156,7 +156,7 @@ returns the error, otherwise returns false. =item check -Checks all fields to make sure this is a valid svc_acct_rt_transaction. If there is +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. @@ -199,13 +199,13 @@ sub 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 +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::svc_acct_rt_transaction->batch_insert(@transactions); + my $errors = FS::acct_rt_transaction->batch_insert(@transactions); if ( $error ) { #success; all payments were inserted } else { diff --git a/FS/MANIFEST b/FS/MANIFEST index 07b1eabf8..559264cbe 100644 --- 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 -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/svc_acct_rt_transaction.t b/FS/t/acct_rt_transaction.t similarity index 75% rename from FS/t/svc_acct_rt_transaction.t rename to FS/t/acct_rt_transaction.t index d9958317e..552bdc84a 100644 --- a/FS/t/svc_acct_rt_transaction.t +++ b/FS/t/acct_rt_transaction.t @@ -1,5 +1,5 @@ BEGIN { $| = 1; print "1..1\n" } END {print "not ok 1\n" unless $loaded;} -use FS::svc_acct_rt_transaction; +use FS::acct_rt_transaction; $loaded=1; print "ok 1\n"; diff --git a/htetc/handler.pl b/htetc/handler.pl index c5873a878..1479145c0 100644 --- 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::svc_acct_rt_transaction; + use FS::acct_rt_transaction; 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 b69c898e8..8e1a66336 100644 --- 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 @svc_acct_rt_transaction; +my @acct_rt_transaction; 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 ) { - 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}, @@ -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; diff --git a/httemplate/search/timeworked.html b/httemplate/search/timeworked.html index 18af74641..858cc6281 100644 --- a/httemplate/search/timeworked.html +++ b/httemplate/search/timeworked.html @@ -55,9 +55,9 @@ push @groupby, "newvalue"; 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)"; @@ -68,7 +68,7 @@ push @groupby, "transactions.created"; 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)"; -- 2.11.0