[freeside-commits] freeside/FS/FS cdr.pm, 1.66.2.5, 1.66.2.6 Conf.pm, 1.397.2.45, 1.397.2.46

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv12971/FS/FS

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	cdr.pm Conf.pm 
Log Message:
self-service view usage customization and CDR display fixes, RT11761

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.397.2.45
retrieving revision 1.397.2.46
diff -u -w -d -r1.397.2.45 -r1.397.2.46
--- Conf.pm	4 May 2011 01:07:12 -0000	1.397.2.45
+++ Conf.pm	5 May 2011 06:53:37 -0000	1.397.2.46
@@ -3839,6 +3839,13 @@
   },
 
   {
+    'key'         => 'selfservice-view_usage_nodomain',
+    'section'     => 'self-service',
+    'description' => 'Show usernames without their domains in "View my usage" in the self-service interface.',
+    'type'        => 'checkbox',
+  },
+
+  {
     'key'         => 'selfservice-bulk_format',
     'section'     => 'deprecated',
     'description' => 'Parameter arrangement for selfservice bulk features',

Index: cdr.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cdr.pm,v
retrieving revision 1.66.2.5
retrieving revision 1.66.2.6
diff -u -w -d -r1.66.2.5 -r1.66.2.6
--- cdr.pm	27 Apr 2011 23:24:08 -0000	1.66.2.5
+++ cdr.pm	5 May 2011 06:53:37 -0000	1.66.2.6
@@ -560,11 +560,11 @@
   my $duration_sub = sub {
     my($cdr, %opt) = @_;
     my $sec = $opt{seconds} || $cdr->billsec;
-    if ( length($opt{granularity}) && 
+    if ( defined $opt{granularity} && 
          $opt{granularity} == 0 ) { #per call
       return '1 call';
     }
-    elsif ( $opt{granularity} == 60 ) {#full minutes
+    elsif ( defined $opt{granularity} && $opt{granularity} == 60 ) {#full minutes
       my $min = int($sec/60);
       $min++ if $sec%60;
       return $min.'m';
@@ -620,7 +620,10 @@
       $duration_sub,
 
       #PRICE
-      sub { my($cdr, %opt) = @_; $opt{money_char}. $opt{charge}; },
+      sub { my($cdr, %opt) = @_; 
+        $opt{charge} = '0.00' unless defined $opt{charge};
+        $opt{money_char}.$opt{charge}; 
+      },
 
     ],
   );
@@ -660,6 +663,8 @@
         }
     @{ $formats{$format} };
 
+  return @columns if defined $opt{'keeparray'};
+
   my $status = $csv->combine(@columns);
   die "FS::CDR: error combining ". $csv->error_input(). "into downstream CSV"
     unless $status;