[freeside-commits] branch FREESIDE_4_BRANCH updated. e56c9ccf3402379423bb800fc8db9b1f718813f0

[Ivan Kohler]

The branch, FREESIDE_4_BRANCH has been updated
       via  e56c9ccf3402379423bb800fc8db9b1f718813f0 (commit)
      from  f8ab34b9ef9c25f2a3aaf623f5cee9bcaaa66289 (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 e56c9ccf3402379423bb800fc8db9b1f718813f0
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Mon Aug 5 16:13:26 2019 -0700

    show imported region and rate #s, RT#83146

diff --git a/httemplate/browse/rate.cgi b/httemplate/browse/rate.cgi
index ea59a0c5b..79bebadee 100644
--- a/httemplate/browse/rate.cgi
+++ b/httemplate/browse/rate.cgi
@@ -8,9 +8,9 @@
                                  'order_by' => 'ORDER BY ratenum',
                                },
               'count_query' => $count_query,
-              'header'      => [ '#',       'Rate plan', 'Rates'    ],
-              'fields'      => [ 'ratenum', 'ratename',  $rates_sub ],
-              'links'       => [ $link,     $link,       ''         ],
+              'header'      => \@header,
+              'fields'      => \@fields,
+              'links'       => \@links,
               'agent_virt'  => 1,
               'agent_pos'   => 1,
               'agent_null_right' => 'Configuration', #'Edit global CDR rates',
@@ -76,4 +76,18 @@ if ( $curuser->access_right('Configuration') ) { #, 'Edit global CDR rates') ) {
   ;
 }
 
+my @header = ();
+my @fields = ();
+my @links = ();
+
+if ( FS::Record->scalar_sql('SELECT 1 FROM rate WHERE agent_rateid IS NOT NULL LIMIT 1') ) {
+  push @header, 'Legacy #';
+  push @fields, 'agent_rateid';
+  push @links, $link;
+}
+
+push @header, 'Rate plan', 'Rates';
+push @fields, 'ratename',  $rates_sub;
+push @links, $link, '';
+
 </%init>
diff --git a/httemplate/browse/rate_region.html b/httemplate/browse/rate_region.html
index b872455ae..1b4fd498f 100644
--- a/httemplate/browse/rate_region.html
+++ b/httemplate/browse/rate_region.html
@@ -68,11 +68,25 @@ my $sub_prefixes = sub {
   ($region->exact_match ? ' <I>(exact match only)</I>' : '');
 };
 
-my @header     = ( '#',         'Region',  'Country code', 'Prefixes' );
-my @fields     = ( 'regionnum', 'regionname',   'ccode',   $sub_prefixes );
-my @links      = ( ($link) x 4 );
-my @align      = ( 'right', 'left', 'right', 'left' );
-my @xls_format = ( ({ locked=>1, bg_color=>22 }) x 4 );
+my @header = ();
+my @fields = ();
+my @links = ();
+my @align = ();
+my @xls_format = ();
+
+if ( FS::Record->scalar_sql('SELECT 1 FROM rate_region WHERE agent_regionid IS NOT NULL LIMIT 1') ) {
+  push @header, 'Legacy #';
+  push @fields, 'agent_regionid';
+  push @links, $link;
+  push @align, 'right';
+  push @xls_format, { locked=>1, bg_color=>22};
+}
+
+push @header, 'Region',  'Country code', 'Prefixes';
+push @fields, 'regionname',   'ccode',   $sub_prefixes;
+push @links, ($link) x 3;
+push @align, 'left', 'right', 'left';
+push @xls_format, ({ locked=>1, bg_color=>22 }) x 3;
 
 my $countrycode_filter_change =
   "window.location = '".
diff --git a/httemplate/edit/rate.cgi b/httemplate/edit/rate.cgi
index 5bfc108c1..c0e8d93f0 100644
--- a/httemplate/edit/rate.cgi
+++ b/httemplate/edit/rate.cgi
@@ -24,8 +24,15 @@
      empty_label   => '(global)',
 &>
 
+% if ( $rate->agent_rateid ) {
+    <TR>
+      <TH ALIGN="right">Legacy #</TH>
+      <TD><% $rate->agent_rateid |h %></TD>
+    </TR>
+% }
+
 <TR>
-  <TD>Rate plan</TD>
+  <TH>Rate plan</TH>
   <TD><INPUT TYPE="text" NAME="ratename" SIZE=32 VALUE="<% $rate->ratename %>"></TD>
 </TR>
 </TABLE>
diff --git a/httemplate/edit/rate_region.cgi b/httemplate/edit/rate_region.cgi
index a1c1bcb7d..b50d2daba 100644
--- a/httemplate/edit/rate_region.cgi
+++ b/httemplate/edit/rate_region.cgi
@@ -11,7 +11,14 @@
 
 %# region info
 
-<% ntable('#cccccc') %>
+<TABLE CLASS="fsinnerbox">
+
+% if ( $rate_region->agent_regionid ) {
+    <TR>
+      <TH ALIGN="right">Legacy #</TH>
+      <TD><% $rate_region->agent_regionid |h %></TD>
+    </TR>
+% }
 
   <TR>
     <TH ALIGN="right">Region name</TH>
@@ -24,10 +31,10 @@
   </TR>
 
   <TR>
-    <TD ALIGN="right">
+    <TH ALIGN="right">
       <B>Prefixes</B>
       <BR><FONT SIZE="-1">(comma-separated)</FONT>
-    </TD>
+    </TH>
     <TD>
       <TEXTAREA NAME="npa" WRAP=SOFT><% join(', ', map { $_->npa. (length($_->nxx) ? '-'.$_->nxx : '') } @rate_prefix ) %></TEXTAREA>
     </TD>

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

Summary of changes:
 httemplate/browse/rate.cgi         | 20 +++++++++++++++++---
 httemplate/browse/rate_region.html | 24 +++++++++++++++++++-----
 httemplate/edit/rate.cgi           |  9 ++++++++-
 httemplate/edit/rate_region.cgi    | 13 ++++++++++---
 4 files changed, 54 insertions(+), 12 deletions(-)