enable CardFortress in test database, #71513

[freeside.git] / httemplate / view / svc_acct.cgi

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index e966715..7474779 100755 (executable)
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,34 +1,36 @@
 % if ( $custnum ) { 
 
-  <& /elements/header.html, mt("View $svc account") &>
+  <& /elements/header.html, mt("View [_1] account",$svc) &>
   <& /elements/small_custview.html, $custnum, '', 1,
      "${p}view/cust_main.cgi" &> 
   <BR>
 
 % } else { 
-% my $delmsg = mt('Permanently delete this account?');
+% my $delmsg = emt('Permanently delete this account?');
 
   <SCRIPT>
   function areyousure(href) {
-      if (confirm("<% $delmsg %>") == true)
+      if (confirm(<% $delmsg |js_string %>) == true)
           window.location.href = href;
   }
   </SCRIPT>
   
   <& /elements/header.html, mt('View account'), menubar(
-    mt("Cancel this (unaudited) account") =>
+    emt("Cancel this (unaudited) account") =>
             "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')",
   ) &>
 
 % } 
 
-<& svc_acct/radius_usage.html,
-              'svc_acct' => $svc_acct,
+
+<& elements/svc_radius_usage.html,
+              'svc'      => $svc_acct,
               'part_svc' => $part_svc,
               'cust_pkg' => $cust_pkg,
               %gopt,
 &>
 
+
 <& svc_acct/change_svc_form.html,
               'part_svc' => \@part_svc,
               'svcnum'   => $svcnum,
@@ -36,17 +38,20 @@
               %gopt,
 &>
 
-<% mt('Service') |h %> #<B><% $svcnum %></B>
-|
+<% mt('Service #') |h %><B><% $svcnum %></B>
 <& /view/elements/svc_edit_link.html, 'svc' => $svc_acct &>
 <& svc_acct/change_svc.html,
               'part_svc' => \@part_svc,
               %gopt,
 &>
 
+</FORM>
+
+
 <& svc_acct/basics.html,
               'svc_acct' => $svc_acct,
               'part_svc' => $part_svc,
+              'cust_svc' => $cust_svc,
               %gopt,
 &>
 
@@ -71,8 +76,13 @@
 <BR><BR>
 % }
 
+<& elements/svc_export_status.html, $svc_acct &>
+
 <& elements/svc_export_settings.html, $svc_acct &>
 
+<& /elements/table-tickets.html, object => $cust_svc &>
+
+<BR>
 <% joblisting({'svcnum'=>$svcnum}, 1) %>
 
 <& /elements/footer.html &>
@@ -84,8 +94,12 @@ die "access denied"
 my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
                 ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
                 ' LEFT JOIN cust_main USING ( custnum ) ';
-
-my($query) = $cgi->keywords;
+my $query;
+if ( $cgi->keywords ) {
+  ($query) = $cgi->keywords;
+} else {
+  $query = $cgi->param('svcnum');
+}
 $query =~ /^(\d+)$/;
 my $svcnum = $1;
 my $svc_acct = qsearchs({