X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_acct.cgi;h=6f79a01a4157bc7f2e6cd7cf45297ad4f5a3fdde;hb=3d2e1d9b5d1883f768f5a90e0dfaae7cc9a41367;hp=7e94df16dc65d50ebc9e6ace122c3ab5b94dc81b;hpb=9ad4f8407cc106ef5815e65bce2ee873cd0896c2;p=freeside.git
diff --git a/httemplate/view/svc_acct.cgi b/httemplate/view/svc_acct.cgi
index 7e94df16d..6f79a01a4 100755
--- a/httemplate/view/svc_acct.cgi
+++ b/httemplate/view/svc_acct.cgi
@@ -1,359 +1,86 @@
% if ( $custnum ) {
- <% include("/elements/header.html","View $svc account") %>
- <% include( '/elements/small_custview.html', $custnum, '', 1,
- "${p}view/cust_main.cgi") %>
+ <& /elements/header.html, mt("View [_1] account",$svc) &>
+ <& /elements/small_custview.html, $custnum, '', 1,
+ "${p}view/cust_main.cgi" &>
% } else {
+% my $delmsg = emt('Permanently delete this account?');
- <% include("/elements/header.html",'Account View', menubar(
- "Cancel this (unaudited) account" =>
+ <& /elements/header.html, mt('View account'), menubar(
+ emt("Cancel this (unaudited) account") =>
"javascript:areyousure(\'${p}misc/cancel-unaudited.cgi?$svcnum\')",
- )) %>
+ ) &>
+
+% }
+
+<& svc_acct/radius_usage.html,
+ 'svc_acct' => $svc_acct,
+ 'part_svc' => $part_svc,
+ 'cust_pkg' => $cust_pkg,
+ %gopt,
+&>
+
+<& svc_acct/change_svc_form.html,
+ 'part_svc' => \@part_svc,
+ 'svcnum' => $svcnum,
+ 'pkgnum' => $pkgnum,
+ %gopt,
+&>
+
+<% mt('Service #') |h %><% $svcnum %>
+|
+<& /view/elements/svc_edit_link.html, 'svc' => $svc_acct &>
+<& svc_acct/change_svc.html,
+ 'part_svc' => \@part_svc,
+ %gopt,
+&>
+
+<& svc_acct/basics.html,
+ 'svc_acct' => $svc_acct,
+ 'part_svc' => $part_svc,
+ %gopt,
+&>
-% }
-
-% if ( $part_svc->part_export_usage ) {
-%
-% my $last_bill;
-% my %plandata;
-% if ( $cust_pkg ) {
-% #false laziness w/httemplate/edit/part_pkg... this stuff doesn't really
-% #belong in plan data
-% %plandata = map { /^(\w+)=(.*)$/; ( $1 => $2 ); }
-% split("\n", $cust_pkg->part_pkg->plandata );
-%
-% $last_bill = $cust_pkg->last_bill;
-% } else {
-% $last_bill = 0;
-% %plandata = ();
-% }
-%
-% my $seconds = $svc_acct->seconds_since_sqlradacct( $last_bill, time );
-% my $hour = int($seconds/3600);
-% my $min = int( ($seconds%3600) / 60 );
-% my $sec = $seconds%60;
-%
-% my $input = $svc_acct->attribute_since_sqlradacct(
-% $last_bill, time, 'AcctInputOctets'
-% ) / 1048576;
-% my $output = $svc_acct->attribute_since_sqlradacct(
-% $last_bill, time, 'AcctOutputOctets'
-% ) / 1048576;
-%
-%
-
-
- RADIUS session information
- <% ntable('#cccccc',2) %>
-
-% if ( $seconds ) {
-
- Online <% $hour %>h <% $min %>m <% $sec %>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
-% }
-
-
-% } else {
-
- (no billing cycle available for unaudited account)
-% }
-
-
- Upload: <% sprintf("%.3f", $input) %> megabytes
- Download: <% sprintf("%.3f", $output) %> megabytes
- Last Login: <% $svc_acct->last_login_text %>
-% my $href = qq!this billing cycle
- | <% $href %>;begin=<% time-15552000 %>">past six months
- | <% $href %>">all sessions
-
- |
-% }
-
-% my @part_svc = ();
-% if ($FS::CurrentUser::CurrentUser->access_right('Change customer service')) {
-
-
-
-
+
+
+<& svc_acct/cardfortress.html,
+ 'svc_acct' => $svc_acct,
+ %gopt,
+&>
+
+<& svc_acct/hosting.html,
+ %gopt,
+&>
+
+%#remove this? does anybody even use it? it was a misunderstood customer
+%#request IIRC?
+% my $conf = new FS::Conf;
+% if ( $conf->exists('svc_acct-notes') ) {
+% warn 'WARNING: svc_acct-notes deprecated\n';
+<% join("
", $conf->config('svc_acct-notes') ) %>
-
-% if ( @svc_www ) {
- Hosting
- <% &ntable("#cccccc") %><% &ntable("#cccccc",2) %>
-% foreach my $svc_www (@svc_www) {
-% my($label, $value) = $svc_www->cust_svc->label;
-% my $link = $p. 'view/svc_www.cgi?'. $svc_www->svcnum;
- |
-
- <% "$label: $value" %>
- |
-
-% }
-
-
% }
-<% join("
", $conf->config('svc_acct-notes') ) %>
-
+<& elements/svc_export_settings.html, $svc_acct &>
<% joblisting({'svcnum'=>$svcnum}, 1) %>
-<% include('/elements/footer.html') %>
+<& /elements/footer.html &>
<%init>
die "access denied"
unless $FS::CurrentUser::CurrentUser->access_right('View customer services');
-my $conf = new FS::Conf;
-
my $addl_from = ' LEFT JOIN cust_svc USING ( svcnum ) '.
' LEFT JOIN cust_pkg USING ( pkgnum ) '.
' LEFT JOIN cust_main USING ( custnum ) ';
@@ -373,7 +100,7 @@ my $svc_acct = qsearchs({
die "Unknown svcnum" unless $svc_acct;
#false laziness w/all svc_*.cgi
-my $cust_svc = qsearchs( 'cust_svc' , { 'svcnum' => $svcnum } );
+my $cust_svc = $svc_acct->cust_svc;
my $pkgnum = $cust_svc->getfield('pkgnum');
my($cust_pkg, $custnum);
if ($pkgnum) {
@@ -389,25 +116,27 @@ my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } );
die "Unknown svcpart" unless $part_svc;
my $svc = $part_svc->svc;
-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;
+my @part_svc = ();
+if ($FS::CurrentUser::CurrentUser->access_right('Change customer service')) {
+
+ 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 },
+ } );
+ }
-my @svc_www = qsearch({
- 'select' => 'svc_www.*',
- 'table' => 'svc_www',
- 'addl_from' => $addl_from,
- 'hashref' => { 'usersvc' => $svcnum },
- #XXX shit outta luck if you somehow got them linked across agents
- # maybe we should show but not link to them? kinda makes sense...
- # (maybe a specific ACL for this situation???)
- 'extra_sql' => ' AND '. $FS::CurrentUser::CurrentUser->agentnums_sql(
- 'null_right' => 'View/link unlinked services'
- ),
-});
+}
+
+my $communigate = scalar($part_svc->part_export('communigate_pro'));
+ # || scalar($part_svc->part_export('communigate_pro_singledomain'));
+
+my %gopt = ( 'communigate' => $communigate,
+ );
%init>