Merge pull request #26 from surprisehighway/release/v2.1.2

Release/v2.1.2

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.1.2
+### Fixed
+- Skip address validation for estimated addresses to avoid errors with incomplete addresses. [#22](https://github.com/surprisehighway/craft-avatax/issues/22)
+- Fixed an issue where updating the shipping state did not refresh the cached tax. [#24](https://github.com/surprisehighway/craft-avatax/issues/24)
+- Fixed an issue where addresses returned by Avalara as unresolved were still considered valid. [#25](https://github.com/surprisehighway/craft-avatax/issues/25)
+
 ## 2.1.1
 ### Fixed
 - Fixed an issue where settings fields were readonly even when not being overridden by config file. [#20](https://github.com/surprisehighway/craft-avatax/issues/20)

composer.json

@@ -2,7 +2,7 @@
     "name": "surprisehighway/craft-avatax",
     "description": "Calculate and add sales tax to an order's base tax using Avalara's Avatax service.",
     "type": "craft-plugin",
-    "version": "2.1.1",
+    "version": "2.1.2",
     "keywords": [
         "craft",
         "cms",

src/controllers/JsonController.php

@@ -82,7 +82,7 @@ public function actionValidateAddress()
 
         $response = $taxService->getValidateAddress($address);
 
-        if(!empty($response->validatedAddresses) || isset($response->coordinates))
+        if(!empty($response->validatedAddresses) && isset($response->coordinates))
         {
             return $this->asJson([
                 'success' => true,

src/services/SalesTaxService.php

@@ -356,9 +356,15 @@ public function validateAddress(Address $address)
             return false;
         }
 
+        if($address->isEstimated) {
+            Avatax::info(__FUNCTION__.'(): Skipping address validation for estimated shipping.');
+
+            return false;
+        }
+
         $response = $this->getValidateAddress($address);
 
-        if(!empty($response->validatedAddresses) || isset($response->coordinates))
+        if(!empty($response->validatedAddresses) && isset($response->coordinates))
         {
             return true;
         }
@@ -768,6 +774,6 @@ private function getAddressSignature(Address $address)
         $zipCode = $address->zipCode;
         $country = $this->getCountry($address);
 
-        return md5($address1.$address2.$city.$zipCode.$country);
+        return md5($address1.$address2.$city.$state.$zipCode.$country);
     }
 }