Virtual field merge

[freeside.git] / httemplate / edit / process / svc_broadband.cgi

diff --git a/httemplate/edit/process/svc_broadband.cgi b/httemplate/edit/process/svc_broadband.cgi
index fd7ba20..4912a3a 100644 (file)
--- a/httemplate/edit/process/svc_broadband.cgi
+++ b/httemplate/edit/process/svc_broadband.cgi
@@ -1,5 +1,11 @@
 <%
 
+# If it's stupid but it works, it's not stupid.
+# -- U.S. Army
+
+local $FS::UID::AutoCommit = 0;
+my $dbh = FS::UID::dbh;
+
 $cgi->param('svcnum') =~ /^(\d*)$/ or die "Illegal svcnum!";
 my $svcnum = $1;
 
@@ -17,14 +23,6 @@ my $new = new FS::svc_broadband ( {
   } ( fields('svc_broadband'), qw( pkgnum svcpart ) )
 } );
 
-unless ( $new->ip_addr ) {
-  $new->ip_addr(join('.', (map $cgi->param('ip_addr_'.$_), (a..d))));
-}
-
-unless ( $new->mac_addr) {
-  $new->mac_addr(join(':', (map $cgi->param('mac_addr_'.$_), (a..f))));
-}
-
 my $error;
 if ( $svcnum ) {
   $error = $new->replace($old);
@@ -33,12 +31,14 @@ if ( $svcnum ) {
   $svcnum = $new->svcnum;
 }
 
+
 if ( $error ) {
   $cgi->param('error', $error);
   $cgi->param('ip_addr', $new->ip_addr);
-  $cgi->param('mac_addr', $new->mac_addr);
+  $dbh->rollback;
   print $cgi->redirect(popurl(2). "svc_broadband.cgi?". $cgi->query_string );
 } else {
+  $dbh->commit or die $dbh->errstr;
   print $cgi->redirect(popurl(3). "view/svc_broadband.cgi?" . $svcnum );
 }