'Setup',
'Last bill',
'Next bill',
+ 'Adjourn',
'Susp.',
'Expire',
'Cancel',
#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 ) ),
+ qw( setup last_bill bill adjourn susp expire cancel ) ),
\&FS::UI::Web::cust_fields,
#sub { '<table border=0 cellspacing=0 cellpadding=0 STYLE="border:none">'.
push @where, '(pkgpart=' . $pkgpart . ')' if $pkgpart;
###
-# parse magic, legacy, etc.
+# parse dates
###
-my $orderby;
-if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
- $orderby = 'ORDER BY bill';
+my $orderby = '';
+
+#false laziness w/report_cust_pkg.html
+my %disable = (
+ 'all' => {},
+ 'one-time charge' => { 'last_bill'=>1, 'bill'=>1, 'adjourn'=>1, 'susp'=>1, 'expire'=>1, 'cancel'=>1, },
+ 'active' => { 'susp'=>1, 'cancel'=>1 },
+ 'suspended' => { 'cancel' => 1 },
+ 'cancelled' => {},
+ '' => {},
+);
+
+foreach my $field (qw( setup last_bill bill adjourn susp expire cancel )) {
+
+ my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
+
+ next if $beginning == 0 && $ending == 4294967295
+ or $disable{$cgi->param('status')}->{$field};
- my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi);
push @where,
- #"bill >= $beginning ",
- #"bill <= $ending",
- "CASE WHEN bill IS NULL THEN 0 ELSE bill END >= $beginning ",
- "CASE WHEN bill IS NULL THEN 0 ELSE bill END <= $ending",
- #'( cancel IS NULL OR cancel = 0 )'
- ;
+ "cust_pkg.$field IS NOT NULL",
+ "cust_pkg.$field >= $beginning",
+ "cust_pkg.$field <= $ending";
-} else {
+ $orderby ||= "ORDER BY cust_pkg.$field";
- if ( $cgi->param('magic') &&
- $cgi->param('magic') =~ /^(active|inactive|suspended|cancell?ed)$/
- ) {
+}
- $orderby = 'ORDER BY pkgnum';
+$orderby ||= 'ORDER BY bill';
- if ( $cgi->param('pkgpart') =~ /^(\d+)$/ ) {
- push @where, "pkgpart = $1";
- }
+###
+# parse magic, legacy, etc.
+###
- } elsif ( $query eq 'pkgnum' ) {
+if ( $cgi->param('magic') &&
+ $cgi->param('magic') =~ /^(active|inactive|suspended|cancell?ed)$/
+) {
- $orderby = 'ORDER BY pkgnum';
+ $orderby = 'ORDER BY pkgnum';
- } elsif ( $query eq 'APKG_pkgnum' ) {
-
- $orderby = 'ORDER BY pkgnum';
-
- 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!";
+ if ( $cgi->param('pkgpart') =~ /^(\d+)$/ ) {
+ push @where, "pkgpart = $1";
}
+} elsif ( $query eq 'pkgnum' ) {
+
+ $orderby = 'ORDER BY pkgnum';
+
+} elsif ( $query eq 'APKG_pkgnum' ) {
+
+ $orderby = 'ORDER BY pkgnum';
+
+ 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
+ )
+ )';
+
}
##