fix very strange "Undefined subroutine &FS::UI::Web::rooturl" with an explicit import...

[freeside.git] / httemplate / view / cust_main / packages.html

diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 5a9f47d..98acb86 100755 (executable)
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -16,7 +16,8 @@
 %      ) {
 %
 
-  <% include('quick-charge.html', $cust_main ) %>
+  <% popup_link('edit/quick-charge.html?custnum='. $cust_main->custnum, 'One-time charge', 'One-time charge', 545) %>
+  <BR>
 % } 
 % if ( $curuser->access_right('Bulk change customer packages') ) { 
 
@@ -218,7 +219,7 @@ Current packages
 
             (&nbsp;<% pkg_unsuspend_link($cust_pkg) %>&nbsp;)
 % } 
-% if ( $curuser->access_right('Cancel customer package') ) { 
+% if ( $curuser->access_right('Cancel customer package immediately') ) { 
 
             (&nbsp;<% pkg_cancel_link($cust_pkg) %>&nbsp;)
 % } 
@@ -269,12 +270,15 @@ Current packages
           <% pkg_datestr($cust_pkg, 'setup', $conf) %>
         </TR>
 % } else { 
-
-
+% if (scalar($cust_pkg->overlimit)) {
+        <TR>
+          <TD COLSPAN=<%$colspan%>><FONT COLOR="#FFD000"><B>Overlimit</B></FONT>,&nbsp;<% $billed_or_prepaid %>&nbsp;<% myfreq($part_pkg) %></TD>
+        </TR>
+%}else{
         <TR>
           <TD COLSPAN=<%$colspan%>><FONT COLOR="#00CC00"><B>Active</B></FONT>,&nbsp;<% $billed_or_prepaid %>&nbsp;<% myfreq($part_pkg) %></TD>
         </TR>
-
+% } 
         <TR>
           <TD WIDTH="<%$width%>" ALIGN="right">Setup&nbsp;</TD>
           <% pkg_datestr($cust_pkg, 'setup', $conf) %>
@@ -346,10 +350,17 @@ Current packages
       </TR>
 
       <TR>
+        <TD ALIGN="right" COLSPAN="2" VALIGN="top" STYLE="padding-bottom:1px;padding-top:0px"><FONT SIZE="-2" COLOR="#FFD000">
+
+            <% $cust_svc->overlimit ? "Overlimit: ". time2str('%b %o %Y' . ($conf->exists('cust_pkg-display_times') ? ' %l:%M %P' : ''), $cust_svc->overlimit) : '' %>
+          </FONT></TD>
+      </TR>
+
+      <TR>
         <TD ALIGN="right" VALIGN="top" STYLE="padding-bottom:5px;padding-top:0px"><FONT SIZE="-2">
 
 %         if ( $curuser->access_right('Recharge customer service')
-%              && $cust_svc->svcdb eq 'svc_acct'
+%              && $part_svc->svcdb eq 'svc_acct'
 %              && (    $cust_svc->svc_x->seconds    ne ''
 %                   || $cust_svc->svc_x->upbytes    ne ''
 %                   || $cust_svc->svc_x->downbytes  ne ''
@@ -429,12 +440,12 @@ Current packages
 %  ) {
 %    $url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$pkgnum_svcpart";
 %  } else {
-%    $url = FS::UI::Web::svc_url(
-%                                 'm'        => $m,
-%                                 'action'   => 'edit',
-%                                 'part_svc' => $part_svc, 
-%                                 'query'    => $pkgnum_svcpart,
-%                               );
+%    $url = svc_url(
+%                    'm'        => $m,
+%                    'action'   => 'edit',
+%                    'part_svc' => $part_svc, 
+%                    'query'    => $pkgnum_svcpart,
+%                  );
 %    #$url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart";
 %  }
 %
@@ -476,7 +487,14 @@ Current packages
 %}
 %
 %sub pkg_change_link    { pkg_link('misc/change_pkg',    'Change&nbsp;package', @_ ); }
-%sub pkg_suspend_link   { pkg_link('misc/susp_pkg',      'Suspend',             @_ ); }
+%
+%sub pkg_suspend_link   { pkg_popup_link( 'misc/cancel_pkg.html?method=suspend',
+%                                         'Suspend',
+%                                         'Suspend',
+%                                         @_
+%                                       );
+%                       }
+%
 %sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg',    'Unsuspend',           @_ ); }
 %sub pkg_expire_link    { pkg_link('misc/expire_pkg',    'Cancel&nbsp;later',   @_ ); }
 %sub pkg_dates_link     { pkg_link('edit/REAL_cust_pkg', 'Edit&nbsp;dates',     @_ ); }
@@ -504,26 +522,26 @@ Current packages
 %sub pkg_link {
 %  my($action, $label, $cust_pkg) = @_;
 %  return '' unless $cust_pkg;
-%  qq!<a href="${p}$action.cgi?!. $cust_pkg->pkgnum. qq!">$label</a>!;
+%  qq!<a href="$p$action.cgi?!. $cust_pkg->pkgnum. qq!">$label</a>!;
 %}
 %
 %sub pkg_popup_link {
 %  my($action, $label, $actionlabel, $cust_pkg) = @_;
 %  $action .= '&pkgnum='. $cust_pkg->pkgnum;
 %  $actionlabel .= ' package '. $cust_pkg->pkgnum;
-%  popup_link($action, $label, $actionlabel);
+%  popup_link($action, $label, $actionlabel, 392);
 %}
 %
 %sub svc_popup_link {
 %  my($action, $label, $actionlabel, $cust_svc) = @_;
 %  $action .= '?svcnum='. $cust_svc->svcnum;
 %  $actionlabel .= ' service '. $cust_svc->svcnum;
-%  popup_link($action, $label, $actionlabel);
+%  popup_link($action, $label, $actionlabel, 392);
 %}
 %
 %sub popup_link {
-%  my($action, $label, $actionlabel) = @_;
-%  qq!<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('$p$action', 392, 336, 'pkg_or_svc_action_popup' ), CAPTION, '$actionlabel', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">$label</A>!;
+%  my($action, $label, $actionlabel, $width) = @_;
+%  qq!<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('$p$action', $width, 336, 'pkg_or_svc_action_popup' ), CAPTION, '$actionlabel', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">$label</A>!;
 %}
 %
 %sub pkg_customize_link {