20.20.2 SHQ18-774 Ensure correct store configuration is used in admin…

… orders
shipperhq · Sep 19, 2018 · 3d2c7f5 · 3d2c7f5 · squeegy06 · Sep 28, 2018
1 parent 91ecdcd
commit 3d2c7f5
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG-PUBLIC.md b/CHANGELOG-PUBLIC.md
@@ -292,3 +292,7 @@ SHQ18-155 support map and location details for in store pickup
 SHQ18-511 Fix tooltips breaking checkout when method has special chars
 
 
+## 20.20.2 (2018-09-19)
+SHQ18-774 Ensure correct store configuration is used in admin orders
+
+
diff --git a/CHANGELOG.MD b/CHANGELOG.MD
@@ -292,3 +292,7 @@ SHQ18-155 support map and location details for in store pickup
 SHQ18-511 Fix tooltips breaking checkout when method has special chars
 
 
+## 20.20.2 (2018-09-19)
+SHQ18-774 Ensure correct store configuration is used in admin orders
+
+
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Once installed, you can configure with your ShipperHQ platform credentials to pr
 
 Compatibility
 -------------
-- Magento >= 2.0 (Incl 2.2.x)
+- Magento >= 2.1 (Including 2.2.x)
 
 - Supports both Magento Opensource (Community) and Magento Commerce (Enterprise)
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "shipperhq/module-shipper",
     "description": "Magento Shipping integration with ShipperHQ",
     "type": "magento2-module",
-    "version": "20.20.1",
+    "version": "20.20.2",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

diff --git a/src/Model/Carrier/Processor/ShipperMapper.php b/src/Model/Carrier/Processor/ShipperMapper.php
@@ -307,7 +307,8 @@ public function getShipperTranslation($magentoRequest)
             $shipperHQRequest->setCarrierId($carrierId);
         }
 
-        $storeId = $magentoRequest->getStoreId();
+        //SHQ18-774
+        $storeId = $magentoRequest->getQuote()->getStoreId() ? $magentoRequest->getQuote()->getStoreId() : $magentoRequest->getStoreId();
         $ipAddress = $magentoRequest->getIpAddress();
         $shipperHQRequest->setSiteDetails($this->getSiteDetails($storeId, $ipAddress));
         $shipperHQRequest->setCredentials($this->getCredentials($storeId));

diff --git a/src/composer.json b/src/composer.json
@@ -2,7 +2,7 @@
   "name": "shipperhq/module-shipper",
   "description": "Magento Shipping integration with ShipperHQ",
   "type": "magento2-module",
-  "version": "20.20.1",
+  "version": "20.20.2",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

diff --git a/src/etc/config.xml b/src/etc/config.xml
@@ -57,7 +57,7 @@
                 <ws_timeout>30</ws_timeout>
                 <use_cache>0</use_cache>
                 <always_use_cache>1</always_use_cache>
-                <extension_version>20.20.1</extension_version>
+                <extension_version>20.20.2</extension_version>
                 <allowed_methods></allowed_methods>
                 <magento_version></magento_version>
             </shipper>