X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fmisc%2Fconfirm-censustract.html;h=0afb7546096995fe7b8f1a06d0d097c3b118a3f6;hp=9e0af498fc901989c69808f76f239c3fc067116f;hb=dc12bf866909b5f69818f3dd24c4c3801c1a9084;hpb=acbc7e3c55a3d5a0e9999b0630653ad510d4b19a
diff --git a/httemplate/misc/confirm-censustract.html b/httemplate/misc/confirm-censustract.html
index 9e0af498f..0afb75460 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,13 +13,17 @@ 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
-% $querystring = "census_year=$year&zip_code=".$cache->get('zip');
-get('zip');
+Map zip code center
+
Entered census tract
@@ -21,33 +32,55 @@ Confirm census tract
<% $old_tract %>
% if ( $error ) {
-
<% $error %>
+
<% $error %>
% } else {
-
<% $new_tract %>
+
<% $new_tract %>
% }
-
+
- Cancel submission
+ Cancel submission
+
+
<%init>
local $SIG{__DIE__}; #disable Mason error trap
@@ -61,11 +94,7 @@ warn $cgi->param('q') if $DEBUG;
my $q = decode_json($cgi->param('q'))
or die "bad argument '".$cgi->param('q')."'";
-my $pre = '';
-if ($q->{billship}) {
- # this still isn't quite correct
- $pre = $q->{'same'} ? 'bill_' : 'ship_';
-}
+my $pre = $q->{prefix} || '';
my %location = (
map { $_ => $q->{$pre.$_} }
qw( company address1 address2 city state zip country latitude longitude )