From b368bc9bf61ba5061f680db4cb5b9791f8aed2ff Mon Sep 17 00:00:00 2001
From: Travis Bernard <travis.bernard@shipperhq.com>
Date: Tue, 1 Jun 2021 08:37:42 -0500
Subject: [PATCH] 20.4.0 RIV-534 support Enhanced Checkout

---
 CHANGELOG-PUBLIC.MD                      |  4 ++
 CHANGELOG.MD                             |  4 ++
 composer.json                            |  5 +-
 src/Helper/Data.php                      | 84 ++++++++++++++++++++++++
 src/Model/AutocompleteConfigProvider.php |  8 +--
 5 files changed, 97 insertions(+), 8 deletions(-)
 create mode 100644 src/Helper/Data.php

diff --git a/CHANGELOG-PUBLIC.MD b/CHANGELOG-PUBLIC.MD
index 003e518..c414ecf 100644
--- a/CHANGELOG-PUBLIC.MD
+++ b/CHANGELOG-PUBLIC.MD
@@ -57,3 +57,7 @@ MNB-532 Fix use long zip option
 MNB-1058 Fix conditionals and fix issue with whole address printing in street line 1
 
 
+## 20.4.0 (2021-06-01)
+RIV-534 support Enhanced Checkout
+
+
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 003e518..c414ecf 100755
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -57,3 +57,7 @@ MNB-532 Fix use long zip option
 MNB-1058 Fix conditionals and fix issue with whole address printing in street line 1
 
 
+## 20.4.0 (2021-06-01)
+RIV-534 support Enhanced Checkout
+
+
diff --git a/composer.json b/composer.json
index 797a8bb..9c47be1 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.3",
+    "version": "20.4.0",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
@@ -20,9 +20,6 @@
     "support": {
         "documentation": "http://docs.shipperhq.com"
     },
-    "require": {
-        "shipperhq/module-shipper": "^20.0"
-    },
     "autoload": {
         "files": [
             "src/registration.php"
diff --git a/src/Helper/Data.php b/src/Helper/Data.php
new file mode 100644
index 0000000..f59dc6b
--- /dev/null
+++ b/src/Helper/Data.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ *
+ * ShipperHQ
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to license@magentocommerce.com so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * Shipper HQ Shipping
+ *
+ * @category  ShipperHQ
+ * @package   ShipperHQ_Address_Autocomplete
+ * @copyright Copyright (c) 2021 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
+ */
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ *
+*/
+
+namespace ShipperHQ\AddressAutocomplete\Helper;
+
+
+/**
+ * Shipping data helper
+ */
+class Data extends \Magento\Framework\App\Helper\AbstractHelper
+{
+
+    private $storeId;
+    /**
+     * @var Mage_Sales_Model_Quote
+     */
+
+
+    public function __construct(
+        \Magento\Framework\App\Helper\Context $context
+    ) {
+        parent::__construct($context);
+    }
+
+
+    /**
+     * Gets a config flag
+     *
+     * @param $configField
+     * @return mixed
+     */
+    public function getConfigFlag($configField)
+    {
+        return $this->scopeConfig->isSetFlag($configField, \Magento\Store\Model\ScopeInterface::SCOPE_STORE);
+    }
+
+    /**
+     * Get Config Value
+     *
+     * @param $configField
+     * @return mixed
+     */
+    public function getConfigValue($configField, $store = null)
+    {
+        return $this->scopeConfig->getValue(
+            $configField,
+            \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
+            $store
+        );
+    }
+
+}
diff --git a/src/Model/AutocompleteConfigProvider.php b/src/Model/AutocompleteConfigProvider.php
index 79462fe..36c26ed 100644
--- a/src/Model/AutocompleteConfigProvider.php
+++ b/src/Model/AutocompleteConfigProvider.php
@@ -39,17 +39,17 @@
 class AutocompleteConfigProvider implements ConfigProviderInterface
 {
     /**
-     * @var \ShipperHQ\Shipper\Helper\Data
+     * @var \ShipperHQ\AddressAutocomplete\Helper\Data
      */
     private $helper;
 
     /**
-     * @param \ShipperHQ\Shipper\Helper\Data $helper
+     * @param \ShipperHQ\AddressAutocomplete\Helper\Data $helper
      */
     public function __construct(
-        \ShipperHQ\Shipper\Helper\Data $helper
+        \ShipperHQ\AddressAutocomplete\Helper\Data $helper
     ) {
-    
+
         $this->helper = $helper;
     }