From: Ivan Kohler Date: Sat, 17 Jan 2015 02:53:25 +0000 (-0800) Subject: Merge branch 'issue/SCT-1140' of https://github.com/Jayceh/Freeside X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=4e68cf76788b220cc15f2a080df5e7a1ea4962b8;hp=8227e787f6b012c3e9f2967bdf61fcd0acd4e622 Merge branch 'issue/SCT-1140' of https://github.com/Jayceh/Freeside --- diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index 0c07e9afa..0b8cb0254 100644 --- a/FS/FS/cust_bill.pm +++ b/FS/FS/cust_bill.pm @@ -629,6 +629,23 @@ sub num_cust_event { Returns the customer (see L) for this invoice. +=item suspend + +Suspends all unsuspended packages (see L) for this invoice + +Returns a list: an empty list on success or a list of errors. + +=cut + +sub suspend { + my $self = shift; + + grep { $_->suspend(@_) } + grep {! $_->getfield('cancel') } + $self->cust_pkg; + +} + =item cust_suspend_if_balance_over AMOUNT Suspends the customer associated with this invoice if the total amount owed on @@ -648,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) for this invoice. diff --git a/FS/FS/part_event/Action/cust_bill_cancel.pm b/FS/FS/part_event/Action/cust_bill_cancel.pm new file mode 100644 index 000000000..70cce4686 --- /dev/null +++ b/FS/FS/part_event/Action/cust_bill_cancel.pm @@ -0,0 +1,35 @@ +package FS::part_event::Action::cust_bill_cancel; + +use strict; +use base qw( FS::part_event::Action ); + +sub description { 'Cancel packages on this invoice'; } + +sub eventtable_hashref { + { 'cust_bill' => 1 }; +} + +sub option_fields { + ( + 'reasonnum' => { 'label' => 'Reason', + 'type' => 'select-reason', + 'reason_class' => 'C', + }, + ); +} + +sub default_weight { 10; } + +sub do_action { + my( $self, $cust_bill ) = @_; + + my @err = $cust_bill->cancel( + 'reason' => $self->option('reasonnum'), + ); + + die join(' / ', @err) if scalar(@err); + + return ''; +} + +1; diff --git a/FS/FS/part_event/Action/cust_bill_suspend.pm b/FS/FS/part_event/Action/cust_bill_suspend.pm new file mode 100644 index 000000000..339d6b9c1 --- /dev/null +++ b/FS/FS/part_event/Action/cust_bill_suspend.pm @@ -0,0 +1,41 @@ +package FS::part_event::Action::cust_bill_suspend; + +use strict; +use base qw( FS::part_event::Action ); + +sub description { 'Suspend packages on this invoice'; } + +sub eventtable_hashref { + { 'cust_bill' => 1 }; +} + +sub option_fields { + ( + 'reasonnum' => { 'label' => 'Reason', + 'type' => 'select-reason', + 'reason_class' => 'S', + }, + 'suspend_bill' => { 'label' => 'Continue recurring billing while suspended', + 'type' => 'checkbox', + 'value' => 'Y', + }, + ); +} + +sub default_weight { 10; } + +sub do_action { + my( $self, $cust_bill ) = @_; + + my @err = $cust_bill->suspend( + 'reason' => $self->option('reasonnum'), + 'options' => { 'suspend_bill' => $self->option('suspend_bill') }, + ); + + die join(' / ', @err) if scalar(@err); + + return ''; + +} + +1;