diff options
Diffstat (limited to 'httemplate/view/cust_main.cgi')
| -rwxr-xr-x | httemplate/view/cust_main.cgi | 40 |
1 files changed, 16 insertions, 24 deletions
diff --git a/httemplate/view/cust_main.cgi b/httemplate/view/cust_main.cgi index 8d8af63d6..229362e6c 100755 --- a/httemplate/view/cust_main.cgi +++ b/httemplate/view/cust_main.cgi @@ -20,6 +20,7 @@ print header("Customer View", menubar( <STYLE TYPE="text/css"> .package TH { font-size: medium } .package TR { font-size: smaller } +.package .pkgnum { font-size: medium } .package .provision { font-weight: bold } </STYLE> @@ -381,7 +382,7 @@ if ( @$packages ) { %> <TABLE CLASS="package" BORDER=1 CELLSPACING=0 CELLPADDING=2 BORDERCOLOR="#999999"> <TR> - <TH>Package</TH> + <TH COLSPAN=2>Package</TH> <TH>Status</TH> <TH COLSPAN=2>Services</TH> </TR> @@ -401,9 +402,9 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) { %> <!--pkgnum: <%=$pkg->{pkgnum}%>--> <TR> + <TD ROWSPAN=<%=$rowspan%> CLASS="pkgnum"><%=$pkg->{pkgnum}%></TD> <TD ROWSPAN=<%=$rowspan%>> - <%=$pkg->{pkgnum}%>: - <%=$pkg->{pkg}%> - <%=$pkg->{comment}%><BR> + <%=$pkg->{pkg}%> - <%=$pkg->{comment}%> ( <%=pkg_details_link($pkg)%> )<BR> <% unless ($pkg->{cancel}) { %> ( <%=pkg_change_link($pkg)%> ) ( <%=pkg_dates_link($pkg)%> | <%=pkg_customize_link($pkg,$custnum)%> ) @@ -537,7 +538,7 @@ foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) { } if ($svcpart->{count} < $svcpart->{quantity}) { print qq!<TR>\n! if ($cnt > 0); - print qq! <TD COLSPAN=2>!.svc_provision_link($pkg, $svcpart, $conf).qq!</TD>\n</TR>\n!; + print qq! <TD COLSPAN=2>!.svc_provision_link($pkg,$svcpart).qq!</TD>\n</TR>\n!; } } } @@ -945,21 +946,13 @@ sub svc_label_link { } sub svc_provision_link { - my ($pkg, $svcpart, $conf) = @_; + my ($pkg, $svcpart) = (shift,shift) or return ''; ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/ /g; - my $pkgnum_svcpart = "pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}"; - my $num_left = $svcpart->{quantity} - $svcpart->{count}; - - my $link = qq!<A CLASS="provision" HREF="${p}edit/$svcpart->{svcdb}.cgi?!. - qq!$pkgnum_svcpart">!. - "Provision $svc_nbsp ($num_left)</A>"; - if ( $conf->exists('legacy_link') ) { - $link .= '<BR>'. - qq!<A CLASS="provision" HREF="${p}misc/link.cgi?!. - qq!$pkgnum_svcpart">!. - "Link to legacy $svc_nbsp ($num_left)</A>"; - } - $link; + return qq!<A CLASS="provision" HREF="${p}edit/$svcpart->{svcdb}.cgi?! . + qq!pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}">! . + "Provision $svc_nbsp (". + ($svcpart->{quantity} - $svcpart->{count}). + ')</A>'; } sub svc_unprovision_link { @@ -990,10 +983,10 @@ sub pkg_datestr { $strip; } -#sub pkg_details_link { -# my $pkg = shift or return ''; -# return qq!<a href="${p}view/cust_pkg.cgi?$pkg->{pkgnum}">Details</a>!; -#} +sub pkg_details_link { + my $pkg = shift or return ''; + return qq!<a href="${p}view/cust_pkg.cgi?$pkg->{pkgnum}">Details</a>!; +} sub pkg_change_link { my $pkg = shift or return ''; @@ -1012,8 +1005,7 @@ sub pkg_unsuspend_link { sub pkg_cancel_link { my $pkg = shift or return ''; - qq!<A HREF="javascript:cust_pkg_areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}')">Cancel now</A> | !. - qq!<A HREF="${p}misc/expire_pkg.cgi?$pkg->{pkgnum}">Cancel later</A>!; + return qq!<A HREF="javascript:cust_pkg_areyousure('${p}misc/cancel_pkg.cgi?$pkg->{pkgnum}')">Cancel</A>!; } sub pkg_dates_link { |