X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=41315701f8f9f77d08ca19284d115079874f54e1;hb=bba2d3e97b173983eebc9ade920ac0a0468c16d7;hp=746e0c7c528bd3f739282c71fa0a81007f63f446;hpb=04220e7ef18314883ad1cec05c552f13d8d5f7e4;p=freeside.git
diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 746e0c7c5..41315701f 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -78,50 +78,6 @@ for (var i = 0; i < all_buttons.length; i++) {
if ( el ) el.scrollIntoView(true);
&>
-% 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++ ? ' | ' : '' %>
- <& /elements/order_pkg_link.html, 'cust_main'=>$cust_main &>
-% }
-
-% if ( $curuser->access_right('One-time charge')
-% && $conf->config('payby-default') ne 'HIDE'
-% ) {
- <% $s++ ? ' | ' : '' %>
- <& 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++ ? ' | ' : '' %>
- <% mt('Bulk order and cancel packages') |h %>
-% }
-
-
-
-% } # unless $opt{no_links}
-
@@ -155,43 +111,22 @@ if ( el ) el.scrollIntoView(true);
|
-% unless ( $opt{no_links} ) {
-
-
- <% 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 %>
- |
-
-% } # unless $opt{no_links}
-
-% if ( $conf->exists('cust_pkg-group_by_location') ) {
-<& locations.html,
- 'cust_main' => $cust_main,
- 'packages' => \@packages,
- %opt,
- &>
-% }
-% else {
-% # in this format, put all packages in one section
-<& /elements/table-grid.html &>
-<& packages/section.html,
- 'cust_main' => $cust_main,
- 'packages' => \@packages,
- %opt,
- &>
- |
-% }
+
+% $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 &>
+
+% }
+
@@ -206,8 +141,6 @@ my $curuser = $FS::CurrentUser::CurrentUser;
my $countrydefault = scalar($conf->config('countrydefault')) || 'US';
-my $hide_changed = $curuser->option('hide_package_changes');
-
my $hide_cancelled = 0;
if ( $cgi->param('showcancelledpackages') eq '0' #see if it was set by me
|| ( $conf->exists('hidecancelledpackages')
@@ -221,7 +154,10 @@ my $cust_pkg_fields =
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') ). ', '.
@@ -233,7 +169,15 @@ my $num_svcs = '( SELECT COUNT(*) FROM cust_svc '.
# don't exclude cancelled packages at this stage
my @packages = $cust_main->all_pkgs( {
'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 %change_to_from; # target pkgnum => current cust_pkg, for future changes
@@ -256,29 +200,26 @@ foreach my $cust_pkg ( @packages ) {
if ( keys %change_to_from or keys %changed_from ) {
my @displayable_packages;
foreach my $cust_pkg (@packages) {
+
if ( exists( $change_to_from{$cust_pkg->pkgnum} ) ) {
+
# $cust_pkg is an ordered, not-yet-active package change target
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);
+
} elsif ( exists( $changed_from{$cust_pkg->pkgnum} ) ) {
+
# $cust_pkg is a canceled package changed into another packge
+ # hide it under the destination package's history
my $changed_to = $changed_from{$cust_pkg->pkgnum};
- if ( ( $hide_changed eq 'all' ) or
- ( $hide_changed eq 'location'
- and $changed_to->pkgpart == $cust_pkg->pkgpart
- and $changed_to->refnum == $cust_pkg->refnum
- and $changed_to->quantity == $cust_pkg->quantity )
- ) {
- # then we're hiding it
- $cust_pkg->set('changed_to_pkg', $changed_to);
- $changed_to->set('changed_from_pkg', $cust_pkg);
- } else { # show it anyway
- push @displayable_packages, $cust_pkg;
- }
+ $cust_pkg->set('changed_to_pkg', $changed_to);
+ $changed_to->set('changed_from_pkg', $cust_pkg);
+
} else {
push @displayable_packages, $cust_pkg;
}
+
}
@packages = @displayable_packages;
}
@@ -313,4 +254,9 @@ $num_old_packages -= scalar(@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 ];
+}
+
%init>