default to a session cookie instead of setting an explicit timeout, weird timezone...

[freeside.git] / httemplate / search / cust_svc.html

diff --git a/httemplate/search/cust_svc.html b/httemplate/search/cust_svc.html
index 3b77043..b282630 100644 (file)
--- a/httemplate/search/cust_svc.html
+++ b/httemplate/search/cust_svc.html
@@ -1,50 +1,66 @@
 <& 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;
+                               return '' unless $cust_pkg_cache{$_[0]->svcnum};
+                               $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 {
+                               $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_pkg;
+                               return '' unless $cust_pkg_cache{$_[0]->svcnum};
+                               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 cust_svc.svcnum'; #has to be ordered by something
@@ -83,6 +99,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");