X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=b54208b79aee453d815a97f9a0288a385184fc69;hb=769ccaa51add3b87ca3aacc1f4792e06401e4627;hp=84160502838293f3bfc8198ee4193f25a433c218;hpb=633c48448d9468690b7ad77eb6ff7c660a286658;p=freeside.git

diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 841605028..b54208b79 100755
--- 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;)
 % } 
@@ -349,7 +350,7 @@ Current packages
         <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 ''
@@ -476,7 +477,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 +512,26 @@ Current packages
 %sub pkg_link {
 %  my($action, $label, $cust_pkg) = @_;
 %  return '' unless $cust_pkg;
-%  qq!<a href="${p}misc/$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 {