X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_domain.cgi;h=56cfa30c8ce3391812c6fe75298762d6eac62ce3;hp=f261ea9f3fead7d5277d0067adb561c294f1d6ac;hb=53c4589b2950b3ed85bcacfb707430c60cd1021e;hpb=08662d58e7b9a13cf841e9c89daa39b28655724e

diff --git a/httemplate/search/svc_domain.cgi b/httemplate/search/svc_domain.cgi
index f261ea9f3..56cfa30c8 100755
--- a/httemplate/search/svc_domain.cgi
+++ b/httemplate/search/svc_domain.cgi
@@ -1,56 +1,105 @@
-<%
+<& elements/search.html,
+                 'title'             => "Domain Search Results",
+                 'name'              => 'domains',
+                 'query'             => $sql_query,
+                 'count_query'       => $count_query,
+                 'redirect'          => $link,
+                 'header'            => [ '#',
+                                          'Service',
+                                          'Domain',
+                                          FS::UI::Web::cust_header(),
+                                        ],
+                 'fields'            => [ 'svcnum',
+                                          'svc',
+                                          'domain',
+                                          \&FS::UI::Web::cust_fields,
+                                        ],
+                 'links'             => [ $link,
+                                          $link,
+                                          $link,
+                                          ( map { $_ ne 'Cust. Status' ? $link_cust : '' }
+                                                FS::UI::Web::cust_header()
+                                          ),
+                                        ],
+                 'align' => 'rll'. FS::UI::Web::cust_aligns(),
+                 'color' => [ 
+                              '',
+                              '',
+                              '',
+                              FS::UI::Web::cust_colors(),
+                            ],
+                 'style' => [ 
+                              '',
+                              '',
+                              '',
+                              FS::UI::Web::cust_styles(),
+                            ],
+              
+&>
+<%init>
 
-my $conf = new FS::Conf;
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('List services');
 
-my($query)=$cgi->keywords;
-$query ||= ''; #to avoid use of unitialized value errors
+my $conf = new FS::Conf;
 
 my $orderby = 'ORDER BY svcnum';
-my $join = '';
 my %svc_domain = ();
-my $extra_sql = '';
-if ( $query eq 'svcnum' ) {
-  #$orderby = 'ORDER BY svcnum';
-} elsif ( $query eq 'domain' ) {
-  $orderby = 'ORDER BY domain';
-} elsif ( $query eq 'UN_svcnum' ) {
-  #$orderby = 'ORDER BY svcnum';
-  $join = 'LEFT JOIN cust_svc USING ( svcnum )';
-  $extra_sql = ' WHERE pkgnum IS NULL';
-} elsif ( $query eq 'UN_domain' ) {
-  $orderby = 'ORDER BY domain';
-  $join = 'LEFT JOIN cust_svc USING ( svcnum )';
-  $extra_sql = ' WHERE pkgnum IS NULL';
+my @extra_sql = ();
+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;
+    $orderby = "ORDER BY $sortby";
+  }
+
 } elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
-  #$orderby = 'ORDER BY svcnum';
-  $join = 'LEFT JOIN cust_svc USING ( svcnum )';
-  $extra_sql = " WHERE svcpart = $1";
+  push @extra_sql, "svcpart = $1";
 } else {
   $cgi->param('domain') =~ /^([\w\-\.]+)$/; 
-  $join = '';
   $svc_domain{'domain'} = $1;
 }
 
-my $count_query = "SELECT COUNT(*) FROM svc_domain $join $extra_sql";
+my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+                FS::UI::Web::join_cust_main('cust_pkg', 'cust_pkg');
+
+#here is the agent virtualization
+push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql( 
+                   'null_right' => 'View/link unlinked services'
+                 );
+
+my $extra_sql = '';
+if ( @extra_sql ) {
+  $extra_sql = ( keys(%svc_domain) ? ' AND ' : ' WHERE ' ).
+               join(' AND ', @extra_sql );
+}
+
+my $count_query = "SELECT COUNT(*) FROM svc_domain $addl_from ";
 if ( keys %svc_domain ) {
   $count_query .= ' WHERE '.
                     join(' AND ', map "$_ = ". dbh->quote($svc_domain{$_}),
                                       keys %svc_domain
                         );
 }
+$count_query .= $extra_sql;
 
 my $sql_query = {
   'table'     => 'svc_domain',
   'hashref'   => \%svc_domain,
   'select'    => join(', ',
                    'svc_domain.*',
-                    'cust_main.custnum',
-                    FS::UI::Web::cust_sql_fields(),
+                   '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 cust_pkg  USING ( pkgnum  ) '.
-                 'LEFT JOIN cust_main USING ( custnum ) ',
+  'extra_sql' => $extra_sql,
+  'order_by'  => $orderby,
+  'addl_from' => $addl_from,
 };
 
 my $link = [ "${p}view/svc_domain.cgi?", 'svcnum' ];
@@ -61,25 +110,4 @@ my $link_cust = sub {
   $svc_x->custnum ? [ "${p}view/cust_main.cgi?", 'custnum' ] : '';
 };
 
-%><%= include ('elements/search.html',
-                 'title'             => "Domain Search Results",
-                 'name'              => 'domains',
-                 'query'             => $sql_query,
-                 'count_query'       => $count_query,
-                 'redirect'          => $link,
-                 'header'            => [ '#',
-                                          'Domain',
-                                          FS::UI::Web::cust_header(),
-                                        ],
-                 'fields'            => [ 'svcnum',
-                                          'domain',
-                                          \&FS::UI::Web::cust_fields,
-                                        ],
-                 'links'             => [ $link,
-                                          $link,
-                                          ( map { $link_cust }
-                                                FS::UI::Web::cust_header()
-                                          ),
-                                        ],
-              )
-%>
+</%init>