X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fsvc_broadband.cgi;h=ad4d6046df7a9e50d71d406c431b2bad1b7aa058;hb=d7a9f5c6dbf89aa85c281578bb553e04a573cbd0;hp=c2fb58ddad5e38eb3fe523d02d3645f30d914f87;hpb=0930d22ffc440f80c1b222b2e750cadbabd9e8f6;p=freeside.git
diff --git a/httemplate/edit/svc_broadband.cgi b/httemplate/edit/svc_broadband.cgi
index c2fb58dda..ad4d6046d 100644
--- a/httemplate/edit/svc_broadband.cgi
+++ b/httemplate/edit/svc_broadband.cgi
@@ -1,167 +1,13 @@
-<% include('/elements/header.html', "Broadband Service $action") %>
-
-<% include('/elements/error.html') %>
-
-Service #<%$svcnum ? $svcnum : "(NEW)"%>
-
-
-
-<% include('/elements/footer.html') %>
-
+<& elements/svc_Common.html,
+ 'post_url' => popurl(1). 'process/svc_broadband.cgi',
+ 'name' => 'broadband service',
+ 'table' => 'svc_broadband',
+ 'fields' => \@fields,
+ 'field_callback' => $callback,
+ 'dummy' => $cgi->query_string,
+ 'onsubmit' => 'validate_coords',
+ 'html_foot' => $js,
+&>
<%init>
die "access denied"
@@ -170,85 +16,175 @@ die "access denied"
# If it's stupid but it works, it's still stupid.
# -Kristian
-use HTML::Widgets::SelectLayers;
-use Tie::IxHash;
-
-my( $svcnum, $pkgnum, $svcpart, $part_svc, $svc_broadband );
-if ( $cgi->param('error') ) {
-
- $svc_broadband = new FS::svc_broadband ( {
- map { $_, scalar($cgi->param($_)) } fields('svc_broadband'), qw(svcpart)
- } );
- $svcnum = $svc_broadband->svcnum;
- $pkgnum = $cgi->param('pkgnum');
- $svcpart = $svc_broadband->svcpart;
- $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
- die "No part_svc entry!" unless $part_svc;
-
-} elsif ( $cgi->param('pkgnum') && $cgi->param('svcpart') ) { #adding
-
- $cgi->param('pkgnum') =~ /^(\d+)$/ or die 'unparsable pkgnum';
- $pkgnum = $1;
- $cgi->param('svcpart') =~ /^(\d+)$/ or die 'unparsable svcpart';
- $svcpart = $1;
-
- $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
- die "No part_svc entry!" unless $part_svc;
-
- $svc_broadband = new FS::svc_broadband({ svcpart => $svcpart });
-
- $svcnum='';
-
- $svc_broadband->set_default_and_fixed;
-
-} else { #editing
-
- my($query) = $cgi->keywords;
- $query =~ /^(\d+)$/ or die "unparsable svcnum";
- $svcnum=$1;
- $svc_broadband=qsearchs('svc_broadband',{'svcnum'=>$svcnum})
- or die "Unknown (svc_broadband) svcnum!";
-
- my($cust_svc)=qsearchs('cust_svc',{'svcnum'=>$svcnum})
- or die "Unknown (cust_svc) svcnum!";
-
- $pkgnum=$cust_svc->pkgnum;
- $svcpart=$cust_svc->svcpart;
-
- $part_svc=qsearchs('part_svc',{'svcpart'=>$svcpart});
- die "No part_svc entry!" unless $part_svc;
-
+my $conf = new FS::Conf;
+
+my $js = <
+ function validate_coords(f){
+END
+;
+if ( $conf->exists('svc_broadband-require-nw-coordinates') ) {
+$js .= < 59 ) {
+ s /= 1000;
+ } else {
+ s /= 60;
+ }
+ s /= 60;
+
+ m /= 60;
+ if ( m > 59 ) {
+ alert('Invalid coordinate with minutes > 59');
+ return false;
+ }
+
+ var tmp = parseInt(d)+parseInt(m)+parseInt(s);
+ tmp = tmp.toFixed(8);
+ coord = (neg ? -1 : 1) * tmp;
+
+ if(coord < lower) {
+ alert('Error: invalid coordinate < '+lower);
+ return false;
+ }
+ if(coord > upper) {
+ alert('Error: invalid coordinate > '+upper);
+ return false;
+ }
+
+ return true;
+END
+;
+}
+$js .= <
+END
+;
+
+my @fields = (
+ qw( description ip_addr speed_down speed_up ),
+ { field=>'sectornum', type=>'select-tower_sector', },
+ qw( blocknum ),
+ { field=>'block_label', type=>'fixed' },
+ qw( mac_addr latitude longitude altitude vlan_profile
+ performance_profile authkey plan_id ),
+);
+
+if ( $conf->exists('svc_broadband-radius') ) {
+ push @fields,
+ { field => 'usergroup',
+ type => 'select-radius_group',
+ multiple => 1,
+ }
}
-my $action = $svc_broadband->svcnum ? 'Edit' : 'Add';
-if ($pkgnum) {
- #Nothing?
+my $fixedblock = '';
-} elsif ( $action eq 'Edit' ) {
+my $callback = sub {
+ my ($cgi, $object, $fieldref) = @_;
- #Nothing?
+ my $svcpart = $object->svcnum ? $object->cust_svc->svcpart
+ : $cgi->param('svcpart');
-} else {
- die "\$action eq Add, but \$pkgnum is null!\n";
-}
+ my $part_svc = qsearchs( 'part_svc', { svcpart => $svcpart } );
+ die "No part_svc entry!" unless $part_svc;
-my $p1 = popurl(1);
-
-my ($ip_addr, $speed_up, $speed_down, $blocknum, $mac_addr,
- $latitude, $longitude, $altitude, $vlan_profile, $auth_key,
- $description) =
- ($svc_broadband->ip_addr,
- $svc_broadband->speed_up,
- $svc_broadband->speed_down,
- $svc_broadband->blocknum,
- $svc_broadband->mac_addr,
- $svc_broadband->latitude,
- $svc_broadband->longitude,
- $svc_broadband->altitude,
- $svc_broadband->vlan_profile,
- $svc_broadband->auth_key,
- $svc_broadband->description,
- );
+ my $columndef = $part_svc->part_svc_column($fieldref->{'field'});
+ if ($columndef->columnflag eq 'F') {
+ $fieldref->{'type'} = length($columndef->columnvalue)
+ ? 'fixed'
+ : 'hidden';
+ $fieldref->{'value'} = $columndef->columnvalue;
+ $fixedblock = $fieldref->{value}
+ if $fieldref->{field} eq 'blocknum';
+
+ if ( $fieldref->{field} eq 'usergroup' ) {
+ $fieldref->{'formatted_value'} =
+ [ $object->radius_groups('long_description') ];
+ }
+ }
+
+ if ($object->svcnum) {
+
+ $fieldref->{type} = 'hidden'
+ if $fieldref->{field} eq 'blocknum';
+
+ $fieldref->{value} = $object->addr_block->label
+ if $fieldref->{field} eq 'block_label' && $object->addr_block;
+
+ } else {
+
+ if ($fieldref->{field} eq 'block_label') {
+ if ($fixedblock && $object->addr_block) {
+ $object->blocknum($fixedblock);
+ $fieldref->{value} = $object->addr_block->label;
+ }else{
+ $fieldref->{type} = 'hidden';
+ }
+ }
+
+ if ($fieldref->{field} eq 'blocknum') {
+ if ( $fixedblock or $conf->exists('auto_router') ) {
+ $fieldref->{type} = 'hidden';
+ $fieldref->{value} = $fixedblock;
+ return;
+ }
+
+ my $cust_pkg = qsearchs( 'cust_pkg', {pkgnum => $cgi->param('pkgnum')} );
+ die "No cust_pkg entry!" unless $cust_pkg;
+
+ $object->svcpart($part_svc->svcpart);
+ my @addr_block =
+ grep { ! $_->agentnum
+ || $cust_pkg->cust_main->agentnum == $_->agentnum
+ && $FS::CurrentUser::CurrentUser->agentnum($_->agentnum)
+ }
+ map { $_->addr_block } $object->allowed_routers;
+ my @options = map { $_->blocknum }
+ sort { $a->label cmp $b->label } @addr_block;
+ my %option_labels = map { ( $_->blocknum => $_->label ) } @addr_block;
+ $fieldref->{type} = 'select';
+ $fieldref->{options} = \@options;
+ $fieldref->{labels} = \%option_labels;
+ }
+
+ }
+};
%init>