From: khoff Date: Fri, 9 May 2003 19:30:57 +0000 (+0000) Subject: Cleaned-up package view code and added CSS tags. X-Git-Tag: freeside_1_5_0pre2~32 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=d60478318bc9c3d94703d1845c0b40504c51a8cb Cleaned-up package view code and added CSS tags. --- diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index cea8d6321..d392f8a39 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -15,6 +15,16 @@ print header("Customer View", menubar( 'Main Menu' => popurl(2) )); +print < +.package TH { font-size: medium } +.package TR { font-size: smaller } +.package .datehdr TH { font-size: smaller } +.package .pkgnum { font-size: medium } +.package .provision { font-size: larger; color: red; font-weight: bold } + +END + die "No customer specified (bad URL)!" unless $cgi->keywords; my($query) = $cgi->keywords; # needs parens with my, ->keywords returns array $query =~ /^(\d+)$/; @@ -357,149 +367,81 @@ print qq!
Packages !, qq!( Order and cancel packages (preserves services) )!, ; -#display packages +#begin display packages #get package info -my @packages; -if ( $conf->exists('hidecancelledpackages') ) { - @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->ncancelled_pkgs); -} else { - @packages = sort { $a->pkgnum <=> $b->pkgnum } ($cust_main->all_pkgs); -} - -if ( @packages ) { - #formatting - my $colspan = $packages[0]->dbdef_table->column('last_bill') ? 6 : 5; - - print &table(), "\n", - qq!Package!, - qq!DatesServices\n!, - qq!Setup!; - - print qq!Last bill! - if $packages[0]->dbdef_table->column('last_bill'); - - print qq!Next bill!, - qq!Susp.!, - qq!Expire!, - qq!Cancel!, - qq!\n!; -} - -my $n1 = ''; -foreach my $package (@packages) { - my $pkgnum = $package->pkgnum; - my $pkg = $package->part_pkg->pkg; - my $comment = $package->part_pkg->comment; - my $pkgview = popurl(2). "view/cust_pkg.cgi?$pkgnum"; +my $packages = get_packages($cust_main); - #my @cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } ); - #my $rowspan = scalar(@cust_svc) || 1; - my @cust_svc = (); +if ( @$packages ) { +%> + + + + + + + + + + + + + + +<% +foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) { my $rowspan = 0; - my %pkg_svc = (); - unless ( $package->getfield('cancel') ) { - foreach my $pkg_svc ( - grep { $_->quantity } - qsearch('pkg_svc',{'pkgpart'=> $package->pkgpart }) - ) { - $rowspan += ( $pkg_svc{$pkg_svc->svcpart} = $pkg_svc->quantity ); - } + + if ($pkg->{cancel}) { + $rowspan = 0; } else { - #@cust_svc = qsearch( 'cust_svc', { 'pkgnum' => $pkgnum } ); - @cust_svc = (); - $rowspan = scalar(@cust_svc) || 1; - } - $rowspan ||= 1; - - my $button_cgi = new CGI; - $button_cgi->param('clone', $package->part_pkg->pkgpart); - $button_cgi->param('pkgnum', $package->pkgnum); - my $button_url = popurl(2). "edit/part_pkg.cgi?". $button_cgi->query_string; - - #print $n1, qq!!, - print $n1, qq!!, - qq!'; - - my @fields = qw( setup ); - push @fields, qw( last_bill ) if $package->dbdef_table->column('last_bill'); - push @fields, qw( bill susp expire cancel); - - for ( @fields ) { - print "', - ; +%> + + + + +<% + foreach (qw(setup last_bill next_bill susp expire cancel)) { + print qq! \n!; } - my $n2 = ''; - #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so - #foreach my $cust_svc ( @cust_svc ) { - foreach my $svcpart ( sort { $a<=>$b } keys %pkg_svc ) { - my $svc = qsearchs('part_svc',{'svcpart'=>$svcpart})->getfield('svc'); - $svc =~ s/ / /g; - my(@cust_svc)=qsearch('cust_svc',{'pkgnum'=>$pkgnum, - 'svcpart'=>$svcpart, - }); - for my $enum ( 1 .. $pkg_svc{$svcpart} ) { - my $cust_svc; - if ( $cust_svc = shift @cust_svc ) { - my($label, $value, $svcdb) = $cust_svc->label; - my($svcnum) = $cust_svc->svcnum; - my($sview) = popurl(2). "view"; - print $n2,qq!!, - qq!!; - } else { - print $n2, qq!'; - } - $n2=""; + if ($rowspan == 0) { print qq!\n!; next; } + + my $cnt = 0; + foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) { + foreach my $service (@{$svcpart->{services}}) { + print '' if ($cnt > 0); +%> + + + +<% + $cnt++; + } + if ($svcpart->{count} < $svcpart->{quantity}) { + print qq!\n! if ($cnt > 0); + print qq! \n\n!; } } +} +print '
PackageDatesServices
SetupLast billNext billSusp.ExpireCancel
$pkgnum$pkgnum!, - #qq!$pkg - $comment!, - qq!$pkg - $comment ( Details )!; - # | !; - - #false laziness with view/cust_pkg.cgi, but i'm trying to make that go away so - unless ( $package->getfield('cancel') ) { - - print qq! ( !. - 'Change package )'; - - print ' ( '; - if ( $package->getfield('susp') ) { - print qq!Unsuspend!; - } else { - print qq!Suspend!; + foreach my $svcpart (@{$pkg->{svcparts}}) { + $rowspan += $svcpart->{count}; + $rowspan++ if ($svcpart->{count} < $svcpart->{quantity}); } - print ' | Cancel'; - - print ' ) '; + } - print ' ( Edit dates | '; - - print qq!Customize )!; - - } - print '", ( $package->getfield($_) - ? time2str("%D
%l:%M:%S%P %z", - $package->getfield($_) ) - : ' ' - ), '
CLASS="pkgnum"><%=$pkg->{pkgnum}%>> + <%=$pkg->{pkg}%> - <%=$pkg->{comment}%> ( <%=pkg_details_link($pkg)%> )
+<% unless ($pkg->{cancel}) { %> + ( <%=pkg_change_link($pkg)%> ) + ( <%=($pkg->{susp}) ? pkg_unsuspend_link($pkg) : pkg_suspend_link($pkg)%> | <%=pkg_cancel_link($pkg)%> ) + ( <%=pkg_dates_link($pkg)%> | <%=pkg_customize_link($pkg)%> ) +<% } %> + 		! . pkg_datestr($pkg,$_) . qq!$label$value
( Unprovision )		!. - qq!Provision $svc!; - - print qq!
!. - qq!Link to legacy $svc! - if $conf->exists('legacy_link'); - - print '
<%=svc_link($svcpart,$service)%><%=svc_label_link($svcpart,$service)%>
( <%=svc_unprovision_link($service)%> )
!.svc_provision_link($pkg,$svcpart).qq!
' +} - $n1=""; -} -print ""; - -#formatting -print ""; +#end display packages print <'; sub keyfield_numerically { (split(/\t/,$a))[0] <=> (split(/\t/,$b))[0]; } %> + +<% + + +sub get_packages { + +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{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; + + $svcpart->{services} = []; + + 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]; + + push @{$svcpart->{services}}, $svc; + + $svcpart->{count}++; + + } + + push @{$pkg{svcparts}}, $svcpart; + + } + + push @packages, \%pkg; + +} + +return \@packages; + +} + +sub svc_link { + + my ($svcpart, $svc) = (shift,shift) or return ''; + return qq!$svcpart->{svc}!; + +} + +sub svc_label_link { + + my ($svcpart, $svc) = (shift,shift) or return ''; + return qq!$svc->{label}!; + +} + +sub svc_provision_link { + my ($pkg, $svcpart) = (shift,shift) or return ''; + return qq!! . + qq!Provision $svcpart->{svc} (! . ($svcpart->{quantity} - $svcpart->{count}) . qq!)!; +} + +sub svc_unprovision_link { + my $svc = shift or return ''; + return qq!Unprovision!; +} + +# This should be generalized to use config options to determine order. +sub pkgsort_pkgnum_cancel { + if ($a->{cancel} and $b->{cancel}) { + return ($a->{pkgnum} <=> $b->{pkgnum}); + } elsif ($a->{cancel} or $b->{cancel}) { + return (-1) if ($b->{cancel}); + return (1) if ($a->{cancel}); + return (0); + } else { + return($a->{pkgnum} <=> $b->{pkgnum}); + } +} + +sub pkg_datestr { + my ($pkg,$field) = (shift,shift) or return ''; + return $pkg->{$field} ? time2str('%D
%l:%M:%S%P %z', + $pkg->{$field}) + : ' '; +} + +sub pkg_details_link { + my $pkg = shift or return ''; + return qq!Details!; +} + +sub pkg_change_link { + my $pkg = shift or return ''; + return qq!Change package!; +} + +sub pkg_suspend_link { + my $pkg = shift or return ''; + return qq!Suspend!; +} + +sub pkg_unsuspend_link { + my $pkg = shift or return ''; + return qq!Unsuspend!; +} + +sub pkg_cancel_link { + my $pkg = shift or return ''; + return qq!Cancel!; +} + +sub pkg_dates_link { + my $pkg = shift or return ''; + return qq!Edit dates!; +} + +sub pkg_customize_link { + my $pkg = shift or return ''; + return qq!Customize!; +} + +%> +