[freeside-commits] freeside/FS/FS Conf.pm, 1.475, 1.476 cust_bill.pm, 1.356, 1.357

[Mark Wells]

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

Modified Files:
	Conf.pm cust_bill.pm 
Log Message:
radius usage totals for invoice, #13655

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.475
retrieving revision 1.476
diff -u -w -d -r1.475 -r1.476
--- Conf.pm	22 Sep 2011 21:38:30 -0000	1.475
+++ Conf.pm	28 Sep 2011 23:29:36 -0000	1.476
@@ -4490,6 +4490,13 @@
   },
   
   {
+    'key'         => 'svc_acct-usage_seconds',
+    'section'     => 'invoicing',
+    'description' => 'Enable calculation of RADIUS usage time for invoices.  You must modify your template to display this information.',
+    'type'        => 'checkbox',
+  },
+  
+  {
     'key'         => 'opensips_gwlist',
     'section'     => 'telephony',
     'description' => 'For svc_phone OpenSIPS dr_rules export, gwlist column value, per-agent',

Index: cust_bill.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_bill.pm,v
retrieving revision 1.356
retrieving revision 1.357
diff -u -w -d -r1.356 -r1.357
--- cust_bill.pm	27 Sep 2011 01:43:29 -0000	1.356
+++ cust_bill.pm	28 Sep 2011 23:29:36 -0000	1.357
@@ -3067,6 +3067,7 @@
 
       $detail->{'sdate'} = $line_item->{'sdate'};
       $detail->{'edate'} = $line_item->{'edate'};
+      $detail->{'seconds'} = $line_item->{'seconds'};
   
       push @detail_items, $detail;
       push @buf, ( [ $detail->{'description'},
@@ -3721,10 +3722,10 @@
 returned from C<_condense_section()>, i.e. C<_condensed_foo_generator>
 coderefs to generate parts of the invoice.  This is not advised.
 
-Takes way too many arguments, all mandatory:
+Arguments:
 
 LATE: an arrayref to push the "late" section hashes onto.  The "early"
-group is simply returned from the method.  Yes, I know.  Don't ask.
+group is simply returned from the method.
 
 SUMMARYPAGE: a flag indicating whether this is a summary-format invoice.
 Turning this on has the following effects:
@@ -3733,9 +3734,7 @@
 - Creates sections for all non-disabled package categories, even if they 
 have no charges on this invoice, as well as a section with no name.
 
-ESCAPE: an escape function to use for section titles.  Why not just 
-let the calling environment escape things itself?  Beats the heck out 
-of me.
+ESCAPE: an escape function to use for section titles.
 
 EXTRA_SECTIONS: an arrayref of additional sections to return after the 
 sorted list.  If there are any of these, section subtotals exclude 
@@ -4871,7 +4870,7 @@
               push @d, &{$escape_function}($loc);
             }
 
-          }
+          } #unless hiding service details
 
           push @d, $cust_bill_pkg->details(%details_opt)
             if $cust_bill_pkg->recur == 0;
@@ -4920,6 +4919,7 @@
                 || $cust_pkg->part_pkg->option('disable_line_item_date_ranges',1);
 
           my @d = ();
+          my @seconds = (); # for display of usage info
 
           #at least until cust_bill_pkg has "past" ranges in addition to
           #the "future" sdate/edate ones... see #3032
@@ -4953,6 +4953,27 @@
               push @d, &{$escape_function}($loc);
             }
 
+            # Display of seconds_since_sqlradacct:
+            # On the invoice, when processing @detail_items, look for a field
+            # named 'seconds'.  This will contain total seconds for each 
+            # service, in the same order as @ext_description.  For services 
+            # that don't support this it will show undef.
+            if ( $conf->exists('svc_acct-usage_seconds') 
+                 and ! $cust_bill_pkg->pkgpart_override ) {
+              foreach my $cust_svc ( 
+                  $cust_pkg->h_cust_svc(@dates, 'I') 
+                ) {
+
+                # eval because not having any part_export_usage exports 
+                # is a fatal error, last_bill/_date because that's how 
+                # sqlradius_hour billing does it
+                my $sec = eval {
+                  $cust_svc->seconds_since_sqlradacct($dates[1] || 0, $dates[0]);
+                };
+                push @seconds, $sec;
+              }
+            } #if svc_acct-usage_seconds
+
           }
 
           unless ( $is_summary ) {
@@ -5000,6 +5021,7 @@
                 %item_dates,
                 ext_description => \@d,
               };
+              $r->{'seconds'} = \@seconds if grep {defined $_} @seconds;
             }
 
           } else {  # $type eq 'U'