use FS::part_pkg;
use FS::cust_main;
use FS::cust_location;
-use FS::type_pkgs;
use FS::pkg_svc;
use FS::cust_bill_pkg;
use FS::cust_pkg_detail;
sub check {
my $self = shift;
- $self->locationnum('') if $self->locationnum == 0 || $self->locationnum == -1;
+ $self->locationnum('')
+ if defined($self->locationnum) && length($self->locationnum)
+ && ( $self->locationnum == 0 || $self->locationnum == -1 );
my $error =
$self->ut_numbern('pkgnum')
$hash{'bill'} = ( $hash{'bill'} || $hash{'setup'} ) + $inactive
if ( $opt{'adjust_next_bill'}
- || $conf->config('unsuspend-always_adjust_next_bill_date') )
+ || $conf->exists('unsuspend-always_adjust_next_bill_date') )
&& $inactive > 0 && ( $hash{'bill'} || $hash{'setup'} );
$hash{'susp'} = '';
sub location_sql {
my($class, %opt) = @_;
my $ornull = $opt{'ornull'};
+ my $nec = $opt{'noempty_county'};
my $conf = new FS::Conf;
# '?' placeholders in _location_sql_where
my @bill_param;
if ( $ornull ) {
- @bill_param = qw( county county county state state state country );
+ @bill_param = qw( county county state state state country );
} else {
- @bill_param = qw( county county state state country );
+ @bill_param = qw( county state state country );
}
+ unshift @bill_param, 'county' unless $nec;
my $main_where;
my @main_param;
$main_where = "(
( ( ship_last IS NULL OR ship_last = '' )
- AND ". _location_sql_where('cust_main', '', $ornull ). "
+ AND ". _location_sql_where('cust_main', '', $ornull, $nec ). "
)
OR ( ship_last IS NOT NULL AND ship_last != ''
- AND ". _location_sql_where('cust_main', 'ship_', $ornull). "
+ AND ". _location_sql_where('cust_main', 'ship_', $ornull, $nec ). "
)
)";
# AND payby != 'COMP'
my @param;
if ( $conf->exists('tax-pkg_address') ) {
+ my $loc_where = _location_sql_where( 'cust_location',
+ '', #prefix
+ $ornull,
+ $nec,
+ );
+
$where = " (
- ( cust_pkg.locationnum IS NULL AND $main_where )
- OR ( cust_pkg.locationnum IS NOT NULL AND ". _location_sql_where('cust_location', '', $ornull). " )
- )";
+ ( cust_pkg.locationnum IS NULL AND $main_where )
+ OR ( cust_pkg.locationnum IS NOT NULL AND $loc_where )
+ )
+ ";
@param = ( @main_param, @bill_param );
} else {
}
-#subroutine, helper for able
+#subroutine, helper for location_sql
sub _location_sql_where {
- my $table = shift;
- my $prefix = @_ ? shift : '';
- my $ornull = @_ ? shift : '';
- $ornull = $ornull ? ' OR ? IS NULL ' : '';
+ my $table = shift;
+ my $prefix = @_ ? shift : '';
+ my $ornull = @_ ? shift : '';
+ my $no_empty_county = @_ ? shift : '';
+
+ $ornull = $ornull ? ' OR ? IS NULL ' : '';
+ my $or_empty_county = $no_empty_county ? '' : " OR ? = '' ";
+
"
- ( $table.${prefix}county = ? OR ? = '' $ornull )
- AND ( $table.${prefix}state = ? OR ? = '' $ornull )
+ ( $table.${prefix}county = ? $or_empty_county $ornull )
+ AND ( $table.${prefix}state = ? OR ? = '' $ornull )
AND $table.${prefix}country = ?
";
}