From 2e0e23071d93ba78f498fcf0f605a32978c69d61 Mon Sep 17 00:00:00 2001
From: Vincent 't Hart <vincent.t.hart@tig.nl>
Date: Wed, 11 Aug 2021 14:26:52 +0200
Subject: [PATCH 1/6] POSTCODENL-284: added extra check proposed in SD-24264

---
 view/frontend/web/js/view/form/fields.js | 40 +++++++++++-------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/view/frontend/web/js/view/form/fields.js b/view/frontend/web/js/view/form/fields.js
index 5e77674..5073de7 100644
--- a/view/frontend/web/js/view/form/fields.js
+++ b/view/frontend/web/js/view/form/fields.js
@@ -97,33 +97,31 @@ define([
             if (typeof options.data === "string") {
                 var data = $.parseJSON(options.data);
 
-                // Handle Magento inconsistencies
-                var customAttributes = 'custom_attributes';
+                if (data != null) {
 
-                if (!_.isUndefined(data.address) && !_.isUndefined(data.address[customAttributes])) {
-                    data.address = this.addToAddress(data.address, customAttributes);
-                }
+                    // Handle Magento inconsistencies
+                    var customAttributes = 'custom_attributes';
 
-                customAttributes = 'customAttributes';
+                    if (!_.isUndefined(data.address) && !_.isUndefined(data.address[customAttributes])) {
+                        data.address = this.addToAddress(data.address, customAttributes);
+                    }
 
-                if (!_.isUndefined(data.addressInformation) && data.addressInformation &&
-                    !_.isUndefined(data.addressInformation.shipping_address) &&
-                    !_.isUndefined(data.addressInformation.shipping_address[customAttributes])) {
-                    data.addressInformation.shipping_address = this.addToAddress(data.addressInformation.shipping_address, customAttributes);
-                }
+                    customAttributes = 'customAttributes';
 
-                if (!_.isUndefined(data.addressInformation) && data.addressInformation &&
-                    !_.isUndefined(data.addressInformation.billing_address) &&
-                    !_.isUndefined(data.addressInformation.billing_address[customAttributes])) {
-                    data.addressInformation.billing_address = this.addToAddress(data.addressInformation.billing_address, customAttributes);
-                }
+                    if (!_.isUndefined(data.addressInformation) && data.addressInformation && !_.isUndefined(data.addressInformation.shipping_address) && !_.isUndefined(data.addressInformation.shipping_address[customAttributes])) {
+                        data.addressInformation.shipping_address = this.addToAddress(data.addressInformation.shipping_address, customAttributes);
+                    }
 
-                if (!_.isUndefined(data.billingAddress) && data.billingAddress &&
-                    !_.isUndefined(data.billingAddress[customAttributes])) {
-                    data.billingAddress = this.addToAddress(data.billingAddress, customAttributes);
-                }
+                    if (!_.isUndefined(data.addressInformation) && data.addressInformation && !_.isUndefined(data.addressInformation.billing_address) && !_.isUndefined(data.addressInformation.billing_address[customAttributes])) {
+                        data.addressInformation.billing_address = this.addToAddress(data.addressInformation.billing_address, customAttributes);
+                    }
+
+                    if (!_.isUndefined(data.billingAddress) && data.billingAddress && !_.isUndefined(data.billingAddress[customAttributes])) {
+                        data.billingAddress = this.addToAddress(data.billingAddress, customAttributes);
+                    }
 
-                return JSON.stringify(data);
+                    return JSON.stringify(data);
+                }
             }
         },
 

From c2f635400bc413d9c9549fdb7e5ebcab8264c690 Mon Sep 17 00:00:00 2001
From: Mickey Beijer <mickey.beijer@tig.nl>
Date: Wed, 11 Aug 2021 18:04:04 +0200
Subject: [PATCH 2/6] POSTNLM2-1179 : improved check on custom attributes to
 avoid errors in onestepcheckout

---
 view/frontend/web/js/view/billing-address-mixin.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/frontend/web/js/view/billing-address-mixin.js b/view/frontend/web/js/view/billing-address-mixin.js
index 037e83a..7b92a16 100644
--- a/view/frontend/web/js/view/billing-address-mixin.js
+++ b/view/frontend/web/js/view/billing-address-mixin.js
@@ -40,12 +40,12 @@ define([
     return function (Component) {
         return Component.extend({
             tigHouseNumber: function () {
-                if (quote.billingAddress().customAttributes.length > 0) {
+                var customAttributes = quote.billingAddress().customAttributes;
+
+                if (customAttributes && customAttributes.length > 0) {
                     var houseNumber = "";
                     var houseNumberAddition = "";
 
-                    var customAttributes = quote.billingAddress().customAttributes;
-
                     // check if custom attribute exists and is not empty
                     customAttributes.forEach(function (attribute) {
                         if (attribute.attribute_code === "tig_housenumber" && attribute.value !== "") {

From 8407d82f6035d4ebb04f86bd2848dec957929313 Mon Sep 17 00:00:00 2001
From: Lucas Hoeffnagel <lucas.hoeffnagel@tig.nl>
Date: Wed, 1 Sep 2021 12:37:15 +0200
Subject: [PATCH 3/6] POSTCODENL-323 - added if statement to avoid errors when
 street field is empty

---
 view/frontend/web/template/billing-address/details.html         | 2 +-
 .../web/template/shipping-address/address-renderer/default.html | 2 +-
 .../template/shipping-information/address-renderer/default.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/view/frontend/web/template/billing-address/details.html b/view/frontend/web/template/billing-address/details.html
index 6440e0b..9df1791 100644
--- a/view/frontend/web/template/billing-address/details.html
+++ b/view/frontend/web/template/billing-address/details.html
@@ -7,7 +7,7 @@
 <div if="isAddressDetailsVisible() && currentBillingAddress()" class="billing-address-details">
     <text args="currentBillingAddress().prefix"/> <text args="currentBillingAddress().firstname"/> <text args="currentBillingAddress().middlename"/>
     <text args="currentBillingAddress().lastname"/> <text args="currentBillingAddress().suffix"/><br/>
-    <text args="currentBillingAddress().street.join(', ')"/>
+    <text args="currentBillingAddress().street.join(', ')" if="currentBillingAddress().street"/>
     <text args="tigHouseNumber()"/><br/>
     <text args="currentBillingAddress().city "/>, <span text="currentBillingAddress().region"></span> <text args="currentBillingAddress().postcode"/><br/>
     <text args="getCountryName(currentBillingAddress().countryId)"/><br/>
diff --git a/view/frontend/web/template/shipping-address/address-renderer/default.html b/view/frontend/web/template/shipping-address/address-renderer/default.html
index 5549e2d..ad0e98b 100644
--- a/view/frontend/web/template/shipping-address/address-renderer/default.html
+++ b/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -7,7 +7,7 @@
 <div class="shipping-address-item" data-bind="css: isSelected() ? 'selected-item' : 'not-selected-item'">
     <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
     <text args="address().lastname"/> <text args="address().suffix"/><br/>
-    <text args="address().street.join(', ')"/>
+    <text args="address().street.join(', ')" if="address().street"/>
     <each args="data: address().customAttributes, as: 'element'">
         <div class="tig-billing-housenumber" if="element['attribute_code'] == 'tig_housenumber' || element['attribute_code'] == 'tig_housenumber_addition'">
             <text args="element.value"/>
diff --git a/view/frontend/web/template/shipping-information/address-renderer/default.html b/view/frontend/web/template/shipping-information/address-renderer/default.html
index d23c95a..08b00e1 100644
--- a/view/frontend/web/template/shipping-information/address-renderer/default.html
+++ b/view/frontend/web/template/shipping-information/address-renderer/default.html
@@ -7,7 +7,7 @@
 <if args="visible()">
     <text args="address().prefix"/> <text args="address().firstname"/> <text args="address().middlename"/>
     <text args="address().lastname"/> <text args="address().suffix"/><br/>
-    <text args="address().street.join(', ')"/>
+    <text args="address().street.join(', ')" if="address().street"/>
     <each args="data: address().customAttributes, as: 'element'">
         <if args="element['attribute_code'] == 'tig_housenumber' || element['attribute_code'] == 'tig_housenumber_addition'">
             <text args="element.value"/>

From 89231ee2d62cefd777b2de94344c5c604cb14ff7 Mon Sep 17 00:00:00 2001
From: Lucas Hoeffnagel <lucas.hoeffnagel@tig.nl>
Date: Fri, 15 Oct 2021 10:00:09 +0200
Subject: [PATCH 4/6] POSTCODENL-284 - codesniffer fix

---
 view/frontend/web/js/view/form/fields.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/view/frontend/web/js/view/form/fields.js b/view/frontend/web/js/view/form/fields.js
index 5073de7..5d68bd4 100644
--- a/view/frontend/web/js/view/form/fields.js
+++ b/view/frontend/web/js/view/form/fields.js
@@ -98,7 +98,6 @@ define([
                 var data = $.parseJSON(options.data);
 
                 if (data != null) {
-
                     // Handle Magento inconsistencies
                     var customAttributes = 'custom_attributes';
 

From 2359529a1a8cdd2a0d1b9845dd35f260c3bc5565 Mon Sep 17 00:00:00 2001
From: Lucas Hoeffnagel <lucas.hoeffnagel@tig.nl>
Date: Tue, 2 Nov 2021 15:00:42 +0100
Subject: [PATCH 5/6] POSTCODENL-330 - fixed if-statement

---
 .../web/template/shipping-address/address-renderer/default.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/frontend/web/template/shipping-address/address-renderer/default.html b/view/frontend/web/template/shipping-address/address-renderer/default.html
index ad0e98b..63cae04 100644
--- a/view/frontend/web/template/shipping-address/address-renderer/default.html
+++ b/view/frontend/web/template/shipping-address/address-renderer/default.html
@@ -24,7 +24,7 @@
         </div>
     </each>
 
-    <button visible="!address().isEditable()"
+    <button visible="address().isEditable()"
         type="button"
             class="action edit-address-link"
             data-bind="click: editAddress, visible: address().isEditable()">

From dc824b656b3caca510428f0a559fb5c46dda7e33 Mon Sep 17 00:00:00 2001
From: Lucas Hoeffnagel <lucas.hoeffnagel@tig.nl>
Date: Thu, 4 Nov 2021 10:05:17 +0100
Subject: [PATCH 6/6] POSTCODENL-326 - updated version number and supported
 magento versions

---
 Block/Adminhtml/Config/Support/Tab.php               | 2 +-
 Test/Unit/Block/Adminhtml/Config/Support/TabTest.php | 6 +++---
 composer.json                                        | 2 +-
 etc/config.xml                                       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Block/Adminhtml/Config/Support/Tab.php b/Block/Adminhtml/Config/Support/Tab.php
index 57fe1b6..41f54ac 100644
--- a/Block/Adminhtml/Config/Support/Tab.php
+++ b/Block/Adminhtml/Config/Support/Tab.php
@@ -40,7 +40,7 @@ class Tab extends Template implements RendererInterface
 {
     const MODULE_NAME = 'TIG_Postcode';
 
-    const EXTENSION_VERSION = '1.4.0';
+    const EXTENSION_VERSION = '1.4.1';
 
     // @codingStandardsIgnoreLine
     protected $_template = 'TIG_Postcode::config/support/tab.phtml';
diff --git a/Test/Unit/Block/Adminhtml/Config/Support/TabTest.php b/Test/Unit/Block/Adminhtml/Config/Support/TabTest.php
index d2c4dd4..acb1b82 100644
--- a/Test/Unit/Block/Adminhtml/Config/Support/TabTest.php
+++ b/Test/Unit/Block/Adminhtml/Config/Support/TabTest.php
@@ -42,7 +42,7 @@ class TabTest extends TestCase
     public function testGetVersionNumber()
     {
         $instance = $this->getInstance();
-        $this->assertSame('1.4.0', $instance->getVersionNumber());
+        $this->assertSame('1.4.1', $instance->getVersionNumber());
     }
 
     public function testGetSupportedMagentoVersions()
@@ -51,7 +51,7 @@ public function testGetSupportedMagentoVersions()
            'moduleConfiguration' => $this->getConfigurationMock()
         ]);
 
-        $this->assertSame('2.3.7, 2.4.2', $instance->getSupportedMagentoVersions());
+        $this->assertSame('2.3.7, 2.4.3', $instance->getSupportedMagentoVersions());
     }
 
     /**+
@@ -62,7 +62,7 @@ private function getConfigurationMock()
         $mock = $this->getFakeMock(ModuleConfiguration::class)->getMock();
         $mockExpects = $mock->expects($this->once());
         $mockExpects->method('getSupportedMagentoVersions');
-        $mockExpects->willReturn('2.3.7, 2.4.2');
+        $mockExpects->willReturn('2.3.7, 2.4.3');
 
         return $mock;
     }
diff --git a/composer.json b/composer.json
index 7318179..bc01203 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
     "magento/module-quote": ">=101.0.5,<=101.0.11|~101.1|~101.2"
   },
   "type": "magento2-module",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "license": "CC-BY-NC-ND-3.0",
   "authors": [
     {
diff --git a/etc/config.xml b/etc/config.xml
index 4ab179a..d2a25ee 100644
--- a/etc/config.xml
+++ b/etc/config.xml
@@ -33,7 +33,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
         <tig_postcode>
-            <supported_magento_version>2.3.7, 2.4.2</supported_magento_version>
+            <supported_magento_version>2.3.7, 2.4.3</supported_magento_version>
             <stability/>
             <configuration>
                 <modus>0</modus>