Feature #53438: fix street line formatting

Author: JerrySmidt

assets/js/postcode-eu-autofill.js

@@ -484,20 +484,33 @@
 			{
 				province = PostcodeNlStateToValueMapping.CHE[result.details.cheCanton.name];
 			}
+
 			fillAddressFields(addressFields, new Map([
 				[PostcodeNlAddressFieldMapping.street, address.street],
 				[PostcodeNlAddressFieldMapping.houseNumber, address.buildingNumber || ''],
 				[PostcodeNlAddressFieldMapping.houseNumberAddition, address.buildingNumberAddition || ''],
 				[PostcodeNlAddressFieldMapping.postcode, address.postcode],
 				[PostcodeNlAddressFieldMapping.city, address.locality],
-				[PostcodeNlAddressFieldMapping.streetAndHouseNumber, (address.street + ' ' + address.building).trim()],
+				[
+					PostcodeNlAddressFieldMapping.streetAndHouseNumber,
+					formatStreetLine(result.country.iso2Code, address.street, address.building)
+				],
 				[PostcodeNlAddressFieldMapping.houseNumberAndAddition, address.building],
 				[PostcodeNlAddressFieldMapping.province, province],
 			]));
 
 			$(document.body).trigger('update_checkout');
 		}
 
+		// Correctly format street and building line for countries that use reversed order.
+		const formatStreetLine = (countryIso2, street, building) => {
+			let a = street, b = building;
+			if (settings.reverseStreetLineCountries.includes(countryIso2))
+				[a, b] = [b, a];
+
+			return `${a} ${b}`.trim();
+		}
+
 		// Get a prefilled address value from the intl field.
 		// If missing, try to construct a value from the address fields.
 		const getPrefilledAddressValue = () => {

src/PostcodeNl/AddressAutocomplete/Main.php

@@ -279,6 +279,7 @@ public function getSettings(): array
 			'houseNumberPlaceholder' => '123 A',
 			'autofillIntlBypassLinkText' => esc_html__('Enter an address', 'postcode-eu-address-validation'),
 			'allowAutofillIntlBypass' => $this->_options->allowAutofillIntlBypass,
+			'reverseStreetLineCountries' => ['LU', 'FR', 'GB', 'IE', 'IT', 'PT'],
 		];
 	}
 

src/components/address-autocomplete-intl/autocomplete-input.js

@@ -9,6 +9,15 @@ const settings = getSetting('postcode-eu-address-validation_data');
 
 const isSupportedCountry = (countryIso2) => typeof settings.enabledCountries[countryIso2] !== 'undefined';
 
+// Correctly format street and building line for countries that use reversed order.
+const formatStreetLine = (countryIso2, street, building) => {
+	let a = street, b = building;
+	if (settings.reverseStreetLineCountries.includes(countryIso2))
+		[a, b] = [b, a];
+
+	return `${a} ${b}`.trim();
+}
+
 PostcodeNl.addressDetailsCache ??= new Map();
 
 function initAutocomplete (inputElement, countryIso3)
@@ -112,7 +121,7 @@ const AutocompleteInput = ({id, addressType, address, setAddress, setAddressDeta
 				const { locality, street, postcode, building } = result.address;
 				setAddress({
 					...addressRef.current,
-					address_1: `${street} ${building}`,
+					address_1: formatStreetLine(result.country.iso2Code, street, building),
 					city: locality,
 					postcode: postcode,
 				});