Skip to content

Fixed incorrect order of setting check #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nealz merged 1 commit into from
Nov 27, 2024
Merged

Fixed incorrect order of setting check #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions view/frontend/web/js/view/postcode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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);

Expand All @@ -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) {
Expand Down