X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Ftr-cust_svc.html;h=2d1a9e6a5ddd058dd8468128c7dd21e4c61af59c;hp=cc5ec0f502e3453fe38b9cdf0fd4e65d6d46936f;hb=7b0bbc4117a7959b9f7b7b2cf999b8188ba34160;hpb=4d81e21107622f8731a6301c3c811108840582fd
diff --git a/httemplate/elements/tr-cust_svc.html b/httemplate/elements/tr-cust_svc.html
index cc5ec0f50..2d1a9e6a5 100644
--- a/httemplate/elements/tr-cust_svc.html
+++ b/httemplate/elements/tr-cust_svc.html
@@ -38,13 +38,23 @@ Usage:
<% FS::UI::Web::svc_label_link($m, $part_svc, $cust_svc) %>
% }
+% if ($part_svc->svcdb eq 'svc_circuit') {
+
Provider: <% $svc_x->circuit_provider->provider %>
+
Type: <% $svc_x->circuit_type->typename %>
+% }
% 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' && ! $opt{no_links} ) {
- ><% $opt{'manage_link_text'} |h %>
+% if ( $opt{'manage_link_loc'} eq 'right' && ! $opt{no_links} ) {
+<& /elements/manage_device_link.html,
+ 'svc' => $svc_x,
+ 'part_svc' => $opt{'part_svc'} || $cust_svc->part_svc,
+ 'manage_link' => $opt{'manage_link'},
+ 'manage_link_text' => $opt{'manage_link_text'},
+ 'manage_link-new_window' => $opt{'manage_link-new_window'}
+&>
% }
|
@@ -90,8 +100,16 @@ $cust_svc->overlimit )
include('/elements/popup_link-ping.html',
'ip' => $svc_x->ip_addr
) %> )
-% if ( $manage_link and $opt{'manage_link_loc'} eq 'bottom' && ! $opt{no_links} ) {
- ( ><% $opt{'manage_link_text'} |h %> )
+% if ( $opt{'manage_link_loc'} eq 'bottom' && ! $opt{no_links} ) {
+<& /elements/manage_device_link.html,
+ 'svc' => $svc_x,
+ 'part_svc' => $opt{'part_svc'} || $cust_svc->part_svc,
+ 'manage_link' => $opt{'manage_link'},
+ 'manage_link_text' => $opt{'manage_link_text'},
+ 'manage_link-new_window' => $opt{'manage_link-new_window'},
+ 'prepend' => '( ',
+ 'append' => ' )'
+&>
% }
% } #svc_broadband
% if ( $curuser->access_right('Unprovision customer service') && ! $opt{no_links} ) {
@@ -114,18 +132,6 @@ my $svc_unprovision_link =
$cust_svc->svcnum .
qq!', '!.emt('Permanently unprovision and delete this service?').qq!')">!.emt('Unprovision').'';
-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 $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';
- $manage_target = ' target="_blank"' if $opt{'manage_link-new_window'};
-}
-else {
- $manage_link = '';
-}
+$opt{'manage_link_loc'} ||= 'bottom';
%init>