projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
stop new IP address assignment code from tripping over ancient svc_acct.slipip values...
[freeside.git]
/
FS
/
FS
/
svc_pbx.pm
diff --git
a/FS/FS/svc_pbx.pm
b/FS/FS/svc_pbx.pm
index
f8b9605
..
f39234d
100644
(file)
--- a/
FS/FS/svc_pbx.pm
+++ b/
FS/FS/svc_pbx.pm
@@
-1,12
+1,15
@@
package FS::svc_pbx;
package FS::svc_pbx;
+use base qw( FS::o2m_Common FS::svc_External_Common );
use strict;
use strict;
-use
base qw( FS::svc_External_Common )
;
+use
Tie::IxHash
;
use FS::Record qw( qsearch qsearchs dbh );
use FS::Record qw( qsearch qsearchs dbh );
+use FS::PagedSearch qw( psearch );
use FS::Conf;
use FS::cust_svc;
use FS::svc_phone;
use FS::svc_acct;
use FS::Conf;
use FS::cust_svc;
use FS::svc_phone;
use FS::svc_acct;
+use FS::pbx_extension;
=head1 NAME
=head1 NAME
@@
-79,6
+82,15
@@
points to. You can ask the object for a copy with the I<hash> method.
sub table { 'svc_pbx'; }
sub table_info {
sub table { 'svc_pbx'; }
sub table_info {
+
+ tie my %fields, 'Tie::IxHash',
+ 'svcnum' => 'PBX',
+ 'id' => 'PBX/Tenant ID',
+ 'title' => 'Name',
+ 'max_extensions' => 'Maximum number of User Extensions',
+ 'max_simultaneous' => 'Maximum number of simultaneous users',
+ ;
+
{
'name' => 'PBX',
'name_plural' => 'PBXs',
{
'name' => 'PBX',
'name_plural' => 'PBXs',
@@
-87,12
+99,7
@@
sub table_info {
'sorts' => 'svcnum', # optional sort field (or arrayref of sort fields, main first)
'display_weight' => 70,
'cancel_weight' => 90,
'sorts' => 'svcnum', # optional sort field (or arrayref of sort fields, main first)
'display_weight' => 70,
'cancel_weight' => 90,
- 'fields' => {
- 'id' => 'ID',
- 'title' => 'Name',
- 'max_extensions' => 'Maximum number of User Extensions',
- 'max_simultaneous' => 'Maximum number of simultaneous users',
- },
+ 'fields' => \%fields,
};
}
};
}
@@
-259,11
+266,13
@@
sub _check_duplicate {
return '';
}
return '';
}
-=item
get_cdrs
+=item
psearch_cdrs OPTIONS
-Returns a set of Call Detail Records (see L<FS::cdr>) associated with this
-service. By default, "associated with" means that the "charged_party" field of
-the CDR matches the "title" field of the service.
+Returns a paged search (L<FS::PagedSearch>) for Call Detail Records
+associated with this service. By default, "associated with" means that
+the "charged_party" field of the CDR matches the "title" field of the
+service. To access the CDRs themselves, call "->fetch" on the resulting
+object.
=over 2
=over 2
@@
-289,13
+298,15
@@
to allow title to indicate a range of IP addresses.
=item begin, end: Start and end of date range, as unix timestamp.
=item begin, end: Start and end of date range, as unix timestamp.
-=item cdrtypenum: Only return CDRs with this type number.
+=item cdrtypenum: Only return CDRs with this type.
+
+=item calltypenum: Only return CDRs with this call type.
=back
=cut
=back
=cut
-sub
get
_cdrs {
+sub
psearch
_cdrs {
my($self, %options) = @_;
my %hash = ();
my @where = ();
my($self, %options) = @_;
my %hash = ();
my @where = ();
@@
-307,6
+318,9
@@
sub get_cdrs {
if ($options{'cdrtypenum'}) {
$hash{'cdrtypenum'} = $options{'cdrtypenum'};
}
if ($options{'cdrtypenum'}) {
$hash{'cdrtypenum'} = $options{'cdrtypenum'};
}
+ if ($options{'calltypenum'}) {
+ $hash{'calltypenum'} = $options{'calltypenum'};
+ }
my $for_update = $options{'for_update'} ? 'FOR UPDATE' : '';
my $for_update = $options{'for_update'} ? 'FOR UPDATE' : '';
@@
-343,15
+357,31
@@
sub get_cdrs {
my $extra_sql = ( keys(%hash) ? ' AND ' : ' WHERE ' ). join(' AND ', @where )
if @where;
my $extra_sql = ( keys(%hash) ? ' AND ' : ' WHERE ' ). join(' AND ', @where )
if @where;
- my @cdrs =
- qsearch( {
+ psearch( {
'table' => 'cdr',
'hashref' => \%hash,
'extra_sql' => $extra_sql,
'order_by' => "ORDER BY startdate $for_update",
'table' => 'cdr',
'hashref' => \%hash,
'extra_sql' => $extra_sql,
'order_by' => "ORDER BY startdate $for_update",
- } );
+ } );
+}
+
+=item get_cdrs (DEPRECATED)
+
+Like psearch_cdrs, but returns all the L<FS::cdr> objects at once, in a
+single list. Arguments are the same as for psearch_cdrs. This can take
+an unreasonably large amount of memory and is best avoided.
- @cdrs;
+=cut
+
+sub get_cdrs {
+ my $self = shift;
+ my $psearch = $self->psearch_cdrs($_);
+ qsearch ( $psearch->{query} )
+}
+
+sub pbx_extension {
+ my $self = shift;
+ qsearch('pbx_extension', { svcnum=>$self->svcnum });
}
=back
}
=back