X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-cust_svc.html;h=3710b27ffa0765a8a5e832d72e6f1aa8a54c6272;hb=05eb6fd62056682d8760b85ced91dabd33357a3b;hp=ca5de86b4d119b1644823d74d3ef9692e2256161;hpb=f981034339688ff4a3c072732afb17112370bbf1;p=freeside.git
diff --git a/httemplate/elements/tr-cust_svc.html b/httemplate/elements/tr-cust_svc.html
index ca5de86b4..3710b27ff 100644
--- a/httemplate/elements/tr-cust_svc.html
+++ b/httemplate/elements/tr-cust_svc.html
@@ -15,20 +15,35 @@ Usage:
'manage_link' => '', #for svc_broadband
'manage_link_text' => '', #default 'Manage Device'
'manage_link_loc' => '', #default 'bottom', or 'right'
- 'maestro-status_test' => '',
)
%>
%doc>
- <%
-FS::UI::Web::svc_link($m, $part_svc, $cust_svc)
-%> |
- <%
-FS::UI::Web::svc_label_link($m, $part_svc, $cust_svc)
-%> |
+
+% if ( $opt{no_links} ) {
+ <% $part_svc->svc |h %>:
+% } else {
+ <% FS::UI::Web::svc_link($m, $part_svc, $cust_svc) %>
+% }
+ |
+
+% if ( $opt{before_svc_callback} ) {
+ <% &{ $opt{before_svc_callback} }( $cust_svc ) %>
+% }
+ <% $cust_svc->agent_svcid ? $cust_svc->agent_svcid.': ' : '' %>
+% if ( $opt{no_links} ) {
+ <% ($cust_svc->label)[1] |h %>
+% } else {
+ <% FS::UI::Web::svc_label_link($m, $part_svc, $cust_svc) %>
+% }
+
+% if ( $opt{after_svc_callback} ) {
+ <% &{ $opt{after_svc_callback} }( $cust_svc ) %>
+% }
+ |
<% FS::UI::Web::svc_export_links($m, $part_svc, $cust_svc) %>
-% if ( $manage_link and $opt{'manage_link_loc'} eq 'right' ) {
+% if ( $manage_link and $opt{'manage_link_loc'} eq 'right' && ! $opt{no_links} ) {
><% $opt{'manage_link_text'} |h %>
% }
|
@@ -49,6 +64,7 @@ $cust_svc->overlimit )
% if ( $curuser->access_right('Recharge customer service')
% && $part_svc->svcdb eq 'svc_acct'
+% && ! $opt{no_links}
% && ( $svc_x->seconds ne ''
% || $svc_x->upbytes ne ''
% || $svc_x->downbytes ne ''
@@ -60,21 +76,17 @@ $cust_svc->overlimit )
|
% # second column: all other action links
-% if ( $part_svc->svcdb eq 'svc_broadband' ) {
+% if ( $part_svc->svcdb eq 'svc_broadband' && ! $opt{no_links} ) {
( <%
include('/elements/popup_link-ping.html',
'ip' => $svc_x->ip_addr
) %> )
-% if ( $manage_link and $opt{'manage_link_loc'} eq 'bottom' ) {
+% if ( $manage_link and $opt{'manage_link_loc'} eq 'bottom' && ! $opt{no_links} ) {
( ><% $opt{'manage_link_text'} |h %> )
% }
% } #svc_broadband
-% if ( $curuser->access_right('Unprovision customer service') ) {
+% if ( $curuser->access_right('Unprovision customer service') && ! $opt{no_links} ) {
( <% $svc_unprovision_link %> )
-% }
-% if ( $part_svc->svcdb eq 'svc_pbx' && $opt{'maestro-status_test'} ) {
- ( Test maestro status )
-
% }
|
@@ -96,7 +108,8 @@ my $svc_unprovision_link =
my $manage_link = $opt{'manage_link'};
my $manage_target = '';
if ( $part_svc->svcdb eq 'svc_broadband' and $manage_link ) {
- my $ip_addr = $svc_x->ip_addr; #substitution for $manage_link
+ my $ip_addr = $svc_x->ip_addr; #substitution for $manage_link
+ my $mac_addr = $svc_x->mac_addr; # ditto
$manage_link = eval(qq("$manage_link"));
$opt{'manage_link_text'} ||= mt('Manage Device');
$opt{'manage_link_loc'} ||= 'bottom';