X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=f424425a7f3053e57c1d26410b2e3380899d232b;hp=8fff7be4f22a2cb097263c56513d11e3a1807906;hb=eb4ff7f73c5d4bdf74a3472448b5a195598ff4cd;hpb=1043b612a287f6ccc6bbe32357483019d390f840 diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index 8fff7be4f..f424425a7 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -1,24 +1,18 @@ -% -% my( $cust_main ) = @_; -% my $conf = new FS::Conf; -% -% my $curuser = $FS::CurrentUser::CurrentUser; -% -% my $packages = get_packages($cust_main, $conf); -% - +Packages
-Packages +% my $s = 0; % if ( $curuser->access_right('Order customer package') ) { - - <% include('order_pkg.html', $cust_main ) %> + <% $s++ ? ' | ' : '' %> + <% order_pkg_link($cust_main) %> % } + % if ( $curuser->access_right('One-time charge') % && $conf->config('payby-default') ne 'HIDE' % ) { % - <% include('quick-charge.html', $cust_main ) %> + <% 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') ) { @@ -58,49 +52,63 @@ Current packages % my $bgcolor1 = '#eeeeee'; % my $bgcolor2 = '#ffffff'; % my $bgcolor = ''; -% - Package Status Services + +%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; % } -% -% - + + - <%$pkg->{pkgnum}%>: - <%$pkg->{pkg}%> - <%$pkg->{comment}%>
+ + <% $cust_pkg->pkgnum %>: + <% $part_pkg->pkg %> - <% $part_pkg->comment %> +
+ -% unless ( $pkg->{cancel} ) { -% if ( $curuser->access_right('Change customer package') ) { +% unless ( $cust_pkg->get('cancel') ) { +% my $br = 0; +% if ( $curuser->access_right('Change customer package') ) { $br=1; - ( <%pkg_change_link($pkg)%> ) -% } -% if ( $curuser->access_right('Edit customer package dates') ) { + ( <%pkg_change_link($cust_pkg)%> ) +% } +% if ( $curuser->access_right('Edit customer package dates') ) { $br=1; - ( <%pkg_dates_link($pkg)%> ) -% } -% if ( $curuser->access_right('Customize customer package') ) { + ( <%pkg_dates_link($cust_pkg)%> ) +% } +% if ( $curuser->access_right('Customize customer package') ) { $br=1; - ( <%pkg_customize_link($pkg,$cust_main->custnum)%> ) -% } + ( <%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)%> ) +% } + + + % @@ -118,7 +126,7 @@ Current packages % % #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,14 +137,19 @@ Current packages % } % % -% if ( $pkg->{cancel} ) { +% if ( $cust_pkg->get('cancel') ) { - <% pkg_datestr($pkg,'cancel',$conf) %> + <% pkg_datestr($cust_pkg, 'cancel', $conf) %> + + + -% unless ( $pkg->{setup} ) { +% unless ( $cust_pkg->get('setup') ) { @@ -147,32 +160,37 @@ Current packages - <% pkg_datestr($pkg, 'setup',$conf) %> + <% pkg_datestr($cust_pkg, 'setup', $conf) %> -% if ( $pkg->{'last_bill'} ) { +% if ( $cust_pkg->get('last_bill') ) { - <% pkg_datestr($pkg, 'last_bill',$conf) %> + <% pkg_datestr($cust_pkg, 'last_bill',$conf) %> % } -% if ( $pkg->{'susp'} ) { +% if ( $cust_pkg->get('susp') ) { - <% pkg_datestr($pkg, 'susp',$conf) %> + <% pkg_datestr($cust_pkg, 'susp', $conf) %> % } % } % } else { -% if ( $pkg->{susp} ) { +% if ( $cust_pkg->get('susp') ) { - <% pkg_datestr($pkg,'susp',$conf) %> + <% pkg_datestr($cust_pkg, 'susp', $conf) %> -% unless ( $pkg->{setup} ) { + + + +% unless ( $cust_pkg->get('setup') ) { @@ -183,24 +201,24 @@ Current packages - <% pkg_datestr($pkg, 'setup',$conf) %> + <% pkg_datestr($cust_pkg, 'setup', $conf) %> % } -% if ( $pkg->{'last_bill'} ) { +% if ( $cust_pkg->get('last_bill') ) { - <% pkg_datestr($pkg, 'last_bill',$conf) %> + <% pkg_datestr($cust_pkg, 'last_bill', $conf) %> % } -% if ( $pkg->{'expire'} ) { +% if ( $cust_pkg->get('expire') ) { - <% pkg_datestr($pkg, 'expire',$conf) %> + <% pkg_datestr($cust_pkg, 'expire', $conf) %> % } @@ -210,11 +228,11 @@ Current packages % if ( $curuser->access_right('Unsuspend customer package') ) { - ( <% pkg_unsuspend_link($pkg) %> ) + ( <% pkg_unsuspend_link($cust_pkg) %> ) % } -% if ( $curuser->access_right('Cancel customer package') ) { +% if ( $curuser->access_right('Cancel customer package immediately') ) { - ( <% pkg_cancel_link($pkg) %> ) + ( <% pkg_cancel_link($cust_pkg) %> ) % } @@ -222,9 +240,9 @@ Current packages % } else { -% unless ( $pkg->{setup} ) { +% unless ( $cust_pkg->get('setup') ) { -% unless ( $pkg->{'freq'} ) { +% unless ( $part_pkg->freq ) { @@ -236,7 +254,7 @@ Current packages % if ( $curuser->access_right('Cancel customer package immediately') ) { - ( <% pkg_cancel_link($pkg) %> ) + ( <% pkg_cancel_link($cust_pkg) %> ) % } @@ -246,12 +264,12 @@ Current packages - + % } % } else { -% unless ( $pkg->{freq} ) { +% unless ( $part_pkg->freq ) { @@ -260,58 +278,72 @@ Current packages - <% pkg_datestr($pkg,'setup',$conf) %> + <% pkg_datestr($cust_pkg, 'setup', $conf) %> % } else { - - +% if (scalar($cust_pkg->overlimit)) { - + - +%}else{ + + + +% } - <% pkg_datestr($pkg, 'setup',$conf) %> + <% pkg_datestr($cust_pkg, 'setup', $conf) %> % } % } -% if ( $pkg->{'last_bill'} ) { +% if ( $cust_pkg->get('last_bill') ) { - <% pkg_datestr($pkg, 'last_bill',$conf) %> + <% pkg_datestr($cust_pkg, 'last_bill', $conf) %> % } -% if ( $pkg->{'next_bill'} ) { +% if ( $cust_pkg->get('bill') ) { #next bill - <% pkg_datestr($pkg, 'next_bill',$conf) %> + <% pkg_datestr($cust_pkg, 'bill', $conf) %> % } -% if ( $pkg->{'expire'} ) { +% if ( $cust_pkg->get('adjourn') ) { + + + + <% pkg_datestr($cust_pkg, 'adjourn', $conf) %> + +% } +% if ( $cust_pkg->get('expire') ) { - <% pkg_datestr($pkg, 'expire',$conf) %> + <% pkg_datestr($cust_pkg, 'expire', $conf) %> % } -% if ( $pkg->{freq} ) { +% if ( $part_pkg->freq ) { % } #end display packages @@ -373,205 +428,207 @@ Current packages
% } -% -%#subroutines -% -%sub get_packages { -% my $cust_main = shift or return undef; -% my $conf = shift; -% -% my @packages = (); -% my $method; -% if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me -% || ( $conf->exists('hidecancelledpackages') -% && ! $cgi->param('showcancelledpackages') ) -% ) -% { -% $method = 'ncancelled_pkgs'; -% } 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}!; -% -%} -% -%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 $url; -% if ( $svcpart->{svcdb} eq 'svc_external' -% && $conf->exists('svc_external-skip_manual') -% ) { -% $url = "${p}edit/process/$svcpart->{svcdb}.cgi?". -% "pkgnum=$pkg->{pkgnum}&". -% "svcpart=$svcpart->{svcpart}"; -% } else { -% $url = "${p}edit/$svcpart->{svcdb}.cgi?$pkgnum_svcpart"; -% } -% -% my $link = qq!!. -% "Provision $svc_nbsp ($num_left)"; -% if ( $conf->exists('legacy_link') -% && $curuser->access_right('View/link unlinked services') -% ) -% { -% $link .= '
'. -% qq!!. -% "Link to legacy $svc_nbsp ($num_left)"; -% } -% $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}); -% } -%} -% -%sub pkg_datestr { -% my($pkg, $field, $conf) = @_ or return ''; -% return ' ' unless $pkg->{$field}; -% my $format = ''. -% ''. -% ''; -% #$format .= ' %l:%M:%S%P %z' -% $format .= ''. -% ''. -% ''. -% '' -% if $conf->exists('cust_pkg-display_times'); -% ( my $strip = time2str($format, $pkg->{$field}) ) =~ s/ (\d)/$1/g; -% $strip; -%} -% -%sub pkg_change_link { -% my $pkg = shift or return ''; -% return qq!!. -% qq!Change package!; -%} -% -%sub pkg_suspend_link { -% my $pkg = shift or return ''; -% qq!Suspend!; -%} -% -%sub pkg_unsuspend_link { -% my $pkg = shift or return ''; -% return qq!Unsuspend!; -%} -% -%sub pkg_cancel_link { -% my $pkg = shift or return ''; -% -% qq!Cancel now!; -%} -% -%sub pkg_expire_link { -% my $pkg = shift or return ''; -% qq!Cancel later!; -%} -% -%sub pkg_dates_link { -% my $pkg = shift or return ''; -% qq!Edit dates!; -%} -% -%sub pkg_customize_link { -% my $pkg = shift or return ''; -% my $custnum = shift; -% qq!Customize!; -%} -% -% - +% 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 { + my $cust_main = shift or return undef; + my $conf = shift; + + my @packages = (); + my $method; + if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me + || ( $conf->exists('hidecancelledpackages') + && ! $cgi->param('showcancelledpackages') ) + ) + { + $method = 'ncancelled_pkgs'; + } else { + $method = 'all_pkgs'; + } + + [ $cust_main->$method() ]; +} + +sub svc_provision_link { + 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 ( $part_svc->svcdb eq 'svc_external' #could be generalized + && $conf->exists('svc_external-skip_manual') + ) { + $url = "${p}edit/process/". $part_svc->svcdb. ".cgi?$pkgnum_svcpart"; + } else { + $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_avail)"; + if ( $conf->exists('legacy_link') + && $curuser->access_right('View/link unlinked services') + ) + { + $link .= '
'. + qq!!. + "Link to legacy $svc_nbsp ($num_avail)"; + } + $link; +} + +sub svc_unprovision_link { + my $cust_svc = shift or return ''; + qq!Unprovision!; +} + +sub pkg_datestr { + my($cust_pkg, $field, $conf) = @_ or return ''; + return ' ' unless $cust_pkg->get($field); + my $format = ''. + ''. + ''; + #$format .= ' %l:%M:%S%P %z' + $format .= ''. + ''. + ''. + '' + if $conf->exists('cust_pkg-display_times'); + my $strip = time2str($format, $cust_pkg->get($field) ); + $strip =~ s/ (\d)/$1/g; + $strip; +} + +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_link { + my($action, $label, $cust_pkg) = @_; + return '' unless $cust_pkg; + qq!$label!; +} + +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 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!$label!; +} + +sub pkg_customize_link { + my $cust_pkg = shift or return ''; + my $custnum = $cust_pkg->custnum; + qq!Customize!; +} + +
Cancelled 
+ <% $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' %> +
Setup 
<% $last_bill_or_renewed %> 
Suspended 
Suspended 
+ <% $cust_pkg->last_reason ? $cust_pkg->last_reason->reason : '' %> +
Setup 
<% $last_bill_or_renewed %> 
Expires 
>Not yet billed (<% $billed_or_prepaid %> <% myfreq($pkg->{part_pkg}) %>)>Not yet billed (<% $billed_or_prepaid %> <% myfreq($part_pkg) %>)
Billed 
>Active, <% $billed_or_prepaid %> <% myfreq($pkg->{part_pkg}) %>>Overlimit, <% $billed_or_prepaid %> <% myfreq($part_pkg) %>
>Active, <% $billed_or_prepaid %> <% myfreq($part_pkg) %>
Setup 
<% $last_bill_or_renewed %> 
<% $next_bill_or_prepaid_until %> 
Adjourns 
Expires 
> % if ( $curuser->access_right('Suspend customer package') ) { - ( <% pkg_suspend_link($pkg) %> ) + ( <% 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($pkg) %> ) + ( <% pkg_cancel_link($cust_pkg) %> ) % } % if ( $curuser->access_right('Cancel customer package later') ) { - ( <% pkg_expire_link($pkg) %> ) + ( <% pkg_expire_link($cust_pkg) %> ) % } @@ -328,32 +360,56 @@ Current packages -% 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 } ) { - - + + -% if ( $curuser->access_right('Unprovision customer service') ) { + + - - + <% $cust_svc->overlimit ? "Overlimit: ". time2str('%b %o %Y' . ($conf->exists('cust_pkg-display_times') ? ' %l:%M %P' : ''), $cust_svc->overlimit) : '' %> + + -% } + + + + + % } -% if ( ! $pkg->{'cancel'} +% if ( ! $cust_pkg->get('cancel') % && $curuser->access_right('Provision customer service') -% && $svcpart->{count} < $svcpart->{quantity} +% && $part_svc->num_avail % ) { @@ -361,7 +417,6 @@ Current packages % } -
<%svc_link($svcpart,$service)%><%svc_label_link($svcpart,$service)%><% FS::UI::Web::svc_link($m, $part_svc, $cust_svc) %><% FS::UI::Web::svc_label_link($m, $part_svc, $cust_svc) %>
-
( <%svc_unprovision_link($service)%> )
+ +% 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($pkg, $svcpart, $conf, $curuser) %> + <% svc_provision_link($cust_pkg, $part_svc, $conf, $curuser) %>
%b %o, %Y %l:%M %P%b %o, %Y %l:%M %P