Merge branch 'release/1.4.5'

classyllama · Sep 14, 2018 · 93b475e · 93b475e
2 parents e1528cc + af41353
commit 93b475e
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+### 1.4.5 (2018-09-14)
+
+* Fix issue where saving AvaTax credentials at the website scope can result in an error [#171](https://github.com/classyllama/ClassyLlama_AvaTax/issues/171)
+
 ### 1.4.4 (2018-09-13)
 
 * Fix issue where invalid/partial zip code values result in errors logged [#122](https://github.com/classyllama/ClassyLlama_AvaTax/issues/122)

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.4.4';
+    const APP_VERSION = '1.4.5';
 }
diff --git a/Framework/Interaction/Tax.php b/Framework/Interaction/Tax.php
@@ -306,7 +306,8 @@ public function getTaxService(
         $scopeType = \Magento\Store\Model\ScopeInterface::SCOPE_STORE
     ) {
         if (is_null($type)) {
-            $type = $this->config->getLiveMode($storeId) ? Config::API_PROFILE_NAME_PROD : Config::API_PROFILE_NAME_DEV;
+            $type = $this->config->getLiveMode($storeId, $scopeType)
+                ? Config::API_PROFILE_NAME_PROD : Config::API_PROFILE_NAME_DEV;
         }
         if (!isset($this->taxServiceSoap[$type])) {
             $this->config->createAvaTaxProfile($storeId, $scopeType);

diff --git a/Helper/Config.php b/Helper/Config.php
@@ -271,7 +271,7 @@ public function __construct(
      */
     public function createAvaTaxProfile($storeId, $scopeType = ScopeInterface::SCOPE_STORE)
     {
-        if ($this->getLiveMode($storeId)) {
+        if ($this->getLiveMode($storeId, $scopeType)) {
             $this->avaTaxConfigFactory->create(
                 [
                     'name' => self::API_PROFILE_NAME_PROD,
@@ -546,11 +546,11 @@ public function getLicenseKey($store, $scopeType = ScopeInterface::SCOPE_STORE)
      * @param $store
      * @return string
      */
-    public function getCompanyCode($store)
+    public function getCompanyCode($store, $scopeType = ScopeInterface::SCOPE_STORE)
     {
         return (string)$this->scopeConfig->getValue(
             self::XML_PATH_AVATAX_PRODUCTION_COMPANY_CODE,
-            ScopeInterface::SCOPE_STORE,
+            $scopeType,
             $store
         );
     }

diff --git a/Observer/ConfigSaveObserver.php b/Observer/ConfigSaveObserver.php
@@ -144,7 +144,8 @@ protected function sendPing($scopeId, $scopeType)
         }
 
         $message = '';
-        $type = $this->config->getLiveMode($scopeId, $scopeType) ? Config::API_PROFILE_NAME_PROD : Config::API_PROFILE_NAME_DEV;
+        $type = $this->config->getLiveMode($scopeId, $scopeType)
+            ? Config::API_PROFILE_NAME_PROD : Config::API_PROFILE_NAME_DEV;
         if ($this->checkCredentialsForMode($scopeId, $scopeType, $type)) {
             try {
                 $result = $this->interactionTax->getTaxService($type, $scopeId, $scopeType)->ping();
@@ -155,7 +156,7 @@ protected function sendPing($scopeId, $scopeType)
                 } elseif (is_object($result) && $result->getResultCode() == \AvaTax\SeverityLevel::$Success) {
                     $this->messageManager->addSuccess(
                         __('Successfully connected to AvaTax using the '
-                            . '<a href="#row_tax_avatax_connection_settings_header">%1 credentials</a>', $type
+                            . '<a href="#row_tax_avatax_connection_settings_header">%1 credentials</a>.', $type
                         )
                     );
                 }

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