X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_event.pm;h=d15f35b7dd2ccd7a326299119aa8e0d299e35c74;hb=7b40e0e045368d350529d78208be0e6124f94b5a;hp=dfbb6a5d35355520a87aaa60905406a20000bb6e;hpb=fb4ab1073f0d15d660c6cdc4e07afebf68ef3924;p=freeside.git diff --git a/FS/FS/part_event.pm b/FS/FS/part_event.pm index dfbb6a5d3..d15f35b7d 100644 --- a/FS/FS/part_event.pm +++ b/FS/FS/part_event.pm @@ -9,7 +9,6 @@ use FS::Conf; use FS::part_event_option; use FS::part_event_condition; use FS::cust_event; -use FS::agent; $DEBUG = 0; @@ -169,13 +168,6 @@ sub _rebless { Returns the conditions associated with this event, as FS::part_event_condition objects (see L) -=cut - -sub part_event_condition { - my $self = shift; - qsearch( 'part_event_condition', { 'eventpart' => $self->eventpart } ); -} - =item new_cust_event OBJECT, [ OPTION => VALUE ] Creates a new customer event (see L) for the provided object. @@ -223,13 +215,6 @@ sub reasontext { confess "part_event->reasontext deprecated"; } Returns the associated agent for this event, if any, as an FS::agent object. -=cut - -sub agent { - my $self = shift; - qsearchs('agent', { 'agentnum' => $self->agentnum } ); -} - =item templatename Returns the alternate invoice template name, if any, or false if there is @@ -253,30 +238,23 @@ sub templatename { } } -=item initialize PARAMS +=item targets OPTIONS -Identify all objects eligible for this event and create L -records for each of them, as of the present time, with status "initial". When -combined with conditions that prevent an event from running more than once -(at all or within some period), this will exclude any objects that met the -conditions before the event was created. +Returns all objects (of type C, for this object's +C) eligible for processing under this event, as of right now. +The L object used to test event conditions will be +included in each object as the 'cust_event' pseudo-field. -If an L object needs to be initialized, it should be created -in a disabled state to avoid running the event prematurely for any existing -objects. C will enable it once all the cust_event records -have been created. - -This may take some time, so it should be run from the job queue. +This is not used in normal event processing (which is done on a +per-customer basis to control timing of pre- and post-billing events) +but can be useful when configuring events. =cut -sub initialize { +sub targets { my $self = shift; - my $time = time; # $opt{'time'}? - - my $oldAutoCommit = $FS::UID::AutoCommit; - local $FS::UID::AutoCommit = 0; - my $dbh = dbh; + my %opt = @_; + my $time = $opt{'time'} || time; my $eventpart = $self->eventpart; $eventpart =~ /^\d+$/ or die "bad eventpart $eventpart"; @@ -286,38 +264,72 @@ sub initialize { my $linkage = ''; # this is the 'object' side of the FROM clause if ( $eventtable ne 'cust_main' ) { - $linkage = ($self->eventtables_cust_join->{$eventtable} || '') . - ' LEFT JOIN cust_main USING (custnum) ' + $linkage = + ($self->eventtables_cust_join->{$eventtable} || '') . + ' LEFT JOIN cust_main USING (custnum) '; } # this is the 'event' side - my $join = FS::part_event_condition->join_conditions_sql( $eventtable ); + my $join = FS::part_event_condition->join_conditions_sql( $eventtable, + 'time' => $time + ); my $where = FS::part_event_condition->where_conditions_sql( $eventtable, 'time' => $time ); - $join = $linkage . + $join = $linkage . " INNER JOIN part_event ON ( part_event.eventpart = $eventpart ) $join"; $where .= ' AND cust_main.agentnum = '.$self->agentnum if $self->agentnum; - # don't enforce check_freq since this is a special, out-of-order check, - # and don't enforce disabled because we want to do this with the part_event - # disabled. + # don't enforce check_freq since this is a special, out-of-order check + # and don't enforce disabled because we want to be able to see targets + # for a disabled event + my @objects = qsearch({ table => $eventtable, hashref => {}, addl_from => $join, extra_sql => "WHERE $where", - debug => 1, }); - warn "initialize: ".(scalar @objects) ." $eventtable objects found\n" - if $DEBUG; - my $error = ''; + my @tested_objects; foreach my $object ( @objects ) { - # test conditions my $cust_event = $self->new_cust_event($object, 'time' => $time); next unless $cust_event->test_conditions; + $object->set('cust_event', $cust_event); + push @tested_objects, $object; + } + @tested_objects; +} + +=item initialize PARAMS + +Identify all objects eligible for this event and create L +records for each of them, as of the present time, with status "initial". When +combined with conditions that prevent an event from running more than once +(at all or within some period), this will exclude any objects that met the +conditions before the event was created. + +If an L object needs to be initialized, it should be created +in a disabled state to avoid running the event prematurely for any existing +objects. C will enable it once all the cust_event records +have been created. + +This may take some time, so it should be run from the job queue. + +=cut + +sub initialize { + my $self = shift; + my $error; + + my $oldAutoCommit = $FS::UID::AutoCommit; + local $FS::UID::AutoCommit = 0; + my $dbh = dbh; + + my @objects = $self->targets; + foreach my $object ( @objects ) { + my $cust_event = $object->get('cust_event'); $cust_event->status('initial'); $error = $cust_event->insert; last if $error; @@ -558,6 +570,7 @@ sub actions { ( map { $_ => $actions{$_} } sort { $actions{$a}->{'default_weight'}<=>$actions{$b}->{'default_weight'} } + # || $actions{$a}->{'description'} cmp $actions{$b}->{'description'} } $class->all_actions( $eventtable ) ); @@ -591,6 +604,22 @@ sub process_initialize { $part_event->initialize; } +sub _upgrade_data { #class method + my ($class, %opts) = @_; + + foreach my $part_event ( + qsearch('part_event', { 'action' => 'cust_bill_realtime_card' }), + qsearch('part_event', { 'action' => 'cust_bill_realtime_check' }), + ) { + + $part_event->action('realtime_auto'); + my $error = $part_event->replace; + die $error if $error; + + } + +} + =back =head1 SEE ALSO