X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_pkg_reason.pm;h=d11d05e95b048657a0b70c8407a7afe826ccd30b;hp=43f83d44df4a0aa803a8b18973b5959a24405da9;hb=674cb2d9d7105f4cc2871539b2e9f7088cdaa750;hpb=1bed9c8b081558e4b25adae1048d3faf898e2100 diff --git a/FS/FS/cust_pkg_reason.pm b/FS/FS/cust_pkg_reason.pm index 43f83d44d..d11d05e95 100644 --- a/FS/FS/cust_pkg_reason.pm +++ b/FS/FS/cust_pkg_reason.pm @@ -1,10 +1,12 @@ package FS::cust_pkg_reason; +use base qw( FS::otaker_Mixin FS::Record ); use strict; -use vars qw( @ISA ); -use FS::Record qw( qsearch qsearchs ); +use vars qw( $ignore_empty_action ); +use FS::Record qw( qsearch ); #qsearchs ); +use FS::upgrade_journal; -@ISA = qw(FS::Record); +$ignore_empty_action = 0; =head1 NAME @@ -34,16 +36,17 @@ currently supported: =over 4 -=item num - primary key +=item num -=item pkgnum - +primary key -=item reasonnum - +=item pkgnum -=item otaker - +=item reasonnum -=item date - +=item usernum +=item date =back @@ -94,12 +97,15 @@ and replace methods. sub check { my $self = shift; + my @actions = ( 'A', 'C', 'E', 'S' ); + push @actions, '' if $ignore_empty_action; + my $error = $self->ut_numbern('num') || $self->ut_number('pkgnum') || $self->ut_number('reasonnum') - || $self->ut_enum('action', [ 'A', 'C', 'E', 'S' ]) - || $self->ut_text('otaker') + || $self->ut_enum('action', \@actions) + || $self->ut_alphan('otaker') || $self->ut_numbern('date') ; return $error if $error; @@ -111,13 +117,6 @@ sub check { Returns the reason (see L) associated with this cust_pkg_reason. -=cut - -sub reason { - my $self = shift; - qsearchs( 'reason', { 'reasonnum' => $self->reasonnum } ); -} - =item reasontext Returns the text of the reason (see L) associated with this @@ -134,46 +133,41 @@ sub reasontext { # # Used by FS::Upgrade to migrate to a new database. +use FS::h_cust_pkg; +use FS::h_cust_pkg_reason; + sub _upgrade_data { # class method my ($class, %opts) = @_; - my $test_cust_pkg_reason = new FS::cust_pkg_reason; - return '' unless $test_cust_pkg_reason->dbdef_table->column('action'); + my $action_replace = + " AND ( history_action = 'replace_old' OR history_action = 'replace_new' )"; my $count = 0; my @unmigrated = qsearch('cust_pkg_reason', { 'action' => '' } ); foreach ( @unmigrated ) { - # we could create h_cust_pkg_reason and h_cust_pkg_reason packages - @FS::h_cust_pkg::ISA = qw( FS::h_Common FS::cust_pkg ); - sub FS::h_cust_pkg::table { 'h_cust_pkg' }; - @FS::h_cust_pkg_reason::ISA = qw( FS::h_Common FS::cust_pkg_reason ); - sub FS::h_cust_pkg_reason::table { 'h_cust_pkg_reason' }; my @history_cust_pkg_reason = qsearch( 'h_cust_pkg_reason', { $_->hash } ); next unless scalar(@history_cust_pkg_reason) == 1; - my %action_value = ( op => 'LIKE', - value => 'replace_%', - ); my $hashref = { pkgnum => $_->pkgnum, history_date => $history_cust_pkg_reason[0]->history_date, - history_action => { %action_value }, }; - my @history = qsearch({ table => 'h_cust_pkg', - hashref => $hashref, - order_by => 'ORDER BY history_action', + my @history = qsearch({ table => 'h_cust_pkg', + hashref => $hashref, + extra_sql => $action_replace, + order_by => 'ORDER BY history_action', }); my $fuzz = 0; while (scalar(@history) < 2 && $fuzz < 3) { $hashref->{history_date}++; - $hashref->{history_action} = { %action_value }; # qsearch distorts this! $fuzz++; - push @history, qsearch({ table => 'h_cust_pkg', - hashref => $hashref, - order_by => 'ORDER BY history_action', + push @history, qsearch({ table => 'h_cust_pkg', + hashref => $hashref, + extra_sql => $action_replace, + order_by => 'ORDER BY history_action', }); } @@ -209,9 +203,28 @@ sub _upgrade_data { # class method } #remove nullability if scalar(@migrated) - $count == 0 && ->column('action'); + + unless ( FS::upgrade_journal->is_done('cust_pkg_reason__missing_reason') ) { + $class->_upgrade_missing_reason(%opts); + FS::upgrade_journal->set_done('cust_pkg_reason__missing_reason'); + } + + #still can't fill in an action? don't abort the upgrade + local($ignore_empty_action) = 1; + + $class->_upgrade_otaker(%opts); + +} + +sub _upgrade_missing_reason { + my ($class, %opts) = @_; + + #false laziness w/above + my $action_replace = + " AND ( history_action = 'replace_old' OR history_action = 'replace_new' )"; #seek expirations/adjourns without reason - foreach my $field qw( expire adjourn cancel susp ) { + foreach my $field (qw( expire adjourn cancel susp )) { my $addl_from = "LEFT JOIN h_cust_pkg ON ". "(cust_pkg_reason.pkgnum = h_cust_pkg.pkgnum AND". @@ -227,30 +240,24 @@ sub _upgrade_data { # class method extra_sql => $extra_sql, }); foreach ( @unmigrated ) { - # we could create h_cust_pkg_reason and h_cust_pkg_reason packages - @FS::h_cust_pkg::ISA = qw( FS::h_Common FS::cust_pkg ); - sub FS::h_cust_pkg::table { 'h_cust_pkg' }; - my %action_value = ( op => 'LIKE', - value => 'replace_%', - ); my $hashref = { pkgnum => $_->pkgnum, history_date => $_->date, - history_action => { %action_value }, }; - my @history = qsearch({ table => 'h_cust_pkg', - hashref => $hashref, - order_by => 'ORDER BY history_action', + my @history = qsearch({ table => 'h_cust_pkg', + hashref => $hashref, + extra_sql => $action_replace, + order_by => 'ORDER BY history_action', }); my $fuzz = 0; while (scalar(@history) < 2 && $fuzz < 3) { $hashref->{history_date}++; - $hashref->{history_action} = { %action_value }; # qsearch distorts this! $fuzz++; push @history, qsearch({ table => 'h_cust_pkg', hashref => $hashref, + extra_sql => $action_replace, order_by => 'ORDER BY history_action', }); } @@ -277,7 +284,7 @@ sub _upgrade_data { # class method } #seek cancels/suspends without reason, but with expire/adjourn reason - foreach my $field qw( cancel susp ) { + foreach my $field (qw( cancel susp )) { my %precursor_map = ( 'cancel' => 'expire', 'susp' => 'adjourn' ); my $precursor = $precursor_map{$field}; @@ -315,16 +322,12 @@ sub _upgrade_data { # class method } } - ''; - } =back =head1 BUGS -Here be termites. Don't use on wooden computers. - =head1 SEE ALSO L, schema.html from the base documentation.