X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_phone.pm;h=725092edb0ee87955cfa7e7d8473fb00211e1f09;hb=0e17979577dacf0277de470ca7ee724f68a56cd5;hp=bd35cbac4897bdf1c01777164f9ebbd9ad696551;hpb=1af8ff7f48f7259fc99f090c301c84b9680fdb4d;p=freeside.git diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm index bd35cbac4..725092edb 100644 --- a/FS/FS/svc_phone.pm +++ b/FS/FS/svc_phone.pm @@ -16,6 +16,7 @@ use FS::Conf; use FS::Record qw( qsearch qsearchs dbh ); use FS::PagedSearch qw( psearch ); use FS::Msgcat qw(gettext); +use FS::Password_Mixin; # for pw_set use FS::part_svc; use FS::svc_pbx; use FS::svc_domain; @@ -25,15 +26,13 @@ use FS::phone_avail; $me = '[' . __PACKAGE__ . ']'; $DEBUG = 0; -#avoid l 1 and o O 0 -@pw_set = ( 'a'..'k', 'm','n', 'p-z', 'A'..'N', 'P'..'Z' , '2'..'9' ); - #ask FS::UID to run this stuff for us later FS::UID->install_callback( sub { $conf = new FS::Conf; $phone_name_max = $conf->config('svc_phone-phone_name-max_length'); $passwordmin = $conf->config('sip_passwordmin') || 0; $passwordmax = $conf->config('sip_passwordmax') || 80; + @pw_set = FS::Password_Mixin->pw_set; } ); @@ -93,9 +92,14 @@ Voicemail PIN Optional svcnum from svc_pbx +=item forward_svcnum + +Forward destination, if it's another service. Some exports use this +configuration. + =item forwarddst -Forwarding destination +Forwarding destination, if it's not a service. =item email @@ -128,6 +132,19 @@ Account number of other provider. See lnp_other_provider. See lnp_status. If lnp_status is portin-reject or portout-reject, this is an optional reject reason. +=item lnp_portid + +Port identifier from porting provider, for checking status + +=item lnp_signature + +Boolean (empty or `Y') indicating if a signature is required for the port + +=item lnp_bill + +Boolean (empty or `Y') indicating if a copy of an existing bill is required for +the port + =item e911_class Class of Service for E911 service (per the NENA 2.1 standard). @@ -136,6 +153,15 @@ Class of Service for E911 service (per the NENA 2.1 standard). Type of Service for E911 service. +=item circuit_svcnum + +The L record for the physical circuit that transports this +phone line. + +=item sip_server + +The hostname of the SIP server that this phone number is routed to. + =back =head1 METHODS @@ -187,13 +213,15 @@ sub table_info { select_table => 'svc_domain', select_key => 'svcnum', select_label => 'domain', + select_allow_empty => 1, disable_inventory => 1, }, 'circuit_svcnum' => { label => 'Circuit', type => 'select', - select_table => 'svc_domain', + select_table => 'svc_circuit', select_key => 'svcnum', - select_label => 'circuit_label', + select_label => 'label', + select_allow_empty=> 1, disable_inventory => 1, }, @@ -214,6 +242,9 @@ sub table_info { 'forwarddst' => { label => 'Forward Destination', %dis2, }, + 'forward_svcnum' => { label => 'Route to service', + %dis2, + }, 'email' => { label => 'Email', %dis2, }, @@ -253,6 +284,10 @@ sub table_info { disable_inventory => 1, multiple => 1, }, + 'sip_server' => { + label => 'SIP Host', + disable_inventory => 1, + }, }, }; } @@ -261,6 +296,8 @@ sub table { 'svc_phone'; } sub table_dupcheck_fields { ( 'countrycode', 'phonenum' ); } +sub device_table { 'phone_device'; } + =item search_sql STRING Class method which returns an SQL fragment to search for the given string. @@ -311,45 +348,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'} ) { - 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; ''; } @@ -537,7 +549,9 @@ sub check { || $self->ut_alphan('sms_account') || $self->ut_numbern('max_simultaneous') || $self->ut_foreign_keyn('locationnum', 'cust_location', 'locationnum') - || $self->ut_numbern('forwarddst') + || $self->ut_numbern('forward_svcnum') + || $self->ut_foreign_keyn('forward_svcnum', 'cust_svc', 'svcnum') + || $self->ut_textn('forwarddst') || $self->ut_textn('email') || $self->ut_numbern('lrn') || $self->ut_numbern('lnp_desired_due_date') @@ -548,6 +562,10 @@ sub check { 'native', 'portin-reject', 'portout-reject']) || $self->ut_enumn('portable', ['','Y']) || $self->ut_textn('lnp_reject_reason') + || $self->ut_textn('lnp_portid') + || $self->ut_enumn('lnp_signature', ['','Y']) + || $self->ut_enumn('lnp_bill', ['','Y']) + || $self->ut_domainn('sip_server') ; return $error if $error;