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
use FS::cdr_cust_pkg_usage;
use FS::part_pkg_msgcat;
use FS::svc_cable;
- use FS::cable_device;
use FS::agent_currency;
use FS::currency_exchange;
use FS::part_pkg_currency;
use FS::vend_bill_pay;
use FS::sales_pkg_class;
use FS::svc_alarm;
+ use FS::cable_model;
# Sammath Naur
if ( $FS::Mason::addl_handler_use ) {
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";
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
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
};
}
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
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;
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',
'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,
};
}
t/access_user_session.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/agent_currency.pm
t/sales_pkg_class.t
FS/svc_alarm.pm
t/svc_alarm.t
+FS/cable_model.pm
+t/cable_model.t
'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'},
$opt{'name'} = "FS::$table"->table_info->{'name'};
my $fields = "FS::$table"->table_info->{'fields'};
+
my %labels = map { $_ => ( ref($fields->{$_})
? $fields->{$_}{'label'}
: $fields->{$_}
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>
'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' ];
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');
projects / freeside.git / commitdiff