projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#6223: Billing process - pending packages - feature request [order quotation on...
[freeside.git]
/
FS
/
FS
/
svc_fiber.pm
diff --git
a/FS/FS/svc_fiber.pm
b/FS/FS/svc_fiber.pm
index
c4036dc
..
00b4e0e
100644
(file)
--- a/
FS/FS/svc_fiber.pm
+++ b/
FS/FS/svc_fiber.pm
@@
-108,6
+108,13
@@
sub table_info {
'disable_inventory' => 1,
'disable_select' => 1,
},
'disable_inventory' => 1,
'disable_select' => 1,
},
+ # ODN circuit
+ 'circuit_id' => {
+ 'label' => 'ODN circuit',
+ 'type' => 'input-fiber_circuit',
+ 'disable_inventory' => 1,
+ 'disable_select' => 1,
+ },
# ONT stuff
'ont_id' => {
'label' => 'ONT #',
# ONT stuff
'ont_id' => {
'label' => 'ONT #',
@@
-180,14
+187,14
@@
sub search_sql {
=item label
=item label
-Returns a description of this fiber service containing the O
LT name and
-
port location, and the ONT serial number
.
+Returns a description of this fiber service containing the O
NT serial number
+
and the OLT name and port location
.
=cut
sub label {
my $self = shift;
=cut
sub label {
my $self = shift;
- $self->ont_serial . ' @ ' . $self->fiber_olt->
oltname
. ' ' .
+ $self->ont_serial . ' @ ' . $self->fiber_olt->
description
. ' ' .
join('-', $self->shelf, $self->card, $self->olt_port);
}
join('-', $self->shelf, $self->card, $self->olt_port);
}
@@
-247,13
+254,15
@@
sub check {
|| $self->ut_alphan('ont_serial')
|| $self->ut_alphan('ont_port')
|| $self->ut_numbern('vlan')
|| $self->ut_alphan('ont_serial')
|| $self->ut_alphan('ont_port')
|| $self->ut_numbern('vlan')
- || $self->ut_s
number
n('signal')
+ || $self->ut_s
float
n('signal')
|| $self->ut_numbern('speed_up')
|| $self->ut_numbern('speed_down')
|| $self->ut_textn('ont_install')
;
return $error if $error;
|| $self->ut_numbern('speed_up')
|| $self->ut_numbern('speed_down')
|| $self->ut_textn('ont_install')
;
return $error if $error;
+ $self->set('signal', sprintf('%.2f', $self->get('signal')));
+
$self->SUPER::check;
}
$self->SUPER::check;
}