X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Felements%2Fsvc_Common.html;h=fc29327aee98cfd42cc8ac0793a7166c008b6717;hb=98652f79fc4fff916a46bc94d6301b24bcd13df3;hp=d46d1cb42d9eed13ead15564a2e7bea32bd1c7d2;hpb=35b1ca7d644c773f4e0aebf6d8798c93f76a7cd8;p=freeside.git
diff --git a/httemplate/edit/elements/svc_Common.html b/httemplate/edit/elements/svc_Common.html
index d46d1cb42..fc29327ae 100644
--- a/httemplate/edit/elements/svc_Common.html
+++ b/httemplate/edit/elements/svc_Common.html
@@ -21,6 +21,7 @@
: ''; #?
&{ $cb }( $cgi,$svc_x, $part_svc,$cust_pkg, $fields,$opt);
}
+
},
'edit_callback' => sub {
@@ -43,6 +44,27 @@
: ''; #?
&{ $cb }( $cgi,$svc_x, $part_svc,$cust_pkg, $fields,$opt);
}
+
+ if ( $part_svc->has_router ) {
+ my $router = qsearchs('router', {svcnum => $svc_x->svcnum});
+ if ( $router ) {
+ $svc_x->set("router_$_", $router->get($_))
+ foreach ('routername', 'routernum');
+ my ($block) = $router->addr_block; # one-to-one for now
+ if ( $block ) {
+ $svc_x->set('router_blocknum', $block->blocknum);
+ # silly, but necessary...make the currently
+ # assigned block appear on the list
+ my ($field) = grep {ref($_) and
+ $_->{field} eq 'router_blocknum'}
+ @$fields;
+ $field->{extra_sql} =
+ ' OR routernum = '.$router->routernum;
+ $field->{curr_value} = $block->blocknum;
+ }
+ }
+ }
+
},
'new_hashref_callback' => sub {
@@ -72,7 +94,6 @@
}
$svc_x->set_default_and_fixed;
-
},
'field_callback' => sub {
@@ -80,14 +101,17 @@
my $columndef = $part_svc->part_svc_column($f->{'field'});
my $flag = $columndef->columnflag;
- if ( $flag eq 'F' ) {
+
+ if ( $flag eq 'F' ) { #fixed
$f->{'type'} = length($columndef->columnvalue)
? 'fixed'
: 'hidden';
$f->{'value'} = $columndef->columnvalue;
- } elsif ( $flag eq 'A' ) {
+
+ } elsif ( $flag eq 'A' ) { #auto assign from inventory
$f->{'type'} = 'hidden';
- } elsif ( $flag eq 'M' ) {
+
+ } elsif ( $flag eq 'M' ) { #manually assign from inventory
$f->{'type'} = 'select-inventory_item';
$f->{'empty_label'} = 'Select inventory item';
$f->{'extra_sql'} = 'WHERE ( svcnum IS NULL ' .
@@ -95,11 +119,19 @@
')';
$f->{'classnum'} = $columndef->columnvalue;
$f->{'disable_empty'} = $object->svcnum ? 1 : 0;
- } elsif ( $flag eq 'H' ) {
+
+ } elsif ( $flag eq 'H' ) { #hardware
$f->{'type'} = 'select-hardware_type';
$f->{'hashref'} = {
'classnum'=>$columndef->columnvalue
};
+
+ } elsif ( $flag eq 'S' #selectable choice
+ && $f->{type} !~ /^select-svc(-domain|_pbx)$/ ) {
+ $f->{type} = 'select';
+ $f->{options} = [ split( /\s*,\s*/,
+ $columndef->columnvalue)
+ ];
}
if ( $f->{'type'} eq 'select-svc_pbx'
@@ -125,20 +157,21 @@
},
'html_init' => sub {
+ my $html;
my $cust_main;
if ( $pkgnum ) {
my $cust_pkg = qsearchs('cust_pkg', {'pkgnum' => $pkgnum});
$cust_main = $cust_pkg->cust_main if $cust_pkg;
- }
- $cust_main
- ? include( '/elements/small_custview.html',
+ if ( $cust_main ) {
+ $html = include( '/elements/small_custview.html',
$cust_main,
'',
1,
popurl(2). "view/cust_main.cgi"
- ). '
'
- : '';
-
+ ). '
';
+ }
+ }
+ $html;
},
'html_table_bottom' => sub {
@@ -200,6 +233,28 @@ sub label_fixup {
$labels->{$field} = $col->columnlabel if $col->columnlabel !~ /^\s*$/;
}
+ if ( $part_svc->has_router ) {
+ # these will be set up as pseudo-fields in the new_ and edit_ callbacks
+ push @{ $opt->{'fields'} }, (
+ { field => 'router_routernum', type => 'hidden' },
+ { field => 'router_routername', type => 'text', size => 32 },
+ # router address block selection
+ # (one-to-one for now)
+ { field => 'router_blocknum',
+ type => 'select-table',
+ table => 'addr_block',
+ hashref => { 'routernum' => '0' },
+ agent_virt => 1,
+ agent_null => 1,
+ name_col => 'cidr',
+ order_by => 'ORDER BY ip_gateway, ip_netmask',
+ empty_label => '(none)',
+ disable_empty => 0,
+ },
+ );
+ $labels->{router_routername} = 'Attached router name';
+ $labels->{router_blocknum} = 'Attached address block';
+ }
}
%once>