diff options
author | ivan <ivan> | 2008-06-05 19:24:33 +0000 |
---|---|---|
committer | ivan <ivan> | 2008-06-05 19:24:33 +0000 |
commit | 1203e278e2ec38fcf1468da2e4f10862004bebeb (patch) | |
tree | 0a9c3155181c6443f5e6faacfa4911e944435697 /FS | |
parent | 3b54099d7b5532a411bb477006d78844c0597745 (diff) |
voxlinesystems CDRs and quantity bs
Diffstat (limited to 'FS')
-rw-r--r-- | FS/FS/cdr.pm | 6 | ||||
-rw-r--r-- | FS/FS/cust_main.pm | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/FS/FS/cdr.pm b/FS/FS/cdr.pm index adde898e4..5b1a4b421 100644 --- a/FS/FS/cdr.pm +++ b/FS/FS/cdr.pm @@ -422,7 +422,7 @@ my %export_formats = ( ], 'voxlinesystems' => [ sub { time2str('%D', shift->calldate_unix ) }, #DATE - sub { time2str('%T', shift->calldate_unix ) }, #TIME + sub { time2str('%r', shift->calldate_unix ) }, #TIME 'userfield', #USER 'dst', #NUMBER_DIALED sub { sprintf('%.2fm', shift->billsec / 60 ) }, #DURATION @@ -729,9 +729,9 @@ my %import_formats = ( 'enddate', #End (also a timestamp!) sub { my($cdr, $field) = @_; }, #End date sub { my($cdr, $field) = @_; }, #End time - 'accountcode', #Calling customer XXX map to agent_custid?? + 'accountcode', #Calling customer... map to agent_custid?? sub { my($cdr, $field) = @_; }, #Calling type - sub { shift->src('30000'); }, #XXX FAKE XXX 'src', #Calling number + 'src', 'userfield', #Calling name #? sub { my($cdr, $field) = @_; }, #Called type 'dst', #Called number diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm index 787a2ef00..1f2fe886b 100644 --- a/FS/FS/cust_main.pm +++ b/FS/FS/cust_main.pm @@ -4675,9 +4675,10 @@ the error, otherwise returns false. sub charge { my $self = shift; - my ( $amount, $pkg, $comment, $taxclass, $additional, $classnum ); + my ( $amount, $quantity, $pkg, $comment, $taxclass, $additional, $classnum ); if ( ref( $_[0] ) ) { $amount = $_[0]->{amount}; + $quantity = exists($_[0]->{quantity}) ? $_[0]->{quantity} : 1; $pkg = exists($_[0]->{pkg}) ? $_[0]->{pkg} : 'One-time charge'; $comment = exists($_[0]->{comment}) ? $_[0]->{comment} : '$'. sprintf("%.2f",$amount); @@ -4686,6 +4687,7 @@ sub charge { $additional = $_[0]->{additional}; }else{ $amount = shift; + $quantity = 1; $pkg = @_ ? shift : 'One-time charge'; $comment = @_ ? shift : '$'. sprintf("%.2f",$amount); $taxclass = @_ ? shift : ''; @@ -4738,8 +4740,9 @@ sub charge { } my $cust_pkg = new FS::cust_pkg ( { - 'custnum' => $self->custnum, - 'pkgpart' => $pkgpart, + 'custnum' => $self->custnum, + 'pkgpart' => $pkgpart, + 'quantity' => $quantity, } ); $error = $cust_pkg->insert; |