From 341adb07d0f22f7386b0d1055aa5d6d6120198ca Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Thu, 17 Mar 2016 00:27:14 -0500 Subject: [PATCH] RT#28648: Unsuspend when past due balance is paid [cleanup NO BACKPORT] --- FS/FS/Schema.pm | 1 - FS/FS/cust_main/Packages.pm | 16 ---------------- FS/FS/cust_pkg.pm | 9 +-------- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index ff6e169a8..a47212045 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -2737,7 +2737,6 @@ sub tables_hashref { 'change_custnum', 'int', 'NULL', '', '', '', 'main_pkgnum', 'int', 'NULL', '', '', '', 'pkglinknum', 'int', 'NULL', '', '', '', - 'manual_flag', 'char', 'NULL', 1, '', '', 'no_auto', 'char', 'NULL', 1, '', '', 'quantity', 'int', 'NULL', '', '', '', 'agent_pkgid', 'varchar', 'NULL', $char_d, '', '', diff --git a/FS/FS/cust_main/Packages.pm b/FS/FS/cust_main/Packages.pm index 4356c59ea..2b3634a83 100644 --- a/FS/FS/cust_main/Packages.pm +++ b/FS/FS/cust_main/Packages.pm @@ -557,22 +557,6 @@ sub suspended_pkgs { grep { $_->susp } $self->ncancelled_pkgs; } -### This appears to be unused, will be going away -# -#=item unflagged_suspended_pkgs -# -#Returns all unflagged suspended packages (see L) for this -#customer (thouse packages without the `manual_flag' set). -# -#=cut - -sub unflagged_suspended_pkgs { - my $self = shift; - return $self->suspended_pkgs - unless dbdef->table('cust_pkg')->column('manual_flag'); - grep { ! $_->manual_flag } $self->suspended_pkgs; -} - =item unsuspended_pkgs Returns all unsuspended (and uncancelled) packages (see L) for diff --git a/FS/FS/cust_pkg.pm b/FS/FS/cust_pkg.pm index 6a10b7173..85234cfec 100644 --- a/FS/FS/cust_pkg.pm +++ b/FS/FS/cust_pkg.pm @@ -753,13 +753,6 @@ sub check { $self->usernum($FS::CurrentUser::CurrentUser->usernum) unless $self->usernum; - if ( $self->dbdef_table->column('manual_flag') ) { - $self->manual_flag('') if $self->manual_flag eq ' '; - $self->manual_flag =~ /^([01]?)$/ - or return "Illegal manual_flag ". $self->manual_flag; - $self->manual_flag($1); - } - $self->SUPER::check; } @@ -1153,7 +1146,7 @@ sub uncancel { setup susp adjourn resume expire start_date contract_end dundate change_date change_pkgpart change_locationnum - manual_flag no_auto separate_bill quantity agent_pkgid + no_auto separate_bill quantity agent_pkgid recur_show_zero setup_show_zero ), }; -- 2.11.0