Merge pull request #117 from JerrySmidt/master

3.6.3

Author: JerrySmidt

Helper/ApiClientHelper.php

@@ -339,20 +339,6 @@ public function getNlAddress(string $zipCode, string $houseNumber): array
             ];
         }
 
-        $streetParts = [
-            $address['street'],
-            $address['houseNumber'],
-            $address['houseNumberAddition'] ?? '',
-        ];
-
-        if ($this->_storeConfigHelper->isSetFlag('split_street_values')) {
-            $lastLineIndex = $this->_addressHelper->getStreetLines() - 1;
-            $address['streetLines'] = array_slice($streetParts, 0, $lastLineIndex);
-            $address['streetLines'][] = implode(' ', array_slice($streetParts, $lastLineIndex));
-        } else {
-            $address['streetLines'] = [rtrim(implode(' ', $streetParts))];
-        }
-
         $result = ['address' => $address, 'status' => $status];
 
         return $this->_prepareResponse($result, $client);

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "postcode-nl/api-magento2-module",
-    "version": "3.6.2",
+    "version": "3.6.3",
     "description": "Postcode.eu International Address API module for Magento 2. Adds autocompletion for addresses in multiple countries using official postal data.",
     "require": {
       "php": "^7.4 || ^8.0 || ^8.1 || ^8.2 || ^8.3 || ^8.4",

etc/config.xml

@@ -3,7 +3,7 @@
     <default>
         <postcodenl_api>
             <status>
-                <module_version>3.6.2</module_version>
+                <module_version>3.6.3</module_version>
                 <account_status>new</account_status>
             </status>
             <general>

view/frontend/web/js/form/components/address-autofill-nl.js

@@ -182,6 +182,17 @@ define([
         },
 
         getAddressParts: function (address) {
+            const streetParts = [address.street, address.houseNumber, address.houseNumberAddition ?? ''];
+
+            if (this.settings.split_street_values) {
+                const lastChildIndex = this.initChildCount - 1;
+
+                address.streetLines = streetParts.slice(0, lastChildIndex);
+                address.streetLines.push(streetParts.slice(lastChildIndex).join(' ').trim());
+            } else {
+                address.streetLines = [streetParts.join(' ').trim()];
+            }
+
             return {
                 ...address,
                 houseNumberAddition: address.houseNumberAddition ?? '',

view/frontend/web/js/form/components/street/group.js

@@ -34,7 +34,8 @@ define([
             // Join remaining args for last or single child.
             values.push(args.slice(lastChildIndex).join(' ').trim());
 
-            values.forEach((v, i) => { Registry.async(`${this.name}.${i}`)('value', v); });
+            // NB. value is cast to string for correct length validation of house numbers.
+            values.forEach((v, i) => { Registry.async(`${this.name}.${i}`)('value', String(v)); });
         },
     });
 });