X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=f424425a7f3053e57c1d26410b2e3380899d232b;hp=8312a866302a2d9afaf63bbf87f076ad6dada00d;hb=eb4ff7f73c5d4bdf74a3472448b5a195598ff4cd;hpb=41a6a1b1811e337be2fca47504ff9687b6b46cf8 diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index 8312a8663..f424425a7 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -1,355 +1,453 @@ -<% - my( $cust_main ) = @_; - my $conf = new FS::Conf; +Packages
- my $curuser = $FS::CurrentUser::CurrentUser; +% my $s = 0; +% if ( $curuser->access_right('Order customer package') ) { + <% $s++ ? ' | ' : '' %> + <% order_pkg_link($cust_main) %> +% } - my $packages = get_packages($cust_main, $conf); -%> +% if ( $curuser->access_right('One-time charge') +% && $conf->config('payby-default') ne 'HIDE' +% ) { +% - + <% popup_link('edit/quick-charge.html?custnum='. $cust_main->custnum, 'One-time charge', 'One-time charge', '#333399', 545) %> +
+% } +% if ( $curuser->access_right('Bulk change customer packages') ) { -Packages + Bulk order and cancel packages (preserves services) +% } -<% if ( $curuser->access_right('Order customer package') ) { %> - <%= include('order_pkg.html', $cust_main ) %> -<% } %> - -<% if ( $curuser->access_right('One-time charge') - && $conf->config('payby-default') ne 'HIDE' - ) { -%> - <%= include('quick-charge.html', $cust_main ) %> -<% } %> - -<% if ( $curuser->access_right('Bulk change customer packages') ) { %> - Bulk order and cancel packages (preserves services) -<% } %>

+% if ( @$packages ) { -<% if ( @$packages ) { %> Current packages -<% } %> - -<% if ( $cust_main->num_cancelled_pkgs ) { - if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me - || ( $conf->exists('hidecancelledpackages') - && ! $cgi->param('showcancelledpackages') - ) - ) - { - $cgi->param('showcancelledpackages', 1); -%> - ( show -<% } else { - $cgi->param('showcancelledpackages', 0); -%> - ( hide -<% } %> +% } +% if ( $cust_main->num_cancelled_pkgs ) { +% if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me +% || ( $conf->exists('hidecancelledpackages') +% && ! $cgi->param('showcancelledpackages') +% ) +% ) +% { +% $cgi->param('showcancelledpackages', 1); +% + + ( show +% } else { +% $cgi->param('showcancelledpackages', 0); +% + + ( hide +% } + cancelled packages ) -<% } %> +% } +% if ( @$packages ) { -<% if ( @$packages ) { %> - +<% include('/elements/table-grid.html') %> +% my $bgcolor1 = '#eeeeee'; +% my $bgcolor2 = '#ffffff'; +% my $bgcolor = ''; + - - - + + + -<% -foreach my $pkg (sort pkgsort_pkgnum_cancel @$packages) { - my $rowspan = 0; +%foreach my $cust_pkg (@$packages) { +% +% my $part_pkg = $cust_pkg->part_pkg; +% +% if ( $bgcolor eq $bgcolor1 ) { +% $bgcolor = $bgcolor2; +% } else { +% $bgcolor = $bgcolor1; +% } - if ($pkg->{cancel}) { - $rowspan = 0; - } else { - foreach my $svcpart (@{$pkg->{svcparts}}) { - $rowspan += $svcpart->{count}; - $rowspan++ if ($svcpart->{count} < $svcpart->{quantity}); - } - } -%> - - + + - - '. ''. ''; @@ -506,48 +522,113 @@ sub pkg_datestr { ''. '' 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!!. - qq!Change package!; +sub pkg_change_link { pkg_link('misc/change_pkg', 'Change package', @_ ); } + +sub pkg_suspend_link { pkg_popup_link( 'misc/cancel_pkg.html?method=suspend', + 'Suspend now', + 'Suspend', + '#FF9900', + @_ + ); + } + +sub pkg_adjourn_link { pkg_popup_link( 'misc/cancel_pkg.html?method=adjourn', + 'Suspend later', + 'Adjourn', + '#CC6600', + @_ + ); + } + +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_cancel_link { pkg_popup_link( 'misc/cancel_pkg.html?method=cancel', + 'Cancel now', + 'Cancel', + '#ff0000', + @_ + ); + } + +sub pkg_expire_link { pkg_popup_link( 'misc/cancel_pkg.html?method=expire', + 'Cancel 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 new package', + 'Order new package', + '#333399', + @_ + ); + } + +sub pkg_event_link { + my($cust_pkg) = @_; + qq!!. + 'View package events'. + ''; } -sub pkg_suspend_link { - my $pkg = shift or return ''; - return qq!Suspend!; +sub pkg_link { + my($action, $label, $cust_pkg) = @_; + return '' unless $cust_pkg; + qq!$label!; } -sub pkg_unsuspend_link { - my $pkg = shift or return ''; - return qq!Unsuspend!; +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); } -sub pkg_cancel_link { - my $pkg = shift or return ''; - qq!!. - qq!Cancel now!; +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 pkg_expire_link { - my $pkg = shift or return ''; - qq!Cancel later!; +sub cust_popup_link { + my($action, $label, $actionlabel, $color, $cust_main) = @_; + $action .= '?'. $cust_main->custnum; + popup_link($action, $label, $actionlabel, $color); } -sub pkg_dates_link { - my $pkg = shift or return ''; - qq!Edit dates!; +sub popup_link { + my($action, $label, $actionlabel, $color, $width) = @_; + $color ||= '#333399'; + $width ||= 540; + qq!$label!; } sub pkg_customize_link { - my $pkg = shift or return ''; - my $custnum = shift; - qq!Customize!; + my $cust_pkg = shift or return ''; + my $custnum = $cust_pkg->custnum; + qq!Customize!; } -%> +
PackageStatusServicesPackageStatusServices
> - <%=$pkg->{pkgnum}%>: - <%=$pkg->{pkg}%> - <%=$pkg->{comment}%>
- - <% unless ( $pkg->{cancel} ) { %> - <% if ( $curuser->access_right('Change customer package') ) { %> - ( <%=pkg_change_link($pkg)%> ) - <% } %> - <% if ( $curuser->access_right('Edit customer package dates') ) { %> - ( <%=pkg_dates_link($pkg)%> ) - <% } %> - <% if ( $curuser->access_right('Customize customer package') ) { %> - ( <%=pkg_customize_link($pkg,$cust_main->custnum)%> ) - <% } %> - <% } %> - - 		> - - -<% - sub myfreq { - my $part_pkg = shift; - my $freq = $part_pkg->freq_pretty; - $freq =~ s/ / /g; - $freq; - } - #this should use cust_pkg->status and cust_pkg->statuscolor eventually + -<% if ( $pkg->{cancel} ) { %> + + + +% } #end display packages +% -<% - if ($rowspan == 0) { print qq!\n!; next; } - - my $cnt = 0; - foreach my $svcpart (sort {$a->{svcpart} <=> $b->{svcpart}} @{$pkg->{svcparts}}) { - foreach my $service (@{$svcpart->{services}}) { - print '' if ($cnt > 0); -%> - - - -<% - $cnt++; - } - if ( $svcpart->{count} < $svcpart->{quantity} - && $curuser->access_right('Provision customer services') - ) { - print qq!\n! if ($cnt > 0); - print qq! \n\n!; - } - } -} -#end display packages -%>
- my $colspan = $conf->exists('cust_pkg-display_times') ? 8 : 4; - my $width = $conf->exists('cust_pkg-display_times') ? '38%' : '56%'; + <% $cust_pkg->pkgnum %>: + <% $part_pkg->pkg %> - <% $part_pkg->comment %> +
- #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 ) { - $billed_or_prepaid = 'billed'; - $last_bill_or_renewed = 'Last bill'; - $next_bill_or_prepaid_until = 'Next bill'; - } else { - $billed_or_prepaid = 'prepaid'; - $last_bill_or_renewed = 'Renewed'; - $next_bill_or_prepaid_until = 'Prepaid until'; - } + +% unless ( $cust_pkg->get('cancel') ) { +% my $br = 0; +% if ( $curuser->access_right('Change customer package') ) { $br=1; + + ( <%pkg_change_link($cust_pkg)%> ) +% } +% if ( $curuser->access_right('Edit customer package dates') ) { $br=1; + + ( <%pkg_dates_link($cust_pkg)%> ) +% } +% if ( $curuser->access_right('Customize customer package') ) { $br=1; + + ( <%pkg_customize_link($cust_pkg,$cust_main->custnum)%> ) +% } + <% $br ? '
' : '' %> +% } + +% if ( $cust_pkg->num_cust_event +% && ( $curuser->access_right('Billing event reports') +% || $curuser->access_right('View customer billing events') +% ) +% ) { + ( <%pkg_event_link($cust_pkg)%> ) +% } + + -%> + 		+ +% +% sub myfreq { +% my $part_pkg = shift; +% my $freq = $part_pkg->freq_pretty; +% $freq =~ s/ / /g; +% $freq; +% } +% +% #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%'; +% +% #false laziness w/edit/REAL_cust_pkg.cgi +% my( $billed_or_prepaid, $last_bill_or_renewed, $next_bill_or_prepaid_until ); +% unless ( $part_pkg->is_prepaid ) { +% $billed_or_prepaid = 'billed'; +% $last_bill_or_renewed = 'Last bill'; +% $next_bill_or_prepaid_until = 'Next bill'; +% } else { +% $billed_or_prepaid = 'prepaid'; +% $last_bill_or_renewed = 'Renewed'; +% $next_bill_or_prepaid_until = 'Prepaid until'; +% } +% +% +% if ( $cust_pkg->get('cancel') ) { + - - <%= pkg_datestr($pkg,'cancel',$conf) %> + + <% pkg_datestr($cust_pkg, 'cancel', $conf) %> + + + +% unless ( $cust_pkg->get('setup') ) { - <% unless ( $pkg->{setup} ) { %> - + +% } else { - <% } else { %> - - <%= pkg_datestr($pkg, 'setup',$conf) %> + + <% pkg_datestr($cust_pkg, 'setup', $conf) %> +% if ( $cust_pkg->get('last_bill') ) { - <% if ( $pkg->{'last_bill'} ) { %> - - <%= pkg_datestr($pkg, 'last_bill',$conf) %> + + <% pkg_datestr($cust_pkg, 'last_bill',$conf) %> - <% } %> +% } +% if ( $cust_pkg->get('susp') ) { - <% if ( $pkg->{'susp'} ) { %> - - <%= pkg_datestr($pkg, 'susp',$conf) %> + + <% pkg_datestr($cust_pkg, 'susp', $conf) %> - <% } %> - - <% } %> - -<% } else { %> - - <% if ( $pkg->{susp} ) { %> +% } +% } +% } else { +% if ( $cust_pkg->get('susp') ) { + - - <%= pkg_datestr($pkg,'susp',$conf) %> + + <% pkg_datestr($cust_pkg, 'susp', $conf) %> + + + +% unless ( $cust_pkg->get('setup') ) { - <% unless ( $pkg->{setup} ) { %> - + +% } else { - <% } else { %> - - <%= pkg_datestr($pkg, 'setup',$conf) %> + + <% pkg_datestr($cust_pkg, 'setup', $conf) %> - - <% } %> +% } +% if ( $cust_pkg->get('last_bill') ) { - <% if ( $pkg->{'last_bill'} ) { %> - - <%= pkg_datestr($pkg, 'last_bill',$conf) %> + + <% pkg_datestr($cust_pkg, 'last_bill', $conf) %> - <% } %> +% } + +% if ( $cust_pkg->get('expire') ) { - <% if ( $pkg->{'expire'} ) { %> - - <%= pkg_datestr($pkg, 'expire',$conf) %> + + <% pkg_datestr($cust_pkg, 'expire', $conf) %> - <% } %> +% } + - +% } else { + +% unless ( $cust_pkg->get('setup') ) { + +% unless ( $part_pkg->freq ) { - <% } else { %> - - <% unless ( $pkg->{setup} ) { %> - - <% unless ( $pkg->{'freq'} ) { %> - + - +% } else { - <% } else { %> - + +% } +% } else { + +% unless ( $part_pkg->freq ) { - <% } %> - - <% } else { %> - - <% unless ( $pkg->{freq} ) { %> - + - - <%= pkg_datestr($pkg,'setup',$conf) %> + + <% pkg_datestr($cust_pkg, 'setup', $conf) %> - - <% } else { %> - +% } else { +% if (scalar($cust_pkg->overlimit)) { - + - +%}else{ - - <%= pkg_datestr($pkg, 'setup',$conf) %> + +% } + + + <% pkg_datestr($cust_pkg, 'setup', $conf) %> + +% } +% } +% if ( $cust_pkg->get('last_bill') ) { - <% } %> - - <% } %> + + + <% pkg_datestr($cust_pkg, 'last_bill', $conf) %> + +% } +% if ( $cust_pkg->get('bill') ) { #next bill - <% if ( $pkg->{'last_bill'} ) { %> - - <%= pkg_datestr($pkg, 'last_bill',$conf) %> + + <% pkg_datestr($cust_pkg, 'bill', $conf) %> - <% } %> +% } +% if ( $cust_pkg->get('adjourn') ) { - <% if ( $pkg->{'next_bill'} ) { %> - - <%= pkg_datestr($pkg, 'next_bill',$conf) %> + + <% pkg_datestr($cust_pkg, 'adjourn', $conf) %> - <% } %> +% } +% if ( $cust_pkg->get('expire') ) { - <% if ( $pkg->{'expire'} ) { %> - - <%= pkg_datestr($pkg, 'expire',$conf) %> + + <% pkg_datestr($cust_pkg, 'expire', $conf) %> - <% } %> +% } +% if ( $part_pkg->freq ) { - <% if ( $pkg->{freq} ) { %> - - <% } %> +% } +% } +% } + + +
Cancelled Cancelled 
+ <% $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' %> +
>Never billed>Never billed
Setup Setup 
<%= $last_bill_or_renewed %> <% $last_bill_or_renewed %> 
Suspended Suspended 
Suspended Suspended 
+ <% $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' %> +
>Never billed>Never billed
Setup Setup 
<%= $last_bill_or_renewed %> <% $last_bill_or_renewed %> 
Expires Expires 
> + > - <% if ( $curuser->access_right('Unsuspend customer package') ) { %> - ( <%= pkg_unsuspend_link($pkg) %> ) - <% } %> - <% if ( $curuser->access_right('Cancel customer package') ) { %> - ( <%= pkg_cancel_link($pkg) %> ) - <% } %> +% if ( $curuser->access_right('Unsuspend customer package') ) { + + ( <% pkg_unsuspend_link($cust_pkg) %> ) +% } +% if ( $curuser->access_right('Cancel customer package immediately') ) { + + ( <% pkg_cancel_link($cust_pkg) %> ) +% } +
>Not yet billed (one-time charge)>Not yet billed (one-time charge)
> + > - <% if ( $curuser->access_right('Cancel customer package immediately') ) { %> - ( <%= pkg_cancel_link($pkg) %> ) - <% } %> +% if ( $curuser->access_right('Cancel customer package immediately') ) { + + ( <% pkg_cancel_link($cust_pkg) %> ) +% } +
>Not yet billed (<%= $billed_or_prepaid %> <%= myfreq($pkg->{part_pkg}) %>)>Not yet billed (<% $billed_or_prepaid %> <% myfreq($part_pkg) %>)
>One-time charge>One-time charge
Billed Billed 
>Active, <%= $billed_or_prepaid %> <%= myfreq($pkg->{part_pkg}) %>>Overlimit, <% $billed_or_prepaid %> <% myfreq($part_pkg) %>
Setup >Active, <% $billed_or_prepaid %> <% myfreq($part_pkg) %>
Setup 
<% $last_bill_or_renewed %> 
<%= $last_bill_or_renewed %> <% $next_bill_or_prepaid_until %> 
<%= $next_bill_or_prepaid_until %> Adjourns 
Expires Expires 
> + > - <% if ( $curuser->access_right('Suspend customer package') ) { %> - ( <%= pkg_suspend_link($pkg) %> ) - <% } %> - <% if ( $curuser->access_right('Cancel customer package immediately') ) { %> - ( <%= pkg_cancel_link($pkg) %> ) - <% } %> - <% if ( $curuser->access_right('Cancel customer package later') ) { %> - ( <%= pkg_expire_link($pkg) %> ) - <% } %> +% if ( $curuser->access_right('Suspend customer package') ) { + + ( <% pkg_suspend_link($cust_pkg) %> ) +% } +% if ( $curuser->access_right('Suspend customer package later') ) { + + ( <% pkg_adjourn_link($cust_pkg) %> ) +% } +% if ( $curuser->access_right('Cancel customer package immediately') ) { + + ( <% pkg_cancel_link($cust_pkg) %> ) +% } +% if ( $curuser->access_right('Cancel customer package later') ) { + + ( <% pkg_expire_link($cust_pkg) %> ) +% } +
+		 + + +% #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 $cust_svc ( @{ $part_svc->cust_pkg_svc } ) { + + + + + + + + + + + + + + + +% } + +% if ( ! $cust_pkg->get('cancel') +% && $curuser->access_right('Provision customer service') +% && $part_svc->num_avail +% ) { + + + + - <% } %> +% } -<% } %> +% }
<% FS::UI::Web::svc_link($m, $part_svc, $cust_svc) %><% FS::UI::Web::svc_label_link($m, $part_svc, $cust_svc) %>
+ + <% $cust_svc->overlimit ? "Overlimit: ". time2str('%b %o %Y' . ($conf->exists('cust_pkg-display_times') ? ' %l:%M %P' : ''), $cust_svc->overlimit) : '' %> +
+ +% if ( $curuser->access_right('Recharge customer service') +% && $part_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($cust_svc)%> ) +% } + + +% if ( $curuser->access_right('Unprovision customer service') ) { + ( <%svc_unprovision_link($cust_svc)%> ) +% } +
+ <% svc_provision_link($cust_pkg, $part_svc, $conf, $curuser) %> +
<%=svc_link($svcpart,$service)%><%=svc_label_link($svcpart,$service)%> - <% if ( $curuser->access_right('Unprovision customer service') ) { %> -
( <%=svc_unprovision_link($service)%> ) - <% } %> -
!.svc_provision_link($pkg, $svcpart, $conf, $curuser).qq!
-<% } else { %> +% } else { +
-<% } %> +% } +% if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) { + +% } +<%init> + +my( $cust_main ) = @_; +my $conf = new FS::Conf; + +my $curuser = $FS::CurrentUser::CurrentUser; + +my $packages = get_packages($cust_main, $conf); + +<%once> -<% #subroutines sub get_packages { @@ -367,102 +465,33 @@ sub get_packages { } 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'); - - - 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], - }; - - #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!$svcpart->{svc}!; - -} - -sub svc_label_link { - - my ($svcpart, $svc) = (shift,shift) or return ''; - return qq!$svc->{label}!; + [ $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 = svc_url( + 'm' => $m, + 'action' => 'edit', + 'part_svc' => $part_svc, + 'query' => $pkgnum_svcpart, + ); + #$url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart"; } my $link = qq!!. - "Provision $svc_nbsp ($num_left)"; + "Provision $svc_nbsp ($num_avail)"; if ( $conf->exists('legacy_link') && $curuser->access_right('View/link unlinked services') ) @@ -470,33 +499,20 @@ sub svc_provision_link { $link .= '
'. qq!!. - "Link to legacy $svc_nbsp ($num_left)"; + "Link to legacy $svc_nbsp ($num_avail)"; } $link; } sub svc_unprovision_link { - my $svc = shift or return ''; - qq!Unprovision!; -} - -# 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!Unprovision!; } 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 = '		%b %o, %Y%M %P