- var ship_fields = ['address1', 'city', 'state', 'zip', 'country',
- 'latitude', 'longitude', 'district'];
+ var ship_fields = [
+ 'locationname', 'address1',<% $conf->exists('cust_main-no_city_in_address') ? '' : q( 'city',) %> 'state', 'zip', 'country',
+ 'latitude', 'longitude', 'district'
+ ];