X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fconfirm-censustract.html;h=10ae91812b858a1386df64ec07746e855f73f450;hb=d02f1d8fb338e4dd1b401892b3408a65cad3b4d4;hp=ae0ae3a6ad9636de8dd555d3c84de95bf256f899;hpb=468c9e660eb0edb2033f0f8dbb4458f20280082c;p=freeside.git
diff --git a/httemplate/misc/confirm-censustract.html b/httemplate/misc/confirm-censustract.html
index ae0ae3a6a..10ae91812 100644
--- a/httemplate/misc/confirm-censustract.html
+++ b/httemplate/misc/confirm-censustract.html
@@ -1,3 +1,10 @@
+% if ( !$error and !$new_tract ) {
+% # then set_censustract returned nothing
+% # because it's not relevant for this address
+% # so output nothing (forces confirm_censustract() to continue)
+% $m->clear_buffer;
+% $m->abort;
+% }
% if ( $error ) {
Census tract error
@@ -6,6 +13,9 @@ Census tract error
Confirm census tract
% }
+<% $location{address1} |h %> <% $location{address2} |h %>
+<% $location{city} |h %>, <% $location{state} |h %> <% $location{zip} |h %>
+
% my $querystring = "census_year=$year&latitude=".$cache->get('latitude').'&longitude='.$cache->get('longitude');
Map service module location
@@ -29,13 +39,14 @@ Confirm census tract
+% if ( !$error ) {
@@ -47,6 +58,14 @@ Confirm census tract
+% } else { # don't show a button to use the calculated value
+
+
+
+
+% }
<%init>
@@ -61,12 +80,13 @@ warn $cgi->param('q') if $DEBUG;
my $q = decode_json($cgi->param('q'))
or die "bad argument '".$cgi->param('q')."'";
+my $pre = $q->{prefix} || '';
my %location = (
- map { $_ => $q->{'ship_'.$_} }
+ map { $_ => $q->{$pre.$_} }
qw( company address1 address2 city state zip country latitude longitude )
);
-my $old_tract = $q->{'ship_censustract'};
+my $old_tract = $q->{$pre.'censustract'};
my $cache = eval { FS::GeocodeCache->new(%location) };
$cache->set_censustract;
my $year = FS::Conf->new->config('census_year');