projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c9ac50f
)
doh, fix pkg display, RT#5083
author
ivan
<ivan>
Mon, 30 Mar 2009 01:39:26 +0000
(
01:39
+0000)
committer
ivan
<ivan>
Mon, 30 Mar 2009 01:39:26 +0000
(
01:39
+0000)
httemplate/view/cust_main/packages.html
patch
|
blob
|
history
diff --git
a/httemplate/view/cust_main/packages.html
b/httemplate/view/cust_main/packages.html
index
8ff2269
..
9b13a8f
100755
(executable)
--- a/
httemplate/view/cust_main/packages.html
+++ b/
httemplate/view/cust_main/packages.html
@@
-86,9
+86,9
@@
Current packages
% }
%
% my %hash = $cust_pkg->hash;
% }
%
% my %hash = $cust_pkg->hash;
-% my %part_pkg = map { /^part_pkg_(.+)$/ or die;
$1 => $hash{$_}
; }
+% my %part_pkg = map { /^part_pkg_(.+)$/ or die;
( $1 => $hash{$_} )
; }
% grep { /^part_pkg_/ } keys %hash;
% grep { /^part_pkg_/ } keys %hash;
-% $cust_pkg->{'_pkgpart'} = new FS::part_pkg
{ $cust_pkg->hash }; #quelle klud
+% $cust_pkg->{'_pkgpart'} = new FS::part_pkg
\%part_pkg;
%
% my %iopt = (
% 'bgcolor' => $bgcolor,
%
% my %iopt = (
% 'bgcolor' => $bgcolor,
@@
-172,12
+172,14
@@
sub get_packages {
$method = 'all_pkgs';
}
$method = 'all_pkgs';
}
- my $part_pkg_fields = join(', ', map { "part_pkg.$_ AS part_pkg_$_" }
- fields('part_pkg')
- );
+ 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') );
my @packages = $cust_main->$method( {
my @packages = $cust_main->$method( {
- 'select' => "
cust_pkg.*
, $part_pkg_fields",
+ 'select' => "
$cust_pkg_fields
, $part_pkg_fields",
'addl_from' => 'LEFT JOIN part_pkg USING ( pkgpart )'
} );
my $num_old_packages = scalar(@packages);
'addl_from' => 'LEFT JOIN part_pkg USING ( pkgpart )'
} );
my $num_old_packages = scalar(@packages);