Skip to content

Commit

Permalink
20.3.2 MNB-532 Fix use long zip option
Browse files Browse the repository at this point in the history
  • Loading branch information
wsajosh committed Dec 21, 2020
1 parent 3fb96e8 commit 96bd30b
Show file tree
Hide file tree
Showing 14 changed files with 164 additions and 16 deletions.
55 changes: 55 additions & 0 deletions CHANGELOG-PUBLIC.MD
Original file line number Diff line number Diff line change
@@ -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


11 changes: 9 additions & 2 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -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


5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------------------------
Expand Down Expand Up @@ -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)
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 11 additions & 1 deletion src/etc/frontend/di.xml
Original file line number Diff line number Diff line change
@@ -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 [email protected]
-->

<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>
Expand All @@ -7,4 +17,4 @@
</argument>
</arguments>
</type>
</config>
</config>
10 changes: 10 additions & 0 deletions src/etc/module.xml
Original file line number Diff line number Diff line change
@@ -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 [email protected]
-->

<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>
13 changes: 12 additions & 1 deletion src/registration.php
Original file line number Diff line number Diff line change
@@ -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 [email protected]
*/

\Magento\Framework\Component\ComponentRegistrar::register(
\Magento\Framework\Component\ComponentRegistrar::MODULE,
'ShipperHQ_AddressAutocomplete',
__DIR__
Expand Down
12 changes: 11 additions & 1 deletion src/view/frontend/layout/checkout_index_index.xml
Original file line number Diff line number Diff line change
@@ -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 [email protected]
-->

<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">
Expand All @@ -19,4 +29,4 @@
</arguments>
</referenceBlock>
</body>
</page>
</page>
10 changes: 10 additions & 0 deletions src/view/frontend/layout/customer_address_form.xml
Original file line number Diff line number Diff line change
@@ -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 [email protected]
-->

<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">
Expand Down
12 changes: 9 additions & 3 deletions src/view/frontend/templates/edit.phtml
Original file line number Diff line number Diff line change
@@ -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 [email protected]
*/

// @codingStandardsIgnoreFile
Expand Down
12 changes: 11 additions & 1 deletion src/view/frontend/web/css/source/_module.less
Original file line number Diff line number Diff line change
@@ -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 [email protected]
*/

// 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;
}
}
12 changes: 11 additions & 1 deletion src/view/frontend/web/js/autocomplete.js
Original file line number Diff line number Diff line change
@@ -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 [email protected]
*/

define([
'jquery',
'uiComponent',
Expand Down Expand Up @@ -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)) {
Expand Down
12 changes: 11 additions & 1 deletion src/view/frontend/web/js/google_maps_loader.js
Original file line number Diff line number Diff line change
@@ -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 [email protected]
*/

//credit: https://gist.github.com/MattSurabian/7868115
var google_maps_loaded_def = null;

Expand All @@ -18,4 +28,4 @@ define(['jquery'],function ($) {
}
return google_maps_loaded_def.promise();

});
});

0 comments on commit 96bd30b

Please sign in to comment.