projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix big in RADIUS session viewing when using an ignored-accounting export
[freeside.git]
/
httemplate
/
view
/
svc_forward.cgi
diff --git
a/httemplate/view/svc_forward.cgi
b/httemplate/view/svc_forward.cgi
index
c8d1d62
..
52360bc
100755
(executable)
--- a/
httemplate/view/svc_forward.cgi
+++ b/
httemplate/view/svc_forward.cgi
@@
-25,10
+25,9
@@
my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
print header('Mail Forward View', menubar(
( ( $pkgnum || $custnum )
print header('Mail Forward View', menubar(
( ( $pkgnum || $custnum )
- ? ( "View this package (#$pkgnum)" => "${p}view/cust_pkg.cgi?$pkgnum",
- "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
+ ? ( "View this customer (#$custnum)" => "${p}view/cust_main.cgi?$custnum",
)
)
- : ( "Cancel this (unaudited)
account
" =>
+ : ( "Cancel this (unaudited)
mail forward
" =>
"${p}misc/cancel-unaudited.cgi?$svcnum" )
),
"Main menu" => $p,
"${p}misc/cancel-unaudited.cgi?$svcnum" )
),
"Main menu" => $p,
@@
-39,16
+38,25
@@
my($srcsvc,$dstsvc,$dst) = (
$svc_forward->dstsvc,
$svc_forward->dst,
);
$svc_forward->dstsvc,
$svc_forward->dst,
);
+my $src = $svc_forward->dbdef_table->column('src') ? $svc_forward->src : '';
+
my $svc = $part_svc->svc;
my $svc = $part_svc->svc;
-my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
- or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc";
-my $source = $svc_acct->email;
+
+my $source;
+if ($srcsvc) {
+ my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$srcsvc})
+ or die "Corrupted database: no svc_acct.svcnum matching srcsvc $srcsvc";
+ $source = $svc_acct->email;
+} else {
+ $source = $src;
+}
+
my $destination;
if ($dstsvc) {
my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc})
or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc";
$destination = $svc_acct->email;
my $destination;
if ($dstsvc) {
my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$dstsvc})
or die "Corrupted database: no svc_acct.svcnum matching dstsvc $dstsvc";
$destination = $svc_acct->email;
-}
else
{
+}
else
{
$destination = $dst;
}
$destination = $dst;
}
@@
-61,7
+69,14
@@
print qq!<A HREF="${p}edit/svc_forward.cgi?$svcnum">Edit this information</A>!.
qq!<TR><TD ALIGN="right">Email to</TD>!.
qq!<TD BGCOLOR="#ffffff">$source</TD></TR>!.
qq!<TR><TD ALIGN="right">Forwards to </TD>!.
qq!<TR><TD ALIGN="right">Email to</TD>!.
qq!<TD BGCOLOR="#ffffff">$source</TD></TR>!.
qq!<TR><TD ALIGN="right">Forwards to </TD>!.
- qq!<TD BGCOLOR="#ffffff">$destination</TD></TR></TABLE>!.
+ qq!<TD BGCOLOR="#ffffff">$destination</TD></TR>!;
+
+foreach (sort { $a cmp $b } $svc_forward->virtual_fields) {
+ print $svc_forward->pvf($_)->widget('HTML', 'view', $svc_forward->getfield($_)),
+ "\n";
+}
+
+print qq! </TABLE>!.
'<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
'</BODY></HTML>'
;
'<BR>'. joblisting({'svcnum'=>$svcnum}, 1).
'</BODY></HTML>'
;