X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fsvc_forward.cgi;h=52360bcc201fbbb13da5b6ff1865df12507c1dc2;hp=a5096e92cf86f75aede8eed777c9f7fd52713526;hb=e3f327b2af9e6a591bae41d315fda731ec7f5128;hpb=22a35047ecdffff80110e06cc08fc84f9ddba9b0
diff --git a/httemplate/view/svc_forward.cgi b/httemplate/view/svc_forward.cgi
index a5096e92c..52360bcc2 100755
--- a/httemplate/view/svc_forward.cgi
+++ b/httemplate/view/svc_forward.cgi
@@ -1,3 +1,4 @@
+
<%
my $conf = new FS::Conf;
@@ -24,10 +25,9 @@ my $part_svc = qsearchs('part_svc',{'svcpart'=> $cust_svc->svcpart } )
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,
@@ -38,23 +38,46 @@ my($srcsvc,$dstsvc,$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_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;
-}else{
+} else {
$destination = $dst;
}
-print qq!Edit this information!,
- "
Service #$svcnum",
- "
Service: $svc",
- qq!
Mail to $source forwards to $destination mailbox.!,
+print qq!Edit this information!.
+ ntable("#cccccc",2).
+ '