[freeside-commits] freeside/httemplate/view/cust_main packages.html, 1.20.2.2, 1.20.2.3

[Jeff Finucane,420,,]

Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail:/tmp/cvs-serv2363/httemplate/view/cust_main

Modified Files:
      Tag: FREESIDE_1_7_BRANCH
	packages.html 
Log Message:
suspend later just like expire (#1487)

Index: packages.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/packages.html,v
retrieving revision 1.20.2.2
retrieving revision 1.20.2.3
diff -u -d -r1.20.2.2 -r1.20.2.3
--- packages.html	19 Apr 2007 20:18:07 -0000	1.20.2.2
+++ packages.html	26 Jun 2007 15:36:54 -0000	1.20.2.3
@@ -299,6 +299,13 @@
         <% pkg_datestr($cust_pkg, 'bill', $conf) %>
       </TR>
 % } 
+% if ( $cust_pkg->get('adjourn') ) { 
+
+      <TR>
+        <TD WIDTH="<%$width%>" ALIGN="right">Adjourns&nbsp;</TD>
+        <% pkg_datestr($cust_pkg, 'adjourn', $conf) %>
+      </TR>
+% } 
 % if ( $cust_pkg->get('expire') ) { 
 
       <TR>
@@ -315,6 +322,10 @@
 
               (&nbsp;<% pkg_suspend_link($cust_pkg) %>&nbsp;)
 % } 
+% if ( $curuser->access_right('Suspend customer package later') ) { 
+
+              (&nbsp;<% pkg_adjourn_link($cust_pkg) %>&nbsp;)
+% } 
 % if ( $curuser->access_right('Cancel customer package immediately') ) { 
 
               (&nbsp;<% pkg_cancel_link($cust_pkg) %>&nbsp;)
@@ -489,7 +500,7 @@
 %sub pkg_change_link    { pkg_link('misc/change_pkg',    'Change&nbsp;package', @_ ); }
 %
 %sub pkg_suspend_link   { pkg_popup_link( 'misc/cancel_pkg.html?method=suspend',
-%                                         'Suspend',
+%                                         'Suspend&nbsp;now',
 %                                         'Suspend',
 %                                         @_
 %                                       );
@@ -505,6 +516,13 @@
 %                                         @_
 %                                       );
 %                       }
+%sub pkg_adjourn_link   { pkg_popup_link( 'misc/cancel_pkg.html?method=adjourn',
+%                                         'Suspend&nbsp;later',
+%                                         'Adjourn',
+%                                         @_
+%                                       );
+%                       }
+%
 %sub pkg_expire_link    { pkg_popup_link( 'misc/cancel_pkg.html?method=expire',
 %                                         'Cancel&nbsp;later',
 %                                         'Expire', #"Cancel package $num later"