Merge pull request #330 from fyndiq/v1.0.4

Bump version
fyndiq · Feb 24, 2016 · 04a2515 · 04a2515
2 parents 07c22d7 + 15278da
commit 04a2515
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/src/backoffice/FmUtils.php b/src/backoffice/FmUtils.php
@@ -7,7 +7,7 @@ class FyndiqProductSKUNotFound extends Exception
 class FmUtils
 {
     const MODULE_NAME = 'fyndiqmerchant';
-    const VERSION = '1.0.3';
+    const VERSION = '1.0.4';
     const COMMIT = 'XXXXXX';
     const REPOSITORY_PATH = 'fyndiq/fyndiq-prestashop-module/';
     const DISABLE_UPDATE_CHECK = 0;

diff --git a/src/backoffice/frontend/css/main.css b/src/backoffice/frontend/css/main.css
@@ -8,20 +8,20 @@
 .center {
   text-align: center; }
 
-.icon {
+.fm-product-panel .icon {
   border-radius: 50%;
   border: 3px solid #fff;
   display: inline-block;
   height: 13px;
   vertical-align: middle;
   width: 13px; }
-  .icon.pending {
+  .fm-product-panel .icon.pending {
     background-color: #f08c48; }
-  .icon.on {
+  .fm-product-panel .icon.on {
     background-color: #83c070; }
-  .icon.noton {
+  .fm-product-panel .icon.noton {
     background-color: #e85353; }
-  .icon.big {
+  .fm-product-panel .icon.big {
     border: 0;
     height: 20px;
     width: 20px; }
@@ -320,7 +320,7 @@
 .fm-products-list-container .prices input:disabled {
   background-color: #e3e3e3; }
 
-.info {
+p.info {
   margin: 1em; }
 
 .fm-product-list-controls,

diff --git a/src/backoffice/includes/shared b/src/backoffice/includes/shared
diff --git a/src/backoffice/models/FmOrder.php b/src/backoffice/models/FmOrder.php
@@ -37,8 +37,12 @@ public function install()
             created timestamp DEFAULT CURRENT_TIMESTAMP);';
         $res &= $this->fmPrestashop->dbGetInstance()->Execute($sql, false);
 
-        $sql = 'CREATE INDEX orderIndexNew ON ' . $tableName . ' (fyndiq_orderid);';
-        $res &= $this->fmPrestashop->dbGetInstance()->Execute($sql, false);
+        try{
+            // Index creation will fail if this is reinstall
+            $sql = 'CREATE INDEX orderIndexNew ON ' . $tableName . ' (fyndiq_orderid);';
+            $this->fmPrestashop->dbGetInstance()->Execute($sql, false);
+        } catch (Exception $e) {
+        }
 
         return (bool)$res;
     }

diff --git a/src/config.xml b/src/config.xml
@@ -2,7 +2,7 @@
 <module>
 	<name>fyndiqmerchant</name>
 	<displayName><![CDATA[Fyndiq]]></displayName>
-	<version><![CDATA[1.0.3]]></version>
+	<version><![CDATA[1.0.4]]></version>
 	<description><![CDATA[Export your products to Fyndiq and import and handle Fyndiq Orders in Prestashop.]]></description>
 	<author><![CDATA[Fyndiq AB]]></author>
 	<tab><![CDATA[market_place]]></tab>