X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=9b1bed90ccda4e2772b8834e22c53e506bf3d647;hb=e4fc461dd93181e8199d5cc5e2de2a11732b1bfd;hp=891fa30097f752eea2952024b7e77032107da7a4;hpb=99037cf94d9d6b5d7c1e512a6dca842706851710;p=freeside.git

diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 891fa3009..9b1bed90c 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -11,7 +11,16 @@
 %      ) {
 %
   <% $s++ ? ' | ' : '' %>
-  <% popup_link('edit/quick-charge.html?custnum='. $cust_main->custnum, 'One-time charge', 'One-time charge', '#333399', 545) %>
+  <% include('/elements/popup_link.html',
+     { 
+       'action'      => $p. 'edit/quick-charge.html?custnum='. $cust_main->custnum,
+       'label'       => 'One-time charge',
+       'actionlabel' => 'One-time charge',
+       'color'       => '#333399',
+       'width'       => 545,
+     })
+  %>
+
 % } 
 % if ( $curuser->access_right('Bulk change customer packages') ) { 
   <% $s++ ? ' | ' : '' %>
@@ -78,6 +87,10 @@ Current packages
     <% $part_pkg->pkg %> - <% $part_pkg->comment %>
     <BR>
 
+%   if ( $cust_pkg->quantity > 1 ) {
+        &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Quantity: <B><% $cust_pkg->quantity %></B><BR>
+%   }
+
     <FONT SIZE=-1>
 % unless ( $cust_pkg->get('cancel') ) { 
 %   my $br = 0;
@@ -136,36 +149,47 @@ Current packages
 %
 %
 % if ( $cust_pkg->get('cancel') ) { #status: cancelled
+%   my $cpr = $cust_pkg->last_cust_pkg_reason;
 
-    <% pkg_status_row($cust_pkg, 'Cancelled', 'cancel', 'color'=>'FF0000' ) %>
+    <% pkg_status_row($cust_pkg, 'Cancelled', 'cancel', 'color'=>'FF0000', conf=>$conf ) %>
 
     <% pkg_status_row_colspan(
-         ( $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' ), '',
+         ( ( $cpr && ( $cpr->date == $cust_pkg->get('cancel') ||
+                       $cpr->date == $cust_pkg->expire
+                     )
+           ) ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
          'align' => 'right', 'color' => 'ff0000', 'size' => '-2',
        )
     %>
 
+
+    <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900', conf=>$conf ) %>
+
 %   unless ( $cust_pkg->get('setup') ) { 
 
         <% pkg_status_row_colspan('Never billed') %>
 
 %   } else { 
 
-       <% pkg_status_row( $cust_pkg, 'Setup', 'setup' ) %>
-       <% pkg_status_row_changed( $cust_pkg ) %>
-       <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill' ) %>
-       <% pkg_status_row_if( $cust_pkg, 'Suspended', 'susp' ) %>
+       <% pkg_status_row( $cust_pkg, 'Setup', 'setup', conf=>$conf ) %>
+       <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
+       <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf ) %>
+       <% pkg_status_row_if( $cust_pkg, 'Suspended', 'susp', conf=>$conf ) %>
 
 %   } 
 %
 % } else { 
 %
 %   if ( $cust_pkg->get('susp') ) { #status: suspended
+%     my $cpr = $cust_pkg->last_cust_pkg_reason;
 
-    <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900' ) %>
+    <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900', conf=>$conf ) %>
 
     <% pkg_status_row_colspan(
-         ( $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' ), '',
+         ( ( $cpr && ( $cpr->date == $cust_pkg->susp ||
+                       $cpr->date == $cust_pkg->adjourn
+                     )
+           ) ? $cpr->reasontext. ' by '. $cpr->otaker : '' ), '',
          'align' => 'right', 'color' => 'FF9900', 'size' => '-2',
        )
     %>
@@ -173,13 +197,13 @@ Current packages
 %   unless ( $cust_pkg->get('setup') ) { 
       <% pkg_status_row_colspan('Never billed') %>
 %   } else { 
-      <% pkg_status_row($cust_pkg, 'Setup', 'setup' ) %>
+      <% pkg_status_row($cust_pkg, 'Setup', 'setup', conf=>$conf ) %>
 %   } 
 
-    <% pkg_status_row_changed( $cust_pkg ) %>
-    <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill' ) %>
-%   # pkg_status_row($cust_pkg, 'Next bill', 'bill')
-    <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire' ) %>
+    <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
+    <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf ) %>
+%   # pkg_status_row($cust_pkg, 'Next bill', 'bill', conf=>$conf)
+    <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf ) %>
 
     <TR>
       <TD COLSPAN=<%$colspan%>>
@@ -224,7 +248,7 @@ Current packages
 
           <% pkg_status_row_colspan('One-time&nbsp;charge') %>
 
-          <% pkg_status_row($cust_pkg, 'Billed', 'setup') %>
+          <% pkg_status_row($cust_pkg, 'Billed', 'setup', conf=>$conf) %>
 
 %       } else { 
 %
@@ -246,17 +270,17 @@ Current packages
             %>
 %         } 
 
-          <% pkg_status_row($cust_pkg, 'Setup', 'setup') %>
+          <% pkg_status_row($cust_pkg, 'Setup', 'setup', conf=>$conf) %>
 
 %       } 
 %
 %     } 
 
-      <% pkg_status_row_changed( $cust_pkg ) %>
-      <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill' ) %>
-      <% pkg_status_row_if( $cust_pkg, $next_bill_or_prepaid_until, 'bill' ) %>
-      <% pkg_status_row_if( $cust_pkg, 'Will suspend on', 'adjourn' ) %>
-      <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire' ) %>
+      <% pkg_status_row_changed( $cust_pkg, conf=>$conf ) %>
+      <% pkg_status_row_if( $cust_pkg, $last_bill_or_renewed, 'last_bill', conf=>$conf ) %>
+      <% pkg_status_row_if( $cust_pkg, $next_bill_or_prepaid_until, 'bill', conf=>$conf ) %>
+      <% pkg_status_row_if( $cust_pkg, 'Will suspend on', 'adjourn', conf=>$conf ) %>
+      <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire', conf=>$conf ) %>
 
 %     if ( $part_pkg->freq ) { 
 
@@ -390,7 +414,7 @@ sub pkg_status_row {
   $html   .= qq($title&nbsp;);
   $html   .= qq(</B></FONT>) if length($color);
   $html   .= qq(</TD>);
-  $html   .= pkg_datestr($cust_pkg, $field, $conf).'</TR>';
+  $html   .= pkg_datestr($cust_pkg, $field, $opt{conf}).'</TR>';
 
   $html;
 }
@@ -401,9 +425,9 @@ sub pkg_status_row_if {
 }
 
 sub pkg_status_row_changed {
-  my($cust_pkg) = @_;
+  my( $cust_pkg, %opt ) = @_;
   return '' unless $cust_pkg->change_date;
-  my $html = pkg_status_row( $cust_pkg, 'Package&nbsp;changed', 'change_date' );
+  my $html = pkg_status_row( $cust_pkg, 'Package&nbsp;changed', 'change_date', conf=>$opt{'conf'} );
   my $old = $cust_pkg->old_cust_pkg;
   if ( $old ) {
     my $part_pkg = $old->part_pkg;
@@ -434,9 +458,6 @@ sub pkg_status_row_colspan {
 
 }
 
-</%init>
-<%once>
-
 #subroutines
 
 sub get_packages {
@@ -516,64 +537,78 @@ sub pkg_datestr {
   $strip;
 }
 
-sub pkg_change_link    { pkg_popup_link('misc/change_pkg.cgi?dummy=value',
-                                          'Change&nbsp;package',
-                                          'Change',
-                                          '',
-                                          @_
-                                       );
-                       }
-
-sub pkg_suspend_link   { pkg_popup_link( 'misc/cancel_pkg.html?method=suspend',
-                                         'Suspend&nbsp;now',
-                                         'Suspend',
-                                         '#FF9900',
-                                         @_
-                                       );
-                       }
-
-sub pkg_adjourn_link   { pkg_popup_link( 'misc/cancel_pkg.html?method=adjourn',
-                                         'Suspend&nbsp;later',
-                                         'Adjourn',
-                                         '#CC6600',
-                                         @_
-                                       );
-                       }
+sub pkg_change_link { include( '/elements/popup_link-cust_pkg.html',
+                               { 'action'      => $p. 'misc/change_pkg.cgi?dummy=value',
+                                 'label'       => 'Change&nbsp;package',
+                                 'actionlabel' => 'Change',
+                                 'cust_pkg'    => shift,
+                               }
+                             )
+                     }
+
+sub pkg_suspend_link { include( '/elements/popup_link-cust_pkg.html',
+                                { 'action'      => $p. 'misc/cancel_pkg.html?method=suspend',
+                                  'label'       => 'Suspend&nbsp;now',
+                                  'actionlabel' => 'Suspend',
+                                  'color'       => '#FF9900',
+                                  'cust_pkg'    => shift,
+                                }
+                              )
+                     }
+
+
+sub pkg_adjourn_link { include( '/elements/popup_link-cust_pkg.html',
+                                { 'action'      => $p. 'misc/cancel_pkg.html?method=adjourn',
+                                  'label'       => 'Suspend&nbsp;later',
+                                  'actionlabel' => 'Adjourn',
+                                  'color'       => '#CC6600',
+                                  'cust_pkg'    => shift,
+                                }
+                              )
+                     }
 
 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',     @_ ); }
 
-sub pkg_cancel_link    { pkg_popup_link( 'misc/cancel_pkg.html?method=cancel',
-                                         'Cancel&nbsp;now',
-                                         'Cancel',
-                                         '#ff0000',
-                                         @_
-                                       );
-                       }
-
-sub pkg_expire_link    { pkg_popup_link( 'misc/cancel_pkg.html?method=expire',
-                                         'Cancel&nbsp;later',
-                                         'Expire', #"Cancel package $num later"
-                                         '#CC0000',
-                                         @_
-                                       );
-                       }
-
-sub svc_recharge_link  { svc_popup_link( 'misc/recharge_svc.html',
-                                         'Recharge',
-                                         'Recharge',
-                                         '#333399',
-                                         @_
-                                       );
-                       }
-
-sub order_pkg_link { cust_popup_link( 'misc/order_pkg.html',
-                                      'Order&nbsp;new&nbsp;package',
-                                      'Order new package',
-                                      '#333399',
-                                      @_
-                                    );
+sub pkg_cancel_link { include( '/elements/popup_link-cust_pkg.html',
+                               { 'action'      => $p. 'misc/cancel_pkg.html?method=cancel',
+                                 'label'       => 'Cancel&nbsp;now',
+                                 'actionlabel' => 'Cancel',
+                                 'color'       => '#ff0000',
+                                 'cust_pkg'    => shift,
+                               }
+                             )
+                    }
+
+sub pkg_expire_link { include( '/elements/popup_link-cust_pkg.html',
+                               { 'action'      => $p. 'misc/cancel_pkg.html?method=expire',
+                                 'label'       => 'Cancel&nbsp;later',
+                                 'actionlabel' => 'Expire', #"Cancel package $num later"
+                                 'color'       => '#CC0000',
+                                 'cust_pkg'    => shift,
+                               }
+                             )
+                    }
+
+sub svc_recharge_link { include( '/elements/popup_link-cust_svc.html',
+                                 { 'action'      => $p. 'misc/recharge_svc.html',
+                                   'label'       => 'Recharge',
+                                   'actionlabel' => 'Recharge',
+                                   'color'       => '#333399',
+                                   'cust_svc'    => shift,
+                                 }
+                               )
+                      }
+
+sub order_pkg_link { include( '/elements/popup_link-cust_main.html',
+                              { 'action'      => $p. 'misc/order_pkg.html',
+                                'label'       => 'Order&nbsp;new&nbsp;package',
+                                'actionlabel' => 'Order new package',
+                                'color'       => '#333399',
+                                'cust_main'   => shift,
+                                'closetext'   => 'Close',
+                              }
+                            )
                    }
 
 sub pkg_event_link {
@@ -589,41 +624,13 @@ sub pkg_link {
   qq!<a href="$p$action.cgi?!. $cust_pkg->pkgnum. qq!">$label</a>!;
 }
 
-sub pkg_popup_link {
-  my($action, $label, $actionlabel, $color, $cust_pkg) = @_;
-  $action .= '&pkgnum='. $cust_pkg->pkgnum;
-  $actionlabel .= ' package '. $cust_pkg->pkgnum;
-  popup_link($action, $label, $actionlabel, $color, 768);
-}
-
-sub svc_popup_link {
-  my($action, $label, $actionlabel, $color, $cust_svc) = @_;
-  $action .= '?svcnum='. $cust_svc->svcnum;
-  $actionlabel .= ' service '. $cust_svc->svcnum;
-  popup_link($action, $label, $actionlabel, $color);
-}
-
-sub cust_popup_link {
-  my($action, $label, $actionlabel, $color, $cust_main) = @_;
-  $action .= '?'. $cust_main->custnum;
-  popup_link($action, $label, $actionlabel, $color);
-}
-
-sub popup_link {
-  my($action, $label, $actionlabel, $color, $width) = @_;
-  $color ||= '#333399';
-  $width ||= 540;
-  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, BGCOLOR, '$color', CGCOLOR, '$color' ); return false;">$label</A>!;
-}
-
 sub pkg_customize_link {
   my $cust_pkg = shift or return '';
   my $custnum = $cust_pkg->custnum;
   qq!<A HREF="${p}edit/part_pkg.cgi?!.
-    "keywords=$custnum;".
     "clone=". $cust_pkg->part_pkg->pkgpart. ';'.
     "pkgnum=". $cust_pkg->pkgnum.
     qq!">Customize</A>!;
 }
 
-</%once>
+</%init>