From 8ea01f3b6874ee3a96441a821b422def2ceead5d Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Sat, 26 Mar 2016 21:45:03 -0700 Subject: [PATCH] improve address standardization UI, #33849 --- httemplate/elements/location.html | 4 +- httemplate/elements/standardize_locations.js | 2 +- httemplate/misc/confirm-address_standardize.html | 90 +++++++++++++++++++++--- httemplate/misc/xmlhttp-address_standardize.html | 8 ++- 4 files changed, 89 insertions(+), 15 deletions(-) diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html index b5f0a963c..3c8e973ed 100644 --- a/httemplate/elements/location.html +++ b/httemplate/elements/location.html @@ -245,13 +245,13 @@ Example: % } % if ( $opt{enable_district} and $conf->config('tax_district_method') ) { - Tax district + Tax district - <% '(automatic)' %> + <% '(automatic)' %> % } else { diff --git a/httemplate/elements/standardize_locations.js b/httemplate/elements/standardize_locations.js index 0c4fb029a..15d687cf3 100644 --- a/httemplate/elements/standardize_locations.js +++ b/httemplate/elements/standardize_locations.js @@ -115,7 +115,7 @@ function confirm_standardize(arg) { // then all entered address fields are correct // but we still need to set the lat/long fields and addr_clean - if ( returned['addr_clean'] ) { + if ( returned['all_clean'] ) { status_message('Verified'); } else { status_message('Unverified'); diff --git a/httemplate/misc/confirm-address_standardize.html b/httemplate/misc/confirm-address_standardize.html index 9d1a5c135..8bd43ca54 100644 --- a/httemplate/misc/confirm-address_standardize.html +++ b/httemplate/misc/confirm-address_standardize.html @@ -7,6 +7,9 @@ th { line-height: 150%; vertical-align: middle; text-align: center; } +button { + width: 215px; +}

% if ( $is_error ) { @@ -23,9 +26,13 @@ Confirm address standardization % my $name = $pre eq 'bill_' ? 'billing' : 'service'; % my $rows = 5; % if ( $new{$pre.'error'} ) { +% # Standardization returned an error, so the user can either "continue +% # without replacing" (replace = "") or "abort". CLASS="td_radio"> +% if ( $show_radio ) { +% } # else confirm_manual_address will be called Entered <%$name%> address @@ -51,15 +58,19 @@ Confirm address standardization % $rows++ if !$new{$pre.'addr_clean'}; CLASS="td_radio"> +% if ( $show_radio ) { +% } Entered <%$name%> address Standardized <%$name%> address CLASS="td_radio"> +% if ( $show_radio ) { +% } -% if ( !$new{$pre.'addr_clean'} ) { +% if ( !$new{$pre.'addr_clean'} ) { # we incremented $rows to fit this in (unverified) @@ -88,18 +99,24 @@ Confirm address standardization % } # if error % } # for $pre -%# only do this part if address standardization provided a censustract -% my $pre = $old{same} ? 'bill_' : 'ship_'; +% # the prefix for the censustract +% my $pre = $old{billship} ? +% ( $old{same} ? 'bill_' : 'ship_' ) : +% ''; % my $censustract = $new{$pre.'censustract'}; % if ( $censustract ) { +% if ( $show_radio ) { > +% } Entered census tract Calculated census tract +% if ( $show_radio ) { > +% } @@ -115,17 +132,40 @@ Confirm address standardization % } #if censustract +% if ( $show_radio ) { +% # One button: "use selected address(es)". + + + +% } else { +% # Two buttons: "use entered address", and "use selected address" +% # and empty columns before and after - + + +% # disable the button if standardization completely failed - + + +% } + +% # always provide a cancel button + + + + @@ -138,15 +178,43 @@ my %old = %{ $q->{old} }; my %new = %{ $q->{new} }; my $addresses = $old{billship} ? 'addresses' : 'address'; +my $show_radio = 0; +my $failed = 0; # true if standardization returned no addresses my @prefixes = (''); + if ( $old{same} ) { + + # Then there are bill and ship addresses and they're the same. Treat + # bill_error as a failure, and let the user accept or reject the whole + # standardization. + @prefixes = ('bill_'); + $failed = 1 if $new{'bill_error'}; + } elsif ( $old{billship} ) { + + # There are separate bill and ship addresses. Treat error in both as a + # failure. Otherwise, at least one of them has a choice between entered + # and standardized address, so let the user choose. + @prefixes = ('bill_', 'ship_'); + if ( $new{'bill_error'} and $new{'ship_error'} ) { + $failed = 1; + } else { + $show_radio = 1; + } + +} else { + + # There are no bill/ship addresses (this is used for package locations). + # Treat like the first case but without the bill_ prefix. + @prefixes = (''); + $failed = 1 if $new{'error'}; + } -my $census_error = $new{'census_error'}; +my $census_error = $new{'census_error'}; # seems to be unused my $is_error = $census_error || grep { $new{$_.'error'} } @prefixes; diff --git a/httemplate/misc/xmlhttp-address_standardize.html b/httemplate/misc/xmlhttp-address_standardize.html index d0255a02a..be58618d0 100644 --- a/httemplate/misc/xmlhttp-address_standardize.html +++ b/httemplate/misc/xmlhttp-address_standardize.html @@ -23,6 +23,7 @@ if ( $old{same} ) { @prefixes = ('bill_', 'ship_'); } my $all_same = 1; +my $all_clean = 1; foreach my $pre ( @prefixes ) { my $location = { @@ -48,8 +49,13 @@ foreach my $pre ( @prefixes ) { $old{$pre.'censustract'} ne $new{$pre.'censustract'} ); $all_same = 0 if $new{$pre.'error'}; + + $all_clean = 0 if !$new{$pre.'addr_clean'}; } -my $return = { old => \%old, new => \%new, all_same => $all_same }; +my $return = { old => \%old, + new => \%new, + all_same => $all_same, + all_clean => $all_clean }; warn "result:\n".encode_json($return) if $DEBUG; -- 2.11.0