X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_svc.html;h=7000e304823331ae40fc4310d5f4940bcaef0289;hp=b245d31142d92d0d9c164e9077658db96c9d0373;hb=46fe3dbcb3ca97d1f3c70d49351846cf0ab6461d;hpb=63973c641c4be00765fa27e55c57cc5b9aa4da19

diff --git a/httemplate/search/cust_svc.html b/httemplate/search/cust_svc.html
index b245d3114..7000e3048 100644
--- a/httemplate/search/cust_svc.html
+++ b/httemplate/search/cust_svc.html
@@ -1,54 +1,67 @@
 <& elements/search.html,
           'title'       => emt('Service search results'),
-	      'name'        => emt('services'),
-	      'query'       => $sql_query,
-	      'count_query' => $count_query,
-	      'redirect'    => $link,
-	      'header'      => [ emt('#'),
-	                         emt('Service'),
-				 # package?
-				 FS::UI::Web::cust_header(),
-	                       ],
-	      'fields'      => [ 'svcnum',
-	                         sub { 
-				   #$_[0]->svc. ': '. $_[0]->label;
-				   my($label, $value, $svcdb) = $_[0]->label;
-                                   my $id = $_[0]->agent_svcid
-                                              ? $_[0]->agent_svcid.': '
-                                              : '';
-				   "$label: $id$value";
-				 },
-				 # package?
-				 \&FS::UI::Web::cust_fields,
-	                       ],
-	      'links'       => [ $link,
-	                         $link,
-				 # package?
-				 ( map { $_ ne 'Cust. Status' ? $link_cust : '' }
-                                       FS::UI::Web::cust_header()
-                                 ),
-			       ],
-              'align' => 'rl'. FS::UI::Web::cust_aligns(),
-              'color' => [ 
-                           '',
-                           '',
-                           FS::UI::Web::cust_colors(),
-                         ],
-              'style' => [ 
-                           '',
-                           '',
-                           FS::UI::Web::cust_styles(),
-                         ],
+          'name'        => emt('services'),
+          'query'       => $sql_query,
+          'count_query' => $count_query,
+          'redirect'    => $link,
+          'header'      => [ emt('#'),
+                             emt('Service'),
+                             emt('Pkg. Status'),
+                             # package?
+                             FS::UI::Web::cust_header(),
+                           ],
+          'fields'      => [ 'svcnum',
+                             sub { 
+                               #$_[0]->svc. ': '. $_[0]->label;
+                               my($label, $value, $svcdb) = $_[0]->label;
+                               my $id = $_[0]->agent_svcid
+                                      ? $_[0]->agent_svcid.': '
+                                      : '';
+                               "$label: $id$value";
+                             },
+                             sub {
+                               $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_pkg;
+                               $cust_pkg_cache{$_[0]->svcnum}->ucfirst_status
+                             },
+                             # package?
+                             \&FS::UI::Web::cust_fields,
+                           ],
+          'links'       => [ $link,
+                             $link,
+                             '', # pkg status
+                             # package?
+                             ( map { $_ ne 'Cust. Status' ? $link_cust : '' }
+                                 FS::UI::Web::cust_header()
+                             ),
+                           ],
+          'align'       => 'rlr'. FS::UI::Web::cust_aligns(),
+          'color'       => [ 
+                             '',
+                             '',
+                             sub {
+                               my $c = FS::cust_pkg::statuscolors;
+                               $c->{$cust_pkg_cache{$_[0]->svcnum}->status };
+                             }, # pkg status
+                             FS::UI::Web::cust_colors(),
+                           ],
+          'style'       => [ 
+                             '',
+                             '',
+                             'b', # pkg status
+                             FS::UI::Web::cust_styles(),
+                           ],
 &>
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('List services');
 
+my %cust_pkg_cache;
+
 my $sql_query;
 
-my $orderby = 'ORDER BY svcnum'; #has to be ordered by something
-                                 #for pagination to work
+my $orderby = 'ORDER BY cust_svc.svcnum'; #has to be ordered by something
+                                          #for pagination to work
 
 if ( length( $cgi->param('search_svc') ) ) {
 
@@ -83,6 +96,13 @@ if ( length( $cgi->param('search_svc') ) ) {
   } elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
 
     push @extra_sql, "svcpart = $1";
+    if (defined($cgi->param('cancelled'))) {
+      if ($cgi->param('cancelled')) {
+        push @extra_sql, "cust_pkg.cancel IS NOT NULL";
+      } else {
+        push @extra_sql, "cust_pkg.cancel IS NULL";
+      }
+    }
 
   } else {
     errorpage("No search term specified");
@@ -96,7 +116,7 @@ if ( length( $cgi->param('search_svc') ) ) {
   my $extra_sql = ' WHERE '. join(' AND ', @extra_sql );
 
   $sql_query = {
-    'select'     => 'svcnum',
+    'select'     => 'cust_svc.*, part_svc.*',
     'table'      => 'cust_svc',
     'addl_from'  => $addl_from,
     'hashref'    => {},
@@ -105,9 +125,10 @@ if ( length( $cgi->param('search_svc') ) ) {
 
 }
 
+# at this point the query must provide all fields from 
+# cust_svc and part_svc, and must include join_cust_main.
 $sql_query->{'select'} = join(', ',
                                     $sql_query->{'select'},
-                                    #'part_svc.*',
                                     'cust_main.custnum',
                                     FS::UI::Web::cust_sql_fields(),
                              );