From 88fdb01339ae2b598b29c8033f31a50d46e44cad Mon Sep 17 00:00:00 2001 From: ivan Date: Mon, 21 Mar 2011 00:52:33 +0000 Subject: [PATCH] fix PBX and DSL capitalization in menu, add qualifiction report to reports->services->dsl, RT#7111 --- FS/FS/svc_dsl.pm | 2 ++ FS/FS/svc_pbx.pm | 23 +++-------------------- httemplate/elements/menu.html | 10 +++++++++- 3 files changed, 14 insertions(+), 21 deletions(-) diff --git a/FS/FS/svc_dsl.pm b/FS/FS/svc_dsl.pm index 89827e8d7..15eea7d07 100644 --- a/FS/FS/svc_dsl.pm +++ b/FS/FS/svc_dsl.pm @@ -129,6 +129,8 @@ sub table_info { { 'name' => 'DSL', + 'name_plural' => 'DSLs', + 'lcname_plural' => 'DSLs', 'sorts' => [ 'phonenum' ], 'display_weight' => 55, 'cancel_weight' => 75, diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm index 0eb544318..093eacd54 100644 --- a/FS/FS/svc_pbx.pm +++ b/FS/FS/svc_pbx.pm @@ -81,8 +81,9 @@ sub table { 'svc_pbx'; } sub table_info { { 'name' => 'PBX', - 'name_plural' => 'PBXs', #optional, - 'longname_plural' => 'PBXs', #optional + 'name_plural' => 'PBXs', + 'lcname_plural' => 'PBXs', + 'longname_plural' => 'PBXs', 'sorts' => 'svcnum', # optional sort field (or arrayref of sort fields, main first) 'display_weight' => 70, 'cancel_weight' => 90, @@ -91,24 +92,6 @@ sub table_info { 'title' => 'Name', 'max_extensions' => 'Maximum number of User Extensions', 'max_simultaneous' => 'Maximum number of simultaneous users', -# 'field' => 'Description', -# 'another_field' => { -# 'label' => 'Description', -# 'def_label' => 'Description for service definitions', -# 'type' => 'text', -# 'disable_default' => 1, #disable switches -# 'disable_fixed' => 1, # -# 'disable_inventory' => 1, # -# }, -# 'foreign_key' => { -# 'label' => 'Description', -# 'def_label' => 'Description for service defs', -# 'type' => 'select', -# 'select_table' => 'foreign_table', -# 'select_key' => 'key_field_in_table', -# 'select_label' => 'label_field_in_table', -# }, - }, }; } diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html index d0741596b..a70abe475 100644 --- a/httemplate/elements/menu.html +++ b/httemplate/elements/menu.html @@ -140,7 +140,7 @@ foreach my $svcdb ( FS::part_svc->svc_tables() ) { my $name = "FS::$svcdb"->table_info->{'name_plural'} || PL( "FS::$svcdb"->table_info->{'name'} ); - my $lcname = lc($name); + my $lcname = "FS::$svcdb"->table_info->{'lcname_plural'} || lc($name); my $lcsname = lc("FS::$svcdb"->table_info->{'name'}); my $longname = "FS::$svcdb"->table_info->{'longname_plural'} || $name; my $lclongname = lc($longname); @@ -197,10 +197,18 @@ foreach my $svcdb ( FS::part_svc->svc_tables() ) { } if ( $svcdb eq 'svc_phone' ) { + $report_svc{"Phone number (DID) availability"} = [ $fsurl."search/report_phone_avail.html", '' ]; $report_svc{"Inventory/Provisioning Status"} = [ $fsurl."search/phone_inventory_provisioned.html", '' ]; + + } elsif ( $svcdb eq 'svc_dsl' ) { + + $report_svc{'Qualifications'} = [ $fsurl. 'search/qual.cgi', #XXX qual.html + '', + ]; + } $report_services{$name} = [ \%report_svc, $longname ]; -- 2.11.0