diff options
author | Ivan Kohler <ivan@freeside.biz> | 2015-05-08 13:00:07 -0700 |
---|---|---|
committer | Ivan Kohler <ivan@freeside.biz> | 2015-05-08 13:00:07 -0700 |
commit | 5cfa294b20d7b7d96e9b8665ab51c3a897dab424 (patch) | |
tree | 17777d3b2f5fca918dafa884c6dd422abb51fd4d /FS/FS/svc_phone.pm | |
parent | 00a60cd6783c5bf541a49ed41e945151773f130f (diff) |
fix svc_phone provisioning with new location, RT#34069
Diffstat (limited to 'FS/FS/svc_phone.pm')
-rw-r--r-- | FS/FS/svc_phone.pm | 42 |
1 files changed, 8 insertions, 34 deletions
diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm index 525025f..326c0be 100644 --- a/FS/FS/svc_phone.pm +++ b/FS/FS/svc_phone.pm @@ -325,46 +325,20 @@ error, otherwise returns false. =cut -sub insert { - my $self = shift; - my %options = @_; +sub preinsert_hook_first { + my( $self, %options ) = @_; - if ( $DEBUG ) { - warn "[$me] insert called on $self: ". Dumper($self). - "\nwith options: ". Dumper(%options); - } - - local $SIG{HUP} = 'IGNORE'; - local $SIG{INT} = 'IGNORE'; - local $SIG{QUIT} = 'IGNORE'; - local $SIG{TERM} = 'IGNORE'; - local $SIG{TSTP} = 'IGNORE'; - local $SIG{PIPE} = 'IGNORE'; - - my $oldAutoCommit = $FS::UID::AutoCommit; - local $FS::UID::AutoCommit = 0; - my $dbh = dbh; + return '' unless $options{'cust_location'}; #false laziness w/cust_pkg.pm... move this to location_Mixin? that would #make it more of a base class than a mixin... :) - if ( $options{'cust_location'} ) { - $options{'cust_location'}->custnum( $self->cust_svc->cust_pkg->custnum ); - my $error = $options{'cust_location'}->find_or_insert; - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return "inserting cust_location (transaction rolled back): $error"; - } - $self->locationnum( $options{'cust_location'}->locationnum ); - } + $options{'cust_location'}->custnum( $self->cust_svc->cust_pkg->custnum ); + my $error = $options{'cust_location'}->find_or_insert; + return "inserting cust_location (transaction rolled back): $error" + if $error; + $self->locationnum( $options{'cust_location'}->locationnum ); #what about on-the-fly edits? if the ui supports it? - my $error = $self->SUPER::insert(%options); - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return $error; - } - - $dbh->commit or die $dbh->errstr if $oldAutoCommit; ''; } |