From 44e840908ac339de1c9d430e9565e03d4bfa5ec3 Mon Sep 17 00:00:00 2001
From: Mark Wells <mark@freeside.biz>
Date: Wed, 30 Dec 2015 16:20:51 -0800
Subject: [PATCH] minor UI fix for future package change + advance billing,
 #37870

---
 httemplate/view/cust_main/packages/status.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/httemplate/view/cust_main/packages/status.html b/httemplate/view/cust_main/packages/status.html
index aa5320bd8..d76c9795f 100644
--- a/httemplate/view/cust_main/packages/status.html
+++ b/httemplate/view/cust_main/packages/status.html
@@ -136,7 +136,7 @@
 %     if ( $change_from ) { # future change
 %
           <% pkg_status_row_colspan( $cust_pkg, emt('Waiting for package change'), '', %opt ) %>
-          <% pkg_status_row( $cust_pkg,
+          <% pkg_status_row_if( $cust_pkg,
                              emt('Will be activated on'),
                              'start_date',
                              %opt ) %>
@@ -284,8 +284,9 @@
 %               }
 %           }
 
-%           if ( !$supplemental ) {
-%           # suspension actions--always available
+%           if ( !$supplemental and !$change_from ) {
+%           # suspension actions--always available for a package that's
+%           # independently active
 %             if ( $curuser->access_right('Suspend customer package') ) {
                 (&nbsp;<% pkg_suspend_link($cust_pkg) %>&nbsp;)
 %             }
-- 
2.11.0