[freeside-commits]
freeside/httemplate/view/cust_main packages.html, 1.12, 1.13
Ivan,,,
ivan at wavetail.420.am
Fri Dec 29 00:51:36 PST 2006
Update of /home/cvs/cvsroot/freeside/httemplate/view/cust_main
In directory wavetail:/tmp/cvs-serv4384/httemplate/view/cust_main
Modified Files:
packages.html
Log Message:
service refactor!
Index: packages.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/view/cust_main/packages.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- packages.html 30 Nov 2006 02:27:57 -0000 1.12
+++ packages.html 29 Dec 2006 08:51:34 -0000 1.13
@@ -1,11 +1,9 @@
-%
% my( $cust_main ) = @_;
% my $conf = new FS::Conf;
%
% my $curuser = $FS::CurrentUser::CurrentUser;
%
% my $packages = get_packages($cust_main, $conf);
-%
<A NAME="cust_pkg"><FONT SIZE="+2">Packages</FONT></A>
@@ -58,44 +56,42 @@
% my $bgcolor1 = '#eeeeee';
% my $bgcolor2 = '#ffffff';
% my $bgcolor = '';
-%
-
<TR>
<TH CLASS="grid" BGCOLOR="#cccccc">Package</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Status</TH>
<TH CLASS="grid" BGCOLOR="#cccccc">Services</TH>
</TR>
+
+%foreach my $cust_pkg (@$packages) {
%
-%foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) {
+% my $part_pkg = $cust_pkg->part_pkg;
%
% if ( $bgcolor eq $bgcolor1 ) {
% $bgcolor = $bgcolor2;
% } else {
% $bgcolor = $bgcolor1;
% }
-%
-%
-<!--pkgnum: <%$pkg->{pkgnum}%>-->
+<!--pkgnum: <% $cust_pkg->pkgnum %>-->
<TR>
<TD CLASS="grid" BGCOLOR="<% $bgcolor %>">
- <A NAME="cust_pkg<%$pkg->{pkgnum}%>"><%$pkg->{pkgnum}%></A>:
- <%$pkg->{pkg}%> - <%$pkg->{comment}%><BR>
+ <A NAME="cust_pkg<% $cust_pkg->pkgnum %>"><% $cust_pkg->pkgnum %></A>:
+ <% $part_pkg->pkg %> - <% $part_pkg->comment %><BR>
<FONT SIZE=-1>
-% unless ( $pkg->{cancel} ) {
+% unless ( $cust_pkg->get('cancel') ) {
% if ( $curuser->access_right('Change customer package') ) {
- ( <%pkg_change_link($pkg)%> )
+ ( <%pkg_change_link($cust_pkg)%> )
% }
% if ( $curuser->access_right('Edit customer package dates') ) {
- ( <%pkg_dates_link($pkg)%> )
+ ( <%pkg_dates_link($cust_pkg)%> )
% }
% if ( $curuser->access_right('Customize customer package') ) {
- ( <%pkg_customize_link($pkg,$cust_main->custnum)%> )
+ ( <%pkg_customize_link($cust_pkg,$cust_main->custnum)%> )
% }
% }
@@ -118,7 +114,7 @@
%
% #false laziness w/edit/REAL_cust_pkg.cgi
% my( $billed_or_prepaid, $last_bill_or_renewed, $next_bill_or_prepaid_until );
-% unless ( $pkg->{'part_pkg'}->is_prepaid ) {
+% unless ( $part_pkg->is_prepaid ) {
% $billed_or_prepaid = 'billed';
% $last_bill_or_renewed = 'Last bill';
% $next_bill_or_prepaid_until = 'Next bill';
@@ -129,19 +125,19 @@
% }
%
%
-% if ( $pkg->{cancel} ) {
+% if ( $cust_pkg->get('cancel') ) {
<!-- #status: cancelled -->
<TR>
<TD WIDTH="<%$width%>" ALIGN="right"><FONT COLOR="#ff0000"><B>Cancelled </B></FONT></TD>
- <% pkg_datestr($pkg,'cancel',$conf) %>
+ <% pkg_datestr($cust_pkg, 'cancel', $conf) %>
</TR>
<TR>
<TD WIDTH="<%$width%>" ALIGN="right"><FONT COLOR="#ff0000" SIZE="-2">
- <% $pkg->{reason} %>
+ <% $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' %>
</FONT></TD>
</TR>
-% unless ( $pkg->{setup} ) {
+% unless ( $cust_pkg->get('setup') ) {
<TR>
@@ -152,37 +148,37 @@
<TR>
<TD WIDTH="<%$width%>" ALIGN="right">Setup </TD>
- <% pkg_datestr($pkg, 'setup',$conf) %>
+ <% pkg_datestr($cust_pkg, 'setup', $conf) %>
</TR>
-% if ( $pkg->{'last_bill'} ) {
+% if ( $cust_pkg->get('last_bill') ) {
<TR>
<TD WIDTH="<%$width%>" ALIGN="right"><% $last_bill_or_renewed %> </TD>
- <% pkg_datestr($pkg, 'last_bill',$conf) %>
+ <% pkg_datestr($cust_pkg, 'last_bill',$conf) %>
</TR>
% }
-% if ( $pkg->{'susp'} ) {
+% if ( $cust_pkg->get('susp') ) {
<TR>
<TD WIDTH="<%$width%>" ALIGN="right">Suspended </TD>
- <% pkg_datestr($pkg, 'susp',$conf) %>
+ <% pkg_datestr($cust_pkg, 'susp', $conf) %>
</TR>
% }
% }
% } else {
-% if ( $pkg->{susp} ) {
+% if ( $cust_pkg->get('susp') ) {
<!-- #status: suspended -->
<TR>
<TD WIDTH="<%$width%>" ALIGN="right"><FONT COLOR="#FF9900"><B>Suspended</B> </FONT></TD>
- <% pkg_datestr($pkg,'susp',$conf) %>
+ <% pkg_datestr($cust_pkg, 'susp', $conf) %>
</TR>
<TR>
<TD WIDTH="<%$width%>" ALIGN="right"><FONT COLOR="#FF9900" SIZE="-2">
- <% $pkg->{reason} %>
+ <% $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' %>
</FONT></TD>
</TR>
-% unless ( $pkg->{setup} ) {
+% unless ( $cust_pkg->get('setup') ) {
<TR>
@@ -193,24 +189,24 @@
<TR>
<TD WIDTH="<%$width%>" ALIGN="right">Setup </TD>
- <% pkg_datestr($pkg, 'setup',$conf) %>
+ <% pkg_datestr($cust_pkg, 'setup', $conf) %>
</TR>
% }
-% if ( $pkg->{'last_bill'} ) {
+% if ( $cust_pkg->get('last_bill') ) {
<TR>
<TD WIDTH="<%$width%>" ALIGN="right"><% $last_bill_or_renewed %> </TD>
- <% pkg_datestr($pkg, 'last_bill',$conf) %>
+ <% pkg_datestr($cust_pkg, 'last_bill', $conf) %>
</TR>
% }
<!-- # next bill ?? -->
-% if ( $pkg->{'expire'} ) {
+% if ( $cust_pkg->get('expire') ) {
<TR>
<TD WIDTH="<%$width%>" ALIGN="right">Expires </TD>
- <% pkg_datestr($pkg, 'expire',$conf) %>
+ <% pkg_datestr($cust_pkg, 'expire', $conf) %>
</TR>
% }
@@ -220,11 +216,11 @@
<FONT SIZE=-1>
% if ( $curuser->access_right('Unsuspend customer package') ) {
- ( <% pkg_unsuspend_link($pkg) %> )
+ ( <% pkg_unsuspend_link($cust_pkg) %> )
% }
% if ( $curuser->access_right('Cancel customer package') ) {
- ( <% pkg_cancel_link($pkg) %> )
+ ( <% pkg_cancel_link($cust_pkg) %> )
% }
</FONT>
@@ -232,9 +228,9 @@
</TR>
% } else {
<!-- #status: active -->
-% unless ( $pkg->{setup} ) {
+% unless ( $cust_pkg->get('setup') ) {
<!-- #not setup -->
-% unless ( $pkg->{'freq'} ) {
+% unless ( $part_pkg->freq ) {
<TR>
@@ -246,7 +242,7 @@
<FONT SIZE=-1>
% if ( $curuser->access_right('Cancel customer package immediately') ) {
- ( <% pkg_cancel_link($pkg) %> )
+ ( <% pkg_cancel_link($cust_pkg) %> )
% }
</FONT>
@@ -256,12 +252,12 @@
<TR>
- <TD COLSPAN=<%$colspan%>>Not yet billed (<% $billed_or_prepaid %> <% myfreq($pkg->{part_pkg}) %>)</TD>
+ <TD COLSPAN=<%$colspan%>>Not yet billed (<% $billed_or_prepaid %> <% myfreq($part_pkg) %>)</TD>
</TR>
% }
% } else {
<!-- #setup -->
-% unless ( $pkg->{freq} ) {
+% unless ( $part_pkg->freq ) {
<TR>
@@ -270,58 +266,58 @@
<TR>
<TD WIDTH="<%$width%>" ALIGN="right">Billed </TD>
- <% pkg_datestr($pkg,'setup',$conf) %>
+ <% pkg_datestr($cust_pkg, 'setup', $conf) %>
</TR>
% } else {
<TR>
- <TD COLSPAN=<%$colspan%>><FONT COLOR="#00CC00"><B>Active</B></FONT>, <% $billed_or_prepaid %> <% myfreq($pkg->{part_pkg}) %></TD>
+ <TD COLSPAN=<%$colspan%>><FONT COLOR="#00CC00"><B>Active</B></FONT>, <% $billed_or_prepaid %> <% myfreq($part_pkg) %></TD>
</TR>
<TR>
<TD WIDTH="<%$width%>" ALIGN="right">Setup </TD>
- <% pkg_datestr($pkg, 'setup',$conf) %>
+ <% pkg_datestr($cust_pkg, 'setup', $conf) %>
</TR>
% }
% }
-% if ( $pkg->{'last_bill'} ) {
+% if ( $cust_pkg->get('last_bill') ) {
<TR>
<TD WIDTH="<%$width%>" ALIGN="right"><% $last_bill_or_renewed %> </TD>
- <% pkg_datestr($pkg, 'last_bill',$conf) %>
+ <% pkg_datestr($cust_pkg, 'last_bill', $conf) %>
</TR>
% }
-% if ( $pkg->{'next_bill'} ) {
+% if ( $cust_pkg->get('bill') ) { #next bill
<TR>
<TD WIDTH="<%$width%>" ALIGN="right"><% $next_bill_or_prepaid_until %> </TD>
- <% pkg_datestr($pkg, 'next_bill',$conf) %>
+ <% pkg_datestr($cust_pkg, 'bill', $conf) %>
</TR>
% }
-% if ( $pkg->{'expire'} ) {
+% if ( $cust_pkg->get('expire') ) {
<TR>
<TD WIDTH="<%$width%>" ALIGN="right">Expires </TD>
- <% pkg_datestr($pkg, 'expire',$conf) %>
+ <% pkg_datestr($cust_pkg, 'expire', $conf) %>
</TR>
% }
-% if ( $pkg->{freq} ) {
+% if ( $part_pkg->freq ) {
<TR>
<TD COLSPAN=<%$colspan%>>
<FONT SIZE=-1>
% if ( $curuser->access_right('Suspend customer package') ) {
- ( <% pkg_suspend_link($pkg) %> )
+ ( <% pkg_suspend_link($cust_pkg) %> )
% }
% if ( $curuser->access_right('Cancel customer package immediately') ) {
- ( <% pkg_cancel_link($pkg) %> )
+ ( <% pkg_cancel_link($cust_pkg) %> )
% }
% if ( $curuser->access_right('Cancel customer package later') ) {
- ( <% pkg_expire_link($pkg) %> )
+ ( <% pkg_expire_link($cust_pkg) %> )
% }
<FONT>
@@ -338,46 +334,49 @@
<TD CLASS="inv" BGCOLOR="<% $bgcolor %>">
<TABLE CLASS="inv" BORDER=0 CELLSPACING=0 CELLPADDING=0 WIDTH="100%">
-% foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) {
+% #foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) {
+% foreach my $part_svc ( $cust_pkg->part_svc ) {
-% foreach my $service (@{$svcpart->{services}}) {
+% #foreach my $service (@{$svcpart->{services}}) {
+% foreach my $cust_svc ( @{ $part_svc->cust_pkg_svc } ) {
<TR>
- <TD ALIGN="right" VALIGN="top"><%svc_link($svcpart,$service)%></TD>
- <TD STYLE="padding-bottom:0px"><B><%svc_label_link($svcpart,$service)%></B></TD>
+ <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>
</TR>
- <TR>
- <TD ALIGN="right" VALIGN="top" STYLE="padding-bottom:5px;padding-top:0px"><FONT SIZE="-2">
+ <TR>
+ <TD ALIGN="right" VALIGN="top" STYLE="padding-bottom:5px;padding-top:0px"><FONT SIZE="-2">
-% if ( $curuser->access_right('Recharge customer service')
-% && ($svcpart->{'svcdb'} eq 'svc_acct')
-% && ($service->{seconds} ne ''
-% || $service->{upbytes} ne ''
-% || $service->{downbytes} ne ''
-% || $service->{totalbytes} ne '' )
+% if ( $curuser->access_right('Recharge customer service')
+% && $cust_svc->svcdb eq 'svc_acct'
+% && ( $cust_svc->svc_x->seconds ne ''
+% || $cust_svc->svc_x->upbytes ne ''
+% || $cust_svc->svc_x->downbytes ne ''
+% || $cust_svc->svc_x->totalbytes ne ''
+% )
% ) {
- ( <%svc_recharge_link($service)%> )
-% }
+ ( <%svc_recharge_link($cust_svc)%> )
+% }
</FONT></TD>
<TD ALIGN="right" VALIGN="top" STYLE="padding-bottom:5px;padding-top:0px"><FONT SIZE="-2">
-% if ( $curuser->access_right('Unprovision customer service') ) {
- ( <%svc_unprovision_link($service)%> )
-% }
+% if ( $curuser->access_right('Unprovision customer service') ) {
+ ( <%svc_unprovision_link($cust_svc)%> )
+% }
</FONT></TD>
</TR>
% }
-% if ( ! $pkg->{'cancel'}
+% if ( ! $cust_pkg->get('cancel')
% && $curuser->access_right('Provision customer service')
-% && $svcpart->{count} < $svcpart->{quantity}
+% && $part_svc->num_avail
% ) {
<TR>
<TD COLSPAN=2 ALIGN="center" STYLE="padding-bottom:4px;padding-top:0px">
- <B><% svc_provision_link($pkg, $svcpart, $conf, $curuser) %></B>
+ <B><% svc_provision_link($cust_pkg, $part_svc, $conf, $curuser) %></B>
</TD>
</TR>
@@ -414,104 +413,33 @@
% } else {
% $method = 'all_pkgs';
% }
-%
-% foreach my $cust_pkg ( $cust_main->$method() ) {
-%
-% my $part_pkg = $cust_pkg->part_pkg;
-%
-% my %pkg = ();
-%
-% #to get back to the original object... should use it in the first place!!
-% $pkg{cust_pkg} = $cust_pkg;
-% $pkg{part_pkg} = $part_pkg;
-%
-% $pkg{pkgnum} = $cust_pkg->pkgnum;
-% $pkg{pkg} = $part_pkg->pkg;
-% $pkg{pkgpart} = $part_pkg->pkgpart;
-% $pkg{comment} = $part_pkg->getfield('comment');
-% $pkg{freq} = $part_pkg->freq;
-% $pkg{setup} = $cust_pkg->getfield('setup');
-% $pkg{last_bill} = $cust_pkg->getfield('last_bill');
-% $pkg{next_bill} = $cust_pkg->getfield('bill');
-% $pkg{susp} = $cust_pkg->getfield('susp');
-% $pkg{expire} = $cust_pkg->getfield('expire');
-% $pkg{cancel} = $cust_pkg->getfield('cancel');
-% $pkg{reason} = $cust_pkg->last_reason->reason if $cust_pkg->last_reason;
-%
-%
-% my %svcparts = map {
-% $_->svcpart => {
-% $_->part_svc->hash,
-% 'quantity' => $_->quantity,
-% 'count' => $cust_pkg->num_cust_svc($_->svcpart),
-% #'services' => [],
-% };
-% } $part_pkg->pkg_svc;
-%
-% foreach my $cust_svc ( $cust_pkg->cust_svc ) {
-% #warn "svcnum ". $cust_svc->svcnum. " / svcpart ". $cust_svc->svcpart. "\n";
-% my $svc = {
-% 'svcnum' => $cust_svc->svcnum,
-% 'label' => ($cust_svc->label)[1],
-% $cust_svc->svc_x->hash,
-% };
-%
-% #false laziness with above, to catch extraneous services. whole
-% #damn thing should be OO...
-% my $svcpart = ( $svcparts{$cust_svc->svcpart} ||= {
-% $cust_svc->part_svc->hash,
-% 'quantity' => 0,
-% 'count' => $cust_pkg->num_cust_svc($cust_svc->svcpart),
-% #'services' => [],
-% } );
-%
-% push @{$svcpart->{services}}, $svc;
-%
-% }
-%
-% $pkg{svcparts} = [ values %svcparts ];
-%
-% push @packages, \%pkg;
-%
-% }
-%
-% return \@packages;
-%
-%}
-%
-%sub svc_link {
-%
-% my ($svcpart, $svc) = (shift,shift) or return '';
-% return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svcpart->{svc}</A>!;
-%
-%}
-%
-%sub svc_label_link {
-%
-% my ($svcpart, $svc) = (shift,shift) or return '';
-% return qq!<A HREF="${p}view/$svcpart->{svcdb}.cgi?$svc->{svcnum}">$svc->{label}</A>!;
%
+% [ $cust_main->$method() ];
%}
-%
+%
%sub svc_provision_link {
-% my ($pkg, $svcpart, $conf, $curuser) = @_;
-% ( my $svc_nbsp = $svcpart->{svc} ) =~ s/\s+/ /g;
-% my $num_left = $svcpart->{quantity} - $svcpart->{count};
-% my $pkgnum_svcpart = "pkgnum$pkg->{pkgnum}-svcpart$svcpart->{svcpart}";
-%
+% my ($cust_pkg, $part_svc, $conf, $curuser) = @_;
+% ( my $svc_nbsp = $part_svc->svc ) =~ s/\s+/ /g;
+% my $num_avail = $part_svc->num_avail;
+% my $pkgnum_svcpart = "pkgnum=". $cust_pkg->pkgnum. ';'.
+% "svcpart=". $part_svc->svcpart;
% my $url;
-% if ( $svcpart->{svcdb} eq 'svc_external'
+% if ( $part_svc->svcdb eq 'svc_external' #could be generalized
% && $conf->exists('svc_external-skip_manual')
% ) {
-% $url = "${p}edit/process/$svcpart->{svcdb}.cgi?".
-% "pkgnum=$pkg->{pkgnum}&".
-% "svcpart=$svcpart->{svcpart}";
+% $url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$pkgnum_svcpart";
% } else {
-% $url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart";
+% $url = FS::UI::Web::svc_url(
+% 'm' => $m,
+% 'action' => 'edit',
+% 'part_svc' => $part_svc,
+% 'query' => $pkgnum_svcpart,
+% );
+% #$url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart";
% }
%
% my $link = qq!<A CLASS="provision" HREF="$url">!.
-% "Provision $svc_nbsp ($num_left)</A>";
+% "Provision $svc_nbsp ($num_avail)</A>";
% if ( $conf->exists('legacy_link')
% && $curuser->access_right('View/link unlinked services')
% )
@@ -519,39 +447,20 @@
% $link .= '<BR>'.
% qq!<A CLASS="provision" HREF="${p}misc/link.cgi?!.
% qq!$pkgnum_svcpart">!.
-% "Link to legacy $svc_nbsp ($num_left)</A>";
+% "Link to legacy $svc_nbsp ($num_avail)</A>";
% }
% $link;
%}
%
%sub svc_unprovision_link {
-% my $svc = shift or return '';
-% qq!<A HREF="javascript:areyousure('${p}misc/unprovision.cgi?$svc->{svcnum}',!.
-% qq!'Permanently unprovision and delete this service?')">Unprovision</A>!;
-%}
-%
-%sub svc_recharge_link {
-% my $svc = shift or return '';
-%
-% qq!<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}misc/recharge_svc.html?svcnum=$svc->{svcnum}', 392, 336, 'recharge_svc_popup' ), CAPTION, 'Recharge service $svc->{svcnum}', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Recharge</A>!;
-%}
-%
-%# This should be generalized to use config options to determine order.
-%sub pkgsort_pkgnum_cancel {
-% if ($a->{cancel} and $b->{cancel}) {
-% return ($a->{pkgnum} <=> $b->{pkgnum});
-% } elsif ($a->{cancel} or $b->{cancel}) {
-% return (-1) if ($b->{cancel});
-% return (1) if ($a->{cancel});
-% return (0);
-% } else {
-% return($a->{pkgnum} <=> $b->{pkgnum});
-% }
+% my $cust_svc = shift or return '';
+% qq!<A HREF="javascript:areyousure('${p}misc/unprovision.cgi?!. $cust_svc->svcnum.
+% qq!', 'Permanently unprovision and delete this service?')">Unprovision</A>!;
%}
%
%sub pkg_datestr {
-% my($pkg, $field, $conf) = @_ or return '';
-% return ' ' unless $pkg->{$field};
+% my($cust_pkg, $field, $conf) = @_ or return '';
+% return ' ' unless $cust_pkg->get($field);
% my $format = '<TD align="left"><B>%b</B></TD>'.
% '<TD align="right"><B> %o,</B></TD>'.
% '<TD align="right"><B> %Y</B></TD>';
@@ -561,48 +470,68 @@
% '<TD ALIGN="left"><B>%M</B></TD>'.
% '<TD ALIGN="left"><B> %P</B></TD>'
% if $conf->exists('cust_pkg-display_times');
-% ( my $strip = time2str($format, $pkg->{$field}) ) =~ s/ (\d)/$1/g;
+% my $strip = time2str($format, $cust_pkg->get($field) );
+% $strip =~ s/ (\d)/$1/g;
% $strip;
%}
%
-%sub pkg_change_link {
-% my $pkg = shift or return '';
-% return qq!<a href="${p}misc/change_pkg.cgi?$pkg->{pkgnum}">!.
-% qq!Change package</a>!;
-%}
+%sub pkg_change_link { pkg_link('misc/change_pkg', 'Change package', @_ ); }
+%sub pkg_suspend_link { pkg_link('misc/susp_pkg', 'Suspend', @_ ); }
+%sub pkg_unsuspend_link { pkg_link('misc/unsusp_pkg', 'Unsuspend', @_ ); }
+%sub pkg_expire_link { pkg_link('misc/expire_pkg', 'Cancel later', @_ ); }
+%sub pkg_dates_link { pkg_link('edit/REAL_cust_pkg', 'Edit dates', @_ ); }
%
-%sub pkg_suspend_link {
-% my $pkg = shift or return '';
-% qq!<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}misc/cancel_pkg.html?method=suspend&pkgnum=$pkg->{pkgnum}', 392, 336, 'suspend_pkg_popup' ), CAPTION, 'Suspend package $pkg->{pkgnum}', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Suspend</A>!;
-%}
+%sub pkg_cancel_link { pkg_popup_link( 'misc/cancel_pkg.html?method=cancel',
+% 'Cancel now',
+% 'Cancel',
+% @_
+% );
+% }
+%sub pkg_expire_link { pkg_popup_link( 'misc/cancel_pkg.html?method=expire',
+% 'Cancel later',
+% 'Expire', #"Cancel package $num later"
+% @_
+% );
+% }
%
-%sub pkg_unsuspend_link {
-% my $pkg = shift or return '';
-% return qq!<a href="${p}misc/unsusp_pkg.cgi?$pkg->{pkgnum}">Unsuspend</a>!;
-%}
+%sub svc_recharge_link { svc_popup_link( 'misc/recharge_svc.html',
+% 'Recharge',
+% 'Recharge',
+% @_
+% );
+% }
%
-%sub pkg_cancel_link {
-% my $pkg = shift or return '';
+%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="javascript:void(0);" onClick="overlib( OLiframeContent('${p}misc/cancel_pkg.html?method=cancel&pkgnum=$pkg->{pkgnum}', 392, 336, 'cancel_pkg_popup' ), CAPTION, 'Cancel package $pkg->{pkgnum}', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Cancel now</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);
%}
%
-%sub pkg_expire_link {
-% my $pkg = shift or return '';
-% qq!<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('${p}misc/cancel_pkg.html?method=expire&pkgnum=$pkg->{pkgnum}', 392, 336, 'expire_pkg_popup' ), CAPTION, 'Expire package $pkg->{pkgnum}', STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, DRAGGABLE, CLOSECLICK ); return false;">Cancel later</A>!;
+%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);
%}
%
-%sub pkg_dates_link {
-% my $pkg = shift or return '';
-% qq!<A HREF="${p}edit/REAL_cust_pkg.cgi?$pkg->{pkgnum}">Edit dates</A>!;
+%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>!;
%}
%
%sub pkg_customize_link {
-% my $pkg = shift or return '';
-% my $custnum = shift;
-% qq!<A HREF="${p}edit/part_pkg.cgi?keywords=$custnum;clone=$pkg->{pkgpart};!.
-% qq!pkgnum=$pkg->{pkgnum}">Customize</A>!;
+% 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>!;
%}
-%
-%
-
More information about the freeside-commits
mailing list