diff options
Diffstat (limited to 'httemplate/view')
| -rw-r--r-- | httemplate/view/cust_main/packages/location.html | 18 | ||||
| -rw-r--r-- | httemplate/view/cust_main/packages/package.html | 6 | ||||
| -rwxr-xr-x | httemplate/view/cust_main/packages/section.html | 5 |
3 files changed, 18 insertions, 11 deletions
diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html index db67d45b9..871bfcbe7 100644 --- a/httemplate/view/cust_main/packages/location.html +++ b/httemplate/view/cust_main/packages/location.html @@ -3,7 +3,7 @@ % { % # don't show the location % } else { -% if ( !$conf->exists('cust_pkg-group_by_location') ) { +% if ( !$opt{'cust_pkg-group_by_location'} ) { % if ( $default ) { <DIV STYLE="font-style: italic; font-size: small"> % } @@ -12,6 +12,7 @@ 'double_space' => ' ', 'escape_function' => \&encode_entities, 'countrydefault' => $countrydefault, + 'cust_main' => $opt{'cust_main'}, ) %> @@ -19,11 +20,13 @@ <BR> <FONT SIZE=-1> <% $loc->latitude %>, <% $loc->longitude %> - <& /elements/coord-links.html, - $loc->latitude, - $loc->longitude, - $opt{'cust_main'}->name_short. ': '. $opt{'part_pkg'}->pkg, - $opt{'cust_main'}->agentnum, + <& /elements/coord-links.html, { + 'latitude' => $loc->latitude, + 'longitude' => $loc->longitude, + 'name' => $opt{'cust_main'}->name_short. + ': '. $opt{'part_pkg'}->pkg, + 'company_address' => $opt{'company_address'}, + } &> </FONT> % } @@ -32,7 +35,7 @@ <FONT SIZE=-1> <% $loc->censustract %> (<% $loc->censusyear %> census) </FONT> -% } elsif ( $conf->exists('cust_main-require_censustract') ) { +% } elsif ( $opt{'cust_main-require_censustract'} ) { <BR> <FONT SIZE=-1 COLOR="#ee3300"> <% emt('Census tract unknown') %> @@ -64,7 +67,6 @@ % # preceding package. <%init> -my $conf = new FS::Conf; my %opt = @_; my $cust_pkg = $opt{'cust_pkg'}; diff --git a/httemplate/view/cust_main/packages/package.html b/httemplate/view/cust_main/packages/package.html index 859a7f42f..120944601 100644 --- a/httemplate/view/cust_main/packages/package.html +++ b/httemplate/view/cust_main/packages/package.html @@ -10,7 +10,7 @@ %> <A NAME="cust_pkg<% $cust_pkg->pkgnum %>" ID ="cust_pkg<% $cust_pkg->pkgnum %>" - ><% $curuser->option('show_pkgnum') ? $cust_pkg->pkgnum.': ' : '' %><B><% $part_pkg->pkg |h %></B></A> + ><% $opt{show_pkgnum} ? $cust_pkg->pkgnum.': ' : '' %><B><% $part_pkg->pkg |h %></B></A> % my $custom_comment = $part_pkg->custom_comment(); <% $custom_comment ? ' - ' : '' %> <% $custom_comment |h %> @@ -72,10 +72,10 @@ <% $br ? '<BR>' : '' %> % } -% if ( $cust_pkg->num_cust_event -% && ( $curuser->access_right('Billing event reports') +% if ( ( $curuser->access_right('Billing event reports') % || $curuser->access_right('View customer billing events') % ) +% && $cust_pkg->num_cust_event % ) { ( <%pkg_event_link($cust_pkg)%> ) % } diff --git a/httemplate/view/cust_main/packages/section.html b/httemplate/view/cust_main/packages/section.html index 152ccaa5d..a02bf594f 100755 --- a/httemplate/view/cust_main/packages/section.html +++ b/httemplate/view/cust_main/packages/section.html @@ -79,6 +79,7 @@ my $countrydefault = scalar($conf->config('countrydefault')) || 'US'; my %conf_opt = ( #for package.html 'invoice-unitprice' => $conf->exists('invoice-unitprice'), + 'show_pkgnum' => $curuser->option('show_pkgnum'), #for services.html and status.html 'cust_pkg-display_times' => ($conf->exists('cust_pkg-display_times') @@ -94,6 +95,10 @@ my %conf_opt = ( 'countrydefault' => $countrydefault, 'statedefault' => ( scalar($conf->config('statedefault')) || ($countrydefault eq 'US' ? 'CA' : '') ), + 'cust_pkg-group_by_location'=> $conf->exists('cust_pkg-group_by_location'), + 'cust_main-require_censustract'=> $conf->exists('cust_main-require_censustract'), + 'company_address' => [ $conf->config('company_address', $opt{cust_main}->agentnum ) ], + #for services.html 'svc_external-skip_manual' => $conf->exists('svc_external-skip_manual'), 'legacy_link' => $conf->exists('legacy_link'), |