X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=9a4997be5cd78c6a77b3460259b105a73690320b;hb=20bddf47a41b6d064b3cfa4c41e55c157cf0c3de;hp=32e0ee1fc36b4ecd76700822187d6307e68af96e;hpb=2c757d7db4cb6a7b9655de13206fcc84fb7ce61f;p=freeside.git
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 32e0ee1fc..9a4997be5 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -1,303 +1,188 @@
-<%
- my( $cust_main ) = @_;
- my $conf = new FS::Conf;
+Packages
- my $packages = get_packages($cust_main, $conf);
-%>
+% if ( $curuser->access_right('One-time charge') ) {
-
+
+
+% }
+
+% my $s = 0;
+% if ( $curuser->access_right('Order customer package') ) {
+ <% $s++ ? ' | ' : '' %>
+ <% order_pkg_link($cust_main) %>
+% }
+
+% if ( $curuser->access_right('One-time charge')
+% && $conf->config('payby-default') ne 'HIDE'
+% ) {
+%
+ <% $s++ ? ' | ' : '' %>
+ <% 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' => 763,
+ })
+ %>
+% }
+
+% if ( $curuser->access_right('Bulk change customer packages') ) {
+ <% $s++ ? ' | ' : '' %>
+ Bulk order and cancel packages (preserves services)
+% }
-
- >Never billed |
-
- <% } else { %>
+
+% if ( @$packages ) {
-
- Setup |
- <%= pkg_datestr($pkg, 'setup',$conf) %>
-
-
- <% } %>
+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 ( $pkg->{'last_bill'} ) { %>
-
- <%= $last_bill_or_renewed %> |
- <%= pkg_datestr($pkg, 'last_bill',$conf) %>
-
- <% } %>
+ cancelled packages )
+% }
+% if ( @$packages ) {
-
+<% include('/elements/table-grid.html') %>
+% my $bgcolor1 = '#eeeeee';
+% my $bgcolor2 = '#ffffff';
+% my $bgcolor = '';
- <% if ( $pkg->{'expire'} ) { %>
-
- Expires |
- <%= pkg_datestr($pkg, 'expire',$conf) %>
-
- <% } %>
+
+ Package |
+ Status |
+ Location |
+ Services |
+
+% foreach my $cust_pkg (@$packages) {
+%
+% if ( $bgcolor eq $bgcolor1 ) {
+% $bgcolor = $bgcolor2;
+% } else {
+% $bgcolor = $bgcolor1;
+% }
+%
+% my %iopt = (
+% 'bgcolor' => $bgcolor,
+% 'cust_pkg' => $cust_pkg,
+% 'part_pkg' => $cust_pkg->part_pkg,
+% );
+
+
- >( <%= pkg_unsuspend_link($pkg) %> | <%= pkg_cancel_link($pkg) %> ) |
+ <% include('packages/package.html', %iopt) %>
+ <% include('packages/status.html', %iopt) %>
+ <% include('packages/location.html', %iopt) %>
+ <% include('packages/services.html', %iopt) %>
- <% } else { %>
-
- <% unless ( $pkg->{setup} ) { %>
-
- <% unless ( $pkg->{'freq'} ) { %>
-
-
- >Not yet billed (one-time charge) |
-
-
-
- >( <%= pkg_cancel_link($pkg) %> ) |
-
-
- <% } else { %>
-
-
- >Not yet billed (<%= $billed_or_prepaid %> <%= myfreq($pkg->{part_pkg}) %>) |
-
-
- <% } %>
-
- <% } else { %>
-
- <% unless ( $pkg->{freq} ) { %>
-
-
- >One-time charge |
-
-
-
- Billed |
- <%= pkg_datestr($pkg,'setup',$conf) %>
-
-
- <% } else { %>
-
-
- >Active, <%= $billed_or_prepaid %> <%= myfreq($pkg->{part_pkg}) %> |
-
+% }
-
- Setup |
- <%= pkg_datestr($pkg, 'setup',$conf) %>
-
-
- <% } %>
-
- <% } %>
-
- <% if ( $pkg->{'last_bill'} ) { %>
-
- <%= $last_bill_or_renewed %> |
- <%= pkg_datestr($pkg, 'last_bill',$conf) %>
-
- <% } %>
-
- <% if ( $pkg->{'next_bill'} ) { %>
-
- <%= $next_bill_or_prepaid_until %> |
- <%= pkg_datestr($pkg, 'next_bill',$conf) %>
-
- <% } %>
+
- <% if ( $pkg->{'expire'} ) { %>
-
- Expires |
- <%= pkg_datestr($pkg, 'expire',$conf) %>
-
- <% } %>
+% } else {
+
+% }
- <% if ( $pkg->{freq} ) { %>
-
- >( <%= pkg_suspend_link($pkg) %> | <%= pkg_cancel_link($pkg) %> ) |
-
- <% } %>
+% if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) {
+
+% }
+<%init>
- <% } %>
+my( $cust_main ) = @_;
+my $conf = new FS::Conf;
-<% } %>
+my $curuser = $FS::CurrentUser::CurrentUser;
-
-
-
-<%
- 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);
-%>
- <%=svc_link($svcpart,$service)%> |
- <%=svc_label_link($svcpart,$service)%> ( <%=svc_unprovision_link($service)%> ) |
-
-<%
- $cnt++;
- }
- if ($svcpart->{count} < $svcpart->{quantity}) {
- print qq!\n! if ($cnt > 0);
- print qq! !.svc_provision_link($pkg, $svcpart, $conf).qq! | \n
\n!;
- }
- }
-}
-#end display packages
-%>
-
-
-<% } else { %>
-
-<% } %>
+my $packages = get_packages($cust_main, $conf);
-<%
#subroutines
sub get_packages {
@@ -315,180 +200,20 @@ 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}!;
-
-}
-
-sub svc_provision_link {
- my ($pkg, $svcpart, $conf) = @_;
- ( 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') ) {
- $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 = '%b | '.
- ' %o, | '.
- ' %Y | ';
- #$format .= ' %l:%M:%S%P %z'
- $format .= ' %l | '.
- ': | '.
- '%M | '.
- ' %P | '
- 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 '';
- 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!!.
- qq!Cancel now | !.
- qq!Cancel later!;
-}
-sub pkg_dates_link {
- my $pkg = shift or return '';
- qq!Edit dates!;
+ [ $cust_main->$method() ];
}
-sub pkg_customize_link {
- my $pkg = shift or return '';
- my $custnum = shift;
- qq!Customize!;
+sub order_pkg_link {
+ include( '/elements/popup_link-cust_main.html',
+ 'action' => $p. 'misc/order_pkg.html',
+ 'label' => 'Order new package',
+ 'actionlabel' => 'Order new package',
+ 'color' => '#333399',
+ 'cust_main' => shift,
+ 'closetext' => 'Close',
+ 'width' => 763,
+ )
}
-%>
+%init>