componentize conflicting %once subroutines (rt#3250)
[freeside.git] / httemplate / view / cust_main / packages.html
index 7cb869f..b51c024 100755 (executable)
 %      ) {
 %
   <% $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++ ? ' | ' : '' %>
@@ -119,9 +128,8 @@ Current packages
 %  }
 %
 %  #this should use cust_pkg->status and cust_pkg->statuscolor eventually
-%
-%  my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4;
-%  my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%';
+%  #my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4;
+%  #my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%';
 %
 %  #false laziness w/edit/REAL_cust_pkg.cgi
 %  my( $billed_or_prepaid, $last_bill_or_renewed, $next_bill_or_prepaid_until );
@@ -136,223 +144,155 @@ Current packages
 %  }
 %
 %
-% if ( $cust_pkg->get('cancel') ) { 
- <!-- #status: cancelled -->
+% if ( $cust_pkg->get('cancel') ) { #status: cancelled
 
-  <TR>
-    <TD WIDTH="<%$width%>" ALIGN="right"><FONT COLOR="#ff0000"><B>Cancelled&nbsp;</B></FONT></TD>
-    <% pkg_datestr($cust_pkg, 'cancel', $conf) %>
-  </TR>
-  <TR>
-    <TD WIDTH="<%$width%>" ALIGN="right"><FONT COLOR="#ff0000" SIZE="-2">
-      <% $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' %>
-    </FONT></TD>
-  </TR>
-% unless ( $cust_pkg->get('setup') ) { 
+    <% pkg_status_row($cust_pkg, 'Cancelled', 'cancel', 'color'=>'FF0000' ) %>
 
+    <% pkg_status_row_colspan(
+         ( $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' ), '',
+         'align' => 'right', 'color' => 'ff0000', 'size' => '-2',
+       )
+    %>
 
-    <TR>
-      <TD COLSPAN=<%$colspan%>>Never billed</TD>
-    </TR>
-% } else { 
+%   unless ( $cust_pkg->get('setup') ) { 
 
+        <% pkg_status_row_colspan('Never billed') %>
 
-    <TR>
-      <TD WIDTH="<%$width%>" ALIGN="right">Setup&nbsp;</TD>
-      <% pkg_datestr($cust_pkg, 'setup', $conf) %>
-    </TR>
-% if ( $cust_pkg->get('last_bill') ) { 
+%   } else { 
 
-      <TR>
-        <TD WIDTH="<%$width%>" ALIGN="right"><% $last_bill_or_renewed %>&nbsp;</TD>
-        <% pkg_datestr($cust_pkg, 'last_bill',$conf) %>
-      </TR>
-% } 
-% if ( $cust_pkg->get('susp') ) { 
+       <% 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' ) %>
 
-      <TR>
-        <TD WIDTH="<%$width%>" ALIGN="right">Suspended&nbsp;</TD>
-        <% pkg_datestr($cust_pkg, 'susp', $conf) %>
-      </TR>
-% } 
-% } 
-% } else { 
-% if ( $cust_pkg->get('susp') ) { 
- <!-- #status: suspended -->
-
-    <TR>
-      <TD WIDTH="<%$width%>" ALIGN="right"><FONT COLOR="#FF9900"><B>Suspended</B>&nbsp;</FONT></TD>
-      <% pkg_datestr($cust_pkg, 'susp', $conf) %>
-    </TR>
-    <TR>
-      <TD WIDTH="<%$width%>" ALIGN="right"><FONT COLOR="#FF9900" SIZE="-2">
-        <% $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' %>
-      </FONT></TD>
-    </TR>
-% unless ( $cust_pkg->get('setup') ) { 
-
-
-      <TR>
-        <TD COLSPAN=<%$colspan%>>Never billed</TD>
-      </TR>
+%   } 
+%
 % } else { 
+%
+%   if ( $cust_pkg->get('susp') ) { #status: suspended
 
+    <% pkg_status_row( $cust_pkg, 'Suspended', 'susp', 'color'=>'FF9900' ) %>
 
-      <TR>
-        <TD WIDTH="<%$width%>" ALIGN="right">Setup&nbsp;</TD>
-        <% pkg_datestr($cust_pkg, 'setup', $conf) %>
-      </TR>
-% } 
-% if ( $cust_pkg->get('last_bill') ) { 
-
-      <TR>
-        <TD WIDTH="<%$width%>" ALIGN="right"><% $last_bill_or_renewed %>&nbsp;</TD>
-        <% pkg_datestr($cust_pkg, 'last_bill', $conf) %>
-      </TR>
-% } 
-
-
-    <!-- # next bill ?? -->
-% if ( $cust_pkg->get('expire') ) { 
+    <% pkg_status_row_colspan(
+         ( $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' ), '',
+         'align' => 'right', 'color' => 'FF9900', 'size' => '-2',
+       )
+    %>
 
-      <TR>
-        <TD WIDTH="<%$width%>" ALIGN="right">Expires&nbsp;</TD>
-        <% pkg_datestr($cust_pkg, 'expire', $conf) %>
-      </TR>
-% } 
+%   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($cust_pkg, 'Next bill', 'bill')
+    <% pkg_status_row_if( $cust_pkg, 'Expires', 'expire' ) %>
 
     <TR>
       <TD COLSPAN=<%$colspan%>>
         <FONT SIZE=-1>
-% if ( $curuser->access_right('Unsuspend customer package') ) { 
-
+%         if ( $curuser->access_right('Unsuspend customer package') ) { 
             (&nbsp;<% pkg_unsuspend_link($cust_pkg) %>&nbsp;)
-% } 
-% if ( $curuser->access_right('Cancel customer package immediately') ) { 
-
+%         } 
+%         if ( $curuser->access_right('Cancel customer package immediately') ) {
             (&nbsp;<% pkg_cancel_link($cust_pkg) %>&nbsp;)
-% } 
-
+%         } 
         </FONT>
       </TD>
     </TR>
-% } else { 
- <!-- #status: active -->
-% unless ( $cust_pkg->get('setup') ) { 
- <!-- #not setup -->
-% unless ( $part_pkg->freq ) { 
-
-
-        <TR>
-          <TD COLSPAN=<%$colspan%>>Not&nbsp;yet&nbsp;billed&nbsp;(one-time&nbsp;charge)</TD>
-        </TR>
-
-        <TR>
-          <TD COLSPAN=<%$colspan%>>
-            <FONT SIZE=-1>
-% if ( $curuser->access_right('Cancel customer package immediately') ) { 
-
-                (&nbsp;<% pkg_cancel_link($cust_pkg) %>&nbsp;)
-% } 
-
-            </FONT>
-          </TD>
-        </TR>
-% } else { 
 
+%   } else { #status: active
+%
+%     unless ( $cust_pkg->get('setup') ) { #not setup
+%
+%       unless ( $part_pkg->freq ) { 
 
-        <TR>
-          <TD COLSPAN=<%$colspan%>>Not&nbsp;yet&nbsp;billed&nbsp;(<% $billed_or_prepaid %>&nbsp;<% myfreq($part_pkg) %>)</TD>
-        </TR>
-% } 
-% } else { 
- <!-- #setup -->
-% unless ( $part_pkg->freq ) { 
+          <% pkg_status_row_colspan('Not&nbsp;yet&nbsp;billed&nbsp;(one-time&nbsp;charge)') %>
 
+          <TR>
+            <TD COLSPAN=<%$colspan%>>
+              <FONT SIZE=-1>
+%               if ( $curuser->access_right('Cancel customer package immediately') ) { 
+                  (&nbsp;<% pkg_cancel_link($cust_pkg) %>&nbsp;)
+%               } 
+              </FONT>
+            </TD>
+          </TR>
 
-        <TR>
-          <TD COLSPAN=<%$colspan%>>One-time&nbsp;charge</TD>
-        </TR>
+%       } else { 
 
-        <TR>
-          <TD WIDTH="<%$width%>" ALIGN="right">Billed&nbsp;</TD>
-          <% 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) %>
-        </TR>
-% } 
-% } 
-% if ( $cust_pkg->get('last_bill') ) { 
+         <% pkg_status_row_colspan("Not&nbsp;yet&nbsp;billed&nbsp;($billed_or_prepaid&nbsp;". myfreq($part_pkg). ')' ) %>
 
-      <TR>
-        <TD WIDTH="<%$width%>" ALIGN="right"><% $last_bill_or_renewed %>&nbsp;</TD>
-        <% pkg_datestr($cust_pkg, 'last_bill', $conf) %>
-      </TR>
-% } 
-% if ( $cust_pkg->get('bill') ) { #next bill
+%       } 
+%
+%     } else { #setup
+%
+%       unless ( $part_pkg->freq ) { 
 
-      <TR>
-        <TD WIDTH="<%$width%>" ALIGN="right"><% $next_bill_or_prepaid_until %>&nbsp;</TD>
-        <% pkg_datestr($cust_pkg, 'bill', $conf) %>
-      </TR>
-% } 
-% if ( $cust_pkg->get('adjourn') ) { 
+          <% pkg_status_row_colspan('One-time&nbsp;charge') %>
 
-      <TR>
-        <TD WIDTH="<%$width%>" ALIGN="right">Adjourns&nbsp;</TD>
-        <% pkg_datestr($cust_pkg, 'adjourn', $conf) %>
-      </TR>
-% } 
-% if ( $cust_pkg->get('expire') ) { 
+          <% pkg_status_row($cust_pkg, 'Billed', 'setup') %>
 
-      <TR>
-        <TD WIDTH="<%$width%>" ALIGN="right">Expires&nbsp;</TD>
-        <% pkg_datestr($cust_pkg, 'expire', $conf) %>
-      </TR>
-% } 
-% if ( $part_pkg->freq ) { 
+%       } else { 
+%
+%         if (scalar($cust_pkg->overlimit)) {
+
+            <% pkg_status_row_colspan(
+                 'Overlimit',
+                 $billed_or_prepaid. '&nbsp;'. myfreq($part_pkg),
+                 'color' => 'FFD000',
+               )
+            %>
+
+%         } else {
+            <% pkg_status_row_colspan(
+                 'Active',
+                 $billed_or_prepaid. '&nbsp;'. myfreq($part_pkg),
+                 'color' => '00CC00',
+               )
+            %>
+%         } 
 
-      <TR>
-        <TD COLSPAN=<%$colspan%>>
-          <FONT SIZE=-1>
-% if ( $curuser->access_right('Suspend customer package') ) { 
+          <% pkg_status_row($cust_pkg, 'Setup', 'setup') %>
 
-              (&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') ) { 
+      <% 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' ) %>
 
-              (&nbsp;<% pkg_cancel_link($cust_pkg) %>&nbsp;)
-% } 
-% if ( $curuser->access_right('Cancel customer package later') ) { 
+%     if ( $part_pkg->freq ) { 
 
-              (&nbsp;<% pkg_expire_link($cust_pkg) %>&nbsp;)
-% } 
+        <TR>
+          <TD COLSPAN=<%$colspan%>>
+            <FONT SIZE=-1>
+%             if ( $curuser->access_right('Suspend customer package') ) { 
+                (&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;)
+%             } 
+%             if ( $curuser->access_right('Cancel customer package later') ) { 
+                (&nbsp;<% pkg_expire_link($cust_pkg) %>&nbsp;)
+%             } 
 
-          <FONT>
-        </TD>
-      </TR>
-% } 
-% } 
+            <FONT>
+          </TD>
+        </TR>
+%     }
+%
+%   } 
 % } 
 
-
 </TABLE>
 </TD>
 
@@ -368,10 +308,11 @@ Current packages
       <TR>
         <TD ALIGN="right" VALIGN="top"><% FS::UI::Web::svc_link($m, $part_svc, $cust_svc) %></TD>
         <TD STYLE="padding-bottom:0px"><B><% FS::UI::Web::svc_label_link($m, $part_svc, $cust_svc) %></B></TD>
+        <TD><% FS::UI::Web::svc_export_links($m, $part_svc, $cust_svc) %></TD>
       </TR>
 
       <TR>
-        <TD ALIGN="right" COLSPAN="2" VALIGN="top" STYLE="padding-bottom:1px;padding-top:0px"><FONT SIZE="-2" COLOR="#FFD000">
+        <TD ALIGN="right" COLSPAN="3" 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>
@@ -407,7 +348,7 @@ Current packages
 %      ) {
 
       <TR>
-        <TD COLSPAN=2 ALIGN="center" STYLE="padding-bottom:4px;padding-top:0px">
+        <TD COLSPAN=3 ALIGN="center" STYLE="padding-bottom:4px;padding-top:0px">
           <B><% svc_provision_link($cust_pkg, $part_svc, $conf, $curuser) %></B>
         </TD>
       </TR>
@@ -444,8 +385,63 @@ my $conf = new FS::Conf;
 my $curuser = $FS::CurrentUser::CurrentUser;
 
 my $packages = get_packages($cust_main, $conf);
-</%init>
-<%once>
+
+my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4;
+my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%';
+
+sub pkg_status_row {
+  my( $cust_pkg, $title, $field, %opt ) = @_;
+
+  my $color = $opt{'color'};
+
+  my $html = qq(<TR><TD WIDTH="<%$width%>" ALIGN="right">);
+  $html   .= qq(<FONT COLOR="#$color"><B>) if length($color);
+  $html   .= qq($title&nbsp;);
+  $html   .= qq(</B></FONT>) if length($color);
+  $html   .= qq(</TD>);
+  $html   .= pkg_datestr($cust_pkg, $field, $conf).'</TR>';
+
+  $html;
+}
+
+sub pkg_status_row_if {
+  my( $cust_pkg, $title, $field, %opt ) = @_;
+  $cust_pkg->get($field) ? pkg_status_row(@_) : '';
+}
+
+sub pkg_status_row_changed {
+  my($cust_pkg) = @_;
+  return '' unless $cust_pkg->change_date;
+  my $html = pkg_status_row( $cust_pkg, 'Package&nbsp;changed', 'change_date' );
+  my $old = $cust_pkg->old_cust_pkg;
+  if ( $old ) {
+    my $part_pkg = $old->part_pkg;
+    my $label = 'Changed from '. $cust_pkg->change_pkgnum. ': '.
+                $part_pkg->pkg. ' - '. $part_pkg->comment;
+    $html .= pkg_status_row_colspan( $label, '', size=>'-1', align=>'right' );
+  }
+  $html;
+}
+
+sub pkg_status_row_colspan {
+  my($title, $addl, %opt) = @_;
+
+  my $align = $opt{'align'} ? 'ALIGN="'. $opt{'align'}.'"' : '';
+  my $color = $opt{'color'} ? 'COLOR="#'.$opt{'color'}.'"' : '';
+  my $size  = $opt{'size'}  ? 'SIZE="'.  $opt{'size'}. '"' : '';
+
+  my $html = qq(<TR><TD COLSPAN=$colspan $align>);
+  $html   .= qq(<FONT $color $size>) if length($color) || $size;
+  $html   .= qq(<B>) if $color && !$size;
+  $html   .= $title;
+  $html   .= qq(</B>) if $color && !$size;
+  $html   .= qq(</FONT>) if length($color) || $size;
+  $html   .= ",&nbsp;$addl" if length($addl);
+  $html   .= qq(</TD></TR>);
+
+  $html;
+
+}
 
 #subroutines
 
@@ -467,7 +463,7 @@ sub get_packages {
 
   [ $cust_main->$method() ];
 }
-  
+
 sub svc_provision_link {
   my ($cust_pkg, $part_svc, $conf, $curuser) = @_;
   ( my $svc_nbsp = $part_svc->svc ) =~ s/\s+/&nbsp;/g;
@@ -526,64 +522,77 @@ 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_svc'    => shift,
+                              }
+                            )
                    }
 
 sub pkg_event_link {
@@ -599,33 +608,6 @@ 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;
@@ -636,4 +618,4 @@ sub pkg_customize_link {
     qq!">Customize</A>!;
 }
 
-</%once>
+</%init>