X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fgeocode_Mixin.pm;h=b999be0abc30c0921562c0a9d022bbf747de0f67;hp=57d8ca0e895c9f9d38addd03857807ca8de83f73;hb=bb7e827141c9ed68f30765c9ca2ddcd1d760ad2d;hpb=60724f233fbeb9388f4b2cbb68a4e6297c2b2118 diff --git a/FS/FS/geocode_Mixin.pm b/FS/FS/geocode_Mixin.pm index 57d8ca0e8..b999be0ab 100644 --- a/FS/FS/geocode_Mixin.pm +++ b/FS/FS/geocode_Mixin.pm @@ -3,7 +3,7 @@ package FS::geocode_Mixin; use strict; use vars qw( $DEBUG $me ); use Carp; -use Locale::Country; +use Locale::Country (); use Geo::Coder::Googlev3; #compile time for now, until others are supported use FS::Record qw( qsearchs qsearch ); use FS::Conf; @@ -11,6 +11,7 @@ use FS::cust_pkg; use FS::cust_location; use FS::cust_tax_location; use FS::part_pkg; +use FS::part_pkg_taxclass; $DEBUG = 0; $me = '[FS::geocode_Mixin]'; @@ -126,25 +127,41 @@ sub location_label { $notfirst++; } } - $line .= $separator. &$escape(code2country($self->country)) + $line .= $separator. &$escape($self->country_full) if $self->country ne $cydefault; $line; } -=item set_coord [ PREFIX ] +=item country_full + +Returns the full country name. + +=cut + +sub country_full { + my $self = shift; + $self->code2country($self->get('country')); +} + +sub code2country { + my( $self, $country ) = @_; + + #a hash? not expecting an explosion of business from unrecognized countries.. + return 'KKTC' if $country eq 'XC'; + + Locale::Country::code2country($country); +} + +=item set_coord Look up the coordinates of the location using (currently) the Google Maps API and set the 'latitude' and 'longitude' fields accordingly. -PREFIX, if specified, will be prepended to all location field names, -including latitude and longitude. - =cut sub set_coord { my $self = shift; - my $pre = scalar(@_) ? shift : ''; #my $module = FS::Conf->new->config('geocode_module') || 'Geo::Coder::Googlev3'; @@ -152,11 +169,11 @@ sub set_coord { my $location = eval { $geocoder->geocode( location => - $self->get($pre.'address1'). ','. - ( $self->get($pre.'address2') ? $self->get($pre.'address2').',' : '' ). - $self->get($pre.'city'). ','. - $self->get($pre.'state'). ','. - code2country($self->get($pre.'country')) + $self->get('address1'). ','. + ( $self->get('address2') ? $self->get('address2').',' : '' ). + $self->get('city'). ','. + $self->get('state'). ','. + $self->country_full ); }; if ( $@ ) { @@ -166,9 +183,9 @@ sub set_coord { my $geo_loc = $location->{'geometry'}{'location'} or return; if ( $geo_loc->{'lat'} && $geo_loc->{'lng'} ) { - $self->set($pre.'latitude', $geo_loc->{'lat'} ); - $self->set($pre.'longitude', $geo_loc->{'lng'} ); - $self->set($pre.'coord_auto', 'Y'); + $self->set('latitude', $geo_loc->{'lat'} ); + $self->set('longitude', $geo_loc->{'lng'} ); + $self->set('coord_auto', 'Y'); } } @@ -232,43 +249,103 @@ Queueable function to update the tax district code using the selected method =cut +# this is run from the job queue so I'm not transactionizing it. + sub process_district_update { my $class = shift; my $id = shift; + my $log = FS::Log->new('FS::cust_location::process_district_update'); eval "use FS::Misc::Geo qw(get_district); use FS::Conf; use $class;"; die $@ if $@; die "$class has no location data" if !$class->can('location_hash'); + my $error; my $conf = FS::Conf->new; my $method = $conf->config('tax_district_method') or return; #nothing to do if null my $self = $class->by_key($id) or die "object $id not found"; + return if $self->disabled; # dies on error, fine my $tax_info = get_district({ $self->location_hash }, $method); - - if ( $tax_info ) { + return unless $tax_info; + + if ($self->district ne $tax_info->{'district'}) { $self->set('district', $tax_info->{'district'} ); - my $error = $self->replace; + $error = $self->replace; die $error if $error; + } - my %hash = map { $_ => $tax_info->{$_} } - qw( district city county state country ); - my $old = qsearchs('cust_main_county', \%hash); - if ( $old ) { - my $new = new FS::cust_main_county { $old->hash, %$tax_info }; - warn "updating tax rate for district ".$tax_info->{'district'} if $DEBUG; - $error = $new->replace($old); - } - else { - my $new = new FS::cust_main_county $tax_info; - warn "creating tax rate for district ".$tax_info->{'district'} if $DEBUG; + my %hash = map { $_ => uc( $tax_info->{$_} ) } + qw( district city county state country ); + $hash{'source'} = $method; # apply the update only to taxes we maintain + + my @classes = FS::part_pkg_taxclass->taxclass_names; + my $taxname = $conf->config('tax_district_taxname'); + # there must be exactly one cust_main_county for each district+taxclass. + # do NOT exclude taxes that are zero. + + # mutex here so that concurrent queue jobs can't make duplicates. + FS::cust_main_county->lock_table; + foreach my $taxclass (@classes) { + my @existing = qsearch('cust_main_county', { + %hash, + 'taxclass' => $taxclass + }); + + if ( scalar(@existing) == 0 ) { + + # then create one with the assigned tax name, and the tax rate from + # the lookup. + my $new = new FS::cust_main_county({ + %hash, + 'taxclass' => $taxclass, + 'taxname' => $taxname, + 'tax' => $tax_info->{tax}, + 'exempt_amount' => 0, + }); + $log->info("creating tax rate for district ".$tax_info->{'district'}); $error = $new->insert; + + } else { + + my $to_update = $existing[0]; + # if there's somehow more than one, find the best candidate to be + # updated: + # - prefer tax > 0 over tax = 0 (leave disabled records disabled) + # - then, prefer taxname = the designated taxname + if ( scalar(@existing) > 1 ) { + $log->warning("tax district ".$tax_info->{district}." has multiple $method taxes."); + foreach (@existing) { + if ( $to_update->tax == 0 ) { + if ( $_->tax > 0 and $to_update->tax == 0 ) { + $to_update = $_; + } elsif ( $_->tax == 0 and $to_update->tax > 0 ) { + next; + } elsif ( $_->taxname eq $taxname and $to_update->tax ne $taxname ) { + $to_update = $_; + } + } + } + # don't remove the excess records here; upgrade does that. + } + my $taxnum = $to_update->taxnum; + if ( $to_update->tax == 0 ) { + $log->debug("tax#$taxnum is set to zero; not updating."); + } elsif ( $to_update->tax == $tax_info->{tax} ) { + # do nothing, no need to update + } else { + $to_update->set('tax', $tax_info->{tax}); + $log->info("updating tax#$taxnum with new rate ($tax_info->{tax})."); + $error = $to_update->replace; + } } + die $error if $error; - } + } # foreach $taxclass + return; }