X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fbrowse%2Fpart_pkg.cgi;h=48b0ab2b3c80a6ed6f1e76d4d4005586c03ecb5a;hp=7b9436cee46abdf3ee558d15faf60186c2caf86e;hb=6fe8172b11d0369d0b1274d6825ec0c57afe8001;hpb=0ebeec96313dd7edfca340f01f8fbbbac1f4aa1d

diff --git a/httemplate/browse/part_pkg.cgi b/httemplate/browse/part_pkg.cgi
index 7b9436cee..48b0ab2b3 100755
--- a/httemplate/browse/part_pkg.cgi
+++ b/httemplate/browse/part_pkg.cgi
@@ -12,7 +12,8 @@ my @part_pkg = qsearch('part_pkg', \%search );
 my $total = scalar(@part_pkg);
 
 my $sortby;
-my %num_active_cust_pkg;
+my %num_active_cust_pkg = ();
+my( $suspended_sth, $canceled_sth ) = ( '', '' );
 if ( $cgi->param('active') ) {
   my $active_sth = dbh->prepare(
     'SELECT COUNT(*) FROM cust_pkg WHERE pkgpart = ?'.
@@ -24,11 +25,28 @@ if ( $cgi->param('active') ) {
     $num_active_cust_pkg{$part_pkg->pkgpart} =
       $active_sth->fetchrow_arrayref->[0];
   }
-  $sortby = \*active_cust_pkg_sort;
+  $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 = \*pkgpart_sort;
+  $sortby = sub { $a->pkgpart <=> $b->pkgpart; };
 }
 
+my $conf = new FS::Conf;
+my $taxclasses = $conf->exists('enable_taxclasses');
+
 %>
 <%= header("Package Definition Listing",menubar( 'Main Menu' => $p )) %>
 <% unless ( $cgi->param('active') ) { %>
@@ -40,76 +58,93 @@ if ( $cgi->param('active') ) {
 <% } %>
 
 <%= $total %> package definitions
-<%
-if ( $cgi->param('showdisabled') ) {
-  $cgi->param('showdisabled', 0);
-  print qq!( <a href="!. $cgi->self_url. qq!">hide disabled packages</a> )!;
-} else {
-  $cgi->param('showdisabled', 1);
-  print qq!( <a href="!. $cgi->self_url. qq!">show disabled packages</a> )!;
-}
+<% 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;
-print &table(), <<END;
+<% my $colspan = $cgi->param('showdisabled') ? 2 : 3; %>
+
+<%= &table() %>
       <TR>
-        <TH COLSPAN=$colspan>Package</TH>
+        <TH COLSPAN=<%= $colspan %>>Package</TH>
         <TH>Comment</TH>
-END
-print '        <TH><FONT SIZE=-1>Customer<BR>packages</FONT></TH>'
-  if $cgi->param('active');
-print <<END;
+<% 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>
-END
 
+<%
 foreach my $part_pkg ( sort $sortby @part_pkg ) {
-  my($hashref)=$part_pkg->hashref;
   my(@pkg_svc)=grep $_->getfield('quantity'),
-    qsearch('pkg_svc',{'pkgpart'=> $hashref->{pkgpart} });
+    qsearch( 'pkg_svc', { 'pkgpart' => $part_pkg->pkgpart } );
   my($rowspan)=scalar(@pkg_svc);
   my $plandata;
-  if ( $hashref->{plan} ) {
-    $plandata = $hashref->{plandata};
+  if ( $part_pkg->plan ) {
+    $plandata = $part_pkg->plandata;
     $plandata =~ s/^(\w+)=/$1&nbsp;/mg;
     $plandata =~ s/\n/<BR>/g;
   } else {
-    $hashref->{plan} = "(legacy)";
-    $plandata = "Setup&nbsp;". $hashref->{setup}.
-                "<BR>Recur&nbsp;". $hashref->{recur};
+    $part_pkg->plan('(legacy)');
+    $plandata = "Setup&nbsp;". $part_pkg->setup.
+                "<BR>Recur&nbsp;". $part_pkg->recur;
   }
-  print <<END;
+%>
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkgpart}</A></TD>
-END
+        <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>
+<% } %>
 
-  unless ( $cgi->param('showdisabled') ) {
-    print "<TD ROWSPAN=$rowspan>";
-    print "DISABLED" if $hashref->{disabled};
-    print '</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>
+<% } %>
 
-  print <<END;
-        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
-        <TD ROWSPAN=$rowspan>$hashref->{comment}</TD>
-END
-  if ( $cgi->param('active') ) {
-    print "        <TD ROWSPAN=$rowspan>";
-    print '<FONT COLOR="#00CC00"><B>'.
-          $num_active_cust_pkg{$hashref->{'pkgpart'}}.
-          qq!</B></FONT>&nbsp;<A HREF="${p}search/cust_pkg.cgi?magic=active;pkgpart=$hashref->{pkgpart}">active</A>!;
-    # suspended/cancelled
-    print '</TD>';
-  }
-  print <<END;
-        <TD ROWSPAN=$rowspan>$hashref->{freq}</TD>
-        <TD ROWSPAN=$rowspan>$hashref->{plan}</TD>
-        <TD ROWSPAN=$rowspan>$plandata</TD>
-END
+        <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($pkg_svc);
   my($n)="";
   foreach $pkg_svc ( @pkg_svc ) {
@@ -117,28 +152,20 @@ END
     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></TR>\n";
+          $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>";
   }
+%>
 
-  print "</TR>";
-}
-
-$colspan = $cgi->param('showdisabled') ? 8 : 9;
-print <<END;
+      </TR>
+<% } %>
 
     </TABLE>
   </BODY>
 </HTML>
-END
-
-
-sub pkgpart_sort {
-  $a->pkgpart <=> $b->pkgpart;
-}
-
-sub active_cust_pkg_sort {
-  $num_active_cust_pkg{$b->pkgpart} <=> $num_active_cust_pkg{$a->pkgpart};
-}
-
-%>