X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_pkg.cgi;h=0afa54750f89cc29a2edb8886790157b2ff710e3;hp=e6454639f612e7a92066b90bb4b973a0a8e7f1f4;hb=1a033848671cad2cbe7687b37fc718b3b2a68b83;hpb=303cb4ce4b6ce634e108e3b7a0b43086a5e4f184

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index e6454639f..0afa54750 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -1,169 +1,236 @@
-<!-- mason kludge -->
 <%
 
-my %search;
-if ( $cgi->param('showdisabled') ) {
-  %search = ();
-} else {
+my %search = ();
+my $search = '';
+unless ( $cgi->param('showdisabled') ) {
   %search = ( 'disabled' => '' );
+  $search = "( disabled = '' OR disabled IS NULL )";
 }
 
-my @part_pkg = qsearch('part_pkg', \%search );
-my $total = scalar(@part_pkg);
-
-my $sortby;
-my %num_active_cust_pkg = ();
-my( $suspended_sth, $canceled_sth ) = ( '', '' );
+my $select = '*';
+my $orderby = 'pkgpart';
 if ( $cgi->param('active') ) {
-  my $active_sth = dbh->prepare(
-    'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
-    ' AND ( cancel IS NULL OR cancel = 0 )'.
-    ' AND ( susp IS NULL OR susp = 0 )'
-  ) or die dbh->errstr;
-  foreach my $part_pkg ( @part_pkg ) {
-    $active_sth->execute($part_pkg->pkgpart) or die $active_sth->errstr;
-    $num_active_cust_pkg{$part_pkg->pkgpart} =
-      $active_sth->fetchrow_arrayref->[0];
-  }
-  $sortby = sub {
-    $num_active_cust_pkg{$b->pkgpart} <=> $num_active_cust_pkg{$a->pkgpart};
-  };
-
-  $suspended_sth = dbh->prepare(
-    'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
-    ' AND ( cancel IS NULL OR cancel = 0 )'.
-    ' AND susp IS NOT NULL AND susp != 0'
-  ) or die dbh->errstr;
-
-  $canceled_sth = dbh->prepare(
-    'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
-    ' AND cancel IS NOT NULL AND cancel != 0'
-  ) or die dbh->errstr;
 
-} else {
-  $sortby = sub { $a->pkgpart <=> $b->pkgpart; };
+  $orderby = 'num_active';
+
+  $select = "
+
+    *,
+
+    ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart
+       AND ( cancel IS NULL OR cancel = 0 )
+       AND ( susp IS NULL OR susp = 0 )
+    ) AS num_active,
+
+    ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart
+        AND ( cancel IS NULL OR cancel = 0 )
+        AND susp IS NOT NULL AND susp != 0
+    ) AS num_suspended,
+
+    ( SELECT COUNT(*) FROM cust_pkg WHERE cust_pkg.pkgpart = part_pkg.pkgpart
+        AND cancel IS NOT NULL AND cancel != 0
+    ) AS num_cancelled
+
+  ";
+
 }
 
 my $conf = new FS::Conf;
 my $taxclasses = $conf->exists('enable_taxclasses');
 
-%>
-<%= include("/elements/header.html","Package Definition Listing",menubar( 'Main Menu' => $p )) %>
-<% unless ( $cgi->param('active') ) { %>
-  One or more service definitions are grouped together into a package 
-  definition and given pricing information.  Customers purchase packages
-  rather than purchase services directly.<BR><BR>
-  <A HREF="<%= $p %>edit/part_pkg.cgi"><I>Add a new package definition</I></A>
-  <BR><BR>
-<% } %>
-
-<%= $total %> package definitions
-<% if ( $cgi->param('showdisabled') ) { $cgi->param('showdisabled', 0); %>
-  ( <a href="<%= $cgi->self_url %>">hide disabled packages</a> )
-<% } else { $cgi->param('showdisabled', 1); %>
-  ( <a href="<%= $cgi->self_url %>">show disabled packages</a> )
-<% } %>
-
-<% my $colspan = $cgi->param('showdisabled') ? 2 : 3; %>
-
-<%= &table() %>
-      <TR>
-        <TH COLSPAN=<%= $colspan %>>Package</TH>
-        <TH>Comment</TH>
-<% if ( $cgi->param('active') ) { %>
-        <TH><FONT SIZE=-1>Customer<BR>packages</FONT></TH>
-<% } %>
-        <TH><FONT SIZE=-1>Freq.</FONT></TH>
-<% if ( $taxclasses ) { %>
-	<TH><FONT SIZE=-1>Taxclass</FONT></TH>
-<% } %>
-        <TH><FONT SIZE=-1>Plan</FONT></TH>
-        <TH><FONT SIZE=-1>Data</FONT></TH>
-        <TH>Service</TH>
-        <TH><FONT SIZE=-1>Quan.</FONT></TH>
-<% if ( dbdef->table('pkg_svc')->column('primary_svc') ) { %>
-        <TH><FONT SIZE=-1>Primary</FONT></TH>
-<% } %>
-
-      </TR>
+my $html_init;
+unless ( $cgi->param('active') ) {
+  $html_init = qq!
+    One or more service definitions are grouped together into a package 
+    definition and given pricing information.  Customers purchase packages
+    rather than purchase services directly.<BR><BR>
+    <A HREF="${p}edit/part_pkg.cgi"><I>Add a new package definition</I></A>
+    <BR><BR>
+  !;
+}
 
-<%
-foreach my $part_pkg ( sort $sortby @part_pkg ) {
-  my @pkg_svc = $part_pkg->pkg_svc;
-  my($rowspan)=scalar(@pkg_svc);
-  my $plandata;
-  if ( $part_pkg->plan ) {
-    $plandata = $part_pkg->plandata;
-    $plandata =~ s/^(\w+)=/$1&nbsp;/mg;
-    $plandata =~ s/\n/<BR>/g;
-  } else {
-    $part_pkg->plan('(legacy)');
-    $plandata = "Setup&nbsp;". $part_pkg->setup.
-                "<BR>Recur&nbsp;". $part_pkg->recur;
-  }
-%>
-      <TR>
-        <TD ROWSPAN=<%= $rowspan %>><A HREF="<%=$p%>edit/part_pkg.cgi?<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkgpart %></A></TD>
-
-<% unless ( $cgi->param('showdisabled') ) { %>
-        <TD ROWSPAN=<%= $rowspan %>>
-   <% if ( $part_pkg->disabled ) { %>
-          DISABLED
-   <% } %>
-        </TD>
-<% } %>
-
-        <TD ROWSPAN=<%= $rowspan %>><A HREF="<%=$p%>edit/part_pkg.cgi?<%= $part_pkg->pkgpart %>"><%= $part_pkg->pkg %></A></TD>
-        <TD ROWSPAN=<%= $rowspan %>><%= $part_pkg->comment %></TD>
-
-<% if ( $cgi->param('active') ) { %>
-        <TD ROWSPAN=<%= $rowspan %>>
-          <FONT COLOR="#00CC00"><B><%= $num_active_cust_pkg{$part_pkg->pkgpart} %></B></FONT>&nbsp;<A HREF="<%=$p%>search/cust_pkg.cgi?magic=active;pkgpart=<%= $part_pkg->pkgpart %>">active</A><BR>
-
-   <% $suspended_sth->execute( $part_pkg->pkgpart )
-        or die $suspended_sth->errstr;
-      my $num_suspended = $suspended_sth->fetchrow_arrayref->[0];
-   %>
-          <FONT COLOR="#FF9900"><B><%= $num_suspended %></B></FONT>&nbsp;<A HREF="<%=$p%>search/cust_pkg.cgi?magic=suspended;pkgpart=<%= $part_pkg->pkgpart %>">suspended</A><BR>
-
-   <% $canceled_sth->execute( $part_pkg->pkgpart )
-        or die $canceled_sth->errstr;
-      my $num_canceled = $canceled_sth->fetchrow_arrayref->[0];
-   %>
-          <FONT COLOR="#FF0000"><B><%= $num_canceled %></B></FONT>&nbsp;<A HREF="<%=$p%>search/cust_pkg.cgi?magic=canceled;pkgpart=<%= $part_pkg->pkgpart %>">canceled</A>
-        </TD>
-<% } %>
-
-        <TD ROWSPAN=<%= $rowspan %>><%= $part_pkg->freq_pretty %></TD>
-
-<% if ( $taxclasses ) { %>
-	<TD ROWSPAN=<%= $rowspan %>><%= $part_pkg->taxclass || '&nbsp;' %></TD>
-<% } %>
-
-        <TD ROWSPAN=<%= $rowspan %>><%= $part_pkg->plan %></TD>
-        <TD ROWSPAN=<%= $rowspan %>><%= $plandata %></TD>
+my $posttotal;
+if ( $cgi->param('showdisabled') ) {
+  $cgi->param('showdisabled', 0);
+  $posttotal = '( <a href="'. $cgi->self_url. '">hide disabled packages</a> )';
+} else {
+  $cgi->param('showdisabled', 1);
+  $posttotal = '( <a href="'. $cgi->self_url. '">show disabled packages</a> )';
+}
 
-<%
-  my($n)="";
-  foreach my $pkg_svc ( @pkg_svc ) {
-    my($svcpart)=$pkg_svc->getfield('svcpart');
-    my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
-    print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
-          $part_svc->getfield('svc'),"</A></TD><TD>",
-          $pkg_svc->getfield('quantity'),"</TD>";
-    if ( dbdef->table('pkg_svc')->column('primary_svc') ) {
-      print '<TD>';
-      print 'PRIMARY' if $pkg_svc->primary_svc =~ /^Y/i;
-      print '</TD>';
-    }
-    print "</TR>\n";
-    $n="<TR>";
-  }
-%>
+# ------
+
+my $link = [ $p.'edit/part_pkg.cgi?', 'pkgpart' ];
+
+my @header = ( '#', 'Package', 'Comment' );
+my @fields = ( 'pkgpart', 'pkg', 'comment' );
+my $align = 'rll';
+my @links = ( $link, $link, '' );
+my @style = ( '', '', '' );
+
+unless ( $cgi->param('showdisabled') ) { #its been reversed already
+  push @header, 'Status';
+  push @fields, sub { shift->disabled
+                        ? '<FONT COLOR="#FF0000">DISABLED</FONT>'
+                        : '<FONT COLOR="#00CC00">Active</FONT>'
+                    };
+  push @links, '';
+  $align .= 'c';
+  push @style, 'b';
+}
+
+unless ( 0 ) { #already showing only one class or something?
+  push @header, 'Class';
+  push @fields, sub { shift->classname || '(none)'; };
+  $align .= 'l';
+}
+
+if ( $cgi->param('active') ) {
+  push @header, 'Customer<BR>packages';
+  my %col = (
+    'active'      => '00CC00',
+    'suspended'   => 'FF9900',
+    'cancelled'   => 'FF0000',
+  );
+  my $cust_pkg_link = $p. 'search/cust_pkg.cgi?pkgpart=';
+  push @fields, sub { my $part_pkg = shift;
+                      [
+                        map {
+                              [
+                                {
+                                 'data'  => '<B><FONT COLOR="#'. $col{$_}. '">'.
+                                            $part_pkg->get("num_$_").
+                                            '</FONT></B>',
+                                 'align' => 'right',
+                                },
+                                {
+                                 'data'  => $_,
+                                 'align' => 'left',
+                                 'link'  => ( $part_pkg->get("num_$_")
+                                                ? $cust_pkg_link.
+                                                  $part_pkg->pkgpart.
+                                                  ";magic=$_"
+                                                : ''
+                                            ),
+                                },
+                              ],
+                            } (qw( active suspended cancelled ))
+                      ]; };
+  $align .= 'r';
+}
 
-      </TR>
-<% } %>
+push @header, 'Frequency';
+push @fields, sub { shift->freq_pretty; };
+$align .= 'l';
 
-    </TABLE>
-  </BODY>
-</HTML>
+if ( $taxclasses ) {
+  push @header, 'Taxclass';
+  push @fields, sub { shift->taxclass() || '&nbsp;'; };
+  $align .= 'l';
+}
+
+push @header, 'Plan',
+              'Data',
+              'Services';
+              #'Service', 'Quan', 'Primary';
+
+push @fields, sub { shift->plan || '(legacy)' }, 
+
+              sub {
+                    my $part_pkg = shift;
+                    if ( $part_pkg->plan ) {
+
+                      [ map { 
+                              /^(\w+)=(.*)$/; #or something;
+                              [
+                                { 'data'  => $1,
+                                  'align' => 'right',
+                                },
+                                { 'data'  => $2,
+                                  'align' => 'left',
+                                },
+                              ];
+                            }
+                        split(/\n/, $part_pkg->plandata)
+                      ];
+
+                    } else {
+
+                      [ map { [
+                                { 'data'  => uc($_),
+                                  'align' => 'right',
+                                },
+                                {
+                                  'data'  => $part_pkg->$_(),
+                                  'align' => 'left',
+                                },
+                              ];
+                            }
+                        (qw(setup recur))
+                      ];
+
+                    }
+
+                  },
+
+              sub {
+                    my $part_pkg = shift;
+
+                    [ map  {
+                             my $pkg_svc = $_;
+                             my $part_svc = $pkg_svc->part_svc;
+                             my $svc = $part_svc->svc;
+                             if ( $pkg_svc->primary_svc =~ /^Y/i ) {
+                               $svc = "<B>$svc (PRIMARY)</B>";
+                             }
+                             $svc =~ s/ +/&nbsp;/g;
+
+                             [
+                               {
+                                 'data'  => '<B>'. $pkg_svc->quantity. '</B>',
+                                 'align' => 'right'
+                               },
+                               {
+                                 'data'  => $svc,
+                                 'align' => 'left',
+                                 'link'  => $p. 'edit/part_svc.cgi?'.
+                                            $part_svc->svcpart,
+                               },
+                             ];
+                           }
+                      sort {     $b->primary_svc =~ /^Y/i
+                             <=> $a->primary_svc =~ /^Y/i
+                           }
+                           $part_pkg->pkg_svc
+
+                    ];
+
+                  };
+
+$align .= 'lrl'; #rr';
+
+# --------
+
+my $count_query = 'SELECT COUNT(*) FROM part_pkg';
+$count_query .= " WHERE $search"
+  if $search;
+
+%><%= include( 'elements/browse.html',
+                 'title'          => 'Package Definitions',
+                 'menubar'        => [ 'Main Menu' => $p ],
+                 'html_init'      => $html_init,
+                 'html_posttotal' => $posttotal,
+                 'name'           => 'package definitions',
+                 'query'          => { 'select'    => $select,
+                                       'table'     => 'part_pkg',
+                                       'hashref'   => \%search,
+                                       'extra_sql' => "ORDER BY $orderby",
+                                     },
+                 'count_query'    => $count_query,
+                 'header'         => \@header,
+                 'fields'         => \@fields,
+                 'links'          => \@links,
+                 'align'          => $align,
+                 'style'          => \@style,
+             )
+%>