summaryrefslogtreecommitdiff
path: root/httemplate/view
diff options
context:
space:
mode:
authorivan <ivan>2009-01-10 00:43:06 +0000
committerivan <ivan>2009-01-10 00:43:06 +0000
commita661ced3f9f678a645780eaa0b183d2de5f100fa (patch)
treeba08ec5dd9af23f31a2366aafd0bcca599fae8f2 /httemplate/view
parent20bddf47a41b6d064b3cfa4c41e55c157cf0c3de (diff)
more work on package service addresses: hide locations when they're all the default, config to show them anyway / finish implementing package ordering, fix all the state/county weirdness when changing the location dropdown. RT#4499
Diffstat (limited to 'httemplate/view')
-rwxr-xr-xhttemplate/view/cust_main/packages.html9
1 files changed, 8 insertions, 1 deletions
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 9a4997be5..afd9941f6 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -97,7 +97,7 @@ function taxoverridequickchargemagic() {
<BR><BR>
-% if ( @$packages ) {
+% if ( @$packages ) {
Current packages
% }
@@ -131,7 +131,9 @@ Current packages
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc">Package</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Status</TH>
+% if ( $show_location ) {
<TH CLASS="grid" BGCOLOR="#cccccc">Location</TH>
+% }
<TH CLASS="grid" BGCOLOR="#cccccc">Services</TH>
</TR>
@@ -153,7 +155,9 @@ Current packages
<TR>
<% include('packages/package.html', %iopt) %>
<% include('packages/status.html', %iopt) %>
+% if ( $show_location ) {
<% include('packages/location.html', %iopt) %>
+% }
<% include('packages/services.html', %iopt) %>
</TR>
@@ -183,6 +187,9 @@ my $curuser = $FS::CurrentUser::CurrentUser;
my $packages = get_packages($cust_main, $conf);
+my $show_location = $conf->exists('cust_pkg-always_show_location')
+ || ( grep $_->locationnum, @$packages ); # ? '1' : '0';
+
#subroutines
sub get_packages {