image salle and ignore siege configs

bornes/assets/js/app.js

@@ -1602,12 +1602,12 @@ app.controller("CaisseController", ['$http', '$scope', '$controller', '$timeout'
         }
 
         if (msg && msg.salle) {
-            $("#waitImage").attr("src", "/" + msg.salle + "?" + new Date().getTime());
+            $("#waitImage").attr("src", that.params.subfolder + msg.salle + "?" + new Date().getTime());
         } else {
             if (that.params.salle) {
-                $("#waitImage").attr("src", "/" + that.params.salle + "?" + new Date().getTime());
+                $("#waitImage").attr("src", that.params.subfolder + that.params.salle + "?" + new Date().getTime());
             } else {
-                $("#waitImage").attr("src", "/assets/img/salle.jpg" + "?" + new Date().getTime());
+                $("#waitImage").attr("src", that.params.subfolder+"/assets/img/salle.jpg" + "?" + new Date().getTime());
             }
         }
     };

inc/settingsNetisse.php

@@ -22,7 +22,7 @@ $GLOBALS["SERVER_CRON"] = true;
 $APP_CONF = array();
 $APP_CONF["PACKAGE"] = "WTS Avancée plus";
 $APP_CONF["VERSION"] = "3.4.0";
-$APP_CONF["SIEGE"] = array("ENABLED" => true, "PATH" => "../siege");
+$APP_CONF["SIEGE"] = array("ENABLED" => false, "PATH" => "../siege");
 $APP_CONF["ASSETS_VERSION"] = "2.1.5";
 $GLOBALS["APP_CONF"] = $APP_CONF;
 
@@ -239,21 +239,21 @@ $BO_CONF["AGENCE"]["MULTIPLE_TYPES"] = false;
 $BO_CONF["AGENCE"]["ACTIVITY"] = true;
 $BO_CONF["AGENCE"]["LEGENDE"] = true;
 $BO_CONF["AGENCE"]["TYPES_TABLE"] = false;
-$BO_CONF["AGENCE"]["SIEGE"]["ENABLED"] = true;
-$BO_CONF["AGENCE"]["SIEGE"]["EVENTS"] = true;
-$BO_CONF["AGENCE"]["SIEGE"]["EVENTS_BY_AGENCY"] = true;
-$BO_CONF["AGENCE"]["SIEGE"]["SITEMAP"] = true;
-$BO_CONF["AGENCE"]["SIEGE"]["CHOICES"] = array("site-map", "shipping", "events");
-$BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["salle"]["width"] = 788;
-$BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["salle"]["height"] = 655;
-$BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["site-map"]["width"] = 1400;
-$BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["site-map"]["height"] = 700;
-$BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["CONSEILLER"]["photo"]["width"] = 142;
-$BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["CONSEILLER"]["photo"]["height"] = 142;
-$BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["entite"]["width"] = 120;
-$BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["entite"]["height"] = 120;
-$BO_CONF["AGENCE"]["SIEGE"]["SALLE"] = "siege/assets/img/salle.jpg";
-$BO_CONF["AGENCE"]["SIEGE"]["RDV"]["COLOR"] = "#012261";
+// $BO_CONF["AGENCE"]["SIEGE"]["ENABLED"] = false;
+// $BO_CONF["AGENCE"]["SIEGE"]["EVENTS"] = false;
+// $BO_CONF["AGENCE"]["SIEGE"]["EVENTS_BY_AGENCY"] = false;
+// $BO_CONF["AGENCE"]["SIEGE"]["SITEMAP"] = false;
+// $BO_CONF["AGENCE"]["SIEGE"]["CHOICES"] = array("site-map", "shipping", "events");
+// $BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["salle"]["width"] = 788;
+// $BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["salle"]["height"] = 655;
+// $BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["site-map"]["width"] = 1400;
+// $BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["site-map"]["height"] = 700;
+// $BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["CONSEILLER"]["photo"]["width"] = 142;
+// $BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["CONSEILLER"]["photo"]["height"] = 142;
+// $BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["entite"]["width"] = 120;
+// $BO_CONF["AGENCE"]["SIEGE"]["IMAGES"]["entite"]["height"] = 120;
+// $BO_CONF["AGENCE"]["SIEGE"]["SALLE"] = "siege/assets/img/salle.jpg";
+// $BO_CONF["AGENCE"]["SIEGE"]["RDV"]["COLOR"] = "#012261";
 $BO_CONF["HIDE_PILE_MENU"] = true;
 $BO_CONF["MOTIF"]["ENABLED"] = true;
 $BO_CONF["MOTIF"]["COLORS"] = false;
@@ -298,5 +298,7 @@ $BO_CONF["SECURITY"]["HASH"] = "4Mb2llgMrcwuTu3cXWOr7kFPxxlf9SxdGwx4ofus0YJyDdOg
 $BO_CONF["VERSION"] = "3.5.0";
 $BO_CONF["ONLY_AGENCY_FROM_PILE"] = true;
 
+$GLOBALS["SUBFOLDER"] = true;
+
 $GLOBALS["BO_CONF"] = $BO_CONF;
 ?>