projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bf53da6
)
optimize package list with lots of packages, RT#28526
author
Ivan Kohler
<ivan@freeside.biz>
Tue, 6 May 2014 12:35:48 +0000
(
05:35
-0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Tue, 6 May 2014 12:35:48 +0000
(
05:35
-0700)
httemplate/view/cust_main/packages.html
patch
|
blob
|
history
httemplate/view/cust_main/packages/package.html
patch
|
blob
|
history
httemplate/view/cust_main/packages/status.html
patch
|
blob
|
history
diff --git
a/httemplate/view/cust_main/packages.html
b/httemplate/view/cust_main/packages.html
index
746e0c7
..
a05142f
100755
(executable)
--- a/
httemplate/view/cust_main/packages.html
+++ b/
httemplate/view/cust_main/packages.html
@@
-313,4
+313,9
@@
$num_old_packages -= scalar(@packages);
# (as will change-target packages)
@packages = grep !$_->main_pkgnum, @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>
</%init>
diff --git
a/httemplate/view/cust_main/packages/package.html
b/httemplate/view/cust_main/packages/package.html
index
ab7bad2
..
6a0c7f7
100644
(file)
--- a/
httemplate/view/cust_main/packages/package.html
+++ b/
httemplate/view/cust_main/packages/package.html
@@
-49,7
+49,7
@@
%
% if ( $curuser->access_right('Discount customer package')
% && $part_pkg->can_discount
%
% if ( $curuser->access_right('Discount customer package')
% && $part_pkg->can_discount
-% && ! scalar(
$cust_pkg->cust_pkg_discount_active
)
+% && ! scalar(
@{ $cust_pkg->{_cust_pkg_discount_active} }
)
% && ! scalar($cust_pkg->part_pkg->part_pkg_discount)
% )
% {
% && ! scalar($cust_pkg->part_pkg->part_pkg_discount)
% )
% {
diff --git
a/httemplate/view/cust_main/packages/status.html
b/httemplate/view/cust_main/packages/status.html
index
689ee45
..
dbf3698
100644
(file)
--- a/
httemplate/view/cust_main/packages/status.html
+++ b/
httemplate/view/cust_main/packages/status.html
@@
-494,7
+494,7
@@
sub pkg_status_row_discount {
my $html;
my $html;
- foreach my $cust_pkg_discount (
$cust_pkg->cust_pkg_discount_active
) {
+ foreach my $cust_pkg_discount (
@{ $cust_pkg->{_cust_pkg_discount_active} }
) {
my $discount = $cust_pkg_discount->discount;
my $discount = $cust_pkg_discount->discount;