diff options
| author | C.J. Adams-Collier <cjac@colliertech.org> | 2014-09-17 11:47:23 -0700 |
|---|---|---|
| committer | C.J. Adams-Collier <cjac@colliertech.org> | 2014-09-17 11:47:30 -0700 |
| commit | 8a3252f9dd5f851d088142e9753289a4e7ab7934 (patch) | |
| tree | 23fdc0abd699102378c0ae840fb4bd5287ac3485 | |
| parent | 03728b5a1f7e30faebc170389c4d91481ade685e (diff) | |
FS RT#3083 - added fields/labels to svc_alarm as spec'd by customer ; verified that input validation is correct
| -rw-r--r-- | FS/FS/Schema.pm | 18 | ||||
| -rw-r--r-- | FS/FS/svc_alarm.pm | 8 |
2 files changed, 18 insertions, 8 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index 04e5dd4..4d6c2e9 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -6284,13 +6284,17 @@ sub tables_hashref { 'svc_alarm' => { 'columns' => [ - 'svcnum', 'int', '', '', '', '', - 'alarmsystemnum', 'int', '', '', '', '', - 'alarmtypenum', 'int', '', '', '', '', - 'alarmstationnum', 'int', '', '', '', '', - 'acctnum', 'varchar', '', $char_d, '', '', - '_password', 'varchar', '', $char_d, '', '', - 'location', 'varchar', 'NULL', $char_d, '', '', +# name type null length default local + 'svcnum', 'int', '', '', '', '', + 'alarmsystemnum', 'int', '', '', '', '', + 'alarmtypenum', 'int', '', '', '', '', + 'alarmstationnum', 'int', '', '', '', '', + 'acctnum', 'varchar', '', $char_d, '', '', + '_password', 'varchar', '', $char_d, '', '', + 'location', 'varchar', 'NULL', $char_d, '', '', + 'cs_receiver', 'int', 'NULL', '', '', '', + 'cs_phonenum', 'varchar', 'NULL', $char_d, '', '', + 'serialnum', 'varchar', 'NULL', $char_d, '', '', #installer (rep) ], 'primary_key' => 'svcnum', diff --git a/FS/FS/svc_alarm.pm b/FS/FS/svc_alarm.pm index fafd9e8..afb4c1d 100644 --- a/FS/FS/svc_alarm.pm +++ b/FS/FS/svc_alarm.pm @@ -74,6 +74,9 @@ sub table_info { 'acctnum' => { label => 'Account #', %opts }, '_password' => { label => 'Password' , %opts }, 'location' => { label => 'Location', %opts }, + 'cs_receiver' => { label => 'CS Reciever #'}, + 'cs_phonenum' => { label => 'CS Phone #' }, + 'serialnum' => { label => 'Alarm Serial #' }, 'alarmsystemnum' => { label => 'Alarm System Vendor', type => 'select-alarm_system', disable_inventory => 1, @@ -194,11 +197,14 @@ sub check { my $x = $self->setfixed; return $x unless ref $x; - my $error = + my $error = $self->ut_numbern('svcnum') || $self->ut_text('acctnum') || $self->ut_alphan('_password') || $self->ut_textn('location') + || $self->ut_numbern('cs_receiver') + || $self->ut_phonen('cs_phonenum') + || $self->ut_alphan('serialnum') || $self->ut_foreign_key('alarmsystemnum', 'alarm_system', 'systemnum') || $self->ut_foreign_key('alarmtypenum', 'alarm_type', 'typenum') || $self->ut_foreign_key('alarmstationnum', 'alarm_station', 'stationnum') |