X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fcust_main%2Fbottomfixup.js;h=0de6d9dab70fd8318154cd61df0bc1238fabb44e;hb=f88dda7fe57054bd030491a5b9363a1aff601bf2;hp=77d4294a62f943b7a88b1dd46bf6fd93c42bb005;hpb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500;p=freeside.git diff --git a/httemplate/edit/cust_main/bottomfixup.js b/httemplate/edit/cust_main/bottomfixup.js index 77d4294a6..0de6d9dab 100644 --- a/httemplate/edit/cust_main/bottomfixup.js +++ b/httemplate/edit/cust_main/bottomfixup.js @@ -7,7 +7,7 @@ my $company_longitude = $conf->config('company_longitude'); my @fixups = ('copy_payby_fields', 'standardize_locations'); -push @fixups, 'fetch_censustract' +push @fixups, 'confirm_censustract' if $conf->exists('cust_main-require_censustract'); push @fixups, 'check_unique' @@ -18,15 +18,19 @@ push @fixups, 'do_submit'; # always last var fixups = <% encode_json(\@fixups) %>; var fixup_position; +var running = false; %# state machine to deal with all the asynchronous stuff we're doing %# call this after each fixup on success: function submit_continue() { - window[ fixups[fixup_position++] ].call(); + if ( running ) { + window[ fixups[fixup_position++] ].call(); + } } %# or on failure: function submit_abort() { + running = false; fixup_position = 0; document.CustomerForm.submitButton.disabled = false; cClick(); @@ -35,6 +39,7 @@ function submit_abort() { function bottomfixup(what) { fixup_position = 0; document.CustomerForm.submitButton.disabled = true; + running = true; submit_continue(); } @@ -63,112 +68,11 @@ function copy_payby_fields() { submit_continue(); } -%# call submit_continue() on completion... -%# otherwise not touching standardize_locations for now -<% include( '/elements/standardize_locations.js', - 'callback' => 'submit_continue();', - 'main_prefix' => 'bill_', - 'no_company' => 1, - ) -%> - -var prefix; -function fetch_censustract() { - - //alert('fetch census tract data'); - prefix = document.getElementById('same').checked ? 'bill_' : 'ship_'; - var cf = document.CustomerForm; - var state_el = cf.elements[prefix + 'state']; - var census_data = new Array( - 'year', <% $conf->config('census_year') || '2012' %>, - 'address1', cf.elements[prefix + 'address1'].value, - 'city', cf.elements[prefix + 'city'].value, - 'state', state_el.options[ state_el.selectedIndex ].value, - 'zip', cf.elements[prefix + 'zip'].value - ); - - censustract( census_data, update_censustract ); - -} - -var set_censustract; - -function update_censustract(arg) { - - var argsHash = eval('(' + arg + ')'); - - var cf = document.CustomerForm; - -/* var msacode = argsHash['msacode']; - var statecode = argsHash['statecode']; - var countycode = argsHash['countycode']; - var tractcode = argsHash['tractcode']; - - var newcensus = - new String(statecode) + - new String(countycode) + - new String(tractcode).replace(/\s$/, ''); // JSON 1 workaround */ - var error = argsHash['error']; - var newcensus = argsHash['censustract']; - - set_censustract = function () { - - cf.elements[prefix + 'censustract'].value = newcensus; - submit_continue(); - - } - - if (error || cf.elements[prefix + 'censustract'].value != newcensus) { - // popup an entry dialog - - if (error) { newcensus = error; } - newcensus.replace(/.*ndefined.*/, 'Not found'); - - var latitude = cf.elements[prefix + 'latitude'].value - || '<% $company_latitude %>'; - var longitude= cf.elements[prefix + 'longitude'].value - || '<% $company_longitude %>'; - - var choose_censustract = - '
Entered census tract | ' + - 'Calculated census tract |
---|---|
' + cf.elements[prefix + 'censustract'].value + - ' | ' + newcensus + ' |
' + - '' + - ' | ' + - '' + - ' |
' + - ' |