[freeside-commits] freeside/FS/FS svc_broadband.pm, 1.22.2.1, 1.22.2.2 Conf.pm, 1.397.2.52, 1.397.2.53

[Erik Levinson]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv22824/FS/FS

Modified Files:
      Tag: FREESIDE_2_1_BRANCH
	svc_broadband.pm Conf.pm 
Log Message:
svc_broadband add/edit: configurable require co-ordinates in NW quadrant, RT12925

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.397.2.52
retrieving revision 1.397.2.53
diff -u -w -d -r1.397.2.52 -r1.397.2.53
--- Conf.pm	5 Jun 2011 05:41:48 -0000	1.397.2.52
+++ Conf.pm	10 Jun 2011 05:16:56 -0000	1.397.2.53
@@ -4394,6 +4394,13 @@
   },
   
   {
+    'key'         => 'svc_broadband-require-nw-coordinates',
+    'section'     => 'UI',
+    'description' => 'On svc_broadband add/edit, require latitude and longitude in the North Western quadrant',
+    'type'        => 'checkbox',
+  },
+  
+  {
     'key'         => 'cust-email-high-visibility',
     'section'     => 'UI',
     'description' => 'Move the invoicing e-mail address field to the top of the billing address section and highlight it.',

Index: svc_broadband.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_broadband.pm,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -w -d -r1.22.2.1 -r1.22.2.2
--- svc_broadband.pm	22 Jan 2011 02:45:32 -0000	1.22.2.1
+++ svc_broadband.pm	10 Jun 2011 05:16:56 -0000	1.22.2.2
@@ -334,6 +334,10 @@
 
   return $x unless ref($x);
 
+  my $nw_coords = $conf->exists('svc_broadband-require-nw-coordinates');
+  my $lat_lower = $nw_coords ? 1 : -90;
+  my $lon_upper = $nw_coords ? -1 : 180;
+
   my $error =
     $self->ut_numbern('svcnum')
     || $self->ut_numbern('blocknum')
@@ -343,8 +347,8 @@
     || $self->ut_ipn('ip_addr')
     || $self->ut_hexn('mac_addr')
     || $self->ut_hexn('auth_key')
-    || $self->ut_coordn('latitude', -90, 90)
-    || $self->ut_coordn('longitude', -180, 180)
+    || $self->ut_coordn('latitude', $lat_lower, 90)
+    || $self->ut_coordn('longitude', -180, $lon_upper)
     || $self->ut_sfloatn('altitude')
     || $self->ut_textn('vlan_profile')
     || $self->ut_textn('plan_id')