projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge NG auth, RT#21563
[freeside.git]
/
httemplate
/
view
/
cust_main
/
packages.html
diff --git
a/httemplate/view/cust_main/packages.html
b/httemplate/view/cust_main/packages.html
index
da4d587
..
546dd89
100755
(executable)
--- a/
httemplate/view/cust_main/packages.html
+++ b/
httemplate/view/cust_main/packages.html
@@
-11,6
+11,15
@@
table.package {
border-spacing: 0;
width: 100%;
}
border-spacing: 0;
width: 100%;
}
+table.usage {
+ border: 1px solid black;
+ margin: auto;
+ width: 60%;
+ border-spacing: 0px;
+}
+.shared > * {
+ background-color: #ffffaa;
+}
.row0 { background-color: #eeeeee; }
.row1 { background-color: #ffffff; }
.row0 { background-color: #eeeeee; }
.row1 { background-color: #ffffff; }
@@
-92,7
+101,7
@@
table.package {
<TR>
<TD COLSPAN=2>
<TR>
<TD COLSPAN=2>
-% if ( $conf->exists('cust_pkg-group_by_location')
and $show_location
) {
+% if ( $conf->exists('cust_pkg-group_by_location') ) {
<& locations.html,
'cust_main' => $cust_main,
'packages' => $packages,
<& locations.html,
'cust_main' => $cust_main,
'packages' => $packages,
@@
-104,7
+113,6
@@
table.package {
<& packages/section.html,
'cust_main' => $cust_main,
'packages' => $packages,
<& packages/section.html,
'cust_main' => $cust_main,
'packages' => $packages,
- 'show_location' => $show_location,
&>
</TABLE>
% }
&>
</TABLE>
% }
@@
-131,10
+139,6
@@
my $curuser = $FS::CurrentUser::CurrentUser;
my( $packages, $num_old_packages ) = get_packages($cust_main, $conf);
my( $packages, $num_old_packages ) = get_packages($cust_main, $conf);
-
-my $show_location = $conf->exists('cust_pkg-always_show_location')
- || (grep $_->locationnum ne $cust_main->ship_locationnum, @$packages);
-
my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
#subroutines
my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
#subroutines