X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_bill.pm;h=0b8cb025418244de8020499990e5ec13cdd5aa67;hb=82fca8a493a6490e385b40ebea690b29bf35bdbd;hp=92ff5f37d9417ccc9f36b0d6e5dbc681a9bd7298;hpb=52a223d87f3bc7068dbda03b86b10add80ec273b;p=freeside.git

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index 92ff5f37d..0b8cb0254 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -641,7 +641,7 @@ sub suspend {
   my $self = shift;
 
   grep { $_->suspend(@_) } 
-  grep { $_->getfield('cancel') } 
+  grep {! $_->getfield('cancel') } 
   $self->cust_pkg;
 
 }
@@ -665,6 +665,36 @@ sub cust_suspend_if_balance_over {
   }
 }
 
+=item cancel
+
+Cancel the packages on this invoice. Largely similar to the cust_main version, but does not bother yet with banned payment options
+
+=cut
+
+sub cancel {
+  my( $self, %opt ) = @_;
+
+  warn "$me cancel called on cust_bill ". $self->invnum . " with options ".
+       join(', ', map { "$_: $opt{$_}" } keys %opt ). "\n"
+    if $DEBUG;
+
+  return ( 'access denied' )
+    unless $FS::CurrentUser::CurrentUser->access_right('Cancel customer');
+
+  my @pkgs = $self->cust_pkg;
+
+  if ( !$opt{nobill} && $conf->exists('bill_usage_on_cancel') ) {
+    $opt{nobill} = 1;
+    my $error = $self->cust_main->bill( pkg_list => [ @pkgs ], cancel => 1 );
+    warn "Error billing during cancel, custnum ". $self->custnum. ": $error"
+      if $error;
+  }
+
+  grep { $_ } map { $_->cancel(%opt) }
+  grep {! $_->getfield('cancel') } 
+  @pkgs;
+}
+
 =item cust_bill_pay
 
 Returns all payment applications (see L<FS::cust_bill_pay>) for this invoice.