X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_broadband.cgi;h=d66cff690766591431ff37729bbf7b3e15c234ec;hb=947c955be56140c4a10b16345c1b15c44b02070a;hp=ee7f8becf011ce61585876cf800b700cb341d442;hpb=c0567c688084e89fcd11bf82348b6c418f1254ac;p=freeside.git
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index ee7f8becf..d66cff690 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -11,11 +11,11 @@ use Tie::IxHash;
my( $svcnum, $pkgnum, $svcpart, $part_svc, $svc_broadband );
if ( $cgi->param('error') ) {
$svc_broadband = new FS::svc_broadband ( {
- map { $_, scalar($cgi->param($_)) } fields('svc_broadband')
+ map { $_, scalar($cgi->param($_)) } fields('svc_broadband'), qw(svcpart)
} );
$svcnum = $svc_broadband->svcnum;
$pkgnum = $cgi->param('pkgnum');
- $svcpart = $cgi->param('svcpart');
+ $svcpart = $svc_broadband->svcpart;
$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
die "No part_svc entry!" unless $part_svc;
} else {
@@ -36,8 +36,6 @@ if ( $cgi->param('error') ) {
} else { #adding
- $svc_broadband = new FS::svc_broadband({});
-
foreach $_ (split(/-/,$query)) { #get & untaint pkgnum & svcpart
$pkgnum=$1 if /^pkgnum(\d+)$/;
$svcpart=$1 if /^svcpart(\d+)$/;
@@ -45,18 +43,11 @@ if ( $cgi->param('error') ) {
$part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
die "No part_svc entry!" unless $part_svc;
- $svc_broadband->setfield('svcpart', $svcpart);
+ $svc_broadband = new FS::svc_broadband({ svcpart => $svcpart });
$svcnum='';
- #set fixed and default fields from part_svc
- foreach my $part_svc_column (
- grep { $_->columnflag } $part_svc->all_part_svc_column
- ) {
- $svc_broadband->setfield( $part_svc_column->columnname,
- $part_svc_column->columnvalue,
- );
- }
+ $svc_broadband->set_default_and_fixed;
}
}
@@ -84,7 +75,7 @@ my ($ip_addr, $speed_up, $speed_down, $blocknum) =
%>
-<%=header("Broadband Service $action", '')%>
+<%=include("/elements/header.html","Broadband Service $action", '')%>
<% if ($cgi->param('error')) { %>
Error: <%=$cgi->param('error')%>
@@ -134,7 +125,9 @@ Service #<%=$svcnum ? $svcnum : "(NEW)"%>