[freeside-commits] branch FREESIDE_3_BRANCH updated. e8e0af4635e6320d2bfa3814b1501103623550fd

[Christopher Burger]

The branch, FREESIDE_3_BRANCH has been updated
       via  e8e0af4635e6320d2bfa3814b1501103623550fd (commit)
      from  226a7d0189cb43980a37c586c28fb62074b5117f (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 e8e0af4635e6320d2bfa3814b1501103623550fd
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Tue Jun 13 11:14:22 2017 -0400

    RT# 76171 - Added new svc_circuit field internal_circuit_id, updated label for existing svc_circuit field circuit_id to Provider Circuit ID.

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index c70861c..1d449dc 100644
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -4791,6 +4791,7 @@ sub tables_hashref {
         'vendor_order_status',  'varchar', 'NULL', $char_d,  '', '',
         'endpoint_ip_addr',     'varchar', 'NULL', 40, '', '',
         'endpoint_mac_addr',    'varchar', 'NULL', 12, '', '',
+        'internal_circuit_id',  'varchar',     '', 64, '', '',
       ],
       'primary_key' => 'svcnum',
       'unique'      => [],
diff --git a/FS/FS/svc_circuit.pm b/FS/FS/svc_circuit.pm
index 0d42bd9..17530f3 100644
--- a/FS/FS/svc_circuit.pm
+++ b/FS/FS/svc_circuit.pm
@@ -51,7 +51,7 @@ L<FS::circuit_provider>.
 =item termnum - circuit termination type; foreign key to 
 L<FS::circuit_termination>
 
-=item circuit_id - circuit ID string defined by the provider
+=item circuit_id - provider circuit ID string defined by the provider
 
 =item desired_due_date - the requested date for completion of the circuit
 order
@@ -75,6 +75,8 @@ space or checked for uniqueness.
 
 =item endpoint_mac_addr - the MAC address of the endpoint.
 
+=item internal_circuit_id - internal circuit ID string defined by the provider
+
 =back
 
 =head1 METHODS
@@ -95,56 +97,57 @@ sub table_info {
               disabled_inventory => 1, disable_select => 1 );
 
   tie my %fields, 'Tie::IxHash', (
-    'svcnum'            => 'Service',
-    'providernum'       => {
+    'svcnum'              => 'Service',
+    'providernum'         => {
                               label         => 'Provider',
                               type          => 'select',
                               select_table  => 'circuit_provider',
                               select_key    => 'providernum',
                               select_label  => 'provider',
                               disable_inventory => 1,
-                           },
-    'typenum'           => {
+                             },
+    'typenum'             => {
                               label         => 'Circuit type',
                               type          => 'select',
                               select_table  => 'circuit_type',
                               select_key    => 'typenum',
                               select_label  => 'typename',
                               disable_inventory => 1,
-                           },
-    'termnum'           => {
+                             },
+    'termnum'             => {
                               label         => 'Termination type',
                               type          => 'select',
                               select_table  => 'circuit_termination',
                               select_key    => 'termnum',
                               select_label  => 'termination',
                               disable_inventory => 1,
-                           },
-    'circuit_id'        => { label => 'Circuit ID', %dis },
-    'desired_due_date'  => { label => 'Desired due date',
+                             },
+    'circuit_id'          => { label => 'Provider Circuit ID', %dis },
+    'desired_due_date'    => { label => 'Desired due date',
                              %dis
-                           },
-    'due_date'          => { label => 'Due date',
+                             },
+    'due_date'            => { label => 'Due date',
                              %dis
-                           },
-    'vendor_order_id'   => { label => 'Vendor order ID', %dis },
-    'vendor_qual_id'    => { label => 'Vendor qualification ID', %dis },
-    'vendor_order_type' => {
+                             },
+    'vendor_order_id'     => { label => 'Vendor order ID', %dis },
+    'vendor_qual_id'      => { label => 'Vendor qualification ID', %dis },
+    'vendor_order_type'   => {
                               label => 'Vendor order type',
                               disable_inventory => 1
-                           }, # should be a select?
+                             }, # should be a select?
     'vendor_order_status' => {
                               label => 'Vendor order status',
                               disable_inventory => 1
                              }, # should also be a select?
-    'endpoint_ip_addr'  => {
+    'endpoint_ip_addr'    => {
                               label => 'Endpoint IP address',
-                           },
-    'endpoint_mac_addr' => {
+                             },
+    'endpoint_mac_addr'   => {
                               label => 'Endpoint MAC address',
                               type => 'input-mac_addr',
                               disable_inventory => 1,
-                           },
+                             },
+    'internal_circuit_id' => { label => 'Internal Circuit ID', %dis },
   );
   return {
     'name'              => 'Circuit',
diff --git a/httemplate/edit/svc_circuit.cgi b/httemplate/edit/svc_circuit.cgi
index 3f9bad5..f91b0ae 100644
--- a/httemplate/edit/svc_circuit.cgi
+++ b/httemplate/edit/svc_circuit.cgi
@@ -45,6 +45,9 @@ my @fields = (
   { field         => 'endpoint_mac_addr',
     type          => 'input-mac_addr',
   },
+  { field         => 'internal_circuit_id',
+    size          => 40,
+  },
 );
 
 # needed: a new_callback to migrate vendor quals over to circuits

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

Summary of changes:
 FS/FS/Schema.pm                 |    1 +
 FS/FS/svc_circuit.pm            |   45 +++++++++++++++++++++------------------
 httemplate/edit/svc_circuit.cgi |    3 +++
 3 files changed, 28 insertions(+), 21 deletions(-)