X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=500632d5507e01deaa121189fad3844f6269b27e;hb=96bfe632aeb28c7596bdfd5a7a98f0464f5ad6a5;hp=31aa262f4775a10ab2fef2adb48d09fda4f59eeb;hpb=63a268637b2d51a8766412617724b9436439deb6;p=freeside.git diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html index 31aa262f4..500632d55 100755 --- a/httemplate/view/cust_main/packages.html +++ b/httemplate/view/cust_main/packages.html @@ -1,41 +1,77 @@ -% my $s = 0; + + +% unless ( $opt{no_links} ) { + +% my $s = 0; + +% if ( $curuser->access_right('Qualify service') ) { + <% $s++ ? ' | ' : '' %> + <& qual_link.html, $cust_main &> +% } + % if ( $curuser->access_right('Order customer package') ) { <% $s++ ? ' | ' : '' %> - <% 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' => $cust_main, - 'closetext' => 'Close', - 'width' => 763, - 'height' => 350, - ) - %> + <& /elements/order_pkg_link.html, 'cust_main'=>$cust_main &> % } % if ( $curuser->access_right('One-time charge') % && $conf->config('payby-default') ne 'HIDE' % ) { <% $s++ ? ' | ' : '' %> - <% include('one_time_charge_link.html', $cust_main) %> + <& one_time_charge_link.html, $cust_main &> +% } + +% if ( $curuser->access_right('Bulk move customer services') ) { + <% $s++ ? ' | ' : '' %> + + <& /elements/popup_link-cust_main.html, + 'label' => emt('Move services between packages'), + 'action' => "${p}edit/bulk-cust_svc-pkgnum.html", + 'cust_main' => $cust_main, + 'actionlabel' => emt('Move services'), + 'width' => 968, #763, + 'height' => 575, + &> + % } % if ( $curuser->access_right('Bulk change customer packages') ) { <% $s++ ? ' | ' : '' %> - Bulk order and cancel packages (preserves services) + <% mt('Bulk order and cancel packages') |h %> % }

+% } # unless $opt{no_links} + - + +% unless ( $opt{no_links} ) { + + +% } # unless $opt{no_links} + - - -% if ( $show_location ) { - -% } - - - -% #$FS::cust_pkg::DEBUG = 2; -% 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, -% %conf_opt, -% ); -% - - - - <% include('packages/package.html', %iopt) %> - <% include('packages/status.html', %iopt) %> -% if ( $show_location ) { - <% include('packages/location.html', %iopt) %> -% } - <% include('packages/services.html', %iopt) %> - - -% } - -
- -% 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') @@ -45,89 +81,60 @@ Current packages % { % my $prev = $cgi->param('showcancelledpackages'); % $cgi->param('showcancelledpackages', 1); - ( show + ( <% mt('show') |h %> % $cgi->param('showcancelledpackages', $prev); % } else { % $cgi->param('showcancelledpackages', 0); - ( hide + ( <% mt('hide') |h %> % $cgi->param('showcancelledpackages', 1); % } - cancelled packages ) + <% mt('cancelled packages') |h %> ) % } % if ( $num_old_packages ) { % $cgi->param('showoldpackages', 1); - ( show old packages ) + ( <% mt('show old packages') |h %> ) % } elsif ( $cgi->param('showoldpackages') ) { % $cgi->param('showoldpackages', 0); - ( hide old packages ) + ( <% mt('hide old packages') |h %> ) % } - Package reports
- Service reports: - accounts + <% mt('Package reports') |h %> +% if ( $curuser->access_right('Qualify service') ) { + | <% mt('View Qualifications') |h %> +% } +
+ <% mt('Service reports:') |h %> + <% mt('accounts') |h %>
+ <% mt('Usage reports:') |h %> + <% mt('CDRs') |h %>
-% if ( @$packages ) { - -<% include('/elements/table-grid.html') %> -% my $bgcolor1 = '#eeeeee'; -% my $bgcolor2 = '#ffffff'; -% my $bgcolor = ''; - -
PackageStatusLocationServices
- -% } else { -
-% } +% $opt{cust_main} = $cust_main; +% $opt{packages} = $packages; +% $opt{cust_location_cache} = {}; +% if ( $conf->exists('cust_pkg-group_by_location') ) { + <& locations.html, %opt &> +% } else { # in this format, put all packages in one section + <& /elements/table-grid.html &> + <& packages/section.html, %opt &> + +% } - % if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) { % } - + <%init> -my( $cust_main ) = @_; +my $cust_main = shift; +my %opt = @_; my $conf = new FS::Conf; my $curuser = $FS::CurrentUser::CurrentUser; my( $packages, $num_old_packages ) = get_packages($cust_main, $conf); -my $show_location = $conf->exists('cust_pkg-always_show_location') - || ( grep $_->locationnum, @$packages ); # ? '1' : '0'; - my $countrydefault = scalar($conf->config('countrydefault')) || 'US'; -my %conf_opt = ( - #for services.html and status.html - 'cust_pkg-display_times' => $conf->exists('cust_pkg-display_times'), - - #for status.html - 'cust_pkg-show_autosuspend' => $conf->exists('cust_pkg-show_autosuspend'), - #for status.html pkg-balances - 'pkg-balances' => $conf->exists('pkg-balances'), - 'money_char' => ( $conf->config('money_char') || '$' ), - - #for location.html - 'countrydefault' => $countrydefault, - 'statedefault' => ( scalar($conf->config('statedefault')) - || ($countrydefault eq 'US' ? 'CA' : '') ), - #for services.html - 'svc_external-skip_manual' => $conf->exists('svc_external-skip_manual'), - 'legacy_link' => $conf->exists('legacy_link'), - 'svc_broadband-manage_link' => $conf->config('svc_broadband-manage_link'), -); - #subroutines sub get_packages { @@ -193,7 +178,10 @@ sub get_packages { join(', ', map { "cust_pkg.$_ AS $_" } fields('cust_pkg') ); my $part_pkg_fields = - join(', ', map { "part_pkg.$_ AS part_pkg_$_" } fields('part_pkg') ); + join(', ', ( map { "part_pkg.$_ AS part_pkg_$_" } fields('part_pkg') ), + 'setup_option.optionvalue AS part_pkg__setup_fee', + 'recur_option.optionvalue AS part_pkg__recur_fee', + ); my $group_by = join(', ', map "cust_pkg.$_", fields('cust_pkg') ). ', '. @@ -204,15 +192,42 @@ sub get_packages { my @packages = $cust_main->$method( { 'select' => "$cust_pkg_fields, $part_pkg_fields, $num_svcs", - 'addl_from' => 'LEFT JOIN part_pkg USING ( pkgpart )', + 'addl_from' => qq{ + LEFT JOIN part_pkg USING ( pkgpart ) + LEFT JOIN part_pkg_option AS setup_option + ON ( cust_pkg.pkgpart = setup_option.pkgpart + AND setup_option.optionname = 'setup_fee' ) + LEFT JOIN part_pkg_option AS recur_option + ON ( cust_pkg.pkgpart = recur_option.pkgpart + AND recur_option.optionname = 'recur_fee' ) + }, } ); my $num_old_packages = scalar(@packages); + my %change_to_from; # target pkgnum => current cust_pkg, for future changes + foreach my $cust_pkg ( @packages ) { my %hash = $cust_pkg->hash; my %part_pkg = map { /^part_pkg_(.+)$/ or die; ( $1 => $hash{$_} ); } grep { /^part_pkg_/ } keys %hash; $cust_pkg->{'_pkgpart'} = new FS::part_pkg \%part_pkg; + if ( $cust_pkg->change_to_pkgnum ) { + $change_to_from{$cust_pkg->change_to_pkgnum} = $cust_pkg; + } + } + + if ( keys %change_to_from ) { + my @not_future_packages; + foreach my $cust_pkg (@packages) { + if ( exists( $change_to_from{$cust_pkg->pkgnum} ) ) { + my $change_from = $change_to_from{ $cust_pkg->pkgnum }; + $cust_pkg->set('change_from_pkg', $change_from); + $change_from->set('change_to_pkg', $cust_pkg); + } else { + push @not_future_packages, $cust_pkg; + } + } + @packages = @not_future_packages; } unless ( $cgi->param('showoldpackages') ) { @@ -231,6 +246,16 @@ sub get_packages { } $num_old_packages -= scalar(@packages); + + # don't include supplemental packages in this list; they'll be found from + # their main packages + # (as will change-target packages) + @packages = grep !$_->main_pkgnum, @packages; + + foreach my $cust_pkg ( @packages ) { + $cust_pkg->{'_cust_pkg_discount_active'} = + [ $cust_pkg->cust_pkg_discount_active ]; + } ( \@packages, $num_old_packages ); }