From 52a223d87f3bc7068dbda03b86b10add80ec273b Mon Sep 17 00:00:00 2001 From: "Jason (Jayce^) Hall" Date: Thu, 8 Jan 2015 14:44:49 -0700 Subject: Creating the ability to suspend from an invoice, suspending all not-cancelled cust_pkg's on that invoice. Also creates a new part_event Action that let's you trigger this as an invoice event. --- FS/FS/cust_bill.pm | 17 ++++++++++++ FS/FS/part_event/Action/cust_bill_suspend.pm | 41 ++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 FS/FS/part_event/Action/cust_bill_suspend.pm diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm index 0c07e9afa..92ff5f37d 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 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; -- cgit v1.2.1 From 82fca8a493a6490e385b40ebea690b29bf35bdbd Mon Sep 17 00:00:00 2001 From: "Jason (Jayce^) Hall" Date: Thu, 8 Jan 2015 15:37:52 -0700 Subject: Similar to cust_bill_suspend, create the ability to CANCEL the packages on an invoice. Create an invoice event that can trigger this. --- FS/FS/cust_bill.pm | 32 +++++++++++++++++++++++++- FS/FS/part_event/Action/cust_bill_cancel.pm | 35 +++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 FS/FS/part_event/Action/cust_bill_cancel.pm 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) 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; -- cgit v1.2.1