diff options
| -rw-r--r-- | FS/FS.pm | 2 | ||||
| -rw-r--r-- | FS/FS/Mason.pm | 2 | ||||
| -rwxr-xr-x | FS/FS/svc_broadband.pm | 7 | ||||
| -rw-r--r-- | FS/FS/svc_cable.pm | 76 | ||||
| -rw-r--r-- | FS/FS/svc_pbx.pm | 19 | ||||
| -rw-r--r-- | FS/MANIFEST | 4 | ||||
| -rw-r--r-- | httemplate/edit/elements/part_svc_column.html | 4 | ||||
| -rw-r--r-- | httemplate/edit/svc_Common.html | 12 | ||||
| -rw-r--r-- | httemplate/elements/menu.html | 6 |
9 files changed, 104 insertions, 28 deletions
@@ -208,6 +208,8 @@ L<FS::svc_dish> - Dish network service class L<FS::svc_cable> - Cable service class +L<FS::cable_model> - Cable-model model class + L<FS::inventory_class> - Inventory classes L<FS::inventory_item> - Inventory items diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm index 820d606a3..a946ebf9f 100644 --- a/FS/FS/Mason.pm +++ b/FS/FS/Mason.pm @@ -339,9 +339,9 @@ if ( -e $addl_handler_use_file ) { use FS::cdr_cust_pkg_usage; use FS::part_pkg_msgcat; use FS::svc_cable; - use FS::cable_device; use FS::sales_pkg_class; use FS::svc_alarm; + use FS::cable_model; # Sammath Naur if ( $FS::Mason::addl_handler_use ) { diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm index b5012caa3..6073902e8 100755 --- a/FS/FS/svc_broadband.pm +++ b/FS/FS/svc_broadband.pm @@ -234,10 +234,11 @@ sub search_sql { my( $class, $string ) = @_; if ( $string =~ /^(\d{1,3}\.){3}\d{1,3}$/ ) { $class->search_sql_field('ip_addr', $string ); - } elsif ( $string =~ /^([a-fA-F0-9]{12})$/ ) { + } elsif ( $string =~ /^([A-F0-9]{12})$/i ) { $class->search_sql_field('mac_addr', uc($string)); - } elsif ( $string =~ /^(([a-fA-F0-9]{1,2}:){5}([a-fA-F0-9]{1,2}))$/ ) { - $class->search_sql_field('mac_addr', uc("$2$3$4$5$6$7") ); + } elsif ( $string =~ /^(([A-F0-9]{2}:){5}([A-F0-9]{2}))$/i ) { + $string =~ s/://g; + $class->search_sql_field('mac_addr', uc($string) ); } elsif ( $string =~ /^(\d+)$/ ) { my $table = $class->table; "$table.svcnum = $1"; diff --git a/FS/FS/svc_cable.pm b/FS/FS/svc_cable.pm index f588f43c3..1980c0ee9 100644 --- a/FS/FS/svc_cable.pm +++ b/FS/FS/svc_cable.pm @@ -1,9 +1,10 @@ package FS::svc_cable; -use base qw( FS::device_Common FS::svc_Common ); +use base qw( FS::svc_Common ); #qw( FS::device_Common FS::svc_Common ); use strict; -use base qw( FS::Record ); -use FS::Record; # qw( qsearch qsearchs ); +use Tie::IxHash; +use FS::Record qw( qsearchs ); # qw( qsearch qsearchs ); +use FS::cable_model; =head1 NAME @@ -52,18 +53,53 @@ points to. You can ask the object for a copy with the I<hash> method. sub table { 'svc_cable'; } +sub table_dupcheck_fields { ( 'mac_addr' ); } + +sub search_sql { + my( $class, $string ) = @_; + if ( $string =~ /^([A-F0-9]{12})$/i ) { + $class->search_sql_field('mac_addr', uc($string)); + } elsif ( $string =~ /^(([A-F0-9]{2}:){5}([A-F0-9]{2}))$/i ) { + $string =~ s/://g; + $class->search_sql_field('mac_addr', uc($string) ); + } elsif ( $string =~ /^(\w+)$/ ) { + $class->search_sql_field('serialnum', $1); + } else { + '1 = 0'; #false + } +} + sub table_info { + + tie my %fields, 'Tie::IxHash', + 'svcnum' => 'Service', + 'modelnum' => { label => 'Model', + type => 'select-cable_model', + disable_inventory => 1, + disable_select => 1, + value_callback => sub { + my $svc = shift; + $svc->cable_model->model_name; + }, + }, + 'serialnum' => 'Serial number', + 'mac_addr' => { label => 'MAC address', + type => 'input-mac_addr', + value_callback => sub { + my $svc = shift; + join(':', $svc->mac_addr =~ /../g); + }, + }, + ; + { - 'name' => 'Cable Subscriber', - #'name_plural' => '', #optional, + 'name' => 'Cable Subscriber', + #'name_plural' => '', #optional, #'longname_plural' => '', #optional - 'sorts' => [ 'svcnum', ], #, 'serviceid' ], # optional sort field (or arrayref of sort fields, main first) - 'display_weight' => 54, - 'cancel_weight' => 70, #? no deps, so - 'fields' => { - 'svcnum' => 'Service', - 'identifier' => 'Identifier', - }, + 'fields' => \%fields, + 'sorts' => [ 'svcnum', 'serialnum', 'mac_addr', ], + 'display_weight' => 54, + 'cancel_weight' => 70, #? no deps, so }; } @@ -93,13 +129,27 @@ sub check { my $self = shift; my $error = - $self->ut_numbern('svcnum') + $self->ut_numbern('svcnum') + || $self->ut_foreign_key('modelnum', 'cable_model', 'modelnum') + || $self->ut_alpha('serialnum') + || $self->ut_mac_addr('mac_addr') ; return $error if $error; $self->SUPER::check; } +=item cable_model + +Returns the cable_model object for this record. + +=cut + +sub cable_model { + my $self = shift; + qsearchs('cable_model', { 'modelnum'=>$self->modelnum } ); +} + =back =head1 BUGS diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm index 66e51da71..7c228f8b5 100644 --- a/FS/FS/svc_pbx.pm +++ b/FS/FS/svc_pbx.pm @@ -1,7 +1,8 @@ package FS::svc_pbx; +use base qw( FS::svc_External_Common ); use strict; -use base qw( FS::svc_External_Common ); +use Tie::IxHash; use FS::Record qw( qsearch qsearchs dbh ); use FS::PagedSearch qw( psearch ); use FS::Conf; @@ -80,6 +81,15 @@ points to. You can ask the object for a copy with the I<hash> method. sub table { 'svc_pbx'; } sub table_info { + + tie my %fields, 'Tie::IxHash', + 'svcnum' => 'PBX', + 'id' => 'PBX/Tenant ID', + 'title' => 'Name', + 'max_extensions' => 'Maximum number of User Extensions', + 'max_simultaneous' => 'Maximum number of simultaneous users', + ; + { 'name' => 'PBX', 'name_plural' => 'PBXs', @@ -88,12 +98,7 @@ sub table_info { 'sorts' => 'svcnum', # optional sort field (or arrayref of sort fields, main first) 'display_weight' => 70, 'cancel_weight' => 90, - 'fields' => { - 'id' => 'ID', - 'title' => 'Name', - 'max_extensions' => 'Maximum number of User Extensions', - 'max_simultaneous' => 'Maximum number of simultaneous users', - }, + 'fields' => \%fields, }; } diff --git a/FS/MANIFEST b/FS/MANIFEST index d326272f8..0ef0fa39c 100644 --- a/FS/MANIFEST +++ b/FS/MANIFEST @@ -690,11 +690,11 @@ FS/part_pkg_msgcat.pm t/part_pkg_msgcat.t FS/svc_cable.pm t/svc_cable.t -FS/cable_device.pm -t/cable_device.t FS/h_svc_cable.pm t/h_svc_cable.t FS/sales_pkg_class.pm t/sales_pkg_class.t FS/svc_alarm.pm t/svc_alarm.t +FS/cable_model.pm +t/cable_model.t diff --git a/httemplate/edit/elements/part_svc_column.html b/httemplate/edit/elements/part_svc_column.html index ddfc85cfc..64901a80f 100644 --- a/httemplate/edit/elements/part_svc_column.html +++ b/httemplate/edit/elements/part_svc_column.html @@ -183,8 +183,8 @@ that field. 'curr_value' => $value, &> % } -% } elsif ( $def->{'type'} =~ /select-(.*?).html/ ) { - <& '/elements/'.$def->{'type'}, +% } elsif ( $def->{'type'} =~ /^select-(.*?)(.html)?$/ && $1 ne 'hardware' ) { + <& "/elements/select-$1.html", 'field' => $name, 'id' => $name.'_select', 'multiple' => $def->{'multiple'}, diff --git a/httemplate/edit/svc_Common.html b/httemplate/edit/svc_Common.html index 3da72d2e8..5949a4dc0 100644 --- a/httemplate/edit/svc_Common.html +++ b/httemplate/edit/svc_Common.html @@ -20,6 +20,7 @@ if ( UNIVERSAL::can("FS::$table", 'table_info') ) { $opt{'name'} = "FS::$table"->table_info->{'name'}; my $fields = "FS::$table"->table_info->{'fields'}; + my %labels = map { $_ => ( ref($fields->{$_}) ? $fields->{$_}{'label'} : $fields->{$_} @@ -28,6 +29,17 @@ if ( UNIVERSAL::can("FS::$table", 'table_info') ) { keys %$fields; $opt{'labels'} = \%labels; + #transform FS::svc_* table_info's structure into one edit.html likes + delete $fields->{svcnum}; + $opt{'fields'} = [ map { ref $fields->{$_} + ? { field => $_, + %{ $fields->{$_} } + } + : $_ + } keys %$fields + ]; + + } </%init> diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index eddcd1c5f..0d446d997 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -509,6 +509,10 @@ tie my %config_radius, 'Tie::IxHash', 'RADIUS Clients' => [ $fsurl.'browse/nas.html', 'Manage RADIUS clients' ], ; +tie my %config_cable, 'Tie::IxHash', + 'Cable modem models' => [ $fsurl.'browse/cable_model.html', '' ], +; + tie my %config_export_svc, 'Tie::IxHash', (); if ( $curuser->access_right('Configuration') ) { $config_export_svc{'Service definitions'} = [ $fsurl.'browse/part_svc.cgi', 'Services are items you offer to your customers' ]; @@ -523,6 +527,8 @@ $config_export_svc{'Phone'} = [ \%config_phone, '' ] if $curuser->access_right('Configuration'); $config_export_svc{'RADIUS'} = [ \%config_radius, '' ] if $curuser->access_right('Configuration'); +$config_export_svc{'Cable'} = [ \%config_cable, '' ] + if $curuser->access_right('Configuration'); $config_export_svc{'Hardware types'} = [ $fsurl.'browse/hardware_class.html', 'Set up hardware type catalog' ] if $curuser->access_right('Configuration'); |