From 6049b584f4677ed7bfb29c489bd0862b74eed647 Mon Sep 17 00:00:00 2001
From: wsajosh <joshua.stewart@shipperhq.com>
Date: Thu, 1 Apr 2021 10:04:38 +0100
Subject: [PATCH] 20.3.3 MNB-1058 Fix conditionals and fix issue with whole
 address printing in street line 1

---
 CHANGELOG-PUBLIC.MD                      |  4 ++++
 CHANGELOG.MD                             |  4 ++++
 composer.json                            |  2 +-
 src/view/frontend/web/js/autocomplete.js | 22 ++++++++++++----------
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG-PUBLIC.MD b/CHANGELOG-PUBLIC.MD
index e683a03..003e518 100644
--- a/CHANGELOG-PUBLIC.MD
+++ b/CHANGELOG-PUBLIC.MD
@@ -53,3 +53,7 @@ MNB-401 Fix issue with popup rendering for logged in users
 MNB-532 Fix use long zip option
 
 
+## 20.3.3 (2021-04-01)
+MNB-1058 Fix conditionals and fix issue with whole address printing in street line 1
+
+
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index e683a03..003e518 100755
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -53,3 +53,7 @@ MNB-401 Fix issue with popup rendering for logged in users
 MNB-532 Fix use long zip option
 
 
+## 20.3.3 (2021-04-01)
+MNB-1058 Fix conditionals and fix issue with whole address printing in street line 1
+
+
diff --git a/composer.json b/composer.json
index ef04a76..797a8bb 100755
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
     "name": "shipperhq/module-address-autocomplete",
     "description": "ShipperHQ Address Autocomplete Tool",
     "type": "magento2-module",
-    "version": "20.3.2",
+    "version": "20.3.3",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/src/view/frontend/web/js/autocomplete.js b/src/view/frontend/web/js/autocomplete.js
index ee82df1..7aaa3be 100644
--- a/src/view/frontend/web/js/autocomplete.js
+++ b/src/view/frontend/web/js/autocomplete.js
@@ -123,23 +123,25 @@ define([
                 } else if (addressType == 'postal_code') {
                     postcode = value;
                     var thisDomID = uiRegistry.get('checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.postcode').uid
-                    if ($('#'+thisDomID)) {
+                    if ($('#'+thisDomID).length) {
                         $('#'+thisDomID).val(postcode + postcodeSuffix);
                         $('#'+thisDomID).trigger('change');
                     }
                 } else if (addressType == 'postal_code_suffix' && window.checkoutConfig.shipperhq_autocomplete.use_long_postcode === '1') {
                     postcodeSuffix = '-' + value;
                     var thisDomID = uiRegistry.get('checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.postcode').uid
-                    if ($('#'+thisDomID)) {
+                    if ($('#'+thisDomID).length) {
                         $('#'+thisDomID).val(postcode + postcodeSuffix);
                         $('#'+thisDomID).trigger('change');
                     }
                 } else {
                     var elementId = lookupElement[addressType];
-                    var thisDomID = uiRegistry.get('checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.'+ elementId).uid;
-                    if ($('#'+thisDomID)) {
-                        $('#'+thisDomID).val(value);
-                        $('#'+thisDomID).trigger('change');
+                    if (elementId !== undefined) {
+                        var thisDomID = uiRegistry.get('checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.' + elementId).uid;
+                        if ($('#' + thisDomID).length) {
+                            $('#' + thisDomID).val(value);
+                            $('#' + thisDomID).trigger('change');
+                        }
                     }
                 }
             }
@@ -148,20 +150,20 @@ define([
             street[0] = streetNumber;
             var domID = uiRegistry.get('checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.street').elems()[0].uid;
             var streetString = street.join(' ');
-            if ($('#'+domID)) {
+            if ($('#'+domID).length) {
                 $('#'+domID).val(streetString);
                 $('#'+domID).trigger('change');
             }
         }
         var cityDomID = uiRegistry.get('checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.city').uid;
-        if ($('#'+cityDomID)) {
+        if ($('#'+cityDomID).length) {
             $('#'+cityDomID).val(city);
             $('#'+cityDomID).trigger('change');
         }
         if (region != '') {
             if (uiRegistry.get('checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.region_id')) {
                 var regionDomId = uiRegistry.get('checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.region_id').uid;
-                if ($('#'+regionDomId)) {
+                if ($('#'+regionDomId).length) {
                     //search for and select region using text
                     $('#'+regionDomId +' option')
                         .filter(function () {
@@ -173,7 +175,7 @@ define([
             }
             if (uiRegistry.get('checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.region_id_input')) {
                 var regionDomId = uiRegistry.get('checkout.steps.shipping-step.shippingAddress.shipping-address-fieldset.region_id_input').uid;
-                if ($('#'+regionDomId)) {
+                if ($('#'+regionDomId).length) {
                     $('#'+regionDomId).val(region);
                     $('#'+regionDomId).trigger('change');
                 }