X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=f4f39084c634f330a70034bd42ff170b1f045b89;hb=a2bddcaabfdaf11d4b726b21af7f6ffc13c458d3;hp=58591fcb568cec9578f5025865562a07a4c1966d;hpb=99d11ad690b5a0e35e9c5388fc1ae5935df3f12b;p=freeside.git

diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 58591fcb5..f4f39084c 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,4 +1,3 @@
-<!-- mason kludge -->
 <%
 
 my $conf = new FS::Conf;
@@ -24,42 +23,46 @@ if ($pkgnum) {
 
 my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
 die "Unknown svcpart" unless $part_svc;
+my $svc = $part_svc->svc;
 
-my $domain;
-if ( $svc_acct->domsvc ) {
-  my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
-  die "Unknown domain" unless $svc_domain;
-  $domain = $svc_domain->domain;
-} else {
-  die "No svc_domain.svcnum record for svc_acct.domsvc: ". $cust_svc->domsvc;
-}
+die 'Empty domsvc for svc_acct.svcnum '. $svc_acct->svcnum
+  unless $svc_acct->domsvc;
+my $svc_domain = qsearchs('svc_domain', { 'svcnum' => $svc_acct->domsvc } );
+die 'Unknown domain (domsvc '. $svc_acct->domsvc.
+    ' for svc_acct.svcnum '. $svc_acct->svcnum. ')'
+  unless $svc_domain;
+my $domain = $svc_domain->domain;
 
 %>
 
-<SCRIPT>
-function areyousure(href) {
-    if (confirm("Permanently delete this account?") == true)
-        window.location.href = href;
-}
-</SCRIPT>
+<% if ( $custnum ) { %>
 
-<%= header('Account View', menubar(
-  ( ( $pkgnum || $custnum )
-    ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
-        "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
-      )
-    : ( "Cancel this (unaudited) account" =>
-          "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')" )
-  ),
-  "Main menu" => $p,
-)) %>
+  <%= include("/elements/header.html","View $svc account", menubar(
+    "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+    "Main menu" => $p,
+  )) %>
 
-<%
+  <%= include( '/elements/small_custview.html', $custnum, '', 1 ) %>
+  <BR>
 
-#if ( $cust_pkg && $cust_pkg->part_pkg->plan eq 'sqlradacct_hour' ) {
-if (    $part_svc->part_export('sqlradius')
-     || $part_svc->part_export('sqlradius_withdomain')
-) {
+<% } else { %>
+
+  <SCRIPT>
+  function areyousure(href) {
+      if (confirm("Permanently delete this account?") == true)
+          window.location.href = href;
+  }
+  </SCRIPT>
+  
+  <%= include("/elements/header.html",'Account View', menubar(
+    "Cancel this (unaudited) account" =>
+            "javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')",
+    "Main menu" => $p,
+  )) %>
+
+<% } %>
+
+<% if ( $part_svc->part_export_usage ) {
 
   my $last_bill;
   my %plandata;
@@ -87,131 +90,243 @@ if (    $part_svc->part_export('sqlradius')
     $last_bill, time, 'AcctOutputOctets'
   ) / 1048576;
 
-  if ( $seconds ) {
-    print "Online <B>$hour</B>h <B>$min</B>m <B>$sec</B>s";
-  } else {
-    print 'Has not logged on';
-  }
+%>
 
-  if ( $cust_pkg ) {
-    print ' since last bill ('. time2str("%C", $last_bill). ') - '. 
-          $plandata{recur_included_hours}. ' total hours in plan<BR>';
+  RADIUS session information<BR>
+  <%= ntable('#cccccc',2) %>
+  <TR><TD BGCOLOR="#ffffff">
+
+  <% if ( $seconds ) { %>
+    Online <B><%= $hour %></B>h <B><%= $min %></B>m <B><%= $sec %></B>s
+  <% } else { %>
+    Has not logged on
+  <% } %>
+
+  <% if ( $cust_pkg ) { %>
+    since last bill (<%= time2str('%a %b %o %Y', $last_bill) %>)
+    <% if ( length($plandata{recur_included_hours}) ) { %>
+    - <%= $plandata{recur_included_hours} %> total hours in plan
+    <% } %>
+    <BR>
+  <% } else { %>
+    (no billing cycle available for unaudited account)<BR>
+  <% } %>
+
+  Upload: <B><%= sprintf("%.3f", $input) %></B> megabytes<BR>
+  Download: <B><%= sprintf("%.3f", $output) %></B> megabytes<BR>
+
+  <% my $href = qq!<A HREF="${p}search/sqlradius.cgi?svcnum=$svcnum!; %>
+  View session detail:
+      <%= $href %>;begin=<%= $last_bill %>">this billing cycle</A>
+    | <%= $href %>;begin=<%= time-15552000 %>">past six months</A>
+    | <%= $href %>">all sessions</A>
+
+  </TD></TR></TABLE><BR>
+
+<% } %>
+
+<SCRIPT TYPE="text/javascript">
+function enable_change () {
+  if ( document.OneTrueForm.svcpart.selectedIndex > 1 ) {
+    document.OneTrueForm.submit.disabled = false;
   } else {
-    print ' (no billing cycle available for unaudited account)<BR>';
+    document.OneTrueForm.submit.disabled = true;
   }
-
-  print 'Input: <B>'. sprintf("%.3f", $input). '</B> megabytes<BR>';
-  print 'Output: <B>'. sprintf("%.3f", $output). '</B> megabytes<BR>';
-
-  print '<BR>';
-
-}
-
-#print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!;
-
-print qq!<A HREF="${p}edit/svc_acct.cgi?$svcnum">Edit this information</A><BR>!.
-      &ntable("#cccccc"). '<TR><TD>'. &ntable("#cccccc",2).
-      "<TR><TD ALIGN=\"right\">Service number</TD>".
-        "<TD BGCOLOR=\"#ffffff\">$svcnum</TD></TR>".
-      "<TR><TD ALIGN=\"right\">Service</TD>".
-        "<TD BGCOLOR=\"#ffffff\">". $part_svc->svc. "</TD></TR>".
-      "<TR><TD ALIGN=\"right\">Username</TD>".
-        "<TD BGCOLOR=\"#ffffff\">". $svc_acct->username. "</TD></TR>"
-;
-
-print "<TR><TD ALIGN=\"right\">Domain</TD>".
-        "<TD BGCOLOR=\"#ffffff\">". $domain, "</TD></TR>";
-
-print "<TR><TD ALIGN=\"right\">Password</TD><TD BGCOLOR=\"#ffffff\">";
-my $password = $svc_acct->_password;
-if ( $password =~ /^\*\w+\* (.*)$/ ) {
-  $password = $1;
-  print "<I>(login disabled)</I> ";
-}
-if ( $conf->exists('showpasswords') ) {
-  print '<PRE>'. encode_entities($password). '</PRE>';
-} else {
-  print "<I>(hidden)</I>";
-}
-print "</TR></TD>";
-$password = '';
-
-if ( $conf->exists('security_phrase') ) {
-  my $sec_phrase = $svc_acct->sec_phrase;
-  print '<TR><TD ALIGN="right">Security phrase</TD><TD BGCOLOR="#ffffff">'.
-        $svc_acct->sec_phrase. '</TD></TR>';
 }
-
-my $svc_acct_pop = $svc_acct->popnum
-                     ? qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum})
-                     : '';
-print "<TR><TD ALIGN=\"right\">Access number</TD>".
-      "<TD BGCOLOR=\"#ffffff\">". $svc_acct_pop->text. '</TD></TR>'
-  if $svc_acct_pop;
-
-if ($svc_acct->uid ne '') {
-  print "<TR><TD ALIGN=\"right\">Uid</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->uid. "</TD></TR>",
-        "<TR><TD ALIGN=\"right\">Gid</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->gid. "</TD></TR>",
-        "<TR><TD ALIGN=\"right\">GECOS</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->finger. "</TD></TR>",
-        "<TR><TD ALIGN=\"right\">Home directory</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->dir. "</TD></TR>",
-        "<TR><TD ALIGN=\"right\">Shell</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->shell. "</TD></TR>",
-        "<TR><TD ALIGN=\"right\">Quota</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->quota. "</TD></TR>"
-  ;
-} else {
-  print "<TR><TH COLSPAN=2>(No shell account)</TH></TR>";
-}
-
-if ($svc_acct->slipip) {
-  print "<TR><TD ALIGN=\"right\">IP address</TD><TD BGCOLOR=\"#ffffff\">".
-        ( ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' )
-          ? "<I>(Dynamic)</I>"
-          : $svc_acct->slipip
-        ). "</TD>";
-  my($attribute);
-  foreach $attribute ( grep /^radius_/, $svc_acct->fields ) {
-    #warn $attribute;
-    $attribute =~ /^radius_(.*)$/;
-    my $pattribute = $FS::raddb::attrib{$1};
-    print "<TR><TD ALIGN=\"right\">Radius (reply) $pattribute</TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->getfield($attribute).
-          "</TD></TR>";
-  }
-  foreach $attribute ( grep /^rc_/, $svc_acct->fields ) {
-    #warn $attribute;
-    $attribute =~ /^rc_(.*)$/;
-    my $pattribute = $FS::raddb::attrib{$1};
-    print "<TR><TD ALIGN=\"right\">Radius (check) $pattribute: </TD>".
-          "<TD BGCOLOR=\"#ffffff\">". $svc_acct->getfield($attribute).
-          "</TD></TR>";
+</SCRIPT>
+<FORM NAME="OneTrueForm" ACTION="<%=$p%>edit/process/cust_svc.cgi">
+<INPUT TYPE="hidden" NAME="svcnum" VALUE="<%= $svcnum %>">
+<INPUT TYPE="hidden" NAME="pkgnum" VALUE="<%= $pkgnum %>">
+
+<% #print qq!<BR><A HREF="../misc/sendconfig.cgi?$svcnum">Send account information</A>!; %>
+
+<% 
+  my @part_svc = ();
+  if ( $pkgnum ) { 
+    @part_svc = grep {    $_->svcdb   eq 'svc_acct'
+                       && $_->svcpart != $part_svc->svcpart }
+                $cust_pkg->available_part_svc;
+  } else {
+    @part_svc = qsearch('part_svc', {
+      svcdb    => 'svc_acct',
+      disabled => '',
+      svcpart  => { op=>'!=', value=>$part_svc->svcpart },
+    } );
   }
-} else {
-  print "<TR><TH COLSPAN=2>(No SLIP/PPP account)</TH></TR>";
-}
+%>
 
-print '<TR><TD ALIGN="right">RADIUS groups</TD><TD BGCOLOR="#ffffff">'.
-      join('<BR>', $svc_acct->radius_groups). '</TD></TR>';
+Service #<B><%= $svcnum %></B>
+| <A HREF="<%=$p%>edit/svc_acct.cgi?<%=$svcnum%>">Edit this service</A>
+
+<% if ( @part_svc ) { %>
+| <SELECT NAME="svcpart" onChange="enable_change()">
+    <OPTION VALUE="">Change service</OPTION>
+    <OPTION VALUE="">--------------</OPTION>
+    <% foreach my $opt_part_svc ( @part_svc ) { %>
+      <OPTION VALUE="<%= $opt_part_svc->svcpart %>"><%= $opt_part_svc->svc %></OPTION>
+    <% } %>
+  </SELECT>
+  <INPUT NAME="submit" TYPE="submit" VALUE="Change" disabled>
+<% } %>
+
+<%= &ntable("#cccccc") %><TR><TD><%= &ntable("#cccccc",2) %>
+
+<TR>
+  <TD ALIGN="right">Service</TD>
+  <TD BGCOLOR="#ffffff"><%= $part_svc->svc %></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Username</TD>
+  <TD BGCOLOR="#ffffff"><%= $svc_acct->username %></TD>
+</TR>
+<TR>
+  <TD ALIGN="right">Domain</TD>
+  <TD BGCOLOR="#ffffff"><%= $domain %></TD>
+</TR>
+
+<TR>
+  <TD ALIGN="right">Password</TD>
+  <TD BGCOLOR="#ffffff">
+
+    <% my $password = $svc_acct->_password; %>
+    <% if ( $password =~ /^\*\w+\* (.*)$/ ) {
+         $password = $1;
+    %>
+      <I>(login disabled)</I>
+    <% } %>
+
+    <% if ( $conf->exists('showpasswords') ) { %>
+      <PRE><%= encode_entities($password) %></PRE>
+    <% } else { %>
+      <I>(hidden)</I>
+    <% } %>
+
+  </TD>
+</TR>
+<% $password = ''; %>
+
+<% if ( $conf->exists('security_phrase') ) {
+     my $sec_phrase = $svc_acct->sec_phrase;
+%>
+  <TR>
+    <TD ALIGN="right">Security phrase</TD>
+    <TD BGCOLOR="#ffffff"><%= $svc_acct->sec_phrase %></TD>
+  </TR>
+<% } %>
+
+<% if ( $svc_acct->popnum ) {
+    my $svc_acct_pop = qsearchs('svc_acct_pop',{'popnum'=>$svc_acct->popnum});
+%>
+  <TR>
+    <TD ALIGN="right">Access number</TD>
+    <TD BGCOLOR="#ffffff"><%= $svc_acct_pop->text %></TD>
+  </TR>
+<% } %>
+
+<% if ($svc_acct->uid ne '') { %>
+  <TR>
+    <TD ALIGN="right">UID</TD>
+    <TD BGCOLOR="#ffffff"><%= $svc_acct->uid %></TD>
+  </TR>
+<% } %>
+
+<% if ($svc_acct->gid ne '') { %>
+  <TR>
+    <TD ALIGN="right">GID</TD>
+    <TD BGCOLOR="#ffffff"><%= $svc_acct->gid %></TD>
+  </TR>
+<% } %>
+
+<% if ($svc_acct->finger ne '') { %>
+  <TR>
+    <TD ALIGN="right">GECOS</TD>
+    <TD BGCOLOR="#ffffff"><%= $svc_acct->finger %></TD>
+  </TR>
+<% } %>
+
+<% if ($svc_acct->dir ne '') { %>
+  <TR>
+    <TD ALIGN="right">Home directory</TD>
+    <TD BGCOLOR="#ffffff"><%= $svc_acct->dir %></TD>
+  </TR>
+<% } %>
+
+<% if ($svc_acct->shell ne '') { %>
+  <TR>
+    <TD ALIGN="right">Shell</TD>
+    <TD BGCOLOR="#ffffff"><%= $svc_acct->shell %></TD>
+  </TR>
+<% } %>
+
+<% if ($svc_acct->quota ne '') { %>
+  <TR>
+    <TD ALIGN="right">Quota</TD>
+    <TD BGCOLOR="#ffffff"><%= $svc_acct->quota %></TD>
+  </TR>
+<% } %>
+
+<% if ($svc_acct->slipip) { %>
+  <TR>
+    <TD ALIGN="right">IP address</TD>
+    <TD BGCOLOR="#ffffff">
+      <%= ( $svc_acct->slipip eq "0.0.0.0" || $svc_acct->slipip eq '0e0' )
+            ? "<I>(Dynamic)</I>"
+            : $svc_acct->slipip
+      %>
+    </TD>
+  </TR>
+<% } %>
+
+<% foreach my $attribute ( grep /^radius_/, $svc_acct->fields ) {
+  $attribute =~ /^radius_(.*)$/;
+  my $pattribute = $FS::raddb::attrib{$1};
+%>
+  <TR>
+    <TD ALIGN="right">Radius (reply) <%= $pattribute %></TD>
+    <TD BGCOLOR="#ffffff"><%= $svc_acct->getfield($attribute) %></TD>
+  </TR>
+<% } %>
+
+<% foreach my $attribute ( grep /^rc_/, $svc_acct->fields ) {
+  $attribute =~ /^rc_(.*)$/;
+  my $pattribute = $FS::raddb::attrib{$1};
+%>
+  <TR>
+    <TD ALIGN="right">Radius (check) <%= $pattribute %></TD>
+    <TD BGCOLOR="#ffffff"><%= $svc_acct->getfield($attribute) %></TD>
+  </TR>
+<% } %>
+
+<TR>
+  <TD ALIGN="right">RADIUS groups</TD>
+  <TD BGCOLOR="#ffffff"><%= join('<BR>', $svc_acct->radius_groups) %></TD>
+</TR>
+
+<% if ( $svc_acct->seconds =~ /^\d+$/ ) { %>
+  <TR>
+    <TD ALIGN="right">Prepaid time</TD>
+    <TD BGCOLOR="#ffffff"><%= duration_exact($svc_acct->seconds) %></TD>
+  </TR>
+<% } %>
 
+<%
 # Can this be abstracted further?  Maybe a library function like
 # widget('HTML', 'view', $svc_acct) ?  It would definitely make UI 
 # style management easier.
-
-foreach (sort { $a cmp $b } $svc_acct->virtual_fields) {
-  print $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)),
-      "\n";
-}
 %>
+
+<% foreach (sort { $a cmp $b } $svc_acct->virtual_fields) { %>
+  <%= $svc_acct->pvf($_)->widget('HTML', 'view', $svc_acct->getfield($_)) %>
+<% } %>
+
 </TABLE></TD></TR></TABLE>
-<%
+</FORM>
+<BR><BR>
 
-print '<BR><BR>';
+<%= join("<BR>", $conf->config('svc_acct-notes') ) %>
+<BR><BR>
 
-print join("\n", $conf->config('svc_acct-notes') ). '<BR><BR>'.
-      joblisting({'svcnum'=>$svcnum}, 1). '</BODY></HTML>';
+<%= joblisting({'svcnum'=>$svcnum}, 1) %>
 
-%>
+</BODY>
+</HTML>