X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fconfirm-censustract.html;h=10ae91812b858a1386df64ec07746e855f73f450;hb=02a46bc015742668a7f6d9336a190fec3141ff56;hp=6a11617e71ec25cca878524ab9e7923d4b3f1b65;hpb=3d0a1bb06b895c5be6e3f0517d355442a6b1e125;p=freeside.git
diff --git a/httemplate/misc/confirm-censustract.html b/httemplate/misc/confirm-censustract.html
index 6a11617e7..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,7 +80,7 @@ warn $cgi->param('q') if $DEBUG;
my $q = decode_json($cgi->param('q'))
or die "bad argument '".$cgi->param('q')."'";
-my $pre = $q->{'same'} ? 'bill_' : 'ship_';
+my $pre = $q->{prefix} || '';
my %location = (
map { $_ => $q->{$pre.$_} }
qw( company address1 address2 city state zip country latitude longitude )