From 96bd30bb0b870d4a4d6c1cb02f701ce9501f5ad8 Mon Sep 17 00:00:00 2001
From: wsajosh <joshua.stewart@shipperhq.com>
Date: Mon, 21 Dec 2020 10:02:52 +0000
Subject: [PATCH] 20.3.2 MNB-532 Fix use long zip option

---
 CHANGELOG-PUBLIC.MD                           | 55 +++++++++++++++++++
 CHANGELOG.MD                                  | 11 +++-
 README.md                                     |  5 +-
 composer.json                                 |  2 +-
 src/composer.json                             |  2 +-
 src/etc/frontend/di.xml                       | 12 +++-
 src/etc/module.xml                            | 10 ++++
 src/registration.php                          | 13 ++++-
 .../frontend/layout/checkout_index_index.xml  | 12 +++-
 .../frontend/layout/customer_address_form.xml | 10 ++++
 src/view/frontend/templates/edit.phtml        | 12 +++-
 src/view/frontend/web/css/source/_module.less | 12 +++-
 src/view/frontend/web/js/autocomplete.js      | 12 +++-
 .../frontend/web/js/google_maps_loader.js     | 12 +++-
 14 files changed, 164 insertions(+), 16 deletions(-)
 create mode 100644 CHANGELOG-PUBLIC.MD

diff --git a/CHANGELOG-PUBLIC.MD b/CHANGELOG-PUBLIC.MD
new file mode 100644
index 0000000..e683a03
--- /dev/null
+++ b/CHANGELOG-PUBLIC.MD
@@ -0,0 +1,55 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+This project adheres to Semantic Versioning(http://semver.org/).
+
+## 1.0.0
+Initial Release
+
+## 1.0.1
+SHQ16-2072 address autocomplete changes
+
+## 1.0.2
+SHQ16-2072 address autocomplete changes
+
+## 1.0.3
+SHQ16-2112 support for address elements specific to New York, UK and Sweden
+
+## 1.0.4
+SHQ16-2150 handle no API key, increase z-index and handle apartment number
+
+## 1.0.5
+SHQ16-2150 handle no API key, increase z-index and handle apartment number. Also changed tagged version number
+
+## 20.0.5
+SHQ16-2150 handle no API key, increase z-index and handle apartment number. Also changed tagged version number
+
+## 20.0.6
+SHQ16-2244 add polyfill for IE 11 issue
+
+## 20.1.0
+SHQ16-2328 moved css for autocomplete to less file
+
+## 20.1.1
+M2-56 code sniffer changes
+
+## 20.1.2
+Updated README with grammar corrections
+
+## 20.1.3
+SHQ18-65 - handle Google API authentication errors
+## 20.2.1 (2018-07-27)
+SHQ18-260 Disable Google Chrome autofill if address lookup is enabled
+
+
+## 20.3.0 (2018-12-18)
+Added a setting to use extended postcodes when available
+
+
+## 20.3.1 (2020-06-18)
+MNB-401 Fix issue with popup rendering for logged in users
+
+
+## 20.3.2 (2020-12-21)
+MNB-532 Fix use long zip option
+
+
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 83f1d6f..e683a03 100755
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -37,12 +37,19 @@ Updated README with grammar corrections
 
 ## 20.1.3
 SHQ18-65 - handle Google API authentication errors
-
 ## 20.2.1 (2018-07-27)
 SHQ18-260 Disable Google Chrome autofill if address lookup is enabled
 
+
 ## 20.3.0 (2018-12-18)
 Added a setting to use extended postcodes when available
 
+
 ## 20.3.1 (2020-06-18)
-MNB-401 Fix rendering of popup on 2.3.4+ for logged in customers
+MNB-401 Fix issue with popup rendering for logged in users
+
+
+## 20.3.2 (2020-12-21)
+MNB-532 Fix use long zip option
+
+
diff --git a/README.md b/README.md
index 231f3f7..46e163d 100644
--- a/README.md
+++ b/README.md
@@ -24,8 +24,7 @@ For more information see [ShipperHQ](https://shipperhq.com/magento2).
 
 Compatibility
 -------------
-- Magento >= 2.2
-- Supports both Magento Opensource (Community) and Magento Commerce (Enterprise)
+- Magento >= 2.0 (Incl 2.2)
 
 Installation Instructions
 -------------------------
@@ -68,4 +67,4 @@ See license files
 
 Copyright
 ---------
-Copyright (c) 2015 Zowta LLC (http://www.ShipperHQ.com)
+Copyright (c) 2015 Zowta LLC (http://www.ShipperHQ.com)
\ No newline at end of file
diff --git a/composer.json b/composer.json
index fa9ecc4..ef04a76 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.1",
+    "version": "20.3.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/src/composer.json b/src/composer.json
index 62d9d77..0bfe6eb 100755
--- a/src/composer.json
+++ b/src/composer.json
@@ -2,7 +2,7 @@
     "name": "shipperhq/module-address-autocomplete",
     "description": "ShipperHQ Address Autocomplete Tool",
     "type": "magento2-module",
-    "version": "20.3.1",
+    "version": "20.3.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
diff --git a/src/etc/frontend/di.xml b/src/etc/frontend/di.xml
index 901f7b2..ecaaa68 100644
--- a/src/etc/frontend/di.xml
+++ b/src/etc/frontend/di.xml
@@ -1,4 +1,14 @@
 <?xml version="1.0"?>
+<!--
+  ~ Shipper HQ
+  ~
+  ~ @category ShipperHQ
+  ~ @package ShipperHQ_AddressAutocomplete
+  ~ @copyright Copyright (c) 2020 Zowta LTD and Zowta LLC (http://www.ShipperHQ.com)
+  ~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+  ~ @author ShipperHQ Team sales@shipperhq.com
+  -->
+
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <type name="Magento\Checkout\Model\CompositeConfigProvider">
         <arguments>
@@ -7,4 +17,4 @@
             </argument>
         </arguments>
     </type>
-</config>
\ No newline at end of file
+</config>
diff --git a/src/etc/module.xml b/src/etc/module.xml
index f7daed3..492d41a 100644
--- a/src/etc/module.xml
+++ b/src/etc/module.xml
@@ -1,3 +1,13 @@
 <?xml version="1.0"?>
+<!--
+  ~ Shipper HQ
+  ~
+  ~ @category ShipperHQ
+  ~ @package ShipperHQ_AddressAutocomplete
+  ~ @copyright Copyright (c) 2020 Zowta LTD and Zowta LLC (http://www.ShipperHQ.com)
+  ~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+  ~ @author ShipperHQ Team sales@shipperhq.com
+  -->
+
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
 <module name="ShipperHQ_AddressAutocomplete" setup_version="0.0.1"/></config>
diff --git a/src/registration.php b/src/registration.php
index 658c65f..4d14908 100644
--- a/src/registration.php
+++ b/src/registration.php
@@ -1,5 +1,16 @@
 <?php
-    \Magento\Framework\Component\ComponentRegistrar::register(
+
+/*
+ * Shipper HQ
+ *
+ * @category ShipperHQ
+ * @package ShipperHQ_AddressAutocomplete
+ * @copyright Copyright (c) 2020 Zowta LTD and Zowta LLC (http://www.ShipperHQ.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @author ShipperHQ Team sales@shipperhq.com
+ */
+
+\Magento\Framework\Component\ComponentRegistrar::register(
         \Magento\Framework\Component\ComponentRegistrar::MODULE,
         'ShipperHQ_AddressAutocomplete',
         __DIR__
diff --git a/src/view/frontend/layout/checkout_index_index.xml b/src/view/frontend/layout/checkout_index_index.xml
index da9de31..d9edcb1 100644
--- a/src/view/frontend/layout/checkout_index_index.xml
+++ b/src/view/frontend/layout/checkout_index_index.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0"?>
 
+<!--
+  ~ Shipper HQ
+  ~
+  ~ @category ShipperHQ
+  ~ @package ShipperHQ_AddressAutocomplete
+  ~ @copyright Copyright (c) 2020 Zowta LTD and Zowta LLC (http://www.ShipperHQ.com)
+  ~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+  ~ @author ShipperHQ Team sales@shipperhq.com
+  -->
+
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="checkout" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="checkout.root">
@@ -19,4 +29,4 @@
             </arguments>
         </referenceBlock>
     </body>
-</page>
\ No newline at end of file
+</page>
diff --git a/src/view/frontend/layout/customer_address_form.xml b/src/view/frontend/layout/customer_address_form.xml
index e3fcd83..a8a6e2c 100644
--- a/src/view/frontend/layout/customer_address_form.xml
+++ b/src/view/frontend/layout/customer_address_form.xml
@@ -1,4 +1,14 @@
 <?xml version="1.0"?>
+<!--
+  ~ Shipper HQ
+  ~
+  ~ @category ShipperHQ
+  ~ @package ShipperHQ_AddressAutocomplete
+  ~ @copyright Copyright (c) 2020 Zowta LTD and Zowta LLC (http://www.ShipperHQ.com)
+  ~ @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+  ~ @author ShipperHQ Team sales@shipperhq.com
+  -->
+
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="customer_address_edit">
diff --git a/src/view/frontend/templates/edit.phtml b/src/view/frontend/templates/edit.phtml
index 106623e..93d20b4 100644
--- a/src/view/frontend/templates/edit.phtml
+++ b/src/view/frontend/templates/edit.phtml
@@ -1,7 +1,13 @@
 <?php
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
+
+/*
+ * Shipper HQ
+ *
+ * @category ShipperHQ
+ * @package ShipperHQ_AddressAutocomplete
+ * @copyright Copyright (c) 2020 Zowta LTD and Zowta LLC (http://www.ShipperHQ.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @author ShipperHQ Team sales@shipperhq.com
  */
 
 // @codingStandardsIgnoreFile
diff --git a/src/view/frontend/web/css/source/_module.less b/src/view/frontend/web/css/source/_module.less
index bd01446..f544873 100644
--- a/src/view/frontend/web/css/source/_module.less
+++ b/src/view/frontend/web/css/source/_module.less
@@ -1,7 +1,17 @@
+/*
+ * Shipper HQ
+ *
+ * @category ShipperHQ
+ * @package ShipperHQ_AddressAutocomplete
+ * @copyright Copyright (c) 2020 Zowta LTD and Zowta LLC (http://www.ShipperHQ.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @author ShipperHQ Team sales@shipperhq.com
+ */
+
 // We acknowledge this contribution from jmonschke via github https://github.com/shipperhq/module-address-autocomplete/issues/5
 // MNB-401 Changed from +1 to +5 to account for @modal-popup__z-index being higher on 2.3.5 for logged in customers
 @googleplaces__z-index: @modal__z-index + 5;
 
 .pac-container {
   z-index: @googleplaces__z-index !important;
-}
\ No newline at end of file
+}
diff --git a/src/view/frontend/web/js/autocomplete.js b/src/view/frontend/web/js/autocomplete.js
index c7c20b8..ee82df1 100644
--- a/src/view/frontend/web/js/autocomplete.js
+++ b/src/view/frontend/web/js/autocomplete.js
@@ -1,3 +1,13 @@
+/*
+ * Shipper HQ
+ *
+ * @category ShipperHQ
+ * @package ShipperHQ_AddressAutocomplete
+ * @copyright Copyright (c) 2020 Zowta LTD and Zowta LLC (http://www.ShipperHQ.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @author ShipperHQ Team sales@shipperhq.com
+ */
+
 define([
     'jquery',
     'uiComponent',
@@ -117,7 +127,7 @@ define([
                         $('#'+thisDomID).val(postcode + postcodeSuffix);
                         $('#'+thisDomID).trigger('change');
                     }
-                } else if (addressType == 'postal_code_suffix' && window.checkoutConfig.shipperhq_autocomplete.use_long_postcode) {
+                } 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)) {
diff --git a/src/view/frontend/web/js/google_maps_loader.js b/src/view/frontend/web/js/google_maps_loader.js
index 5d59794..b3242d6 100644
--- a/src/view/frontend/web/js/google_maps_loader.js
+++ b/src/view/frontend/web/js/google_maps_loader.js
@@ -1,3 +1,13 @@
+/*
+ * Shipper HQ
+ *
+ * @category ShipperHQ
+ * @package ShipperHQ_AddressAutocomplete
+ * @copyright Copyright (c) 2020 Zowta LTD and Zowta LLC (http://www.ShipperHQ.com)
+ * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
+ * @author ShipperHQ Team sales@shipperhq.com
+ */
+
 //credit: https://gist.github.com/MattSurabian/7868115
 var google_maps_loaded_def = null;
 
@@ -18,4 +28,4 @@ define(['jquery'],function ($) {
     }
     return google_maps_loaded_def.promise();
 
-});
\ No newline at end of file
+});