[freeside-commits] freeside/httemplate/search cust_pkg.cgi, 1.34,
1.35 cust_pay.cgi, 1.18, 1.19
Ivan,,,
ivan at wavetail.420.am
Sat Aug 6 17:40:04 PDT 2005
Update of /home/cvs/cvsroot/freeside/httemplate/search
In directory wavetail:/tmp/cvs-serv11217/httemplate/search
Modified Files:
cust_pkg.cgi cust_pay.cgi
Log Message:
move cust_pkg search to new template, add active/suspended/cancelled customer packages to agent browse
Index: cust_pay.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pay.cgi,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- cust_pay.cgi 14 Jul 2005 10:52:46 -0000 1.18
+++ cust_pay.cgi 7 Aug 2005 00:40:02 -0000 1.19
@@ -41,27 +41,11 @@
}
}
}
-
- #false laziness with cust_pkg.cgi
- if ( $cgi->param('beginning')
- && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- my $beginning = str2time($1);
- push @search, "_date >= $beginning ";
- }
- if ( $cgi->param('ending')
- && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- my $ending = str2time($1) + 86399;
- push @search, " _date <= $ending ";
- }
- if ( $cgi->param('begin')
- && $cgi->param('begin') =~ /^(\d+)$/ ) {
- push @search, "_date >= $1 ";
- }
- if ( $cgi->param('end')
- && $cgi->param('end') =~ /^(\d+)$/ ) {
- push @search, " _date < $1 ";
- }
-
+
+ my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+ push @search, "_date >= $beginning ",
+ "_date <= $ending";
+
my $search = '';
if ( @search ) {
$search = ' WHERE '. join(' AND ', @search);
Index: cust_pkg.cgi
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/search/cust_pkg.cgi,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- cust_pkg.cgi 22 Mar 2004 11:05:58 -0000 1.34
+++ cust_pkg.cgi 7 Aug 2005 00:40:02 -0000 1.35
@@ -1,363 +1,234 @@
<%
-my $conf = new FS::Conf;
-my $maxrecords = $conf->config('maxsearchrecordsperpage');
-
my %part_pkg = map { $_->pkgpart => $_ } qsearch('part_pkg', {});
-my $limit = '';
-$limit .= "LIMIT $maxrecords" if $maxrecords;
-
-my $offset = $cgi->param('offset') || 0;
-$limit .= " OFFSET $offset" if $offset;
-
-my $total;
-
my($query) = $cgi->keywords;
-my $sortby;
-my @cust_pkg;
-
-if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
- $sortby=\*bill_sort;
- #false laziness with cust_pay.cgi
- my $range = '';
- if ( $cgi->param('beginning')
- && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- my $beginning = str2time($1);
- $range = " WHERE bill >= $beginning ";
- }
- if ( $cgi->param('ending')
- && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- my $ending = str2time($1) + 86399;
- $range .= ( $range ? ' AND ' : ' WHERE ' ). " bill <= $ending ";
- }
+my $orderby;
+my @where;
+my $cjoin = '';
- $range .= ( $range ? 'AND ' : ' WHERE ' ). '( cancel IS NULL OR cancel = 0 )';
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) {
+ $cjoin = "LEFT JOIN cust_main USING ( custnum )";
+ push @where,
+ "agentnum = $1";
+}
- if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) {
- $range .= ( $range ? 'AND ' : ' WHERE ' ).
- "$1 = ( SELECT agentnum FROM cust_main".
- " WHERE cust_main.custnum = cust_pkg.custnum )";
- }
+if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
+ $orderby = 'ORDER BY bill';
- #false laziness with below
- my $statement = "SELECT COUNT(*) FROM cust_pkg $range";
- warn $statement;
- my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
- $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
-
- $total = $sth->fetchrow_arrayref->[0];
-
- @cust_pkg = qsearch('cust_pkg',{}, '', " $range ORDER BY bill $limit" );
+ my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
+ push @where,
+ "bill >= $beginning ",
+ "bill <= $ending",
+ '( cancel IS NULL OR cancel = 0 )';
} else {
- my $qual = '';
if ( $cgi->param('magic') &&
- $cgi->param('magic') =~ /^(active|suspended|canceled)$/
+ $cgi->param('magic') =~ /^(active|suspended|cancell?ed)$/
) {
+ $orderby = 'ORDER BY pkgnum';
+
if ( $cgi->param('magic') eq 'active' ) {
- $qual = 'WHERE ( susp IS NULL OR susp = 0 )'.
- ' AND ( cancel IS NULL OR cancel = 0)';
+
+ #push @where,
+ # '( susp IS NULL OR susp = 0 )',
+ # '( cancel IS NULL OR cancel = 0)';
+ push @where, FS::cust_pkg->active_sql();
+
} elsif ( $cgi->param('magic') eq 'suspended' ) {
- $qual = 'WHERE susp IS NOT NULL AND susp != 0'.
- ' AND ( cancel IS NULL OR cancel = 0)';
- } elsif ( $cgi->param('magic') eq 'canceled' ) {
- $qual = 'WHERE cancel IS NOT NULL AND cancel != 0';
+
+ push @where,
+ 'susp IS NOT NULL',
+ 'susp != 0',
+ '( cancel IS NULL OR cancel = 0)';
+
+ } elsif ( $cgi->param('magic') =~ /^cancell?ed$/ ) {
+
+ push @where,
+ 'cancel IS NOT NULL',
+ 'cancel != 0';
+
} else {
die "guru meditation #420";
}
- $sortby = \*pkgnum_sort;
-
if ( $cgi->param('pkgpart') =~ /^(\d+)$/ ) {
- $qual .= " AND pkgpart = $1";
+ push @where, "pkgpart = $1";
}
} elsif ( $query eq 'pkgnum' ) {
- $sortby=\*pkgnum_sort;
+ $orderby = 'ORDER BY pkgnum';
} elsif ( $query eq 'APKG_pkgnum' ) {
- $sortby=\*pkgnum_sort;
-
- #@cust_pkg=();
- ##perhaps this should go in cust_pkg as a qsearch-like constructor?
- #my($cust_pkg);
- #foreach $cust_pkg (
- # qsearch('cust_pkg',{}, '', "ORDER BY pkgnum $limit" )
- #) {
- # my($flag)=0;
- # my($pkg_svc);
- # PKG_SVC:
- # foreach $pkg_svc (qsearch('pkg_svc',{ 'pkgpart' => $cust_pkg->pkgpart })) {
- # if ( $pkg_svc->quantity
- # > scalar(qsearch('cust_svc',{
- # 'pkgnum' => $cust_pkg->pkgnum,
- # 'svcpart' => $pkg_svc->svcpart,
- # }))
- # )
- # {
- # $flag=1;
- # last PKG_SVC;
- # }
- # }
- # push @cust_pkg, $cust_pkg if $flag;
- #}
-
- if ( driver_name eq 'mysql' ) {
- #$query = "DROP TABLE temp1_$$,temp2_$$;";
- #my $sth = dbh->prepare($query);
- #$sth->execute;
-
- $query = "CREATE TEMPORARY TABLE temp1_$$ TYPE=MYISAM
- SELECT cust_svc.pkgnum,cust_svc.svcpart,COUNT(*) as count
- FROM cust_pkg,cust_svc,pkg_svc
- WHERE cust_pkg.pkgnum = cust_svc.pkgnum
- AND cust_svc.svcpart = pkg_svc.svcpart
- AND cust_pkg.pkgpart = pkg_svc.pkgpart
- GROUP BY cust_svc.pkgnum,cust_svc.svcpart";
- my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
-
- $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
+ $orderby = 'ORDER BY pkgnum';
- $query = "CREATE TEMPORARY TABLE temp2_$$ TYPE=MYISAM
- SELECT cust_pkg.pkgnum FROM cust_pkg
- LEFT JOIN pkg_svc ON (cust_pkg.pkgpart=pkg_svc.pkgpart)
- LEFT JOIN temp1_$$ ON (cust_pkg.pkgnum = temp1_$$.pkgnum
- AND pkg_svc.svcpart=temp1_$$.svcpart)
- WHERE ( pkg_svc.quantity > temp1_$$.count
- OR temp1_$$.pkgnum IS NULL )
- AND pkg_svc.quantity != 0;";
- $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
- $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
- $qual = " LEFT JOIN temp2_$$ ON cust_pkg.pkgnum = temp2_$$.pkgnum
- WHERE temp2_$$.pkgnum IS NOT NULL";
-
- } else {
-
- $qual = "
- WHERE 0 <
- ( SELECT count(*) FROM pkg_svc
- WHERE pkg_svc.pkgpart = cust_pkg.pkgpart
- AND pkg_svc.quantity > ( SELECT count(*) FROM cust_svc
- WHERE cust_svc.pkgnum = cust_pkg.pkgnum
- AND cust_svc.svcpart = pkg_svc.svcpart
- )
- )
- ";
-
- }
+ push @where, '0 < (
+ SELECT count(*) FROM pkg_svc
+ WHERE pkg_svc.pkgpart = cust_pkg.pkgpart
+ AND pkg_svc.quantity > ( SELECT count(*) FROM cust_svc
+ WHERE cust_svc.pkgnum = cust_pkg.pkgnum
+ AND cust_svc.svcpart = pkg_svc.svcpart
+ )
+ )';
} else {
die "Empty or unknown QUERY_STRING!";
}
-
- my $statement = "SELECT COUNT(*) FROM cust_pkg $qual";
- my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
- $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
-
- $total = $sth->fetchrow_arrayref->[0];
-
- my $tblname = driver_name eq 'mysql' ? 'cust_pkg.' : '';
- @cust_pkg =
- qsearch('cust_pkg',{}, '', "$qual ORDER BY ${tblname}pkgnum $limit" );
- if ( driver_name eq 'mysql' ) {
- $query = "DROP TABLE temp1_$$,temp2_$$;";
- my $sth = dbh->prepare($query) or die dbh->errstr. " doing $query";
- $sth->execute; # or die "Error executing \"$query\": ". $sth->errstr;
- }
-
}
-if ( scalar(@cust_pkg) == 1 ) {
- print $cgi->redirect("${p}view/cust_main.cgi?". $cust_pkg[0]->custnum.
- "#cust_pkg". $cust_pkg[0]->pkgnum );
- #exit;
-} elsif ( scalar(@cust_pkg) == 0 ) { #error
-%>
-<!-- mason kludge -->
-<%
- eidiot("No packages found");
-} else {
-%>
-<!-- mason kludge -->
-<%
- $total ||= scalar(@cust_pkg);
-
- #begin pager
- my $pager = '';
- if ( $total != scalar(@cust_pkg) && $maxrecords ) {
- unless ( $offset == 0 ) {
- $cgi->param('offset', $offset - $maxrecords);
- $pager .= '<A HREF="'. $cgi->self_url.
- '"><B><FONT SIZE="+1">Previous</FONT></B></A> ';
- }
- my $poff;
- my $page;
- for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
- $page++;
- if ( $offset == $poff ) {
- $pager .= qq!<FONT SIZE="+2">$page</FONT> !;
- } else {
- $cgi->param('offset', $poff);
- $pager .= qq!<A HREF="!. $cgi->self_url. qq!">$page</A> !;
- }
- }
- unless ( $offset + $maxrecords > $total ) {
- $cgi->param('offset', $offset + $maxrecords);
- $pager .= '<A HREF="'. $cgi->self_url.
- '"><B><FONT SIZE="+1">Next</FONT></B></A> ';
- }
- }
- #end pager
-
- print header('Package Search Results',''),
- "$total matching packages found<BR><BR>$pager", &table(), <<END;
- <TR>
- <TH>Package</TH>
- <TH><FONT SIZE=-1>Setup</FONT></TH>
-END
-
- print '<TH><FONT SIZE=-1>Last<BR>bill</FONT></TH>'
- if defined dbdef->table('cust_pkg')->column('last_bill');
-
- print <<END;
- <TH><FONT SIZE=-1>Next<BR>bill</FONT></TH>
- <TH><FONT SIZE=-1>Susp.</FONT></TH>
- <TH><FONT SIZE=-1>Expire</FONT></TH>
- <TH><FONT SIZE=-1>Cancel</FONT></TH>
- <TH><FONT SIZE=-1>Cust#</FONT></TH>
- <TH>(bill) name</TH>
- <TH>company</TH>
-END
-
- print '<TH>(service) name</TH><TH>company</TH>'
- if defined dbdef->table('cust_main')->column('ship_last');
-
- print '<TH COLSPAN=2>Services</TH></TR>';
-
- my $n1 = '<TR>';
- my(%saw,$cust_pkg);
- foreach $cust_pkg (
- sort $sortby grep(!$saw{$_->pkgnum}++, @cust_pkg)
- ) {
- my($cust_main)=qsearchs('cust_main',{'custnum'=>$cust_pkg->custnum});
- my($pkgnum, $setup, $bill, $susp, $expire, $cancel,
- $custnum, $last, $first, $company ) = (
- $cust_pkg->pkgnum,
- $cust_pkg->getfield('setup')
- ? time2str("%D", $cust_pkg->getfield('setup') )
- : '',
- $cust_pkg->getfield('bill')
- ? time2str("%D", $cust_pkg->getfield('bill') )
- : '',
- $cust_pkg->getfield('susp')
- ? time2str("%D", $cust_pkg->getfield('susp') )
- : '',
- $cust_pkg->getfield('expire')
- ? time2str("%D", $cust_pkg->getfield('expire') )
- : '',
- $cust_pkg->getfield('cancel')
- ? time2str("%D", $cust_pkg->getfield('cancel') )
- : '',
- $cust_pkg->custnum,
- $cust_main ? $cust_main->last : '',
- $cust_main ? $cust_main->first : '',
- $cust_main ? $cust_main->company : '',
- );
+my $extra_sql = scalar(@where) ? ' WHERE '. join(' AND ', @where) : '';
- my $last_bill = $cust_pkg->getfield('last_bill')
- ? time2str("%D", $cust_pkg->getfield('last_bill') )
- : ''
- if defined dbdef->table('cust_pkg')->column('last_bill');
+my $count_query = "SELECT COUNT(*) FROM cust_pkg $cjoin $extra_sql";
- my($ship_last, $ship_first, $ship_company);
- if ( defined dbdef->table('cust_main')->column('ship_last') ) {
- ($ship_last, $ship_first, $ship_company) = (
- $cust_main
- ? ( $cust_main->ship_last || $cust_main->getfield('last') )
- : '',
- $cust_main
- ? ( $cust_main->ship_last
- ? $cust_main->ship_first
- : $cust_main->first )
- : '',
- $cust_main
- ? ( $cust_main->ship_last
- ? $cust_main->ship_company
- : $cust_main->company )
- : '',
- );
- }
- my $pkg = $part_pkg{$cust_pkg->pkgpart}->pkg;
- #$pkg .= ' - '. $part_pkg{$cust_pkg->pkgpart}->comment;
- my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
- my $rowspan = scalar(@cust_svc) || 1;
- my $p = popurl(2);
- print $n1, <<END;
- <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_main.cgi?$custnum#cust_pkg$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
- <TD ROWSPAN=$rowspan>$setup</TD>
-END
+my $sql_query = {
+ 'table' => 'cust_pkg',
+ 'hashref' => {},
+ 'select' => join(', ',
+ 'cust_pkg.*',
+ 'cust_main.custnum as cust_main_custnum',
+ FS::UI::Web::cust_sql_fields(),
+ ),
+ 'extra_sql' => "$extra_sql $orderby",
+ 'addl_from' => ' LEFT JOIN cust_main USING ( custnum ) ',
+ #' LEFT JOIN part_pkg USING ( pkgpart ) '
+};
- print "<TD ROWSPAN=$rowspan>$last_bill</TD>"
- if defined dbdef->table('cust_pkg')->column('last_bill');
+my $link = sub {
+ [ "${p}view/cust_main.cgi?".shift->custnum.'#cust_pkg', 'pkgnum' ];
+};
- print <<END;
- <TD ROWSPAN=$rowspan>$bill</TD>
- <TD ROWSPAN=$rowspan>$susp</TD>
- <TD ROWSPAN=$rowspan>$expire</TD>
- <TD ROWSPAN=$rowspan>$cancel</TD>
-END
- if ( $cust_main ) {
- print <<END;
- <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$custnum</A></FONT></TD>
- <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$last, $first</A></FONT></TD>
- <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$company</A></FONT></TD>
-END
- if ( defined dbdef->table('cust_main')->column('ship_last') ) {
- print <<END;
- <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$ship_last, $ship_first</A></FONT></TD>
- <TD ROWSPAN=$rowspan><FONT SIZE=-1><A HREF="${p}view/cust_main.cgi?$custnum">$ship_company</A></FONT></TD>
-END
- }
- } else {
- my $colspan = defined dbdef->table('cust_main')->column('ship_last')
- ? 5 : 3;
- print <<END;
- <TD ROWSPAN=$rowspan COLSPAN=$colspan>WARNING: couldn't find cust_main.custnum $custnum (cust_pkg.pkgnum $pkgnum)</TD>
-END
- }
+my $clink = sub {
+ my $cust_pkg = shift;
+ $cust_pkg->cust_main_custnum
+ ? [ "${p}view/cust_main.cgi?", 'custnum' ]
+ : '';
+};
- my $n2 = '';
- foreach my $cust_svc ( @cust_svc ) {
- my($label, $value, $svcdb) = $cust_svc->label;
- my $svcnum = $cust_svc->svcnum;
- my $sview = $p. "view";
- print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
- qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
- $n2="</TR><TR>";
- }
+#if ( scalar(@cust_pkg) == 1 ) {
+# print $cgi->redirect("${p}view/cust_main.cgi?". $cust_pkg[0]->custnum.
+# "#cust_pkg". $cust_pkg[0]->pkgnum );
- $n1 = "</TR><TR>";
+# my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } );
+# my $rowspan = scalar(@cust_svc) || 1;
- }
- print '</TR>';
-
- print "</TABLE>$pager</BODY></HTML>";
+# my $n2 = '';
+# foreach my $cust_svc ( @cust_svc ) {
+# my($label, $value, $svcdb) = $cust_svc->label;
+# my $svcnum = $cust_svc->svcnum;
+# my $sview = $p. "view";
+# print $n2,qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$label</FONT></A></TD>!,
+# qq!<TD><A HREF="$sview/$svcdb.cgi?$svcnum"><FONT SIZE=-1>$value</FONT></A></TD>!;
+# $n2="</TR><TR>";
+# }
+sub time_or_blank {
+ my $column = shift;
+ return sub {
+ my $record = shift;
+ my $value = $record->get($column); #mmm closures
+ $value ? time2str('%b %d %Y', $value ) : '';
+ };
}
-sub pkgnum_sort {
- $a->getfield('pkgnum') <=> $b->getfield('pkgnum');
-}
+%><%= include( 'elements/search.html',
+ 'title' => 'Package Search Results',
+ 'name' => 'packages',
+ 'query' => $sql_query,
+ 'count_query' => $count_query,
+ 'redirect' => $link,
+ 'header' => [ '#',
+ 'Package',
+ 'Status',
+ 'Freq.',
+ 'Setup',
+ 'Last bill',
+ 'Next bill',
+ 'Susp.',
+ 'Expire',
+ 'Cancel',
+ FS::UI::Web::cust_header(),
+ 'Services',
+ ],
+ 'fields' => [
+ 'pkgnum',
+ sub { my $part_pkg = $part_pkg{shift->pkgpart};
+ $part_pkg->pkg; # ' - '. $part_pkg->comment;
+ },
+ sub { ucfirst(shift->status); },
+ sub { #shift->part_pkg->freq_pretty;
+ my $part_pkg = $part_pkg{shift->pkgpart};
+ $part_pkg->freq_pretty;
+ },
-sub bill_sort {
- $a->getfield('bill') <=> $b->getfield('bill');
-}
+ #sub { time2str('%b %d %Y', shift->setup); },
+ #sub { time2str('%b %d %Y', shift->last_bill); },
+ #sub { time2str('%b %d %Y', shift->bill); },
+ #sub { time2str('%b %d %Y', shift->susp); },
+ #sub { time2str('%b %d %Y', shift->expire); },
+ #sub { time2str('%b %d %Y', shift->get('cancel')); },
+ ( map { time_or_blank($_) }
+ qw( setup last_bill bill susp expire cancel ) ),
+ \&FS::UI::Web::cust_fields,
+ #sub { '<table border=0 cellspacing=0 cellpadding=0 STYLE="border:none">'.
+ # join('', map { '<tr><td align="right" style="border:none">'. $_->[0].
+ # ':</td><td style="border:none">'. $_->[1]. '</td></tr>' }
+ # shift->labels
+ # ).
+ # '</table>';
+ # },
+ sub {
+ [ map {
+ [
+ { 'data' => $_->[0]. ':',
+ 'align'=> 'right',
+ },
+ { 'data' => $_->[1],
+ 'align'=> 'left',
+ 'link' => $p. 'view/' .
+ $_->[2]. '.cgi?'. $_->[3],
+ },
+ ];
+ } shift->labels
+ ];
+ },
+ ],
+ 'color' => [
+ '',
+ '',
+ sub { shift->statuscolor; },
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ ( map { '' } FS::UI::Web::cust_header() ),
+ '',
+ ],
+ 'style' => [ '', '', 'b' ],
+ 'size' => [ '', '', '-1', ],
+ 'align' => 'rlclrrrrrr',
+ 'links' => [
+ $link,
+ $link,
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '',
+ ( map { $clink } FS::UI::Web::cust_header() ),
+ '',
+ ],
+ )
%>
More information about the freeside-commits
mailing list