projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix cust_main package list colors
[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
e16b2c1
..
da4d587
100755
(executable)
--- a/
httemplate/view/cust_main/packages.html
+++ b/
httemplate/view/cust_main/packages.html
@@
-1,3
+1,20
@@
+<STYLE TYPE="text/css">
+td.package {
+ vertical-align: top;
+ border-width: 0;
+ border-style: solid;
+ border-color: #bbbbff;
+}
+table.package {
+ border: none;
+ padding: 0;
+ border-spacing: 0;
+ width: 100%;
+}
+.row0 { background-color: #eeeeee; }
+.row1 { background-color: #ffffff; }
+
+</STYLE>
% my $s = 0;
% if ( $curuser->access_right('Qualify service') ) {
% my $s = 0;
% if ( $curuser->access_right('Qualify service') ) {
@@
-7,7
+24,7
@@
% if ( $curuser->access_right('Order customer package') ) {
<% $s++ ? ' | ' : '' %>
% if ( $curuser->access_right('Order customer package') ) {
<% $s++ ? ' | ' : '' %>
- <&
order_pkg_link.html,
$cust_main &>
+ <&
/elements/order_pkg_link.html, 'cust_main'=>
$cust_main &>
% }
% if ( $curuser->access_right('One-time charge')
% }
% if ( $curuser->access_right('One-time charge')
@@
-116,7
+133,7
@@
my( $packages, $num_old_packages ) = get_packages($cust_main, $conf);
my $show_location = $conf->exists('cust_pkg-always_show_location')
my $show_location = $conf->exists('cust_pkg-always_show_location')
-
|| (grep $_->locationnum, @$packages); # ? '1' : '0'
;
+
|| (grep $_->locationnum ne $cust_main->ship_locationnum, @$packages)
;
my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
#subroutines
my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
#subroutines
@@
-178,6
+195,10
@@
sub get_packages {
}
$num_old_packages -= scalar(@packages);
}
$num_old_packages -= scalar(@packages);
+
+ # don't include supplemental packages in this list; they'll be found from
+ # their main packages
+ @packages = grep !$_->main_pkgnum, @packages;
( \@packages, $num_old_packages );
}
( \@packages, $num_old_packages );
}