projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b7d483c
)
fix double display of service links in bundled packages (and mis-alignment in custome...
author
ivan
<ivan>
Fri, 5 Aug 2011 19:27:01 +0000
(19:27 +0000)
committer
ivan
<ivan>
Fri, 5 Aug 2011 19:27:01 +0000
(19:27 +0000)
FS/FS/cust_pkg.pm
patch
|
blob
|
history
FS/FS/part_pkg.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_pkg.pm
b/FS/FS/cust_pkg.pm
index
b9b58e5
..
08e8b2b
100644
(file)
--- a/
FS/FS/cust_pkg.pm
+++ b/
FS/FS/cust_pkg.pm
@@
-1931,7
+1931,7
@@
sub extra_part_svc {
my $self = shift;
my $pkgnum = $self->pkgnum;
my $self = shift;
my $pkgnum = $self->pkgnum;
- my $pkgpart = $self->pkgpart;
+
#
my $pkgpart = $self->pkgpart;
# qsearch( {
# 'table' => 'part_svc',
# qsearch( {
# 'table' => 'part_svc',
@@
-1950,23
+1950,27
@@
sub extra_part_svc {
# 'extra_param' => [ [$self->pkgpart=>'int'], [$self->pkgnum=>'int'] ],
# } );
# 'extra_param' => [ [$self->pkgpart=>'int'], [$self->pkgnum=>'int'] ],
# } );
-#seems to benchmark slightly faster...
+#seems to benchmark slightly faster... (or did?)
+
+ my @pkgparts = map $_->pkgpart, $self->part_pkg->self_and_svc_linked;
+ my $pkgparts = join(',', @pkgparts);
+
qsearch( {
#'select' => 'DISTINCT ON (svcpart) part_svc.*',
#MySQL doesn't grok DISINCT ON
'select' => 'DISTINCT part_svc.*',
'table' => 'part_svc',
'addl_from' =>
qsearch( {
#'select' => 'DISTINCT ON (svcpart) part_svc.*',
#MySQL doesn't grok DISINCT ON
'select' => 'DISTINCT part_svc.*',
'table' => 'part_svc',
'addl_from' =>
-
'
LEFT JOIN pkg_svc ON ( pkg_svc.svcpart = part_svc.svcpart
- AND pkg_svc.pkgpart
= ?
+
"
LEFT JOIN pkg_svc ON ( pkg_svc.svcpart = part_svc.svcpart
+ AND pkg_svc.pkgpart
IN ($pkgparts)
AND quantity > 0
)
LEFT JOIN cust_svc ON ( cust_svc.svcpart = part_svc.svcpart )
LEFT JOIN cust_pkg USING ( pkgnum )
AND quantity > 0
)
LEFT JOIN cust_svc ON ( cust_svc.svcpart = part_svc.svcpart )
LEFT JOIN cust_pkg USING ( pkgnum )
-
'
,
+
"
,
'hashref' => {},
'extra_sql' => "WHERE pkgsvcnum IS NULL AND cust_pkg.pkgnum = ? ",
'hashref' => {},
'extra_sql' => "WHERE pkgsvcnum IS NULL AND cust_pkg.pkgnum = ? ",
- 'extra_param' => [ [$self->pkg
part=>'int'], [$self->pkg
num=>'int'] ],
+ 'extra_param' => [ [$self->pkgnum=>'int'] ],
} );
}
} );
}
diff --git
a/FS/FS/part_pkg.pm
b/FS/FS/part_pkg.pm
index
66ce36e
..
f658dcf
100644
(file)
--- a/
FS/FS/part_pkg.pm
+++ b/
FS/FS/part_pkg.pm
@@
-975,6
+975,10
@@
sub self_and_bill_linked {
shift->_self_and_linked('bill', @_);
}
shift->_self_and_linked('bill', @_);
}
+sub self_and_svc_linked {
+ shift->_self_and_linked('svc', @_);
+}
+
sub _self_and_linked {
my( $self, $type, $hidden ) = @_;
$hidden ||= '';
sub _self_and_linked {
my( $self, $type, $hidden ) = @_;
$hidden ||= '';