Merge pull request #114 from JerrySmidt/master

3.6.1

Author: JerrySmidt

Helper/ApiClientHelper.php

@@ -339,6 +339,20 @@ 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);

Model/Validator/City.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace Flekto\Postcode\Model\Validator;
+
+/**
+ * Customer city fields validator.
+ */
+class City extends \Magento\Customer\Model\Validator\City
+{
+    /**
+     * Validate city fields.
+     *
+     * Adopt pattern from Magento release 2.4.9-alpha3 to fix city validation.
+     * @see https://github.com/magento/magento2/issues/39854
+     *
+     * @param Customer $customer
+     * @return bool
+     */
+    public function isValid($customer): bool
+    {
+        $city = $customer->getCity();
+        if ($city === null) {
+            return true;
+        }
+
+        if (preg_match( '/^[\p{L}\p{M}\d\s\-_\'’\.,&\(\)]{1,100}$/u', $city, $matches)) {
+            if ($matches[0] === $city) {
+                return true;
+            }
+        }
+
+        parent::_addMessages([[
+            'city' => "Invalid City. Please use letters, numbers, spaces,
+            and the following characters: - _ ' ’ . , & ( )"
+        ]]);
+
+        return false;
+    }
+}

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "postcode-nl/api-magento2-module",
-    "version": "3.6.0",
+    "version": "3.6.1",
     "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.0</module_version>
+                <module_version>3.6.1</module_version>
                 <account_status>new</account_status>
             </status>
             <general>

etc/di.xml

@@ -5,6 +5,7 @@
     <preference for="Flekto\Postcode\Api\UpdateNotificationRepositoryInterface" type="Flekto\Postcode\Model\UpdateNotificationRepository" />
     <preference for="Magento\Framework\Filesystem\DriverInterface" type="Magento\Framework\Filesystem\Driver\File" />
     <preference for="Magento\Checkout\Block\Checkout\AttributeMerger" type="Flekto\Postcode\Block\Checkout\AttributeMerger" />
+    <preference for="Magento\Customer\Model\Validator\City" type="Flekto\Postcode\Model\Validator\City" />
 
     <type name="Magento\Framework\App\AreaList">
         <arguments>

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

@@ -64,17 +64,22 @@ define([
         setInputAddress: function (address) {
             const addressParts = this.getAddressParts(address);
 
-            if (this.settings.split_street_values) {
-                // Street children may not yet be available at this point, so value needs to be set asynchronously.
-                this.street().asyncSetValues(
+            // Result could be an old address from localStorage, without streetLines.
+            if (typeof addressParts.streetLines === 'undefined') {
+                addressParts.streetLines = [
                     addressParts.street,
                     addressParts.houseNumber,
-                    addressParts.houseNumberAddition
-                );
-            } else {
-                this.street().asyncSetValues(`${addressParts.street} ${addressParts.house}`);
+                    addressParts.houseNumberAddition,
+                ];
+
+                if (!this.settings.split_street_values) {
+                    addressParts.streetLines = [addressParts.streetLines.join(' ')];
+                }
             }
 
+            // Street children may not yet be available at this point, so value needs to be set asynchronously.
+            this.street().asyncSetValues(...addressParts.streetLines);
+
             this.city().value(addressParts.city);
             this.postcode().value(addressParts.postcode);
 

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

@@ -123,7 +123,10 @@ define([
         setInputAddress: function (address) {
             const addressParts = this.getAddressParts(address);
 
-            this.inputs.street[0].value = addressParts.street + ' ' + addressParts.house;
+            for (let i = 0; i < address.streetLines.length; i++) {
+                this.inputs.street[i].value = address.streetLines[i];
+            }
+
             this.inputs.city.value = addressParts.city;
             this.inputs.postcode.value = addressParts.postcode;
 

view/frontend/web/js/form/element/checkout/address-autofill-intl.js

@@ -92,16 +92,13 @@ define([
             switch (this.settings.show_hide_address_fields) {
             case 'disable':
                 for (const field of ['street', 'city', 'postcode', 'regionId', 'regionIdInput']) {
-                    this[field](component => component.disabled(!state));
+                    this[field](component => component.disabled(!state)); // eslint-disable-line no-loop-func
                 }
                 break;
             case 'format':
-                if (!force) {
-                    for (const field of ['street', 'city', 'postcode']) {
-                        this[field](component => component.visible(false));
-                    }
-                }
-                break;
+                state = force && state; // Always hide fields unless forced otherwise.
+
+            /* falls through */
             case 'hide':
                 for (const field of ['street', 'city', 'postcode']) {
                     this[field](component => component.visible(state));