projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#42043: Check for cancelled packages with a cancellation date age option [age_newes...
[freeside.git]
/
FS
/
FS
/
part_event
/
Condition
/
hasnt_pkgpart_cancelled.pm
diff --git
a/FS/FS/part_event/Condition/hasnt_pkgpart_cancelled.pm
b/FS/FS/part_event/Condition/hasnt_pkgpart_cancelled.pm
index
b4ff6c3
..
42845cb
100644
(file)
--- a/
FS/FS/part_event/Condition/hasnt_pkgpart_cancelled.pm
+++ b/
FS/FS/part_event/Condition/hasnt_pkgpart_cancelled.pm
@@
-18,8
+18,15
@@
sub option_fields {
'type' => 'select-part_pkg',
'multiple' => 1,
},
'type' => 'select-part_pkg',
'multiple' => 1,
},
- 'age
' => { 'label' => 'Cancellation in last
',
+ 'age
_newest' => { 'label' => 'Cancelled more than
',
'type' => 'freq',
'type' => 'freq',
+ 'post_text' => ' ago (blank for no limit)',
+ 'allow_blank' => 1,
+ },
+ 'age' => { 'label' => 'Cancelled less than',
+ 'type' => 'freq',
+ 'post_text' => ' ago (blank for no limit)',
+ 'allow_blank' => 1,
},
);
}
},
);
}
@@
-29,10
+36,12
@@
sub condition {
my $cust_main = $self->cust_main($object);
my $cust_main = $self->cust_main($object);
- my $age = $self->option_age_from('age', $opt{'time'} );
+ my $oldest = length($self->option('age')) ? $self->option_age_from('age', $opt{'time'} ) : 0;
+ my $newest = $self->option_age_from('age_newest', $opt{'time'} );
my $if_pkgpart = $self->option('if_pkgpart') || {};
my $if_pkgpart = $self->option('if_pkgpart') || {};
- ! grep { $if_pkgpart->{ $_->pkgpart } && $_->get('cancel') > $age }
+
+ ! grep { $if_pkgpart->{ $_->pkgpart } && ($_->get('cancel') > $oldest) && ($_->get('cancel') <= $newest) }
$cust_main->cancelled_pkgs;
}
$cust_main->cancelled_pkgs;
}