X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=inline;f=FS%2FFS%2Fcust_bill.pm;h=7727c9982d1b296fae1bc39b6e718dc24006ed30;hb=0b1c458214a23b0ae3d8b8926989341e69468ff3;hp=eeb6ad9893ad7b70b48b2e68b7f814ab6bf3072d;hpb=97bd9c0842f1799722c87de24fd0bfc69027ea65;p=freeside.git

diff --git a/FS/FS/cust_bill.pm b/FS/FS/cust_bill.pm
index eeb6ad989..7727c9982 100644
--- a/FS/FS/cust_bill.pm
+++ b/FS/FS/cust_bill.pm
@@ -2660,6 +2660,16 @@ sub print_generic {
                  $money_char. sprintf("%10.2f", $pr_total) ];
     push @buf, ['',''];
   }
+ 
+  if ( $conf->exists('svc_phone-did-summary') ) {
+      my ($didsummary,$minutes) = $self->_did_summary;
+      my $didsummary_desc = 'DID Activity Summary (Past 30 days)';
+      push @detail_items, 
+	{ 'description' => $didsummary_desc,
+	    'ext_description' => [ $didsummary, $minutes ],
+	}
+	if !$multisection;
+  }
 
   foreach my $section (@sections, @$late_sections) {
 
@@ -3795,6 +3805,72 @@ sub _items_extra_usage_sections {
 
 }
 
+sub _did_summary {
+    my $self = shift;
+    my $end = $self->_date;
+    my $start = $end - 2592000; # 30 days
+    my $cust_main = $self->cust_main;
+    my @pkgs = $cust_main->all_pkgs;
+    my($num_activated,$num_deactivated,$num_portedin,$num_portedout,$minutes)
+	= (0,0,0,0,0);
+    my @seen = ();
+    foreach my $pkg ( @pkgs ) {
+	my @h_cust_svc = $pkg->h_cust_svc($end);
+	foreach my $h_cust_svc ( @h_cust_svc ) {
+	    next if grep {$_ eq $h_cust_svc->svcnum} @seen;
+	    next unless $h_cust_svc->part_svc->svcdb eq 'svc_phone';
+
+	    my $inserted = $h_cust_svc->date_inserted;
+	    my $deleted = $h_cust_svc->date_deleted;
+	    my $phone_inserted = $h_cust_svc->h_svc_x($inserted);
+	    my $phone_deleted;
+	    $phone_deleted =  $h_cust_svc->h_svc_x($deleted) if $deleted;
+	    
+# DID either activated or ported in; cannot be both for same DID simultaneously
+	    if ($inserted >= $start && $inserted <= $end && $phone_inserted
+		&& (!$phone_inserted->lnp_status 
+		    || $phone_inserted->lnp_status eq ''
+		    || $phone_inserted->lnp_status eq 'native')) {
+		$num_activated++;
+	    }
+	    else { # this one not so clean, should probably move to (h_)svc_phone
+		 my $phone_portedin = qsearchs( 'h_svc_phone',
+		      { 'svcnum' => $h_cust_svc->svcnum, 
+			'lnp_status' => 'portedin' },  
+		      FS::h_svc_phone->sql_h_searchs($end),  
+		    );
+		 $num_portedin++ if $phone_portedin;
+	    }
+
+# DID either deactivated or ported out;	cannot be both for same DID simultaneously
+	    if($deleted >= $start && $deleted <= $end && $phone_deleted
+		&& (!$phone_deleted->lnp_status 
+		    || $phone_deleted->lnp_status ne 'portingout')) {
+		$num_deactivated++;
+	    } 
+	    elsif($deleted >= $start && $deleted <= $end && $phone_deleted 
+		&& $phone_deleted->lnp_status 
+		&& $phone_deleted->lnp_status eq 'portingout') {
+		$num_portedout++;
+	    }
+
+	    # increment usage minutes
+	    my @cdrs = $phone_inserted->get_cdrs('begin'=>$start,'end'=>$end);
+	    foreach my $cdr ( @cdrs ) {
+		$minutes += $cdr->billsec/60;
+	    }
+
+	    # don't look at this service again
+	    push @seen, $h_cust_svc->svcnum;
+	}
+    }
+
+    $minutes = sprintf("%d", $minutes);
+    ("Activated: $num_activated  Ported-In: $num_portedin  Deactivated: "
+	. "$num_deactivated  Ported-Out: $num_portedout ",
+	    "Total Minutes: $minutes");
+}
+
 sub _items_svc_phone_sections {
   my $self = shift;
   my $escape = shift;
@@ -4100,15 +4176,20 @@ sub _items_cust_bill_pkg {
           unless ( $cust_pkg->part_pkg->hide_svc_detail
                 || $cust_bill_pkg->hidden )
           {
+
             push @d, map &{$escape_function}($_),
-                         $cust_pkg->h_labels_short($self->_date);
+                         $cust_pkg->h_labels_short($self->_date, undef, 'I')
+              unless $cust_bill_pkg->pkgpart_override; #don't redisplay services
+
             if ( $multilocation ) {
               my $loc = $cust_pkg->location_label;
               $loc = substr($loc, 0, 50). '...'
                 if $format eq 'latex' && length($loc) > 50;
               push @d, &{$escape_function}($loc);
             }
+
           }
+
           push @d, $cust_bill_pkg->details(%details_opt)
             if $cust_bill_pkg->recur == 0;
 
@@ -4151,23 +4232,27 @@ sub _items_cust_bill_pkg {
           my @dates = ( $self->_date );
           my $prev = $cust_bill_pkg->previous_cust_bill_pkg;
           push @dates, $prev->sdate if $prev;
+          push @dates, undef if !$prev;
 
           unless ( $cust_pkg->part_pkg->hide_svc_detail
                 || $cust_bill_pkg->itemdesc
                 || $cust_bill_pkg->hidden
                 || $is_summary && $type && $type eq 'U' )
           {
+
             push @d, map &{$escape_function}($_),
-                         $cust_pkg->h_labels_short(@dates)
+                         $cust_pkg->h_labels_short(@dates, 'I')
                                                    #$cust_bill_pkg->edate,
                                                    #$cust_bill_pkg->sdate)
-            ;
+              unless $cust_bill_pkg->pkgpart_override; #don't redisplay services
+
             if ( $multilocation ) {
               my $loc = $cust_pkg->location_label;
               $loc = substr($loc, 0, 50). '...'
                 if $format eq 'latex' && length($loc) > 50;
               push @d, &{$escape_function}($loc);
             }
+
           }
 
           push @d, $cust_bill_pkg->details(%details_opt)