Merge branch 'release/1.3.5'

classyllama · Mar 5, 2018 · cf4280b · cf4280b
2 parents e84bb2b + cf7a931
commit cf4280b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.3.5 (2018-03-05)
+
+* Fix issue where sometimes the connection credentials fail when assigned at website level [#112](https://github.com/classyllama/ClassyLlama_AvaTax/issues/112)
+
 ### 1.3.4 (2018-02-14)
 
 * Fix problem where customer can't save edited address in address book [#110](https://github.com/classyllama/ClassyLlama_AvaTax/issues/110)

diff --git a/Framework/AppInterface.php b/Framework/AppInterface.php
@@ -20,5 +20,5 @@ interface AppInterface
     /**
      * If this is updated it must also be updated in composer.json
      */
-    const APP_VERSION = '1.3.4';
+    const APP_VERSION = '1.3.5';
 }
diff --git a/Helper/Config.php b/Helper/Config.php
@@ -591,13 +591,14 @@ public function getDevelopmentLicenseKey($store, $scopeType = ScopeInterface::SC
      * Get development company code from config
      *
      * @param $store
+     * @param $scopeType
      * @return string
      */
-    public function getDevelopmentCompanyCode($store)
+    public function getDevelopmentCompanyCode($store, $scopeType = ScopeInterface::SCOPE_STORE)
     {
         return (string)$this->scopeConfig->getValue(
             self::XML_PATH_AVATAX_DEVELOPMENT_COMPANY_CODE,
-            ScopeInterface::SCOPE_STORE,
+            $scopeType,
             $store
         );
     }

diff --git a/Observer/ConfigSaveObserver.php b/Observer/ConfigSaveObserver.php
@@ -188,15 +188,15 @@ protected function checkCredentialsForMode($scopeId, $scopeType, $mode)
             if (
                 $this->config->getAccountNumber($scopeId, $scopeType) != ''
                 && $this->config->getLicenseKey($scopeId, $scopeType) != ''
-                && $this->config->getCompanyCode($scopeId) != ''
+                && $this->config->getCompanyCode($scopeId, $scopeType) != ''
             ) {
                 return true;
             }
         } else {
             if (
                 $this->config->getDevelopmentAccountNumber($scopeId, $scopeType) != ''
                 && $this->config->getDevelopmentLicenseKey($scopeId, $scopeType) != ''
-                && $this->config->getDevelopmentCompanyCode($scopeId) != ''
+                && $this->config->getDevelopmentCompanyCode($scopeId, $scopeType) != ''
             ) {
                 return true;
             }

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "classyllama/module-avatax",
     "type": "magento2-module",
-    "version": "1.3.4",
+    "version": "1.3.5",
     "license": "OSL-3.0",
     "require": {
         "magento/framework": "^100.1.0|101.0.*",