[freeside-commits] branch master updated. 8ebe92e270a8e035e2afee0ad99cb0c411a0201c

[Christopher Burger]

The branch, master has been updated
       via  8ebe92e270a8e035e2afee0ad99cb0c411a0201c (commit)
      from  7c4c3bd3e3e2d6a820c77bec346f9d378e2761dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8ebe92e270a8e035e2afee0ad99cb0c411a0201c
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Wed Aug 1 15:22:48 2018 -0400

    RT# 78356 - created script to cycle thru svc_broadband and move speed field values.

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index bd7bf9b13..02136c594 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -156,8 +156,8 @@ sub table_info {
                              disable_inventory => 1,
                            },
       'serviceid' => 'Torrus serviceid', #but is should be hidden
-      'speed_test_up'      => 'Speed test download (Kbps)',
-      'speed_test_down'    => 'Speed test upload (Kbps)',
+      'speed_test_up'      => { 'label' => 'Speed test upload (Kbps)' },
+      'speed_test_down'    => { 'label' => 'Speed test download (Kbps)' },
       'speed_test_latency' => 'Speed test latency (ms)',
     },
   };
@@ -364,6 +364,8 @@ sub check {
     || $self->ut_textn('description')
     || $self->ut_numbern('speed_up')
     || $self->ut_numbern('speed_down')
+    || $self->ut_numbern('speed_test_up')
+    || $self->ut_numbern('speed_test_down')
     || $self->ut_ipn('ip_addr')
     || $self->ut_hexn('mac_addr')
     || $self->ut_hexn('auth_key')
diff --git a/bin/move_svc_broadband_speeds.pl b/bin/move_svc_broadband_speeds.pl
new file mode 100644
index 000000000..fed405b43
--- /dev/null
+++ b/bin/move_svc_broadband_speeds.pl
@@ -0,0 +1,52 @@
+#!/usr/bin/perl
+
+use strict;
+use FS::UID qw(adminsuidsetup);
+use FS::Record qw(qsearchs qsearch);
+use FS::svc_broadband;
+
+my $user = shift or die &usage;
+my $dbh = adminsuidsetup($user);
+
+my $fcc_up_speed = "(select part_pkg_fcc_option.optionvalue from part_pkg_fcc_option where fccoptionname = 'broadband_upstream' and pkgpart = cust_pkg.pkgpart) AS fcc477_upstream";
+my $fcc_down_speed = "(select part_pkg_fcc_option.optionvalue from part_pkg_fcc_option where fccoptionname = 'broadband_downstream' and pkgpart = cust_pkg.pkgpart) AS fcc477_downstream";
+foreach my $rec (qsearch({
+	'select'    => 'svc_broadband.*, cust_svc.svcpart, cust_pkg.pkgpart, '.$fcc_up_speed.', '.$fcc_down_speed,
+	'table'     => 'svc_broadband',
+	'addl_from' => 'LEFT JOIN cust_svc USING ( svcnum ) LEFT JOIN cust_pkg USING ( pkgnum )',
+})) {
+  $rec->{Hash}->{speed_test_up} = $rec->{Hash}->{speed_up};
+  $rec->{Hash}->{speed_test_down} = $rec->{Hash}->{speed_down};
+  $rec->{Hash}->{speed_up} = $rec->{Hash}->{fcc477_upstream} * 1000;
+  $rec->{Hash}->{speed_down} = $rec->{Hash}->{fcc477_downstream} * 1000;
+  $rec->replace();
+  warn "Fixing broadband service speeds for service ".$rec->{Hash}->{svcnum}."-".$rec->{Hash}->{description}."\n";
+}
+
+warn "Completed fixing broadband service speeds!\n";
+
+exit;
+
+=head1 NAME
+
+move_svc_broadband_speeds
+
+=head1 SYNOPSIS
+
+  move_svc_broadband_speeds.pl [ user ]
+
+=head1 DESCRIPTION
+
+Moves value for speed_down to speed_test_down, speed_up to speed_test_up, 
+and sets speed_down, speed_up to matching fcc_477 speeds from package for
+all svc_broadband services.
+
+user: freeside username
+
+=head1 BUGS
+
+=head1 SEE ALSO
+
+L<FS::svc_broadband>
+
+=cut
\ No newline at end of file
diff --git a/httemplate/view/svc_broadband.cgi b/httemplate/view/svc_broadband.cgi
index 0517c307a..189fe5e6f 100644
--- a/httemplate/view/svc_broadband.cgi
+++ b/httemplate/view/svc_broadband.cgi
@@ -33,6 +33,9 @@ my @fields = (
   { field => 'routernum', value_callback => \&router },
   'speed_down',
   'speed_up',
+  'speed_test_down',
+  'speed_test_up',
+  'speed_test_latency',
   { field => 'ip_addr', value_callback => \&ip_addr },
   { field => 'sectornum', value_callback => \&sectornum },
   { field => 'mac_addr', type=>'mac_addr', value_callback => \&mac_addr },

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/svc_broadband.pm            |  6 +++--
 bin/move_svc_broadband_speeds.pl  | 52 +++++++++++++++++++++++++++++++++++++++
 httemplate/view/svc_broadband.cgi |  3 +++
 3 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 bin/move_svc_broadband_speeds.pl