X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_broadband.cgi;h=53a0aa09769791cdbbde5028d142fb9843676bd1;hp=ff2538c9317292ff98e83d9d4c61ac87baa86ccd;hb=266e0c3c894568fb06a15dfbcf4a4eb9bc6989b3;hpb=46fe3dbcb3ca97d1f3c70d49351846cf0ab6461d

diff --git a/httemplate/search/svc_broadband.cgi b/httemplate/search/svc_broadband.cgi
index ff2538c93..53a0aa097 100755
--- a/httemplate/search/svc_broadband.cgi
+++ b/httemplate/search/svc_broadband.cgi
@@ -10,6 +10,7 @@
                                  'Router',
                                  @tower_header,
                                  'IP Address',
+                                 @header_pkg,
                                  emt('Pkg. Status'),
                                  FS::UI::Web::cust_header($cgi->param('cust_fields')),
                                ],
@@ -21,8 +22,10 @@
                                  },
                                  @tower_fields,
                                  'ip_addr',
+                                 @fields_pkg,
                                  sub {
                                    $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+                                   return '' unless $cust_pkg_cache{$_[0]->svcnum};
                                    $cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
                                  },
                                  \&FS::UI::Web::cust_fields,
@@ -31,21 +34,28 @@
                                  $link,
                                  '', #$link_router,
                                  (map '', @tower_fields),
-                                 $link,
+                                 $link, # ip_addr
+                                 @blank_pkg,
                                  '', # pkg status
                                  ( map { $_ ne 'Cust. Status' ? $link_cust : '' }
                                        FS::UI::Web::cust_header($cgi->param('cust_fields'))
                                  ),
                                ],
-              'align'       => 'rll'.('r' x @tower_fields).'rr'.
+              'align'       => 'rll'.('r' x @tower_fields).
+                                'r'. # ip_addr
+                                $align_pkg.
+                                'r'. # pkg status
                                 FS::UI::Web::cust_aligns(),
               'color'       => [ 
                                  '',
                                  '',
                                  '',
                                  (map '', @tower_fields),
-                                 '',
+                                 '', # ip_addr
+                                 @blank_pkg,
                                  sub {
+                                   $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+                                   return '' unless $cust_pkg_cache{$_[0]->svcnum};
                                    my $c = FS::cust_pkg::statuscolors;
                                    $c->{$cust_pkg_cache{$_[0]->svcnum}->status };
                                  }, # pkg status
@@ -56,8 +66,9 @@
                                  '',
                                  '',
                                  (map '', @tower_fields),
-                                 '',
-                                 'b',
+                                 '',  # ip_addr
+                                 @blank_pkg,
+                                 'b', # pkg status
                                  FS::UI::Web::cust_styles(),
                                ],
           
@@ -71,6 +82,8 @@ my %cust_pkg_cache;
 
 my $conf = new FS::Conf;
 
+$m->comp('/elements/handle_uri_query');
+
 my %search_hash;
 if ( $cgi->param('magic') eq 'unlinked' ) {
   %search_hash = ( 'unlinked' => 1 );
@@ -121,9 +134,40 @@ my $html_init = include('/elements/email-link.html',
                   'search_hash' => \%search_hash,
                   'table' => 'svc_broadband' 
                 );
+
+my $query = $m->scomp('/elements/create_uri_query');
+
 $html_init .= ' | ' .
   '<a href="' .
-  $fsurl . 'search/svc_broadband-map.html?' . $cgi->query_string .
+  $fsurl . 'search/svc_broadband-map.html?' . $query .
   '">' . emt('View a map of these services') . '</a>';
 
+my (@header_pkg,@fields_pkg,@blank_pkg);
+my $align_pkg = '';
+#false laziness with search/svc_acct.cgi
+$cgi->param('cust_pkg_fields') =~ /^([\w\,]*)$/ or die "bad cust_pkg_fields";
+my @pkg_fields = split(',', $1);
+foreach my $pkg_field ( @pkg_fields ) {
+  ( my $header = ucfirst($pkg_field) ) =~ s/_/ /; #:/
+  push @header_pkg, $header;
+
+  #not the most efficient to do it every field, but this is of niche use. so far
+  push @fields_pkg, sub { my $svc_x = shift;
+                          my $cust_pkg = $svc_x->cust_svc->cust_pkg or return '';
+                          my $value;
+                          if ($pkg_field eq 'package') {
+                            $value = $cust_pkg->part_pkg->pkg;
+                            #$value = $cust_pkg->pkg_label;
+                          }
+                          else {
+                            $value = $cust_pkg->get($pkg_field);#closures help alot 
+                            $value ? time2str('%b %d %Y', $value ) : '';
+                          }
+                        };
+
+  push @blank_pkg, '';
+  $align_pkg .= 'c';
+}
+
+
 </%init>