diff options
author | Mark Wells <mark@freeside.biz> | 2016-08-31 12:41:32 -0700 |
---|---|---|
committer | Mark Wells <mark@freeside.biz> | 2016-08-31 12:41:32 -0700 |
commit | 3182ddaae3900b8477f17fae7be74e2ae7b66c84 (patch) | |
tree | 2f54a6c9a87ce5a25c831debe955f8508f036e44 /FS/FS | |
parent | e9a3a684ac4d154e2ea43c347fc616a8f983e4f0 (diff) |
on upgrade, remove all leading/trailing whitespace from address fields, #72194
Diffstat (limited to 'FS/FS')
-rw-r--r-- | FS/FS/Upgrade.pm | 6 | ||||
-rw-r--r-- | FS/FS/cust_location.pm | 19 |
2 files changed, 15 insertions, 10 deletions
diff --git a/FS/FS/Upgrade.pm b/FS/FS/Upgrade.pm index 6ecac88..0729816 100644 --- a/FS/FS/Upgrade.pm +++ b/FS/FS/Upgrade.pm @@ -361,6 +361,9 @@ sub upgrade_data { #payby actions to new ones 'part_event' => [], + #fix whitespace - before cust_main + 'cust_location' => [], + #cust_main (remove paycvv from history, locations, cust_payby, etc) 'cust_main' => [], @@ -490,9 +493,6 @@ sub upgrade_data { #mark certain taxes as system-maintained, # and fix whitespace 'cust_main_county' => [], - - #fix whitespace - 'cust_location' => [], ; \%hash; diff --git a/FS/FS/cust_location.pm b/FS/FS/cust_location.pm index 5a144b8..a9660d8 100644 --- a/FS/FS/cust_location.pm +++ b/FS/FS/cust_location.pm @@ -14,6 +14,12 @@ use FS::cust_main_county; use FS::part_export; use FS::GeocodeCache; +# Essential fields. Can't be modified in place, will be considered in +# deciding if a location is "new", and (because of that) can't have +# leading/trailing whitespace. +my @essential = (qw(custnum address1 address2 city county state zip country + location_number location_type location_kind disabled)); + $import = 0; $DEBUG = 0; @@ -174,9 +180,6 @@ sub find_or_insert { warn "find_or_insert:\n".Dumper($self) if $DEBUG; - my @essential = (qw(custnum address1 address2 city county state zip country - location_number location_type location_kind disabled)); - if ($conf->exists('cust_main-no_city_in_address')) { warn "Warning: passed city to find_or_insert when cust_main-no_city_in_address is configured, ignoring it" if $self->get('city'); @@ -377,9 +380,9 @@ sub check { return '' if $self->disabled; # so that disabling locations never fails - # maybe should just do all fields in the table? - # or in every table? - $self->trim_whitespace(qw(district city county state country)); + # whitespace in essential fields leads to problems figuring out if a + # record is "new"; get rid of it. + $self->trim_whitespace(@essential); my $error = $self->ut_numbern('locationnum') @@ -929,7 +932,9 @@ sub _upgrade_data { # trim whitespace on records that need it local $allow_location_edit = 1; - foreach my $field (qw(city county state country district)) { + foreach my $field (@essential) { + next if $field eq 'custnum'; + next if $field eq 'disabled'; foreach my $location (qsearch({ table => 'cust_location', extra_sql => " WHERE $field LIKE ' %' OR $field LIKE '% '" |