.package TH { font-size: medium }
.package TR { font-size: smaller }
.package .pkgnum { font-size: medium }
-.package .provision { font-size: larger; color: red; font-weight: bold }
+.package .provision { font-weight: bold }
</STYLE>
END
print '</TD></TR></TABLE>';
if ( defined $cust_main->dbdef_table->column('comments')
- && $cust_main->comments )
+ && $cust_main->comments =~ /[^\s\n\r]/ )
{
print "<BR>Comments". &ntable("#cccccc"). "<TR><TD>".
&ntable("#cccccc",2).
#get package info
-my $packages = get_packages($cust_main);
+my $packages = get_packages($cust_main, $conf);
if ( @$packages ) {
%>
<%=$pkg->{pkg}%> - <%=$pkg->{comment}%> ( <%=pkg_details_link($pkg)%> )<BR>
<% unless ($pkg->{cancel}) { %>
( <%=pkg_change_link($pkg)%> )
- ( <%=pkg_dates_link($pkg)%> | <%=pkg_customize_link($pkg)%> )
+ ( <%=pkg_dates_link($pkg)%> | <%=pkg_customize_link($pkg,$custnum)%> )
<% } %>
</TD>
<%
#foreach (qw(setup last_bill next_bill susp expire cancel)) {
- # print qq! <TD ROWSPAN=$rowspan>! . pkg_datestr($pkg,$_) . qq!</TD>\n!;
+ # print qq! <TD ROWSPAN=$rowspan>! . pkg_datestr($pkg,$_,$conf) . qq!</TD>\n!;
#}
print "<TD ROWSPAN=$rowspan>". &itable('');
- #move
- my %freq = (
- 1 => 'monthly',
- 2 => 'bi-monthly',
- 3 => 'quarterly',
- 6 => 'semi-annually',
- 12 => 'annually',
- 24 => 'bi-annually',
- 36 => 'tri-annually',
- );
-
sub freq {
+
+ #false laziness w/edit/part_pkg.cgi
+ my %freq = ( #move this
+ '1d' => 'daily',
+ '1w' => 'weekly',
+ '2w' => 'biweekly (every 2 weeks)',
+ '1' => 'monthly',
+ '2' => 'bimonthly (every 2 months)',
+ '3' => 'quarterly (every 3 months)',
+ '6' => 'semiannually (every 6 months)',
+ '12' => 'annually',
+ '24' => 'biannually (every 2 years)',
+ );
+
my $freq = shift;
exists $freq{$freq} ? $freq{$freq} : "every $freq months";
}
if ( $pkg->{cancel} ) { #status: cancelled
- print '<TR><TD><FONT COLOR="#ff0000">Cancelled </FONT></TD><TD>'.
- pkg_datestr($pkg,'cancel'). '</TD></TR>';
+ print '<TR><TD><FONT COLOR="#ff0000"><B>Cancelled </B></FONT></TD>'.
+ '<TD>'. pkg_datestr($pkg,'cancel',$conf). '</TD></TR>';
unless ( $pkg->{setup} ) {
print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
} else {
print "<TR><TD>Setup </TD><TD>".
- pkg_datestr($pkg, 'setup'). '</TD></TR>';
+ pkg_datestr($pkg, 'setup',$conf). '</TD></TR>';
print "<TR><TD>Last bill </TD><TD>".
- pkg_datestr($pkg, 'last_bill'). '</TD></TR>'
+ pkg_datestr($pkg, 'last_bill',$conf). '</TD></TR>'
if $pkg->{'last_bill'};
print "<TR><TD>Suspended </TD><TD>".
- pkg_datestr($pkg, 'susp'). '</TD></TR>'
+ pkg_datestr($pkg, 'susp',$conf). '</TD></TR>'
if $pkg->{'susp'};
}
} else {
if ( $pkg->{susp} ) { #status: suspended
- print '<TR><TD><FONT COLOR="#FF9900">Suspended </FONT></TD><TD>'.
- pkg_datestr($pkg,'susp'). '</TD></TR>';
+ print '<TR><TD><FONT COLOR="#FF9900"><B>Suspended</B> </FONT></TD>'.
+ '<TD>'. pkg_datestr($pkg,'susp',$conf). '</TD></TR>';
unless ( $pkg->{setup} ) {
print '<TR><TD COLSPAN=2>Never billed</TD></TR>';
} else {
print "<TR><TD>Setup </TD><TD>".
- pkg_datestr($pkg, 'setup'). '</TD></TR>';
+ pkg_datestr($pkg, 'setup',$conf). '</TD></TR>';
}
print "<TR><TD>Last bill </TD><TD>".
- pkg_datestr($pkg, 'last_bill'). '</TD></TR>'
+ pkg_datestr($pkg, 'last_bill',$conf). '</TD></TR>'
if $pkg->{'last_bill'};
# next bill ??
print "<TR><TD>Expires </TD><TD>".
- pkg_datestr($pkg, 'expire'). '</TD></TR>'
+ pkg_datestr($pkg, 'expire',$conf). '</TD></TR>'
if $pkg->{'expire'};
print '<TR><TD COLSPAN=2>( '. pkg_unsuspend_link($pkg).
' | '. pkg_cancel_link($pkg). ' )</TD></TR>';
unless ( $pkg->{freq} ) {
print "<TR><TD COLSPAN=2>One-time charge</TD></TR>".
'<TR><TD>Billed </TD><TD>'.
- pkg_datestr($pkg,'setup'). '</TD></TR>';
+ pkg_datestr($pkg,'setup',$conf). '</TD></TR>';
} else {
- print '<TR><TD COLSPAN=2><FONT COLOR="#00CC00">Active</FONT>, '.
- 'billed '. freq($pkg->{freq}). '</TD></TR>'.
+ print '<TR><TD COLSPAN=2><FONT COLOR="#00CC00"><B>Active</B></FONT>'.
+ ', billed '. freq($pkg->{freq}). '</TD></TR>'.
'<TR><TD>Setup </TD><TD>'.
- pkg_datestr($pkg, 'setup'). '</TD></TR>';
+ pkg_datestr($pkg, 'setup',$conf). '</TD></TR>';
}
}
print "<TR><TD>Last bill </TD><TD>".
- pkg_datestr($pkg, 'last_bill'). '</TD></TR>'
+ pkg_datestr($pkg, 'last_bill',$conf). '</TD></TR>'
if $pkg->{'last_bill'};
print "<TR><TD>Next bill </TD><TD>".
- pkg_datestr($pkg, 'next_bill'). '</TD></TR>'
+ pkg_datestr($pkg, 'next_bill',$conf). '</TD></TR>'
if $pkg->{'next_bill'};
print "<TR><TD>Expires </TD><TD>".
- pkg_datestr($pkg, 'expire'). '</TD></TR>'
+ pkg_datestr($pkg, 'expire',$conf). '</TD></TR>'
if $pkg->{'expire'};
if ( $pkg->{freq} ) {
print '<TR><TD COLSPAN=2>( '. pkg_suspend_link($pkg).
sub get_packages {
+ my $cust_main = shift or return undef;
+ my $conf = shift;
+
+ my @packages = ();
+
+ foreach my $cust_pkg (
+ $conf->exists('hidecancelledpackages')
+ ? $cust_main->ncancelled_pkgs
+ : $cust_main->all_pkgs
+ ) {
+
+ my $part_pkg = $cust_pkg->part_pkg;
+
+ my %pkg = ();
+ $pkg{pkgnum} = $cust_pkg->pkgnum;
+ $pkg{pkg} = $part_pkg->pkg;
+ $pkg{pkgpart} = $part_pkg->pkgpart;
+ $pkg{comment} = $part_pkg->getfield('comment');
+ $pkg{freq} = $part_pkg->freq;
+ $pkg{setup} = $cust_pkg->getfield('setup');
+ $pkg{last_bill} = $cust_pkg->getfield('last_bill');
+ $pkg{next_bill} = $cust_pkg->getfield('bill');
+ $pkg{susp} = $cust_pkg->getfield('susp');
+ $pkg{expire} = $cust_pkg->getfield('expire');
+ $pkg{cancel} = $cust_pkg->getfield('cancel');
+
+ my %svcparts = ();
-my $cust_main = shift or return undef;
-
-my @packages = ();
-
-foreach my $cust_pkg (($conf->exists('hidecancelledpackages') ? ($cust_main->ncancelled_pkgs)
- : ($cust_main->all_pkgs))) {
-
- my $part_pkg = $cust_pkg->part_pkg;
-
- my %pkg = ();
- $pkg{pkgnum} = $cust_pkg->pkgnum;
- $pkg{pkg} = $part_pkg->pkg;
- $pkg{pkgpart} = $part_pkg->pkgpart;
- $pkg{comment} = $part_pkg->getfield('comment');
- $pkg{freq} = $part_pkg->freq;
- $pkg{setup} = $cust_pkg->getfield('setup');
- $pkg{last_bill} = $cust_pkg->getfield('last_bill');
- $pkg{next_bill} = $cust_pkg->getfield('bill');
- $pkg{susp} = $cust_pkg->getfield('susp');
- $pkg{expire} = $cust_pkg->getfield('expire');
- $pkg{cancel} = $cust_pkg->getfield('cancel');
-
- $pkg{svcparts} = [];
-
- foreach my $pkg_svc (qsearch('pkg_svc', { 'pkgpart' => $part_pkg->pkgpart })) {
-
- next if ($pkg_svc->quantity == 0);
-
- my $part_svc = qsearchs('part_svc', { 'svcpart' => $pkg_svc->svcpart });
-
- my $svcpart = {};
- $svcpart->{svcpart} = $part_svc->svcpart;
- $svcpart->{svc} = $part_svc->svc;
- $svcpart->{svcdb} = $part_svc->svcdb;
- $svcpart->{quantity} = $pkg_svc->quantity;
- $svcpart->{count} = 0;
+ foreach my $pkg_svc (
+ qsearch('pkg_svc', { 'pkgpart' => $part_pkg->pkgpart })
+ ) {
+
+ next if ($pkg_svc->quantity == 0);
+
+ my $part_svc = qsearchs('part_svc', { 'svcpart' => $pkg_svc->svcpart });
+
+ my $svcpart = {};
+ $svcpart->{svcpart} = $part_svc->svcpart;
+ $svcpart->{svc} = $part_svc->svc;
+ $svcpart->{svcdb} = $part_svc->svcdb;
+ $svcpart->{quantity} = $pkg_svc->quantity;
+ $svcpart->{count} = 0;
+
+ $svcpart->{services} = [];
- $svcpart->{services} = [];
+ $svcparts{$svcpart->{svcpart}} = $svcpart;
- foreach my $cust_svc (qsearch('cust_svc', { 'pkgnum' => $cust_pkg->pkgnum,
- 'svcpart' => $part_svc->svcpart } )) {
+ }
- my $svc = {};
- $svc->{svcnum} = $cust_svc->svcnum;
- $svc->{label} = ($cust_svc->label)[1];
+ foreach my $cust_svc (
+ qsearch( 'cust_svc', {
+ 'pkgnum' => $cust_pkg->pkgnum,
+ #'svcpart' => $part_svc->svcpart,
+ }
+ )
+ ) {
+
+ warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n";
+ my $svc = {
+ 'svcnum' => $cust_svc->svcnum,
+ 'label' => ($cust_svc->label)[1],
+ };
+
+ #false laziness with above, to catch extraneous services. whole
+ #damn thing should be OO...
+ my $svcpart = ( $svcparts{$cust_svc->svcpart} ||= {
+ 'svcpart' => $cust_svc->svcpart,
+ 'svc' => $cust_svc->part_svc->svc,
+ 'svcdb' => $cust_svc->part_svc->svcdb,
+ 'quantity' => 0,
+ 'count' => 0,
+ 'services' => [],
+ } );
push @{$svcpart->{services}}, $svc;
}
- push @{$pkg{svcparts}}, $svcpart;
+ $pkg{svcparts} = [ values %svcparts ];
+ push @packages, \%pkg;
+
}
-
- push @packages, \%pkg;
-
-}
-
-return \@packages;
+
+ return \@packages;
}
sub svc_link {
- my ($svcpart, $svc) = (shift,shift) or return '';
- return qq!<A HREF="$p1/view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
+ my ($svcpart, $svc) = (shift,shift) or return '';
+ return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
}
sub svc_label_link {
- my ($svcpart, $svc) = (shift,shift) or return '';
- return qq!<A HREF="$p1/view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
+ my ($svcpart, $svc) = (shift,shift) or return '';
+ return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
}
sub svc_provision_link {
my ($pkg, $svcpart) = (shift,shift) or return '';
- return qq!<A CLASS="provision" HREF="${p1}/edit/$svcpart->{svcdb}.cgi?! .
+ ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/ /g;
+ return qq!<A CLASS="provision" HREF="${p}edit/$svcpart->{svcdb}.cgi?! .
qq!pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}">! .
- qq!Provision $svcpart->{svc} (! . ($svcpart->{quantity} - $svcpart->{count}) . qq!)</A>!;
+ "Provision $svc_nbsp (".
+ ($svcpart->{quantity} - $svcpart->{count}).
+ ')</A>';
}
sub svc_unprovision_link {
}
sub pkg_datestr {
- my($pkg, $field) = @_ or return '';
+ my($pkg, $field, $conf) = @_ or return '';
return ' ' unless $pkg->{$field};
my $format = $conf->exists('pkg_showtimes')
? '<B>%D</B> <FONT SIZE=-3>%l:%M:%S%P %z</FONT>'
sub pkg_customize_link {
my $pkg = shift or return '';
+ my $custnum = shift;
return qq!<A HREF="${p}edit/part_pkg.cgi?keywords=$custnum;clone=$pkg->{pkgpart};pkgnum=$pkg->{pkgnum}">Customize</A>!;
}