Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 19:04:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve postal code lookup

Browse Source
This commit is contained in:
Hillel Coren 2018-04-25 16:20:19 +03:00
parent 807c1e4db3
commit 8420b3f36d
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/clients/edit.blade.php
View File

@ -94,7 +94,7 @@
{!! Former::text('city') !!} {!! Former::text('city') !!}
{!! Former::text('state') !!} {!! Former::text('state') !!}
{!! Former::text('postal_code') {!! Former::text('postal_code')
->onchange(config('ninja.google_maps_api_key') ? 'lookupPostalCode()' : '') !!} ->oninput(config('ninja.google_maps_api_key') ? 'lookupPostalCode()' : '') !!}
{!! Former::select('country_id')->addOption('','') {!! Former::select('country_id')->addOption('','')
->fromQuery($countries, 'name', 'id') !!} ->fromQuery($countries, 'name', 'id') !!}
@ -112,7 +112,7 @@
{!! Former::text('shipping_city')->label('city') !!} {!! Former::text('shipping_city')->label('city') !!}
{!! Former::text('shipping_state')->label('state') !!} {!! Former::text('shipping_state')->label('state') !!}
{!! Former::text('shipping_postal_code') {!! Former::text('shipping_postal_code')
->onchange(config('ninja.google_maps_api_key') ? 'lookupPostalCode(true)' : '') ->oninput(config('ninja.google_maps_api_key') ? 'lookupPostalCode(true)' : '')
->label('postal_code') !!} ->label('postal_code') !!}
{!! Former::select('shipping_country_id')->addOption('','') {!! Former::select('shipping_country_id')->addOption('','')
->fromQuery($countries, 'name', 'id')->label('country_id') !!} ->fromQuery($countries, 'name', 'id')->label('country_id') !!}

7
resources/views/partials/google_geocode.blade.php
View File

@ -64,10 +64,12 @@ function lookupPostalCode(isShipping) {
var countryId = $('#' + countryField).val() || {{ $account->getCountryId() }}; var countryId = $('#' + countryField).val() || {{ $account->getCountryId() }};
var countryCode = countryMap[countryId].iso_3166_2; var countryCode = countryMap[countryId].iso_3166_2;
if (! postalCode) { if (! postalCode || postalCode.length < 5) {
return; return;
} }
$('#' + cityField).attr('placeholder', {!! json_encode(trans('texts.loading') . '...') !!});
var geocoder = new google.maps.Geocoder; var geocoder = new google.maps.Geocoder;
geocoder.geocode({ geocoder.geocode({
componentRestrictions: { componentRestrictions: {
@ -97,8 +99,9 @@ function lookupPostalCode(isShipping) {
} }
} }
} }
$('#' + cityField).attr('placeholder', '');
} else { } else {
$('#' + cityField).attr("placeholder", {!! json_encode(trans('texts.no_match_found')) !!}); $('#' + cityField).attr('placeholder', {!! json_encode(trans('texts.no_match_found')) !!});
} }
showGeocodePlaceholder(isShipping); showGeocodePlaceholder(isShipping);
}); });

2
resources/views/vendors/edit.blade.php vendored
View File

@ -65,7 +65,7 @@
{!! Former::text('state') !!} {!! Former::text('state') !!}
{!! Former::text('postal_code') {!! Former::text('postal_code')
->onchange(config('ninja.google_maps_api_key') ? 'lookupPostalCode()' : '') !!} ->oninput(config('ninja.google_maps_api_key') ? 'lookupPostalCode()' : '') !!}
{!! Former::select('country_id')->addOption('','') {!! Former::select('country_id')->addOption('','')
->fromQuery($countries, 'name', 'id') !!} ->fromQuery($countries, 'name', 'id') !!}