X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fdetail_format.pm;h=8840a006d0608db285444d8da5eb46bb62f216df;hb=b54dbcd5bf26986115279680e12668cf9a0b51b7;hp=c90d313063ee06a45fc2c50e4d9db7d3e0f6831d;hpb=c0afff8c23e18fc39e60219b2b48dcdde14bd5d8;p=freeside.git diff --git a/FS/FS/detail_format.pm b/FS/FS/detail_format.pm index c90d31306..8840a006d 100644 --- a/FS/FS/detail_format.pm +++ b/FS/FS/detail_format.pm @@ -63,13 +63,13 @@ sub new { my %opt = @_; my $locale = $opt{'locale'} || ''; - my $conf = FS::Conf->new(locale => $locale); + my $conf = FS::Conf->new({ locale => $locale }); $locale ||= $conf->config('locale') || 'en_US'; my %locale_info = FS::Locales->locale_info($locale); my $language_name = $locale_info{'name'}; - my $self = { conf => FS::Conf->new(locale => $locale), + my $self = { conf => FS::Conf->new({ locale => $locale }), csv => Text::CSV_XS->new({ binary => 1 }), inbound => ($opt{'inbound'} ? 1 : 0), buffer => ($opt{'buffer'} || []), @@ -98,6 +98,19 @@ sub inbound { $self->{inbound}; } +=item phonenum VALUE + +Set/get the locally meaningful phone number. This is used to tag call details +for presentation on certain kinds of invoices. + +=cut + +sub phonenum { + my $self = shift; + $self->{phonenum} = shift if @_; + $self->{phonenum}; +} + =item append CDRS Takes any number of call detail records (as L objects), @@ -165,21 +178,15 @@ Takes a single CDR and returns an invoice detail to describe it. By default, this maps the following fields from the CDR: -=over 4 +rated_price => amount +rated_classnum => classnum +rated_seconds => duration +rated_regionname => regionname +accountcode => accountcode +startdate => startdate -=item rated_price => amount - -=item rated_classnum => classnum - -=item rated_seconds => duration - -=item rated_regionname => regionname - -=item accountcode => accountcode - -=item startdate => startdate - -=back +'phonenum' is set to the internal C value set on the formatter +object. It then calls C on the CDR to obtain a list of detail columns, formats them as a CSV string, and stores that in the @@ -209,6 +216,7 @@ sub single_detail { 'startdate' => $cdr->startdate, 'format' => 'C', 'detail' => $self->csv->string, + 'phonenum' => $self->phonenum, }); }