projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
service label localization, internals and UI, #71347
[freeside.git]
/
FS
/
FS
/
svc_Common.pm
diff --git
a/FS/FS/svc_Common.pm
b/FS/FS/svc_Common.pm
index
9d9e50f
..
1dd9ffb
100644
(file)
--- a/
FS/FS/svc_Common.pm
+++ b/
FS/FS/svc_Common.pm
@@
-189,7
+189,7
@@
sub check {
foreach my $field (keys %$required) {
unless (length($self->get($field)) > 0) {
my $name = $labels->{$field} || $field;
foreach my $field (keys %$required) {
unless (length($self->get($field)) > 0) {
my $name = $labels->{$field} || $field;
- return "
Field
$name is required\n"
+ return "$name is required\n"
}
}
}
}
}
}
@@
-282,7
+282,7
@@
sub insert {
$self->svcpart($cust_svc->svcpart);
}
$self->svcpart($cust_svc->svcpart);
}
- my $error = $self->preinsert_hook_first
+ my $error = $self->preinsert_hook_first
(%options)
|| $self->set_auto_inventory
|| $self->check
|| $self->_check_duplicate
|| $self->set_auto_inventory
|| $self->check
|| $self->_check_duplicate
@@
-719,6
+719,8
@@
sub setx {
sub part_svc {
my $self = shift;
sub part_svc {
my $self = shift;
+ cluck 'svc_X->part_svc called' if $DEBUG;
+
#get part_svc
my $svcpart;
if ( $self->get('svcpart') ) {
#get part_svc
my $svcpart;
if ( $self->get('svcpart') ) {
@@
-1154,7
+1156,9
@@
Runs the provided export hook (i.e. "suspend", "unsuspend") for this service.
sub export {
my( $self, $method ) = ( shift, shift );
sub export {
my( $self, $method ) = ( shift, shift );
+ # $method must start with export_, $action must be the part after that
$method = "export_$method" unless $method =~ /^export_/;
$method = "export_$method" unless $method =~ /^export_/;
+ my ($action) = $method =~ /^export_(\w+)/;
local $SIG{HUP} = 'IGNORE';
local $SIG{INT} = 'IGNORE';
local $SIG{HUP} = 'IGNORE';
local $SIG{INT} = 'IGNORE';
@@
-1171,6
+1175,7
@@
sub export {
unless ( $noexport_hack ) {
foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
next unless $part_export->can($method);
unless ( $noexport_hack ) {
foreach my $part_export ( $self->cust_svc->part_svc->part_export ) {
next unless $part_export->can($method);
+ next if $part_export->get("no_$action"); # currently only 'no_suspend'
my $error = $part_export->$method($self, @_);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
my $error = $part_export->$method($self, @_);
if ( $error ) {
$dbh->rollback if $oldAutoCommit;
@@
-1349,6
+1354,9
@@
sub search_sql {
#my( $class, $string ) = @_;
'1 = 0'; #false
}
#my( $class, $string ) = @_;
'1 = 0'; #false
}
+sub search_sql_addl_from {
+ '';
+}
=item search HASHREF
=item search HASHREF
@@
-1379,11
+1387,17
@@
Parameters:
=item order_by
=item order_by
+=item cancelled - if true, only returns svcs attached to cancelled pkgs;
+if defined and false, only returns svcs not attached to cancelled packages
+
=back
=cut
=back
=cut
-# svc_broadband::search should eventually use this instead
+### Don't call the 'cancelled' option 'Service Status'
+### There is no such thing
+### See cautionary note in httemplate/browse/part_svc.cgi
+
sub search {
my ($class, $params) = @_;
sub search {
my ($class, $params) = @_;
@@
-1487,6
+1501,14
@@
sub search {
push @where, "exportnum = $1";
}
push @where, "exportnum = $1";
}
+ if ( defined($params->{'cancelled'}) ) {
+ if ($params->{'cancelled'}) {
+ push @where, "cust_pkg.cancel IS NOT NULL";
+ } else {
+ push @where, "cust_pkg.cancel IS NULL";
+ }
+ }
+
# # sector and tower
# my @where_sector = $class->tower_sector_sql($params);
# if ( @where_sector ) {
# # sector and tower
# my @where_sector = $class->tower_sector_sql($params);
# if ( @where_sector ) {