Merge pull request #6 from webshopapps/SHQ16-992_A

SHQ16-992 implement config switch for caching rates
shipperhq · Feb 2, 2017 · 300b8ab · 300b8ab
2 parents b83b72f + 2cf596c
commit 300b8ab
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/src/Helper/CarrierCache.php b/src/Helper/CarrierCache.php
@@ -51,12 +51,18 @@ class CarrierCache extends \Magento\Framework\App\Helper\AbstractHelper
      */
     protected static $quotesCache = [];
 
+    protected $useCache = false;
+
     /**
      * @param Context $context
      */
-    public function __construct(\Magento\Framework\App\CacheInterface $cache, \Magento\Framework\App\Helper\Context $context)
+    public function __construct(\Magento\Framework\App\CacheInterface $cache,
+                                \Shipperhq\Shipper\Helper\Data $shipperDataHelper,
+                                \Magento\Framework\App\Helper\Context $context)
     {
         $this->cache = $cache;
+        $this->shipperDataHelper = $shipperDataHelper;
+        $this->useCache = $this->shipperDataHelper->getConfigValue('carriers/shipper/use_cache');
         parent::__construct($context);
     }
 
@@ -90,9 +96,12 @@ protected function getQuotesCacheKey($requestParams, $carrierCode)
     public function getCachedQuotes($requestParams, $carrierCode)
     {
         $key = $this->getQuotesCacheKey($requestParams, $carrierCode);
-       // return isset(self::$quotesCache[$key]) ? self::$quotesCache[$key] : null;
-        $cachedResult = $this->cache->load($key);
+        $cachedResult = false;
+        if($this->useCache) {
+            $cachedResult = $this->cache->load($key);
+        }
         return $cachedResult ? unserialize($cachedResult) : $cachedResult;
+
     }
 
     /**
@@ -104,9 +113,10 @@ public function getCachedQuotes($requestParams, $carrierCode)
      */
     public function setCachedQuotes($requestParams, $response, $carrierCode)
     {
-        $key = $this->getQuotesCacheKey($requestParams, $carrierCode);
-        $this->cache->save(serialize($response), $key, [self::CACHE_TAG]);
-       // self::$quotesCache[$key] = $response;
+        if($this->useCache) {
+            $key = $this->getQuotesCacheKey($requestParams, $carrierCode);
+            $this->cache->save(serialize($response), $key, [self::CACHE_TAG]);
+        }
         return $this;
     }