X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_broadband.cgi;h=7026f52e332b4928dfc747e138347e6eeeb81bd9;hp=297d74c1d10289a26f058605c996619ff52bb53b;hb=636dd1f25af52d35efe7a323a5765ff5adeadf83;hpb=633c48448d9468690b7ad77eb6ff7c660a286658

diff --git a/httemplate/search/svc_broadband.cgi b/httemplate/search/svc_broadband.cgi
index 297d74c1d..7026f52e3 100755
--- a/httemplate/search/svc_broadband.cgi
+++ b/httemplate/search/svc_broadband.cgi
@@ -1,118 +1,92 @@
-%my $conf = new FS::Conf;
-%
-%my @svc_broadband = ();
-%my $sortby=\*svcnum_sort;
-%if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
-%
-%  @svc_broadband=qsearch('svc_broadband',{});
-%
-%  if ( $cgi->param('magic') eq 'unlinked' ) {
-%    @svc_broadband = grep { qsearchs('cust_svc', {
-%                                                   'svcnum' => $_->svcnum,
-%                                                   'pkgnum' => '',
-%                                                 }
-%                                    )
-%                          }
-%		      @svc_broadband;
-%  }
-%
-%  if ( $cgi->param('sortby') =~ /^(\w+)$/ ) {
-%    my $sortby = $1;
-%    if ( $sortby eq 'blocknum' ) {
-%      $sortby = \*blocknum_sort;
-%    }
-%  }
-%
-%} elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
-%
-%  @svc_broadband =
-%    qsearch( 'svc_broadband', {}, '',
-%               " WHERE $1 = ( SELECT svcpart FROM cust_svc ".
-%               "              WHERE cust_svc.svcnum = svc_external.svcnum ) "
-%    );
-%
-%} elsif ( $cgi->param('ip_addr') =~ /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/ ) {
-%  my $ip_addr = $1;
-%  @svc_broadband = qsearchs('svc_broadband',{'ip_addr'=>$ip_addr});
-%}
-%
-%my %routerbyblock = ();
-%foreach my $router (qsearch('router', {})) {
-%  foreach ($router->addr_block) {
-%    $routerbyblock{$_->blocknum} = $router;
-%  }
-%}
-%
-%if ( scalar(@svc_broadband) == 1 ) {
-%  print $cgi->redirect(popurl(2). "view/svc_broadband.cgi?". $svc_broadband[0]->svcnum);
-%  #exit;
-%} elsif ( scalar(@svc_broadband) == 0 ) {
-%
+<% include( 'elements/search.html',
+              'title'       => 'Broadband Search Results',
+              'name'        => 'broadband services',
+              'html_init'   => $html_init,
+              'query'       => $sql_query,
+              'count_query' => $sql_query->{'count_query'},
+              'redirect'    => [ popurl(2). "view/svc_broadband.cgi?", 'svcnum' ],
+              'header'      => [ '#',
+                                 'Service',
+                                 'Router',
+                                 'IP Address',
+                                 FS::UI::Web::cust_header(),
+                               ],
+              'fields'      => [ 'svcnum',
+                                 'svc',
+                                 sub { $routerbyblock{shift->blocknum}->routername; },
+                                 'ip_addr',
+                                 \&FS::UI::Web::cust_fields,
+                               ],
+              'links'       => [ $link,
+                                 $link,
+                                 $link_router,
+                                 $link,
+                                 ( map { $_ ne 'Cust. Status' ? $link_cust : '' }
+                                       FS::UI::Web::cust_header()
+                                 ),
+                               ],
+              'align'       => 'rllr'. FS::UI::Web::cust_aligns(),
+              'color'       => [ 
+                                 '',
+                                 '',
+                                 '',
+                                 '',
+                                 FS::UI::Web::cust_colors(),
+                               ],
+              'style'       => [ 
+                                 '',
+                                 '',
+                                 '',
+                                 '',
+                                 FS::UI::Web::cust_styles(),
+                               ],
+          )
+%>
+<%init>
 
-<!-- mason kludge -->
-%
-%  eidiot "No matching ip address found!\n";
-%} else {
-%
+die "access denied" unless
+  $FS::CurrentUser::CurrentUser->access_right('List services');
 
-<!-- mason kludge -->
-%
-%  my($total)=scalar(@svc_broadband);
-%  print header("IP Address Search Results",''), <<END;
-%
-%    $total matching broadband services found
-%    <TABLE BORDER=4 CELLSPACING=0 CELLPADDING=0>
-%      <TR>
-%        <TH>Service #</TH>
-%	<TH>Router</TH>
-%        <TH>IP Address</TH>
-%      </TR>
-%END
-%
-%  foreach my $svc_broadband (
-%    sort $sortby (@svc_broadband)
-%  ) {
-%    my($svcnum,$ip_addr,$routername,$routernum)=(
-%      $svc_broadband->svcnum,
-%      $svc_broadband->ip_addr,
-%      $routerbyblock{$svc_broadband->blocknum}->routername,
-%      $routerbyblock{$svc_broadband->blocknum}->routernum,
-%    );
-%
-%    my $rowspan = 1;
-%
-%    print <<END;
-%    <TR>
-%      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_broadband.cgi?$svcnum">$svcnum</A></TD>
-%      <TD ROWSPAN=$rowspan><A HREF="${p}view/router.cgi?$routernum">$routername</A></TD>
-%      <TD ROWSPAN=$rowspan><A HREF="${p}view/svc_broadband.cgi?$svcnum">$ip_addr</A></TD>
-%END
-%
-%    #print @rows;
-%    print "</TR>";
-%
-%  }
-% 
-%  print <<END;
-%    </TABLE>
-%  </BODY>
-%</HTML>
-%END
-%
-%}
-%
-%sub svcnum_sort {
-%  $a->getfield('svcnum') <=> $b->getfield('svcnum');
-%}
-%
-%sub blocknum_sort {
-%  if ($a->getfield('blocknum') == $b->getfield('blocknum')) {
-%    $a->getfield('ip_addr') cmp $b->getfield('ip_addr');
-%  } else {
-%    $a->getfield('blocknum') cmp $b->getfield('blocknum');
-%  }
-%}
-%
-%
-%
+my $conf = new FS::Conf;
 
+my %search_hash;
+if ( $cgi->param('magic') eq 'unlinked' ) {
+  %search_hash = ( 'unlinked' => 1 );
+}
+else {
+  foreach (qw(custnum agentnum svcpart)) {
+    $search_hash{$_} = $cgi->param($_) if $cgi->param($_);
+  }
+  foreach (qw(pkgpart routernum)) {
+    $search_hash{$_} = [ $cgi->param($_) ] if $cgi->param($_);
+  }
+}
+
+if ( $cgi->param('sortby') =~ /^(\w+)$/ ) {
+  $search_hash{'order_by'} = $1;
+}
+
+my $sql_query = FS::svc_broadband->search(\%search_hash);
+
+my %routerbyblock = ();
+foreach my $router (qsearch('router', {})) {
+  foreach ($router->addr_block) {
+    $routerbyblock{$_->blocknum} = $router;
+  }
+}
+
+my $link = [ $p.'view/svc_broadband.cgi?', 'svcnum' ];
+
+#XXX get the router link working
+my $link_router = sub { my $routernum = $routerbyblock{shift->blocknum}->routernum;
+                        [ $p.'view/router.cgi?'.$routernum, 'routernum' ];
+                      };
+
+my $link_cust = [ $p.'view/cust_main.cgi?', 'custnum' ];
+
+my $html_init = include('/elements/email-link.html',
+                  'search_hash' => \%search_hash,
+                  'table' => 'svc_broadband' 
+                );
+
+</%init>