diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-01-11 21:57:44 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-01-11 21:57:44 -0800 |
| commit | 85a657f7c32fc5548ca17f7f5024955c87c07f43 (patch) | |
| tree | 753becb70b6879a227f076e74aa9e7758ed112bd /FS | |
| parent | fa270adc74187564109bcdac9cc5fc4acfb4bf47 (diff) | |
svc_phone.sim_imsi was not for 2.3 branch, reverting, RT#20768
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/Schema.pm | 1 | ||||
| -rw-r--r-- | FS/FS/svc_phone.pm | 15 |
2 files changed, 2 insertions, 14 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index c434e8a2f..03a6c2748 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -3271,7 +3271,6 @@ sub tables_hashref { 'svcnum', 'int', '', '', '', '', 'countrycode', 'varchar', '', 3, '', '', 'phonenum', 'varchar', '', 15, '', '', #12 ? - 'sim_imsi', 'varchar', 'NULL', 15, '', '', 'pin', 'varchar', 'NULL', $char_d, '', '', 'sip_password', 'varchar', 'NULL', $char_d, '', '', 'phone_name', 'varchar', 'NULL', $char_d, '', '', diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm index bb5757332..118748ea2 100644 --- a/FS/FS/svc_phone.pm +++ b/FS/FS/svc_phone.pm @@ -22,11 +22,10 @@ $DEBUG = 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 { +$FS::UID::callback{'FS::svc_acct'} = sub { $conf = new FS::Conf; $phone_name_max = $conf->config('svc_phone-phone_name-max_length'); -} -); +}; =head1 NAME @@ -68,10 +67,6 @@ primary key =item phonenum -=item sim_imsi - -SIM IMSI (http://en.wikipedia.org/wiki/International_mobile_subscriber_identity) - =item sip_password =item pin @@ -151,7 +146,6 @@ sub table_info { disable_select => 1, }, 'phonenum' => 'Phone number', - 'sim_imsi' => 'IMSI', #http://en.wikipedia.org/wiki/International_mobile_subscriber_identity 'pin' => { label => 'Voicemail PIN', #'Personal Identification Number', type => 'text', disable_inventory => 1, @@ -470,7 +464,6 @@ sub check { $self->ut_numbern('svcnum') || $self->ut_numbern('countrycode') || $self->$phonenum_check_method('phonenum') - || $self->ut_numbern('sim_imsi') || $self->ut_anything('sip_password') || $self->ut_numbern('pin') || $self->ut_textn('phone_name') @@ -491,10 +484,6 @@ sub check { ; return $error if $error; - return 'Illegal IMSI (not 14-15 digits)' #shorter? - if length($self->sim_imsi) - && ( length($self->sim_imsi) < 14 || length($self->sim_imsi) > 15 ); - # LNP data validation return 'Cannot set LNP fields: no LNP in progress' if ( ($self->lnp_desired_due_date || $self->lnp_due_date |