X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_bill_pkg_detail.pm;h=dd118c1b2fac7e0899cfbff51bafb057af3262bf;hp=4d9ee81919d604ef938165591efbd823bf5c46ac;hb=674cb2d9d7105f4cc2871539b2e9f7088cdaa750;hpb=cc9855d8e52fe35a362f7bda01616d53f04a7aab diff --git a/FS/FS/cust_bill_pkg_detail.pm b/FS/FS/cust_bill_pkg_detail.pm index 4d9ee8191..dd118c1b2 100644 --- a/FS/FS/cust_bill_pkg_detail.pm +++ b/FS/FS/cust_bill_pkg_detail.pm @@ -55,6 +55,10 @@ inherits from FS::Record. The following fields are currently supported: =item phonenum - +=item accountcode - accountcode + +=item startdate - CDR startdate, if any + =item detail - detail description =back @@ -84,7 +88,23 @@ otherwise returns false. =cut -# the insert method can be inherited from FS::Record +sub insert { + my $self = shift; + my $error = $self->SUPER::insert(@_); + return $error if $error; + + # link CDRs + my $acctids = $self->get('acctid') or return ''; + $acctids = [ $acctids ] unless ref $acctids; + foreach my $acctid ( @$acctids ) { + my $cdr = FS::cdr->by_key($acctid); + $cdr->set('detailnum', $self->detailnum); + $error = $cdr->replace; + # this should never happen + return "error linking CDR #$acctid: $error" if $error; + } + ''; +} =item delete @@ -92,7 +112,16 @@ Delete this record from the database. =cut -# the delete method can be inherited from FS::Record +sub delete { + my $self = shift; + my $error = $self->SUPER::delete; + return $error if $error; + foreach my $cdr (qsearch('cdr', { detailnum => $self->detailnum })) { + $cdr->set('detailnum', ''); + $error = $cdr->replace; + return "error unlinking CDR #" . $cdr->acctid . ": $error" if $error; + } +} =item replace OLD_RECORD @@ -101,7 +130,7 @@ returns the error, otherwise returns false. =cut -# the replace method can be inherited from FS::Record +# the replace method can be inherited from FS::Record (doesn't touch CDRs) =item check @@ -137,9 +166,11 @@ sub check { || $self->ut_enum('format', [ '', 'C' ] ) || $self->ut_numbern('duration') || $self->ut_textn('regionname') + || $self->ut_textn('accountcode') || $self->ut_text('detail') || $self->ut_foreign_keyn('classnum', 'usage_class', 'classnum') || $self->$phonenum_check_method('phonenum') + || $self->ut_numbern('startdate') || $self->SUPER::check ; @@ -158,11 +189,13 @@ for tabular appearance in those environments if possible. If I is set then the format is processed by this function before being returned. +DEPRECATED? (mostly unused, expensive) If I is set then the detail is handed to this callback for processing. =cut +#totally false laziness w/cust_bill_pkg->detail sub formatted { my ( $self, %opt ) = @_; my $format = $opt{format} || ''; @@ -230,18 +263,30 @@ sub formatted { ; } +=item cust_bill_pkg -# _upgrade_data -# -# Used by FS::Upgrade to migrate to a new database. +Returns the L object (the invoice line item) that +this detail belongs to. -sub _upgrade_data { # class method +=cut + +sub cust_bill_pkg { + my $self = shift; + my $billpkgnum = $self->billpkgnum or return ''; + FS::cust_bill_pkg->by_key($billpkgnum); +} + +# Used by FS::Upgrade to migrate to a new database schema +sub _upgrade_schema { # class method my ($class, %opts) = @_; warn "$me upgrading $class\n" if $DEBUG; - my $type = dbdef->table($class->table)->column('classnum')->type; + my $classnum = dbdef->table($class->table)->column('classnum') + or return; + + my $type = $classnum->type; unless ( $type =~ /^int/i || $type =~ /int$/i ) { my $dbh = dbh; @@ -313,51 +358,50 @@ sub _upgrade_data { # class method } +} - if ( defined( dbdef->table($class->table)->column('billpkgnum') ) && - defined( dbdef->table($class->table)->column('invnum') ) && - defined( dbdef->table($class->table)->column('pkgnum') ) - ) { - - warn "$me Checking for unmigrated invoice line item details\n" if $DEBUG; - - my @cbpd = qsearch({ 'table' => $class->table, - 'hashref' => {}, - 'extra_sql' => 'WHERE invnum IS NOT NULL AND '. - 'pkgnum IS NOT NULL', - }); - - if (scalar(@cbpd)) { - warn "$me Found unmigrated invoice line item details\n" if $DEBUG; - - foreach my $cbpd ( @cbpd ) { - my $detailnum = $cbpd->detailnum; - warn "$me Contemplating detail $detailnum\n" if $DEBUG > 1; - my $cust_bill_pkg = - qsearchs({ 'table' => 'cust_bill_pkg', - 'hashref' => { 'invnum' => $cbpd->invnum, - 'pkgnum' => $cbpd->pkgnum, - }, - 'order_by' => 'ORDER BY billpkgnum LIMIT 1', - }); - if ($cust_bill_pkg) { - $cbpd->billpkgnum($cust_bill_pkg->billpkgnum); - $cbpd->invnum(''); - $cbpd->pkgnum(''); - my $error = $cbpd->replace; - - warn "*** WARNING: error replacing line item detail ". - "(cust_bill_pkg_detail) $detailnum: $error ***\n" - if $error; - } else { - warn "Found orphaned line item detail $detailnum during upgrade.\n"; - } +# Used by FS::Upgrade to migrate to a new database +sub _upgrade_data { # class method + + my ($class, %opts) = @_; - } # foreach $cbpd + warn "$me Checking for unmigrated invoice line item details\n" if $DEBUG; + + my @cbpd = qsearch({ 'table' => $class->table, + 'hashref' => {}, + 'extra_sql' => 'WHERE invnum IS NOT NULL AND '. + 'pkgnum IS NOT NULL', + }); + + if (scalar(@cbpd)) { + warn "$me Found unmigrated invoice line item details\n" if $DEBUG; + + foreach my $cbpd ( @cbpd ) { + my $detailnum = $cbpd->detailnum; + warn "$me Contemplating detail $detailnum\n" if $DEBUG > 1; + my $cust_bill_pkg = + qsearchs({ 'table' => 'cust_bill_pkg', + 'hashref' => { 'invnum' => $cbpd->invnum, + 'pkgnum' => $cbpd->pkgnum, + }, + 'order_by' => 'ORDER BY billpkgnum LIMIT 1', + }); + if ($cust_bill_pkg) { + $cbpd->billpkgnum($cust_bill_pkg->billpkgnum); + $cbpd->invnum(''); + $cbpd->pkgnum(''); + my $error = $cbpd->replace; + + warn "*** WARNING: error replacing line item detail ". + "(cust_bill_pkg_detail) $detailnum: $error ***\n" + if $error; + } else { + warn "Found orphaned line item detail $detailnum during upgrade.\n"; + } - } # if @cbpd + } # foreach $cbpd - } # if billpkgnum, invnum, and pkgnum columns defined + } # if @cbpd '';