diff options
Diffstat (limited to 'httemplate/elements')
| -rw-r--r-- | httemplate/elements/location.html | 27 | ||||
| -rw-r--r-- | httemplate/elements/order_pkg.js | 7 | ||||
| -rw-r--r-- | httemplate/elements/standardize_locations.html | 2 | ||||
| -rw-r--r-- | httemplate/elements/standardize_locations.js | 288 | ||||
| -rw-r--r-- | httemplate/elements/tr-select-cust_location.html | 7 |
5 files changed, 186 insertions, 145 deletions
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html index 5c7c888de..de844e465 100644 --- a/httemplate/elements/location.html +++ b/httemplate/elements/location.html @@ -33,7 +33,7 @@ Example: 'options' => \@location_kind_options, 'labels' => $location_kind_labels, 'curr_value' => scalar($cgi->param('location_kind')) - || $object->get($pre.'location_kind'), + || $object->get('location_kind'), ) %> </TD> @@ -164,7 +164,7 @@ Example: NAME = "<%$pre%>zip" ID = "<%$pre%>zip" VALUE = "<% $object->get('zip') |h %>" - SIZE = 10 + SIZE = 11 onChange = "<% $onchange %>" <% $disabled %> <% $style %> @@ -206,23 +206,22 @@ Example: <INPUT TYPE="hidden" NAME="<%$pre%>coord_auto" VALUE="<% $object->coord_auto %>"> <INPUT TYPE="hidden" NAME="<%$pre%>geocode" VALUE="<% $object->geocode %>"> +<INPUT TYPE="hidden" NAME="<%$pre%>censustract" VALUE="<% $object->censustract %>"> <INPUT TYPE="hidden" NAME="<%$pre%>censusyear" VALUE="<% $object->censusyear %>"> -<TR> % if ( $opt{enable_censustract} ) { +<TR> <TD ALIGN="right">Census tract</TD> <TD COLSPAN=8> <INPUT TYPE="text" SIZE=15 - NAME="<%$pre%>censustract" + NAME="enter_censustract" VALUE="<% $object->censustract %>"> <% '(automatic)' %> </TD> -% } else { - <INPUT TYPE="hidden" NAME="<%$pre%>censustract" VALUE="<% $object->censustract %>"> -% } </TR> +% } % if ( $conf->config('tax_district_method') ) { - <TR> % if ( $opt{enable_district} ) { + <TR> <TD ALIGN="right">Tax district</TD> <TD COLSPAN=8> <INPUT TYPE="text" SIZE=15 @@ -230,12 +229,22 @@ Example: VALUE="<% $object->district %>"> <% '(automatic)' %> </TD> + </TR> % } else { <INPUT TYPE="hidden" NAME="<%$pre%>district" VALUE="<% $object->district %>"> % } - </TR> % } +%# For address standardization: +%# keep a clean copy of the address so we know if we need +%# to re-standardize +% foreach (qw(address1 city state country zip latitude +% longitude censustract addr_clean) ) { +<INPUT TYPE="hidden" NAME="old_<%$pre.$_%>" ID="old_<%$pre.$_%>" VALUE="<% $object->get($_) |h%>"> +% } +%# Placeholders +<INPUT TYPE="hidden" NAME="<%$pre%>cachenum" VALUE=""> +<INPUT TYPE="hidden" NAME="<%$pre%>addr_clean" VALUE=""> <%init> my %opt = @_; diff --git a/httemplate/elements/order_pkg.js b/httemplate/elements/order_pkg.js index 48073593a..8c1efd93a 100644 --- a/httemplate/elements/order_pkg.js +++ b/httemplate/elements/order_pkg.js @@ -19,13 +19,10 @@ function pkg_changed () { form.start_date_text.disabled = false; form.start_date.style.backgroundColor = '#ffffff'; form.start_date_button.style.display = ''; - form.start_date_button_disabled.style.display = 'none'; - form.invoice_terms.disabled = true; } else { form.start_date_text.disabled = true; form.start_date.style.backgroundColor = '#dddddd'; form.start_date_button.style.display = 'none'; - form.start_date_button_disabled.style.display = ''; } } else { @@ -44,3 +41,7 @@ function standardize_new_location() { form.submit(); } } + +function submit_abort() { + document.OrderPkgForm.submitButton.disabled = false; +} diff --git a/httemplate/elements/standardize_locations.html b/httemplate/elements/standardize_locations.html index 9f8b71c62..5a4ee0f80 100644 --- a/httemplate/elements/standardize_locations.html +++ b/httemplate/elements/standardize_locations.html @@ -1,7 +1,7 @@ <% include('/elements/init_overlib.html') %> <% include( '/elements/xmlhttp.html', - 'url' => $p.'misc/xmlhttp-cust_main-address_standardize.html', + 'url' => $p.'misc/xmlhttp-address_standardize.html', 'subs' => [ 'address_standardize' ], #'method' => 'POST', #could get too long? ) diff --git a/httemplate/elements/standardize_locations.js b/httemplate/elements/standardize_locations.js index 86f8d2be8..f6564a55e 100644 --- a/httemplate/elements/standardize_locations.js +++ b/httemplate/elements/standardize_locations.js @@ -1,179 +1,205 @@ -function standardize_locations() { - +function form_address_info() { var cf = document.<% $formname %>; - var state_el = cf.elements['<% $main_prefix %>state']; var ship_state_el = cf.elements['<% $ship_prefix %>state']; - - var address_info = new Array( + return { % if ( $onlyship ) { - 'onlyship', 1, + 'onlyship': 1, % } else { % if ( $withfirm ) { 'company', cf.elements['company'].value, % } - 'address1', cf.elements['<% $main_prefix %>address1'].value, - 'address2', cf.elements['<% $main_prefix %>address2'].value, - 'city', cf.elements['<% $main_prefix %>city'].value, - 'state', state_el.options[ state_el.selectedIndex ].value, - 'zip', cf.elements['<% $main_prefix %>zip'].value, + 'address1': cf.elements['<% $main_prefix %>address1'].value, + 'address2': cf.elements['<% $main_prefix %>address2'].value, + 'city': cf.elements['<% $main_prefix %>city'].value, + 'state': state_el.options[ state_el.selectedIndex ].value, + 'zip': cf.elements['<% $main_prefix %>zip'].value, + 'country': cf.elements['<% $main_prefix %>country'].value, % } - 'ship_address1', cf.elements['<% $ship_prefix %>address1'].value, - 'ship_address2', cf.elements['<% $ship_prefix %>address2'].value, - 'ship_city', cf.elements['<% $ship_prefix %>city'].value, - 'ship_state', ship_state_el.options[ ship_state_el.selectedIndex ].value, - 'ship_zip', cf.elements['<% $ship_prefix %>zip'].value - ); - - address_standardize( address_info, update_address ); - +% if ( $withcensus ) { + 'ship_censustract': cf.elements['enter_censustract'].value, +% } + 'ship_address1': cf.elements['<% $ship_prefix %>address1'].value, + 'ship_address2': cf.elements['<% $ship_prefix %>address2'].value, + 'ship_city': cf.elements['<% $ship_prefix %>city'].value, + 'ship_state': ship_state_el.options[ ship_state_el.selectedIndex ].value, + 'ship_zip': cf.elements['<% $ship_prefix %>zip'].value, + 'ship_country': cf.elements['<% $ship_prefix %>country'].value, + }; } -var standardize_address; - -function update_address(arg) { +function standardize_locations() { - var argsHash = eval('(' + arg + ')'); + var startup_msg = '<P STYLE="position:absolute; top:50%; margin-top:-1em; width:100%; text-align:center"><B><FONT SIZE="+1">Verifying address...</FONT></B></P>'; + overlib(startup_msg, WIDTH, 444, HEIGHT, 168, CAPTION, 'Please wait...', STICKY, AUTOSTATUSCAP, CLOSECLICK, MIDX, 0, MIDY, 0); + var cf = document.<% $formname %>; + var address_info = form_address_info(); - var changed = argsHash['address_standardized']; - var ship_changed = argsHash['ship_address_standardized']; - var error = argsHash['error']; - var ship_error = argsHash['ship_error']; - + var changed = false; // have any of the address fields been changed? - //yay closures - standardize_address = function () { +// clear coord_auto fields if the user has changed the coordinates +% for my $pre ($ship_prefix, $onlyship ? () : $main_prefix) { +% for my $field ($pre.'latitude', $pre.'longitude') { - var cf = document.<% $formname %>; - var state_el = cf.elements['<% $main_prefix %>state']; - var ship_state_el = cf.elements['<% $ship_prefix %>state']; + if ( cf.elements['<% $field %>'].value != cf.elements['old_<% $field %>'].value ) { + cf.elements['<% $pre %>coord_auto'].value = ''; + } -% if ( !$onlyship ) { - if ( changed ) { -% if ( $withfirm ) { - cf.elements['<% $main_prefix %>company'].value = argsHash['new_company']; % } - cf.elements['<% $main_prefix %>address1'].value = argsHash['new_address1']; - cf.elements['<% $main_prefix %>address2'].value = argsHash['new_address2']; - cf.elements['<% $main_prefix %>city'].value = argsHash['new_city']; - setselect(cf.elements['<% $main_prefix %>state'], argsHash['new_state']); - cf.elements['<% $main_prefix %>zip'].value = argsHash['new_zip']; - } -% } + // but if the coordinates have been set to null, turn coord_auto on + // and standardize + if ( cf.elements['<% $pre %>latitude'].value == '' && + cf.elements['<% $pre %>longitude'].value == '' ) { + cf.elements['<% $pre %>coord_auto'].value = 'Y'; + changed = true; + } - if ( ship_changed ) { -% if ( $withfirm ) { - cf.elements['<% $ship_prefix %>company'].value = argsHash['new_ship_company']; % } - cf.elements['<% $ship_prefix %>address1'].value = argsHash['new_ship_address1']; - cf.elements['<% $ship_prefix %>address2'].value = argsHash['new_ship_address2']; - cf.elements['<% $ship_prefix %>city'].value = argsHash['new_ship_city']; - setselect(cf.elements['<% $ship_prefix %>state'], argsHash['new_ship_state']); - cf.elements['<% $ship_prefix %>zip'].value = argsHash['new_ship_zip']; - } - post_standardization(); + // standardize if the old address wasn't clean + if ( cf.elements['old_<% $ship_prefix %>addr_clean'].value == '' || + ( <% !$onlyship || 0 %> && + cf.elements['old_<% $main_prefix %>addr_clean'].value == '' ) ) { + changed = true; + + } + // or if it was clean but has been changed + for (var key in address_info) { + var old_el = cf.elements['old_'+key]; + if ( old_el && address_info[key] != old_el.value ) { + changed = true; + break; + } } +% # If address hasn't been changed, auto-confirm the existing value of +% # censustract so that we don't ask the user to confirm it again. + if ( !changed ) { + cf.elements['<% $main_prefix %>censustract'].value = + address_info['ship_censustract']; + } - if ( changed || ship_changed ) { +% if ( $conf->config('address_standardize_method') ) { + if ( changed ) { + address_standardize(JSON.stringify(address_info), confirm_standardize); + } + else { + cf.elements['ship_addr_clean'].value = 'Y'; +% if ( !$onlyship ) { + cf.elements['addr_clean'].value = 'Y'; +% } + post_standardization(); + } -% if ( $conf->exists('cust_main-auto_standardize_address') ) { +% } else { - standardize_address(); + post_standardization(); -% } else { +% } # if address_standardize_method +} - // popup a confirmation popup +var returned; - var confirm_change = - '<CENTER><BR><B>Confirm address standardization</B><BR><BR>' + - '<TABLE>'; - - if ( changed ) { +function confirm_standardize(arg) { + // contains 'old', which was what we sent, and 'new', which is what came + // back, including any errors + returned = JSON.parse(arg); - confirm_change = confirm_change + - '<TR><TH>Entered billing address</TH>' + - '<TH>Standardized billing address</TH></TR>'; - // + '<TR><TD> </TD><TD> </TD></TR>'; - - if ( argsHash['company'] || argsHash['new_company'] ) { - confirm_change = confirm_change + - '<TR><TD>' + argsHash['company'] + - '</TD><TD>' + argsHash['new_company'] + '</TD></TR>'; - } - - confirm_change = confirm_change + - '<TR><TD>' + argsHash['address1'] + - '</TD><TD>' + argsHash['new_address1'] + '</TD></TR>' + - '<TR><TD>' + argsHash['address2'] + - '</TD><TD>' + argsHash['new_address2'] + '</TD></TR>' + - '<TR><TD>' + argsHash['city'] + ', ' + argsHash['state'] + ' ' + argsHash['zip'] + - '</TD><TD>' + argsHash['new_city'] + ', ' + argsHash['new_state'] + ' ' + argsHash['new_zip'] + '</TD></TR>' + - '<TR><TD> </TD><TD> </TD></TR>'; + if ( <% $conf->exists('cust_main-auto_standardize_address') || 0 %> ) { - } + replace_address(); // with the contents of returned['new'] + + } + else { + + var querystring = encodeURIComponent( JSON.stringify(returned) ); + // confirmation popup: knows to call replace_address(), + // post_standardization(), or submit_abort() depending on the + // user's choice. + OLpostAJAX( + '<%$p%>/misc/confirm-address_standardize.html', + 'q='+querystring, + function() { + overlib( OLresponseAJAX, CAPTION, 'Address standardization', STICKY, + AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, + 576, HEIGHT, 268, BGCOLOR, '#333399', CGCOLOR, '#333399', + TEXTSIZE, 3 ); + }, 0); - if ( ship_changed ) { - - confirm_change = confirm_change + - '<TR><TH>Entered service address</TH>' + - '<TH>Standardized service address</TH></TR>'; - // + '<TR><TD> </TD><TD> </TD></TR>'; - - if ( argsHash['ship_company'] || argsHash['new_ship_company'] ) { - confirm_change = confirm_change + - '<TR><TD>' + argsHash['ship_company'] + - '</TD><TD>' + argsHash['new_ship_company'] + '</TD></TR>'; - } - - confirm_change = confirm_change + - '<TR><TD>' + argsHash['ship_address1'] + - '</TD><TD>' + argsHash['new_ship_address1'] + '</TD></TR>' + - '<TR><TD>' + argsHash['ship_address2'] + - '</TD><TD>' + argsHash['new_ship_address2'] + '</TD></TR>' + - '<TR><TD>' + argsHash['ship_city'] + ', ' + argsHash['ship_state'] + ' ' + argsHash['ship_zip'] + - '</TD><TD>' + argsHash['new_ship_city'] + ', ' + argsHash['new_ship_state'] + ' ' + argsHash['new_ship_zip'] + '</TD></TR>' + - '<TR><TD> </TD><TD> </TD></TR>'; + } +} - } +function replace_address() { - var addresses = 'address'; - var height = 268; - if ( changed && ship_changed ) { - addresses = 'addresses'; - height = 396; // #what - } + var newaddr = returned['new']; - confirm_change = confirm_change + - '<TR><TD>' + - '<BUTTON TYPE="button" onClick="post_standardization();"><IMG SRC="<%$p%>images/error.png" ALT=""> Use entered ' + addresses + '</BUTTON>' + - '</TD><TD>' + - '<BUTTON TYPE="button" onClick="standardize_address();"><IMG SRC="<%$p%>images/tick.png" ALT=""> Use standardized ' + addresses + '</BUTTON>' + - '</TD></TR>' + - '<TR><TD COLSPAN=2 ALIGN="center">' + - '<BUTTON TYPE="button" onClick="document.<% $formname %>.submitButton.disabled=false; parent.cClick();"><IMG SRC="<%$p%>images/cross.png" ALT=""> Cancel submission</BUTTON></TD></TR>' + - - '</TABLE></CENTER>'; + var clean = newaddr['addr_clean'] == 'Y'; + var ship_clean = newaddr['ship_addr_clean'] == 'Y'; + var error = newaddr['error']; + var ship_error = newaddr['ship_error']; - overlib( confirm_change, CAPTION, 'Confirm address standardization', STICKY, AUTOSTATUSCAP, CLOSETEXT, '', MIDX, 0, MIDY, 0, DRAGGABLE, WIDTH, 576, HEIGHT, height, BGCOLOR, '#333399', CGCOLOR, '#333399', TEXTSIZE, 3 ); + var cf = document.<% $formname %>; + var state_el = cf.elements['<% $main_prefix %>state']; + var ship_state_el = cf.elements['<% $ship_prefix %>state']; +% if ( !$onlyship ) { + if ( clean ) { +% if ( $withfirm ) { + cf.elements['<% $main_prefix %>company'].value = newaddr['company']; % } + cf.elements['<% $main_prefix %>address1'].value = newaddr['address1']; + cf.elements['<% $main_prefix %>address2'].value = newaddr['address2']; + cf.elements['<% $main_prefix %>city'].value = newaddr['city']; + setselect(cf.elements['<% $main_prefix %>state'], newaddr['state']); + cf.elements['<% $main_prefix %>zip'].value = newaddr['zip']; + cf.elements['<% $main_prefix %>addr_clean'].value = 'Y'; + + if ( cf.elements['<% $main_prefix %>coord_auto'].value ) { + cf.elements['<% $main_prefix %>latitude'].value = newaddr['latitude']; + cf.elements['<% $main_prefix %>longitude'].value = newaddr['longitude']; + } + } +% } - } else { - - post_standardization(); - + if ( ship_clean ) { +% if ( $withfirm ) { + cf.elements['<% $ship_prefix %>company'].value = newaddr['ship_company']; +% } + cf.elements['<% $ship_prefix %>address1'].value = newaddr['ship_address1']; + cf.elements['<% $ship_prefix %>address2'].value = newaddr['ship_address2']; + cf.elements['<% $ship_prefix %>city'].value = newaddr['ship_city']; + setselect(cf.elements['<% $ship_prefix %>state'], newaddr['ship_state']); + cf.elements['<% $ship_prefix %>zip'].value = newaddr['ship_zip']; + cf.elements['<% $ship_prefix %>addr_clean'].value = 'Y'; + if ( cf.elements['<% $ship_prefix %>coord_auto'].value ) { + cf.elements['<% $ship_prefix %>latitude'].value = newaddr['latitude']; + cf.elements['<% $ship_prefix %>longitude'].value = newaddr['longitude']; + } + } +% if ( $withcensus ) { +% # then set the censustract if address_standardize provided one. + if ( ship_clean && newaddr['ship_censustract'] ) { + cf.elements['<% $main_prefix %>censustract'].value = newaddr['ship_censustract']; } +% } + post_standardization(); } -function post_standardization() { - +function confirm_manual_address() { +%# not much to do in this case, just confirm the censustract +% if ( $withcensus ) { var cf = document.<% $formname %>; + cf.elements['<% $main_prefix %>censustract'].value = + cf.elements['<% $main_prefix %>enter_censustract'].value; +% } + post_standardization(); +} + +function post_standardization() { % if ( $conf->exists('enable_taxproducts') ) { @@ -262,6 +288,7 @@ my %opt = @_; my $conf = new FS::Conf; my $withfirm = 1; +my $withcensus = 1; my $formname = $opt{form} || 'CustomerForm'; my $onlyship = $opt{onlyship} || ''; @@ -271,5 +298,6 @@ my $taxpre = $main_prefix; $taxpre = $ship_prefix if ( $conf->exists('tax-ship_address') || $onlyship ); my $post_geocode = $opt{callback} || 'post_geocode();'; $withfirm = 0 if $opt{no_company}; +$withcensus = 0 if $opt{no_census}; </%init> diff --git a/httemplate/elements/tr-select-cust_location.html b/httemplate/elements/tr-select-cust_location.html index b804f4548..7ffbd6c14 100644 --- a/httemplate/elements/tr-select-cust_location.html +++ b/httemplate/elements/tr-select-cust_location.html @@ -52,10 +52,11 @@ Example: if( ftype != 'SELECT') what.form.<%$_%>.style.backgroundColor = '#ffffff'; % } % if ( $opt{'alt_format'} ) { - if ( what.form.location_type.options[what.form.location_type.selectedIndex].value ) { + if ( what.form.location_type && + what.form.location_type.options[what.form.location_type.selectedIndex].value ) { what.form.location_number.disabled = false; what.form.location_number.style.backgroundColor = '#ffffff'; - } + } % } } @@ -281,6 +282,8 @@ if ( $locationnum && $locationnum > 0 ) { } } +$cust_location->coord_auto('Y'); + my $location_sort = sub { $a->country cmp $b->country or lc($a->city) cmp lc($b->city) |