From 84e871747696ab95262ef0ca1fbdbdf0682d88c9 Mon Sep 17 00:00:00 2001 From: Roy van Os Date: Tue, 10 Apr 2018 15:50:16 +0200 Subject: [PATCH] Fixed incorrect order of setting check --- view/frontend/web/js/view/postcode.js | 30 +++++++++++++-------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/view/frontend/web/js/view/postcode.js b/view/frontend/web/js/view/postcode.js index 007e537..869f2e6 100755 --- a/view/frontend/web/js/view/postcode.js +++ b/view/frontend/web/js/view/postcode.js @@ -131,19 +131,19 @@ define([ clearStreet = streetArray[0]; } - if (settings.useStreet2AsHouseNumber != 0) { + if (settings.useStreet3AsHouseNumber != 0) { self.updateFields(['street.0'], 'value', clearStreet); - var street1 = formData.postcode_housenumber.toString(); + self.updateFields(['street.1'], 'value', formData.postcode_housenumber.toString()); if (formData.postcode_housenumber_addition_manual) { - street1 += ' ' + formData.postcode_housenumber_addition_manual; + self.updateFields(['street.2'], 'value', formData.postcode_housenumber_addition_manual); } - self.updateFields(['street.1'], 'value', street1); - } else if (settings.useStreet3AsHouseNumber != 0) { + } else if (settings.useStreet2AsHouseNumber != 0) { self.updateFields(['street.0'], 'value', clearStreet); - self.updateFields(['street.1'], 'value', formData.postcode_housenumber.toString()); + var street1 = formData.postcode_housenumber.toString(); if (formData.postcode_housenumber_addition_manual) { - self.updateFields(['street.2'], 'value', formData.postcode_housenumber_addition_manual); + street1 += ' ' + formData.postcode_housenumber_addition_manual; } + self.updateFields(['street.1'], 'value', street1); } else { var street0 = clearStreet + ' ' + formData.postcode_housenumber; if (formData.postcode_housenumber_addition_manual) { @@ -372,7 +372,14 @@ define([ self.debug('Postcode: API request result:'); self.debug(response); - if (settings.useStreet2AsHouseNumber != 0) { + if (settings.useStreet3AsHouseNumber != 0) { + self.updateFields(['street.0'], 'error', false); + self.updateFields(['street.0'], 'value', response.street); + self.updateFields(['street.1'], 'value', response.houseNumber); + if (response.houseNumberAddition) { + self.updateFields(['street.2'], 'value', response.houseNumberAddition); + } + } else if (settings.useStreet2AsHouseNumber != 0) { self.updateFields(['street.0', 'street.1'], 'error', false); self.updateFields(['street.0'], 'value', response.street); @@ -383,13 +390,6 @@ define([ } self.updateFields(['street.1'], 'value', street1); - } else if (settings.useStreet3AsHouseNumber != 0) { - self.updateFields(['street.0'], 'error', false); - self.updateFields(['street.0'], 'value', response.street); - self.updateFields(['street.1'], 'value', response.houseNumber); - if (response.houseNumberAddition) { - self.updateFields(['street.2'], 'value', response.houseNumberAddition); - } } else { var street0 = response.street + ' ' + response.houseNumber; if (response.houseNumberAddition) {