From 943f3ff4145a0ce2ef946aba3f0ba4aa495f224e Mon Sep 17 00:00:00 2001
From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 11 Mar 2016 18:56:59 -0800
Subject: [PATCH] move misc/cust_pkg_usageprice.html to
 elements/table-cust_pkg_usageprice.html, RT#33410

---
 .../table-cust_pkg_usageprice.html}                          | 4 ++++
 httemplate/misc/change_pkg.cgi                               | 5 ++---
 httemplate/misc/order_pkg.html                               | 4 +---
 3 files changed, 7 insertions(+), 6 deletions(-)
 rename httemplate/{misc/cust_pkg_usageprice.html => elements/table-cust_pkg_usageprice.html} (92%)

diff --git a/httemplate/misc/cust_pkg_usageprice.html b/httemplate/elements/table-cust_pkg_usageprice.html
similarity index 92%
rename from httemplate/misc/cust_pkg_usageprice.html
rename to httemplate/elements/table-cust_pkg_usageprice.html
index f2e0f57e6..b023e81d1 100644
--- a/httemplate/misc/cust_pkg_usageprice.html
+++ b/httemplate/elements/table-cust_pkg_usageprice.html
@@ -27,6 +27,7 @@ While disabled, calling usageprice_pkg_changed will have no effect.
 <TABLE BGCOLOR="#cccccc" BORDER=0 CELLSPACING=0 ID="cust_pkg_usageprice_table">
 
 </TABLE>
+<BR ID="cust_pkg_usageprice_br" STYLE="display:none">
 
 <SCRIPT>
 
@@ -64,6 +65,7 @@ function clear_part_pkg_usageprice () {
     table.deleteRow(r);
   }
   document.getElementById('cust_pkg_usageprice_title').style.display = 'none';
+  document.getElementById('cust_pkg_usageprice_br').style.display = 'none';
 }
 
 // catches response from xmlhttp request, updates cache & calls update function
@@ -100,8 +102,10 @@ function update_part_pkg_usageprice (pkgpart) {
 
   if ( rownum > 0 ) {
     document.getElementById('cust_pkg_usageprice_title').style.display = '';
+    document.getElementById('cust_pkg_usageprice_br').style.display = '';
   } else {
     document.getElementById('cust_pkg_usageprice_title').style.display = 'none';
+    document.getElementById('cust_pkg_usageprice_br').style.display = 'none';
   }
 
 }
diff --git a/httemplate/misc/change_pkg.cgi b/httemplate/misc/change_pkg.cgi
index b562d24cd..e3ef4b7a8 100755
--- a/httemplate/misc/change_pkg.cgi
+++ b/httemplate/misc/change_pkg.cgi
@@ -39,11 +39,10 @@
 </TABLE>
 <BR>
 
-<% include('/misc/cust_pkg_usageprice.html',
+<& /elements/table-cust_pkg_usageprice.html,
      'pkgpart' => (scalar($cgi->param('pkgpart')) || $cust_pkg->pkgpart),
      'pkgnum'  => ($cust_pkg->change_to_pkgnum || $pkgnum),
-   ) %>
-<BR>
+&>
 
 <FONT CLASS="fsinnerbox-title"><% mt('Change') |h %></FONT>
 <% ntable('#cccccc') %>
diff --git a/httemplate/misc/order_pkg.html b/httemplate/misc/order_pkg.html
index f3a573c56..a08cb4bf1 100644
--- a/httemplate/misc/order_pkg.html
+++ b/httemplate/misc/order_pkg.html
@@ -136,12 +136,10 @@
 
 </TABLE><BR>
 
-<& /misc/cust_pkg_usageprice.html,
+<& /elements/table-cust_pkg_usageprice.html,
      'pkgpart' => $pkgpart
 &>
 
-<BR>
-
 % my $discount_cust_pkg = $curuser->access_right('Discount customer package');
 % my $waive_setup_fee   = $curuser->access_right('Waive setup fee');
 %
-- 
2.20.1