diff options
author | Mark Wells <mark@freeside.biz> | 2016-06-09 15:56:36 -0700 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2016-06-09 15:56:54 -0700 |
commit | d02f1d8fb338e4dd1b401892b3408a65cad3b4d4 (patch) | |
tree | 2b5852476004135b0f6fde2b4b19f2b610e09886 /FS/FS/cust_event.pm | |
parent | ac44c24787eb093e47b92ee9939d003acf8464e7 (diff) |
remove "failed billing events" report, and add "completed with an error" status search, #42637
Diffstat (limited to 'FS/FS/cust_event.pm')
-rw-r--r-- | FS/FS/cust_event.pm | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/FS/FS/cust_event.pm b/FS/FS/cust_event.pm index 93743c4..094c4fa 100644 --- a/FS/FS/cust_event.pm +++ b/FS/FS/cust_event.pm @@ -245,7 +245,13 @@ sub do_event { $statustext = "Error running ". $part_event->action. " action: $@"; } elsif ( $error ) { $status = 'done'; - $statustext = $error; + if ( $error eq 'N/A' ) { + # archaic way to indicate no-op completion of spool_csv (and maybe + # other events)? + $self->no_action('Y'); + } else { + $statustext = $error; + } } else { $status = 'done'; } @@ -393,17 +399,22 @@ sub search_sql_where { if ( @event_status ) { my @status; - my ($done_Y, $done_N); + my ($done_Y, $done_N, $done_S); + # done_Y: action was taken + # done_N: action was not taken + # done_S: status message returned foreach (@event_status) { if ($_ eq 'done_Y') { $done_Y = 1; } elsif ( $_ eq 'done_N' ) { $done_N = 1; + } elsif ( $_ eq 'done_S' ) { + $done_S = 1; } else { push @status, $_; } } - if ( $done_Y or $done_N ) { + if ( $done_Y or $done_N or $done_S ) { push @status, 'done'; } if ( @status ) { @@ -412,12 +423,23 @@ sub search_sql_where { ')'; } - if ( $done_Y and not $done_N ) { - push @search, "cust_event.no_action IS NULL"; - } elsif ( $done_N and not $done_Y ) { - push @search, "cust_event.no_action = 'Y'"; - } # else they're both true, so don't add a constraint, or both false, - # and it doesn't matter. + # done_S status should include only those where statustext is not null, + # and done_Y should include only those where it is. + if ( $done_Y and $done_N and $done_S ) { + # then not necessary + } else { + my @done_status; + if ( $done_Y ) { + push @done_status, "(cust_event.no_action IS NULL AND cust_event.statustext IS NULL)"; + } + if ( $done_N ) { + push @done_status, "(cust_event.no_action = 'Y')"; + } + if ( $done_S ) { + push @done_status, "(cust_event.no_action IS NULL AND cust_event.statustext IS NOT NULL)"; + } + push @search, join(' OR ', @done_status) if @done_status; + } } # event_status |