Merge dev branch into master branch (publish the module on Addons)

Readme.md

@@ -43,3 +43,11 @@ This module is shipped with a testsuite using PHPUnit, you need Composer to inst
 composer install
 composer test
 ```
+
+### Versions of PrestaShop supported
+
+This module is compatible with 1.6.1.x and 1.7.x versions.
+
+> As of 31th of october, 2018, PrestaShop 1.6.1.x will only receives security patches.
+
+This module is maintained for 1.7.4.x and above *only*.

classes/GamificationTools.php

@@ -64,7 +64,7 @@ public static function retrieveJsonApiFile($url, $withResponseHeaders = false)
         curl_setopt($curl, CURLOPT_ENCODING, 'gzip');
         curl_setopt($curl, CURLOPT_USERAGENT, 'gzip');
         curl_setopt($curl, CURLOPT_HEADER, $withResponseHeaders);
-        curl_setopt($curl, CURLOPT_RETURNTRANSFER, $withResponseHeaders);
+        curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
 
         $content = curl_exec($curl);
 

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>gamification</name>
 	<displayName><![CDATA[Merchant Expertise]]></displayName>
-	<version><![CDATA[2.1.0]]></version>
+	<version><![CDATA[2.2.0]]></version>
 	<description><![CDATA[Become an e-commerce expert within the blink of an eye!]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[administration]]></tab>

gamification.php

@@ -46,10 +46,10 @@ public function __construct()
     {
         $this->name = 'gamification';
         $this->tab = 'administration';
-        $this->version = '2.1.0';
+        $this->version = '2.2.0';
         $this->author = 'PrestaShop';
         $this->ps_versions_compliancy = array(
-            'min' => '1.7.0.0',
+            'min' => '1.6.1.0',
         );
 
         parent::__construct();
@@ -205,7 +205,12 @@ public function hookDisplayBackOfficeHeader()
 
         if (method_exists($this->context->controller, 'addJquery')) {
             $this->context->controller->addJquery();
-            $this->context->controller->addCss($this->_path.'views/css/gamification.css');
+            $cssFile = 'gamification.css';
+            if (version_compare(_PS_VERSION_, '1.7.0.0', '<=')) {
+                $cssFile = 'gamification-1.6.css';
+            }
+
+            $this->context->controller->addCss($this->_path.'views/css/'. $cssFile);
 
             //add css for advices
             $advices = Advice::getValidatedByIdTab($this->context->controller->id, true);
@@ -298,6 +303,7 @@ public function refreshDatas($iso_lang = null)
         }
 
         $cache_file = $this->cache_data.'data_'.strtoupper($iso_lang).'_'.strtoupper($iso_currency).'_'.strtoupper($iso_country).'.json';
+
         if (!$this->isFresh($cache_file, 86400)) {
             if ($this->getData($iso_lang)) {
                 $data = Tools::jsonDecode(Tools::file_get_contents($cache_file));
@@ -350,7 +356,7 @@ public function getData($iso_lang = null)
         $versioning = '?v='.$this->version.'&ps_version='._PS_VERSION_;
         $data = GamificationTools::retrieveJsonApiFile($this->url_data.$file_name.$versioning);
 
-        return (bool)file_put_contents($this->cache_data.'data_'.strtoupper($iso_lang).'_'.strtoupper($iso_currency).'_'.strtoupper($iso_country).'.json', $data);
+        return (bool) file_put_contents($this->cache_data.'data_'.strtoupper($iso_lang).'_'.strtoupper($iso_currency).'_'.strtoupper($iso_country).'.json', $data, FILE_USE_INCLUDE_PATH);
     }
 
     public function processCleanAdvices()

tools/install_module.sh

@@ -14,4 +14,12 @@ rm -Rf     $TRAVIS_BUILD_DIR/modules/$1/*
 cp -Rf    $MODULE_DIR/*              $TRAVIS_BUILD_DIR/modules/$1/
 
 # Enable the Module
-php bin/console prestashop:module install $1
+case $PS_VERSION in
+    1.7.0.x|1.7.1.x|1.7.2.x|1.7.3.x)
+        sql_insert="INSERT INTO ps_module (name, active, version) VALUES ('$1', 1 , 'test');"
+        mysql -D prestashop -e $sql_insert
+    ;;
+    *)
+        php bin/console prestashop:module install $1
+    ;;
+esac