X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_acct.cgi;h=ee8a5d0a7c553791071969603bebb58563259443;hp=d4565aefc61204d468b70af4d5556dd1d6d14beb;hb=eb4ff7f73c5d4bdf74a3472448b5a195598ff4cd;hpb=08662d58e7b9a13cf841e9c89daa39b28655724e

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index d4565aefc..ee8a5d0a7 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,30 +1,84 @@
-<%
-
-my $orderby = 'ORDER BY svcnum';
+<% include( 'elements/search.html',
+                 'title'       => 'Account Search Results',
+                 'name'        => 'accounts',
+                 'query'       => $sql_query,
+                 'count_query' => $count_query,
+                 'redirect'    => $link,
+                 'header'      => [ '#',
+                                    'Service',
+                                    'Account',
+                                    'UID',
+                                    FS::UI::Web::cust_header(),
+                                  ],
+                 'fields'      => [ 'svcnum',
+                                    'svc',
+                                    'email',
+                                    'uid',
+                                    \&FS::UI::Web::cust_fields,
+                                  ],
+                 'links'       => [ $link,
+                                    $link,
+                                    $link,
+                                    $link,
+                                    ( map { $_ ne 'Cust. Status' ? $link_cust : '' }
+                                          FS::UI::Web::cust_header()
+                                    ),
+                                  ],
+                 'align' => 'rlll'. FS::UI::Web::cust_aligns(),
+                 'color' => [ 
+                              '',
+                              '',
+                              '',
+                              '',
+                              FS::UI::Web::cust_colors(),
+                            ],
+                 'style' => [ 
+                              '',
+                              '',
+                              '',
+                              '',
+                              FS::UI::Web::cust_styles(),
+                            ],
+             )
+%>
+<%init>
 
-my($query)=$cgi->keywords;
-$query ||= ''; #to avoid use of unitialized value errors
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('List services');
 
-my $cjoin = '';
 my @extra_sql = ();
-if ( $query =~ /^UN_(.*)$/ ) {
-  $query = $1;
-  $cjoin = 'LEFT JOIN cust_svc USING ( svcnum )';
-  push @extra_sql, 'pkgnum IS NULL';
-}
 
-if ( $query eq 'svcnum' ) {
-  #$orderby = "ORDER BY svcnum";
-} elsif ( $query eq 'username' ) {
-  $orderby = "ORDER BY LOWER(username)";
-} elsif ( $query eq 'uid' ) {
-  $orderby = "ORDER BY uid";
-  push @extra_sql, "uid IS NOT NULL";
+ if ( $cgi->param('domain') ) { 
+   my $svc_domain =
+     qsearchs('svc_domain', { 'domain' => $cgi->param('domain') } );
+   unless ( $svc_domain ) {
+     #it would be nice if this looked more like the other "not found"
+     #errors, but this will do for now.
+     eidiot "Domain ". $cgi->param('domain'). " not found at all";
+   } else {
+     push @extra_sql, 'domsvc = '. $svc_domain->svcnum;
+   }
+ }
+
+my $orderby = 'ORDER BY svcnum';
+if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
+
+  push @extra_sql, 'pkgnum IS NULL'
+    if $cgi->param('magic') eq 'unlinked';
+
+  if ( $cgi->param('sortby') =~ /^(\w+)$/ ) {
+    my $sortby = $1;
+    $sortby = "LOWER($sortby)"
+      if $sortby eq 'username';
+    push @extra_sql, "$sortby IS NOT NULL"
+      if $sortby eq 'uid';
+    $orderby = "ORDER BY $sortby";
+  }
+
 } elsif ( $cgi->param('popnum') =~ /^(\d+)$/ ) {
   push @extra_sql, "popnum = $1";
   $orderby = "ORDER BY LOWER(username)";
 } elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
-  $cjoin ||= 'LEFT JOIN cust_svc USING ( svcnum )';
   push @extra_sql, "svcpart = $1";
   $orderby = "ORDER BY uid";
   #$orderby = "ORDER BY svcnum";
@@ -72,12 +126,22 @@ if ( $query eq 'svcnum' ) {
 
 }
 
+my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                ' LEFT JOIN cust_main USING ( custnum ) ';
+
+#here is the agent virtualization
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql( 
+                   'null_right' => 'View/link unlinked services'
+                 );
+
 my $extra_sql = 
   scalar(@extra_sql)
     ? ' WHERE '. join(' AND ', @extra_sql )
     : '';
 
-my $count_query = "SELECT COUNT(*) FROM svc_acct $cjoin $extra_sql";
+my $count_query = "SELECT COUNT(*) FROM svc_acct $addl_from $extra_sql";
 #if ( keys %svc_acct ) {
 #  $count_query .= ' WHERE '.
 #                    join(' AND ', map "$_ = ". dbh->quote($svc_acct{$_}),
@@ -90,14 +154,12 @@ my $sql_query = {
   'hashref'   => {}, # \%svc_acct,
   'select'    => join(', ',
                     'svc_acct.*',
+                    'part_svc.svc',
                     'cust_main.custnum',
                     FS::UI::Web::cust_sql_fields(),
                   ),
   'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => 'LEFT JOIN cust_svc  USING ( svcnum  ) '.
-                 'LEFT JOIN part_svc  USING ( svcpart ) '.
-                 'LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
-                 'LEFT JOIN cust_main USING ( custnum ) ',
+  'addl_from' => $addl_from,
 };
 
 my $link      = [ "${p}view/svc_acct.cgi?",   'svcnum'  ];
@@ -110,31 +172,5 @@ my $link_cust = sub {
   }
 };
 
-%><%= include( 'elements/search.html',
-                 'title'       => 'Account Search Results',
-                 'name'        => 'accounts',
-                 'query'       => $sql_query,
-                 'count_query' => $count_query,
-                 'redirect'    => $link,
-                 'header'      => [ '#',
-                                    'Account',
-                                    'UID',
-                                    'Service',
-                                    FS::UI::Web::cust_header(),
-                                  ],
-                 'fields'      => [ 'svcnum',
-                                    'email',
-                                    'uid',
-                                    'svc',
-                                    \&FS::UI::Web::cust_fields,
-                                  ],
-                 'links'       => [ $link,
-                                    $link,
-                                    $link,
-                                    '',
-                                    ( map { $link_cust }
-                                          FS::UI::Web::cust_header()
-                                    ),
-                                  ],
-             )
-%>
+</%init>
+