[freeside-commits] freeside/FS/FS cust_event.pm, 1.11, 1.12 cust_main.pm, 1.587, 1.588
Mark Wells
mark at wavetail.420.am
Mon Aug 29 13:50:35 PDT 2011
Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv31086/FS/FS
Modified Files:
cust_event.pm cust_main.pm
Log Message:
start of svc_acct events, #13202
Index: cust_event.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_event.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -d -r1.11 -r1.12
--- cust_event.pm 2 Jul 2010 00:25:45 -0000 1.11
+++ cust_event.pm 29 Aug 2011 20:50:32 -0000 1.12
@@ -10,6 +10,7 @@
use FS::cust_main;
use FS::cust_pkg;
use FS::cust_bill;
+use FS::svc_acct;
$DEBUG = 0;
$me = '[FS::cust_event]';
@@ -138,7 +139,7 @@
$dbdef_eventtable->primary_key
)
|| $self->ut_number('_date')
- || $self->ut_enum('status', [qw( new locked done failed )])
+ || $self->ut_enum('status', [qw( new locked done failed initial)])
|| $self->ut_anything('statustext')
;
return $error if $error;
@@ -190,6 +191,11 @@
my $object = $self->cust_X;
my @conditions = $part_event->part_event_condition;
$opt{'cust_event'} = $self;
+ $opt{'time'} = $self->_date
+ or die "test_conditions called without cust_event._date\n";
+ # this MUST be set, or all hell breaks loose in event conditions.
+ # it MUST be in the same time as in the cust_event object, or
+ # future time-dependent events will trigger incorrectly.
#no unsatisfied conditions
#! grep ! $_->condition( $object, %opt ), @conditions;
@@ -212,6 +218,8 @@
sub do_event {
my $self = shift;
+ my %opt = @_; # currently only 'time'
+ my $time = $opt{'time'} || time;
my $part_event = $self->part_event;
@@ -242,7 +250,7 @@
}
#replace or add myself
- $self->_date(time);
+ $self->_date($time);
$self->status($status);
$self->statustext($statustext);
@@ -291,7 +299,7 @@
$self->replace($old);
}
-=item join_cust_sql
+=item join_sql
=cut
@@ -302,9 +310,13 @@
JOIN part_event USING ( eventpart )
LEFT JOIN cust_bill ON ( eventtable = 'cust_bill' AND tablenum = invnum )
LEFT JOIN cust_pkg ON ( eventtable = 'cust_pkg' AND tablenum = pkgnum )
+
+ LEFT JOIN cust_svc ON ( eventtable = 'svc_acct' AND tablenum = svcnum )
+ LEFT JOIN cust_pkg AS cust_pkg_for_svc ON ( cust_svc.pkgnum = cust_pkg_for_svc.pkgnum )
LEFT JOIN cust_main ON ( ( eventtable = 'cust_main' AND tablenum = cust_main.custnum )
OR ( eventtable = 'cust_bill' AND cust_bill.custnum = cust_main.custnum )
OR ( eventtable = 'cust_pkg' AND cust_pkg.custnum = cust_main.custnum )
+ OR ( eventtable = 'svc_acct' AND cust_pkg_for_svc.custnum = cust_main.custnum )
)
";
@@ -325,6 +337,8 @@
=item pkgnum
+=item svcnum
+
=item failed
=item beginning
@@ -387,6 +401,11 @@
"tablenum = '$1'";
}
+ if ( $param->{'svcnum'} =~ /^(\d+)$/ ) {
+ push @search, "part_event.eventtable = 'svc_acct'",
+ "tablenum = '$1'";
+ }
+
my $where = 'WHERE '. join(' AND ', @search );
join(' AND ', @search );
Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.587
retrieving revision 1.588
diff -u -w -d -r1.587 -r1.588
--- cust_main.pm 6 Aug 2011 00:50:48 -0000 1.587
+++ cust_main.pm 29 Aug 2011 20:50:32 -0000 1.588
@@ -3581,6 +3581,56 @@
qsearch($opt);
}
+=item svc_x SVCDB [ OPTION => VALUE | EXTRA_QSEARCH_PARAMS_HASHREF ]
+
+Returns all services of type SVCDB (such as 'svc_acct') for this customer.
+
+Optionally, a list or hashref of additional arguments to the qsearch call can
+be passed following the SVCDB.
+
+=cut
+
+sub svc_x {
+ my $self = shift;
+ my $svcdb = shift;
+ if ( ! $svcdb =~ /^svc_\w+$/ ) {
+ warn "$me svc_x requires a svcdb";
+ return;
+ }
+ my $opt = ref($_[0]) ? shift : { @_ };
+
+ $opt->{'table'} = $svcdb;
+ $opt->{'addl_from'} =
+ 'LEFT JOIN cust_svc USING (svcnum) LEFT JOIN cust_pkg USING (pkgnum) '.
+ ($opt->{'addl_from'} || '');
+
+ my $custnum = $self->custnum;
+ $custnum =~ /^\d+$/ or die "bad custnum '$custnum'";
+ my $where = "cust_pkg.custnum = $custnum";
+
+ my $extra_sql = $opt->{'extra_sql'} || '';
+ if ( keys %{ $opt->{'hashref'} } ) {
+ $extra_sql = " AND $where $extra_sql";
+ }
+ else {
+ if ( $opt->{'extra_sql'} =~ /^\s*where\s(.*)/si ) {
+ $extra_sql = "WHERE $where AND $1";
+ }
+ else {
+ $extra_sql = "WHERE $where $extra_sql";
+ }
+ }
+ $opt->{'extra_sql'} = $extra_sql;
+
+ qsearch($opt);
+}
+
+# required for use as an eventtable;
+sub svc_acct {
+ my $self = shift;
+ $self->svc_x('svc_acct', @_);
+}
+
=item cust_credit
Returns all the credits (see L<FS::cust_credit>) for this customer.
More information about the freeside-commits
mailing list