diff options
| author | Jonathan Prykop <jonathan@freeside.biz> | 2016-08-03 23:04:05 -0500 |
|---|---|---|
| committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-08-29 16:37:19 -0500 |
| commit | b941e602f1362b232845cd21279600f3b9793dc0 (patch) | |
| tree | 5edeb3b537918ae528acede19311841d33211fa5 /FS/FS/part_event | |
| parent | ae72b17b3bea122afd5058577dce7d3237b9561a (diff) | |
RT#42043: Check for cancelled packages with a cancellation date age option [age_newest options]
Diffstat (limited to 'FS/FS/part_event')
| -rw-r--r-- | FS/FS/part_event/Condition.pm | 2 | ||||
| -rw-r--r-- | FS/FS/part_event/Condition/hasnt_pkg_class_cancelled.pm | 22 | ||||
| -rw-r--r-- | FS/FS/part_event/Condition/hasnt_pkgpart_cancelled.pm | 15 |
3 files changed, 28 insertions, 11 deletions
diff --git a/FS/FS/part_event/Condition.pm b/FS/FS/part_event/Condition.pm index 36fbe9a..d1d5196 100644 --- a/FS/FS/part_event/Condition.pm +++ b/FS/FS/part_event/Condition.pm @@ -312,7 +312,7 @@ sub option_age_from { } elsif ( $age =~ /^(\d+)d$/i ) { $mday -= $1; } elsif ( $age =~ /^(\d+)h$/i ) { - $hour -= $hour; + $hour -= $1; } else { die "unparsable age: $age"; } diff --git a/FS/FS/part_event/Condition/hasnt_pkg_class_cancelled.pm b/FS/FS/part_event/Condition/hasnt_pkg_class_cancelled.pm index 353e646..d54fb88 100644 --- a/FS/FS/part_event/Condition/hasnt_pkg_class_cancelled.pm +++ b/FS/FS/part_event/Condition/hasnt_pkg_class_cancelled.pm @@ -21,9 +21,16 @@ sub option_fields { 'type' => 'select-pkg_class', 'multiple' => 1, }, - 'age' => { 'label' => 'Cancellation in last', - 'type' => 'freq', - }, + 'age_newest' => { 'label' => 'Cancelled more than', + '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, + }, ); } @@ -32,11 +39,12 @@ sub condition { 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 $pkgclass = $self->option('pkgclass') || {}; - #XXX test - my $hashref = $self->option('pkgclass') || {}; - ! grep { $hashref->{ $_->part_pkg->classnum } && $_->get('cancel') > $age } + ! grep { $pkgclass->{ $_->part_pkg->classnum } && ($_->get('cancel') > $oldest) && ($_->get('cancel') <= $newest) } $cust_main->cancelled_pkgs; } 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 --- 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, }, - 'age' => { 'label' => 'Cancellation in last', + 'age_newest' => { 'label' => 'Cancelled more than', '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 $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') || {}; - ! grep { $if_pkgpart->{ $_->pkgpart } && $_->get('cancel') > $age } + + ! grep { $if_pkgpart->{ $_->pkgpart } && ($_->get('cancel') > $oldest) && ($_->get('cancel') <= $newest) } $cust_main->cancelled_pkgs; } |