tagged as 1.15.1

.gitignore

@@ -25,11 +25,11 @@ lang/es/tmp/*.n
 
 www/lang/*.mo
 
-www/file/*
-
 www/js/app.js
 www/js/libs.js
 
+www/file/*
+
 www/css/.sass-cache
 www/css/*.css
 !www/css/bootstrap.min.css

.semver_git_tag

@@ -1 +1 @@
-1.11.1
+1.15.1

Makefile

@@ -73,8 +73,9 @@ templates:
 	haxe cagette.hxml -D i18n_generation
 	@make LANG=fr ctemplates
 	msgfmt www/lang/texts_fr.po -o www/lang/texts_fr.mo
+
 	chown www-data:www-data -R www
-	chown www-data:www-data -R lang/fr
+	chown www-data:www-data -R lang
 
 ctemplates:
 	(cd lang/$(LANG)/tpl; temploc2 -macros macros.mtt -output ../tmp/ *.mtt */*.mtt */*/*.mtt)

README.md

@@ -1,13 +1,15 @@
 CAGETTE PEI
 ===========
 
+Cagette Péi est un logiciel libre qui favorise les circuits courts.
+Il a été adapté pour les besoins des AMAPs sur le marché réunionnais.
+
 > <french>
-> Fourche du logiciel [Cagette.net](https://github.com/CagetteNet) à partir de la version 0.9.2 Novembre 2018
+> Fourche du logiciel [Cagette.net](https://github.com/CagetteNet) à partir de la version 0.9.2 Novembre 2018. Certaines portions de code n'étant plus disponibles en téléchargement à partir de cette date, le logiciel a été repris, adapté puis réactualisé. Pour plus d'information, contact@artcode.re
-> 
-> Certaines portions du code source de Cagette.net n'étant plus disponibles en téléchargement à partir de cette date, 
-> j'ai repris sur la base d'un existant pour adapter au marché local réunionnais et leurs AMAPéi.
 > </french>
 
+![Screenshot](www/img/screenshot.png)
+
 ## PREREQUISITE MARIADB
 
 ```bash
@@ -28,30 +30,24 @@ curl -L https://deb.nodesource.com/setup_8.x | bash -
 apt install -y nodejs=8.17.0-1nodesource1
 apt install -y sudo haxe apache2 make git imagemagick gettext libapache2-mod-neko mariadb-server sendemail libio-socket-ssl-perl libnet-ssleay-perl
 
-mysql -u root <<EOF
-CREATE DATABASE cagettepei;
-GRANT ALL ON cagettepei.* TO 'cagettepei'@'%' IDENTIFIED BY 'cagettepei';
-EOF
-
 cd /var/www
 git clone https://git.artcode.re/cagetters/cagettepei.git
 cd cagettepei
 make install ENV=dev
+
 vim /etc/apache2/sites-available/cagettepei.conf
 ```
 
+
 ```
 <VirtualHost *:80>
-  ServerName cagettepei
+DocumentRoot /var/www/cagettepei/www
-  DirectoryIndex index.n
+DirectoryIndex index.n
-  DocumentRoot /var/www/cagettepei/www/
+CustomLog ${APACHE_LOG_DIR}/cagettepei/access.log combined
-
-  CustomLog ${APACHE_LOG_DIR}/cagettepei/access.log combined
-  ErrorLog ${APACHE_LOG_DIR}/cagettepei/debug.log
-  ErrorLogFormat "[%{uc}t] %M"
 </VirtualHost>
 ```
 
+
 ```bash
 sed -i '/<Directory \/var\/www\/>/,/<\/Directory>/ s/AllowOverride None/AllowOverride All/' /etc/apache2/apache2.conf
 a2dissite 000-default.conf
@@ -69,18 +65,18 @@ vim config.xml
 ```
 ```
 <config
-host="<DOMAIN.TLD>"
+host = "<DOMAIN.TLD>"
-database="mysql://cagettepei:cagettepei@localhost/cagettepei"
+database = "mysql://cagettepei:cagettepei@localhost/cagettepei"
-key="<SECRET_PHRASE>"
+key = "<SECRET_PHRASE>"
 default_email = "<EMAIL>"
 webmaster_email = "<EMAIL>"
 
-debug="0"
+debug = "0"
-sqllog="0"
+sqllog = "0"
-maintain="0"
+maintain = "0"
 
-cache="1"
+cache = "1"
-cachetpl="0"
+cachetpl = "0"
 />
 ```
 
@@ -91,7 +87,7 @@ go to http://localhost for ERROR + table regeneration, then
 
 ```
 cd /var/www/cagettepei
-SECRET=$(grep key= config.xml | cut -d= -f2 | cut -d'"' -f2)
+SECRET=$(grep key config.xml | cut -d= -f2 | cut -d'"' -f2)
 echo "insert into User values (1,'fr',MD5('${SECRET}cagettepei'),1,'Administrateur','Cagette Péi', 'admin', null, null, null, null, null, null, null, null, null, now(), now(),6,null, null)" | mysql -h localhost -u cagettepei -pcagettepei cagettepei
 ```
 

js/App.hx

@@ -1,33 +1,33 @@
-//React lib
+// React lib
 import react.ReactMacro.jsx;
 import react.ReactDOM;
 import react.*;
 import react.router.*;
-//custom components
+// custom components
 import react.order.*;
 import react.product.*;
 import react.store.*;
 import react.map.*;
 import react.user.*;
 
-//require bootstrap JS since it's bundled with browserify
+// require bootstrap JS since it's bundled with browserify
-//@:jsRequire('bootstrap') extern class Bootstrap{}
+// @:jsRequire('bootstrap') extern class Bootstrap{}
-//@:jsRequire('jquery') extern class JQ extends js.jquery.JQuery{}
+// @:jsRequire('jquery') extern class JQ extends js.jquery.JQuery{}
-
 class App {
+	public static var instance:App;
 
-	public static var instance : App;
+	public var LANG:String;
-	public var LANG : String;
+	public var currency:String; // currency symbol like € or $
-	public var currency : String; //currency symbol like € or $
+	public var t:sugoi.i18n.GetText; // gettext translator
-	public var t : sugoi.i18n.GetText;//gettext translator
 
-	//i dont want to use redux now... saved state from react.OrderBox
+	// i dont want to use redux now... saved state from react.OrderBox
-	public static var SAVED_ORDER_STATE : Dynamic;
+	public static var SAVED_ORDER_STATE:Dynamic;
 
-	function new(?lang="fr",?currency="€") {
+	function new(?lang = "fr", ?currency = "€") {
-		//singleton
+		// singleton
 		instance = this;
-		if(lang!=null) this.LANG = lang;
+		if (lang != null)
+			this.LANG = lang;
 		this.currency = currency;
 	}
 
@@ -39,7 +39,7 @@ class App {
 		return new js.JQuery(r);
 	}
 
-	public static inline function jq(r:Dynamic):js.jquery.JQuery{
+	public static inline function jq(r:Dynamic):js.jquery.JQuery {
 		return new js.jquery.JQuery(r);
 	}
 
@@ -47,8 +47,7 @@ class App {
 	 * The JS App will be available as "_" in the document.
 	 */
 	public static function main() {
-		
+		// untyped js.Browser.window.$ = js.Lib.require("jQuery");
-		//untyped js.Browser.window.$ = js.Lib.require("jQuery");
 		untyped js.Browser.window._ = new App();
 	}
 
@@ -56,32 +55,31 @@ class App {
 		return new ShopCart();
 	}
 
-	public function getTagger(cid:Int ) {
+	public function getTagger(cid:Int) {
 		return new Tagger(cid);
 	}
 
 	public function getTuto(name:String, step:Int) {
-		new Tuto(name,step);
+		new Tuto(name, step);
 	}
 
 	/**
 	 * remove method for IE compat
 	 */
-	public function remove(el:js.html.Element){
+	public function remove(el:js.html.Element) {
-		if (el == null) return;
+		if (el == null)
+			return;
 		el.parentElement.removeChild(el);
 	}
 
-	public function getVATBox(ttcprice:Float,currency:String,rates:String,vat:Float,formName:String){
+	public function getVATBox(ttcprice:Float, currency:String, rates:String, vat:Float, formName:String) {
-		
 		var input = js.Browser.document.querySelector('form input[name="${formName}_price"]');
 
-		remove( js.Browser.document.querySelector('form input[name="${formName}_vat"]').parentElement.parentElement );
+		remove(js.Browser.document.querySelector('form input[name="${formName}_vat"]').parentElement.parentElement);
 
 		ReactDOM.render(jsx('<$VATBox ttc="$ttcprice" currency="$currency" vatRates="$rates" vat="$vat" formName="$formName"/>'), input.parentElement);
 
-		//remove(input);
+		// remove(input);
-		
 	}
 
 	/*public function getProductComposer(){
@@ -89,7 +87,6 @@ class App {
 			//ReactDOM.render(jsx('<$ComposerApp/>'), js.Browser.document.getElementById("app"));
 		//});
 	}*/
-
 	/**
 	 * Removes the form element and replace it by a react js component
 	 * @param	divId
@@ -97,72 +94,71 @@ class App {
 	 * @param	txpProductId
 	 * @param	formName
 	 */
-	public function getProductInput(divId:String, productName:String, txpProductId:String, formName:String ){
+	public function getProductInput(divId:String, productName:String, txpProductId:String, formName:String) {
-
 		js.Browser.document.addEventListener("DOMContentLoaded", function(event) {
+			// dirty stuff to remove "real" input, and replace it by the react one
+			App.j("form input[name='" + formName + "_name']").parent().parent().remove();
+			App.j("form select[name='" + formName + "_txpProductId']")
+				.parent()
+				.parent()
+				.remove();
 
-			//dirty stuff to remove "real" input, and replace it by the react one
+			if (txpProductId == null)
-			App.j("form input[name='"+formName+"_name']").parent().parent().remove();
+				txpProductId = "";
-			App.j("form select[name='" + formName+"_txpProductId']").parent().parent().remove();
 
-			if (txpProductId == null) txpProductId = "";
+			ReactDOM.render(jsx('<$ProductInput productName="$productName" txpProductId="$txpProductId" formName="$formName"/>'),
-
+				js.Browser.document.getElementById(divId));
-			ReactDOM.render(jsx('<$ProductInput productName="$productName" txpProductId="$txpProductId" formName="$formName"/>'),  js.Browser.document.getElementById(divId));
 		});
 	}
 
-	public function initReportHeader(){
+	public function initReportHeader() {
 		ReactDOM.render(jsx('<$ReportHeader />'), js.Browser.document.querySelector('div.reportHeaderContainer'));
 	}
 
-	public function initOrderBox(userId:Int, distributionId:Int, contractId:Int, contractType:Int, date:String, place:String, userName:String, currency:String, hasPayments:Bool,callbackUrl:String){
+	public function initOrderBox(userId:Int, distributionId:Int, contractId:Int, contractType:Int, date:String, place:String, userName:String,
-
+			currency:String, hasPayments:Bool, callbackUrl:String) {
 		untyped App.j("#myModal").modal();
 		var onValidate = function() js.Browser.location.href = callbackUrl;
 		var node = js.Browser.document.querySelector('#myModal .modal-body');
-		ReactDOM.unmountComponentAtNode(node); //the previous modal DOM element is still there, so we need to destroy it
+		ReactDOM.unmountComponentAtNode(node); // the previous modal DOM element is still there, so we need to destroy it
 		ReactDOM.render(jsx('<$OrderBox userId="$userId" distributionId="$distributionId"
 			contractId="$contractId" contractType="$contractType" date="$date" place="$place" userName="$userName"
-			onValidate=$onValidate currency=$currency hasPayments=$hasPayments />'),node,postReact);
+			onValidate=$onValidate currency=$currency hasPayments=$hasPayments />'), node, postReact);
-
 	}
 
-	function postReact(){
+	function postReact() {
 		trace("post react");
-		haxe.Timer.delay(function(){
+		haxe.Timer.delay(function() {
 			untyped jq('[data-toggle="tooltip"]').tooltip();
 			untyped jq('[data-toggle="popover"]').popover();
-		},500);
+		}, 500);
-		
 	}
 
 	public static function roundTo(n:Float, r:Int):Float {
-		return Math.round(n * Math.pow(10,r)) / Math.pow(10,r) ;
+		return Math.round(n * Math.pow(10, r)) / Math.pow(10, r);
 	}
 
-
 	/**
 	 * Ajax loads a page and display it in a modal window
 	 * @param	url
 	 * @param	title
 	 */
-	public function overlay(url:String,?title,?large=true) {
+	public function overlay(url:String, ?title, ?large = true) {
-
+		if (title != null)
-		if (title != null) title = StringTools.urlDecode(title);
+			title = StringTools.urlDecode(title);
 
 		var r = new haxe.Http(url);
 		r.onData = function(data) {
-
+			// setup body and title
-			//setup body and title
 			var m = App.j("#myModal");
 			m.find(".modal-body").html(data);
-			if (title != null) m.find(".modal-title").html(title);
+			if (title != null)
+				m.find(".modal-title").html(title);
 
-			if (!large) m.find(".modal-dialog").removeClass("modal-lg");
+			if (!large)
-
+				m.find(".modal-dialog").removeClass("modal-lg");
-
-			untyped App.j('#myModal').modal(); //bootstrap 3 modal window
 
+			untyped App.j('#myModal').modal(); // bootstrap 3 modal window
 		}
 		r.request();
 	}
@@ -170,24 +166,37 @@ class App {
 	/**
 	 * Displays a login box
 	 */
-	public function loginBox(redirectUrl:String,?message:String,?phoneRequired=false) {
+	public function loginBox(redirectUrl:String, ?message:String, ?phoneRequired = false) {
 		var m = App.j("#myModal");
 		m.find(".modal-title").html("S'identifier");
 		m.find(".modal-dialog").removeClass("modal-lg");
 		untyped m.modal();
-		ReactDOM.render(jsx('<$LoginBox redirectUrl="$redirectUrl" message=$message phoneRequired="$phoneRequired"/>'),  js.Browser.document.querySelector('#myModal .modal-body'));
+		ReactDOM.render(jsx('<$LoginBox redirectUrl="$redirectUrl" message=$message phoneRequired="$phoneRequired"/>'),
+			js.Browser.document.querySelector('#myModal .modal-body'));
 		return false;
 	}
 
 	/**
 	 *  Displays a sign up box
 	 */
-	public function registerBox(redirectUrl:String,?message:String,?phoneRequired=false) {
+	public function registerBox(redirectUrl:String, ?message:String, ?phoneRequired = false) {
 		var m = App.j("#myModal");
 		m.find(".modal-title").html("S'inscrire");
 		m.find(".modal-dialog").removeClass("modal-lg");
 		untyped m.modal();
-		ReactDOM.render(jsx('<$RegisterBox redirectUrl="$redirectUrl" message=$message phoneRequired="$phoneRequired"/>'),  js.Browser.document.querySelector('#myModal .modal-body'));
+		ReactDOM.render(jsx('<$RegisterBox redirectUrl="$redirectUrl" message=$message phoneRequired="$phoneRequired"/>'),
+			js.Browser.document.querySelector('#myModal .modal-body'));
+		return false;
+	}
+
+	public function cookieConsentBox(redirectUrl:String, ?message:String, ?phoneRequired = false) {
+		js.Browser.console.log("cookieConsentBox should load modal...");
+		var m = App.j("#myModal");
+		m.find(".modal-title").html("Consentement aux cookies");
+		m.find(".modal-dialog").removeClass("modal-lg");
+		untyped m.modal();
+		ReactDOM.render(jsx('<$CookieConsentBox redirectUrl="$redirectUrl" message=$message phoneRequired="$phoneRequired"/>'),
+			js.Browser.document.querySelector('#myModal .modal-body'));
 		return false;
 	}
 
@@ -195,7 +204,7 @@ class App {
 		ReactDOM.render(jsx('<$Store date=$date place=$place/>'), js.Browser.document.querySelector('#shop'));
 	}
 
-	public function groupMap(lat:String,lng:String,address:String) {
+	public function groupMap(lat:String, lng:String, address:String) {
 		ReactDOM.render(jsx('<$GroupMapRoot lat="$lat" lng="$lng" address="$address"/>'), js.Browser.document.querySelector('#map'));
 	}
 
@@ -203,19 +212,19 @@ class App {
 	 * Helper to get values of a bunch of checked checkboxes
 	 * @param	formSelector
 	 */
-	public function getCheckboxesId(formSelector:String):Array<String>{
+	public function getCheckboxesId(formSelector:String):Array<String> {
 		var out = [];
 		var checkboxes = js.Browser.document.querySelectorAll(formSelector + " input[type=checkbox]");
-		for ( input in checkboxes ){
+		for (input in checkboxes) {
-			var input : js.html.InputElement = cast input;
+			var input:js.html.InputElement = cast input;
-			if ( input.checked ) out.push(input.value);
+			if (input.checked)
+				out.push(input.value);
 		}
 		return out;
 	}
 
-
 	#if plugins
-	public function getHostedPlugin(){
+	public function getHostedPlugin() {
 		return new hosted.js.App();
 	}
 	#end
@@ -223,40 +232,35 @@ class App {
 	/**
 	 * set up a warning message when leaving the page
 	 */
-	public function setWarningOnUnload(active:Bool, ?msg:String){
+	public function setWarningOnUnload(active:Bool, ?msg:String) {
-		if (active){
+		if (active) {
 			js.Browser.window.addEventListener("beforeunload", warn);
-		}else{
+		} else {
 			js.Browser.window.removeEventListener("beforeunload", warn);
 		}
-
 	}
 
 	function warn(e:js.html.Event) {
 		var msg = "Voulez vous vraiment quitter cette page ?";
-		//js.Browser.window.confirm(msg);
+		// js.Browser.window.confirm(msg);
-		untyped e.returnValue = msg; //Gecko + IE
+		untyped e.returnValue = msg; // Gecko + IE
 		e.preventDefault();
-		return msg; //Gecko + Webkit, Safari, Chrome etc.
+		return msg; // Gecko + Webkit, Safari, Chrome etc.
 	}
 
 	/**
 	 * Anti Doubleclick with btn elements.
 	 * Can be bypassed by adding a .btn-noAntiDoubleClick class
 	 */
-	public function antiDoubleClick(){
+	public function antiDoubleClick() {
-
+		for (n in js.Browser.document.querySelectorAll(".btn:not(.btn-noAntiDoubleClick)")) {
-		for( n in js.Browser.document.querySelectorAll(".btn:not(.btn-noAntiDoubleClick)") ){
+			n.addEventListener("click", function(e:js.html.MouseEvent) {
-			n.addEventListener("click",function(e:js.html.MouseEvent){
 				var x = untyped e.target;
 				x.classList.add("disabled");
-				haxe.Timer.delay(function(){
+				haxe.Timer.delay(function() {
 					x.classList.remove("disabled");
-				},1000);
+				}, 1000);
 			});
 		}
-		
 	}
 }
-
-

js/react/user/CookieConsentBox.hx

@@ -0,0 +1,103 @@
+package react.user;
+
+import react.ReactComponent;
+import react.ReactMacro.jsx;
+import Common;
+
+typedef CookieConsentBoxProps = {
+	redirectUrl:String,
+	message:String,
+	?phoneRequired:Bool
+}
+
+typedef CookieConsentBoxState = {
+	email:String,
+	password:String,
+	error:String
+}
+
+/**
+ * CookieConsent Box
+ * @author fbarbut
+ */
+class CookieConsentBox extends react.ReactComponentOfPropsAndState<CookieConsentBoxProps, CookieConsentBoxState> {
+	public function new(props:CookieConsentBoxProps) {
+		if (props.redirectUrl == null || props.redirectUrl == "null")
+			props.redirectUrl = "/";
+		if (props.message == "")
+			props.message = null;
+		super(props);
+
+		this.state = {email: "", password: "", error: null};
+	}
+
+	function setError(err:String) {
+		this.setState(cast {error: err});
+	}
+
+	override public function render() {
+		return jsx('<div onKeyPress=$onKeyPress>
+			<$Error error="${state.error}" />
+			<$Message message="${props.message}" />
+			<form action="" method="post" className="form-horizontal">
+				<h4>Personnalisation du paramétrage</h4>
+				<p>L\'outil CagettePéi n\'utilise que des cookies nécessaires pour vous aider à naviguer efficacement et à exécuter certaines fonctionnalités. Pas de cookie publicitaire, en provenance de site tiers ou de mesure d\'audience.
+				</p>
+				<p>
+				Seuls les cookies nécessaires sont cruciaux pour les fonctions de base du site Web et celui-ci ne fonctionnera pas comme prévu sans eux. Ces cookies ne stockent aucune donnée personnellement identifiable.
+				</p>
+
+				<p className="text-center">
+					<a onClick={deny} className="btn btn-secondary btn-lg" ><span className="glyphicon glyphicon-remove"></span> Tout Refuser</a>
+					&nbsp;
+					<a onClick={submit} className="btn btn-primary btn-lg" ><span className="glyphicon glyphicon-ok"></span> Tout Accepter</a>
+				</p>
+			</form>
+		</div>');
+
+	}
+
+	/**
+	 * @doc https://facebook.github.io/react/docs/forms.html
+	 */
+	function onChange(e:js.html.Event) {
+		e.preventDefault();
+
+		var name:String = untyped e.target.name;
+		var value:String = untyped /*(e.target.value == "") ? null :*/ e.target.value;
+		Reflect.setField(state, name, value);
+		this.setState(this.state);
+	}
+
+	public function submit(?e:js.html.Event) {
+		// lock button
+		var el:js.html.Element = null;
+		if (e != null) {
+			el = cast e.target;
+			el.classList.add("disabled");
+		}
+		// var cookie = js.Browser.document.cookie;
+		var newCookie = "rgpd=true; SameSite=Lax";
+		js.Browser.document.cookie = newCookie;
+		// js.Browser.window.location.href = props.redirectUrl;
+		js.Browser.window.location.href = '/';
+	}
+
+	public function deny(?e:js.html.Event) {
+		// lock button
+		var el:js.html.Element = null;
+		if (e != null) {
+			el = cast e.target;
+			el.classList.add("disabled");
+		}
+		var newCookie = "rgpd=false; SameSite=Lax";
+		js.Browser.document.cookie = newCookie;
+		// js.Browser.window.location.href = props.redirectUrl;
+		js.Browser.window.location.href = '/';
+	}
+
+	function onKeyPress(e:js.html.KeyboardEvent) {
+		if (e.key == "Enter")
+			submit();
+	}
+}

lang/master/tpl/design.mtt

@@ -123,54 +123,8 @@
 			</div>
 		</div>-->
 
-		<div class="row" id="footer">
+		::use 'footer.mtt'::
-			
-				<div class="col-md-2" >
-					<img width="120" style="border: white 5px solid;" src="/img/logo-mini.jpg" alt="::_("Cagette.net")::" title="Logo ::_("Cagette.net")::"/>
-				</div>
-
-				<div class="col-md-7" style="padding-top:1em">
-					Cagette Péi est un logiciel libre qui favorise les circuits courts.<br/>
-					Il a été adapté pour les besoins des AMAPs sur le marché réunionnais.<br/>
-				</div>
-				
-				<div class="col-md-3" >
-					::_("HELP")::
-					<ul>
-						<li> 
-							<a href="http://www.cagette.net/wiki" target="_blank">::_("Documentation")::</a> 
-						</li>
-						<li>
-							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Proposer une amélioration</a>
-						</li>
-						<li>
-							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Soumettre une anomalie</a>
-						</li>
-					</ul>				
-				
-				</div>
-								
-		</div>
-		
-		<div class="row" id="subfooter">
-			<span>version cagettepei-<a target="_blank" href="https://git.artcode.re/cagetters/cagettepei/src/tag/::VERSION::">::VERSION::</a></span>
-		</div>
-		
-		<div class="row">
-			<div class="col-md-12">			
-				<!--  SQL LOG -->
-				<table class="sqlLog table table-bordered" ::cond sqlLog::>
-				::foreach r sqlLog::
-				<tr ::attr class if(r.bad) 'badSql'::>
-					<td>::r.t::ms</td>
-					<td>::r.length::</td>
-					<td><a href="#" onclick="javascript:alert('::r.explain::');return false;">Exp</a></td>
-					<td><a href="#" onclick="javascript:alert('::r.stack::');return false;">Stack</a></td>
-					<td>::r.sql::</td>
-				</tr>
 		::end::
-				</table>
+
-			</div>
-		</div>
 
 ::end::

lang/master/tpl/footer.mtt

@@ -0,0 +1,56 @@
+		<div class="row" id="footer">
+
+				<div class="col-md-2" >
+					<img width="120" style="border: white 5px solid;" src="/img/logo-mini.jpg" alt="::_("Cagette.net")::" title="Logo ::_("Cagette.net")::"/>
+				</div>
+
+				<div class="col-md-7" style="padding-top:1em">
+					Cagette Péi est un logiciel libre qui favorise les circuits courts.<br/>
+					Il a été adapté pour les besoins des AMAPs sur le marché réunionnais.<br/>
+				</div>
+
+				<div class="col-md-3" >
+					::_("HELP")::
+					<ul>
+						<li>
+							<a href="https://wiki.cagette.net/doku.php" target="_blank">::_("Documentation")::</a>
+						</li>
+						<li>
+							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Proposer une amélioration</a>
+						</li>
+						<li>
+							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Soumettre une anomalie</a>
+						</li>
+					</ul>
+
+				</div>
+
+		</div>
+
+		<div class="row" id="subfooter">
+			<p><a href="/mentions">MENTIONS LÉGALES</a></p>
+			<p>
+				version cagettepei-<a target="_blank" href="https://git.artcode.re/cagetters/cagettepei/src/tag/::VERSION::">::VERSION::</a>
+			</p>
+			::if BANDEAU_REGION::
+			<img src='/img/bandeau_region_france_relance.png' alt='bandeau Région Réunion' width='640'></img>
+			::end::
+
+		</div>
+
+		<div class="row">
+			<div class="col-md-12">
+				<!--  SQL LOG -->
+				<table class="sqlLog table table-bordered" ::cond sqlLog::>
+				::foreach r sqlLog::
+				<tr ::attr class if(r.bad) 'badSql'::>
+					<td>::r.t::ms</td>
+					<td>::r.length::</td>
+					<td><a href="#" onclick="javascript:alert('::r.explain::');return false;">Exp</a></td>
+					<td><a href="#" onclick="javascript:alert('::r.stack::');return false;">Stack</a></td>
+					<td>::r.sql::</td>
+				</tr>
+				::end::
+				</table>
+			</div>
+		</div>

lang/master/tpl/group/view.mtt

@@ -1,6 +1,6 @@
 ::use 'base.mtt'::
 
-	
+<div class="row header" style="margin-top:10px;">
 	<div class="col-md-8 col-md-offset-2" style="margin-top:12px;">
 
 		<!-- Notifications -->
@@ -185,11 +185,19 @@
 
 	</div>
 
-	<div class="col-md-12">
+::if user == null::
-		<div id="footer">
+	<script language="javascript">
-			<a href="::_("http://www.cagette.net")::">::_("Cagette.net, the free software of food direct-selling")::</a>.	
+		if (document.cookie.includes("rgpd=true")) console.log("RGPD consent OK");
-		</div>
+		else {
+			console.log("no consent YET");
+			_.cookieConsentBox('::redirect::');
+		}
+	</script>
+::end::
 
-	</div>
+
+</div>
+::use 'footer.mtt'::
+::end::
 
 ::end::

lang/master/tpl/mentions_legales/default.mtt

@@ -0,0 +1,62 @@
+::use 'design.mtt'::
+
+
+<div class="col-md-9">
+
+<div class="article">
+
+
+			<h4>Mentions Légales</h4>
+			<table class="table table-bordered table-condensed">
+				<tbody><tr>
+					<th>Champ</th>
+					<th>Valeur</th>
+				</tr>
+
+				<tr>
+					<td>Adresse de courrier électronique</td>
+					<td>contact@mangue-et-solidaire.re</td>
+				</tr>
+
+				<tr>
+					<td>Numéro Siren</td>
+					<td>879178739</td>
+				</tr>
+
+				<tr>
+					<td>Numéro Siret</td>
+					<td>87917873900022</td>
+				</tr>
+
+				<tr>
+					<td>Code NAF / APE</td>
+					<td>4711B</td>
+				</tr>
+
+				<tr>
+					<td>Forme juridique et capital</td>
+					<td>Association Loi 1901</td>
+				</tr>
+
+				<tr>
+					<td>Responsable éditorial</td>
+					<td>Yann Jacob</td>
+				</tr>
+
+				<tr>
+					<td>Hébergeur</td>
+					<td><a href="www.artcode.re">Artcode</a></td>
+				</tr>
+			</tbody>
+		</table>
+
+	</div>
+
+
+</div>
+
+
+
+
+
+::end::

lang/master/tpl/user/cookieConsent.mtt

@@ -0,0 +1,14 @@
+::use 'design.mtt'::
+
+<div class="col-md-12" style="height:500px;">
+
+::if user != null::
+	consent agreed
+::else::
+	<script language="javascript">
+		_.cookieConsentBox('::redirect::');
+	</script>
+::end::
+
+</div>
+::end::

package.json

@@ -1,51 +1 @@
-{
+{"name": "cagette-pei", "description": "le logiciel libre du circuit court", "license": "AGPL-3.0", "dependencies": {"bootstrap": "^3.3.4", "eonasdan-bootstrap-datetimepicker": "^4.7.14", "geolib": "^2.0.24", "haxe-modular": "^0.7.0", "jquery": "^2.2.4", "leaflet": "^1.3.1", "react": "^15.6.1", "react-bootstrap-typeahead": "1.4.2", "react-datetime": "^2.9.0", "react-dom": "^15.6.1", "react-leaflet": "^1.8.0", "react-places-autocomplete": "^6.0.2", "react-router": "^4.2.0", "react-router-dom": "^4.2.2"}, "devDependencies": {"babel-preset-es2015": "^6.24.1", "babel-preset-react": "^6.24.1", "babelify": "^7.3.0", "browserify": "^14.4.0", "cross-env": "^5.1.1", "node-sass": "^4.5.3", "npm-run-all": "^4.1.2", "uglify-js": "^3.1.9", "watchify": "^3.9.0"}, "scripts": {"build": "npm-run-all --parallel build:*", "build:js": "haxe cagetteJs.hxml", "build:sass": "node-sass www/css -o www/css", "watch:sass": "npm run build:sass -- --watch", "build2": "babel src -d lib", "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d", "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js", "test": "haxe testsJS.hxml && node js/test/tests.js", "prepush": "npm test"}, "repository": {"type": "git", "url": "git+https://github.com/bablukid/cagette.git"}, "bugs": {"url": "https://github.com/bablukid/cagette/issues"}, "version": "1.15.1"}
-  "name": "cagette-pei",
-  "description": "le logiciel libre du circuit court",
-  "license": "AGPL-3.0",
-  "dependencies": {
-    "bootstrap": "^3.3.4",
-    "eonasdan-bootstrap-datetimepicker": "^4.7.14",
-    "geolib": "^2.0.24",
-    "haxe-modular": "^0.7.0",
-    "jquery": "^2.2.4",
-    "leaflet": "^1.3.1",
-    "react": "^15.6.1",
-    "react-bootstrap-typeahead": "1.4.2",
-    "react-datetime": "^2.9.0",
-    "react-dom": "^15.6.1",
-    "react-leaflet": "^1.8.0",
-    "react-places-autocomplete": "^6.0.2",
-    "react-router": "^4.2.0",
-    "react-router-dom": "^4.2.2"
-  },
-  "devDependencies": {
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-react": "^6.24.1",
-    "babelify": "^7.3.0",
-    "browserify": "^14.4.0",
-    "cross-env": "^5.1.1",
-    "node-sass": "^4.5.3",
-    "npm-run-all": "^4.1.2",
-    "uglify-js": "^3.1.9",
-    "watchify": "^3.9.0"
-  },
-  "scripts": {
-    "build": "npm-run-all --parallel build:*",
-    "build:js": "haxe cagetteJs.hxml",
-    "build:sass": "node-sass www/css -o www/css",
-    "watch:sass": "npm run build:sass -- --watch",
-    "build2": "babel src -d lib",
-    "libs:dev": "browserify js/libs/libs.js -o www/js/libs.js -d",
-    "libs:prod": "cross-env NODE_ENV=production browserify js/libs/libs.js | uglifyjs -c -m > www/js/libs.js",
-    "test": "haxe testsJS.hxml && node js/test/tests.js",
-    "prepush": "npm test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/bablukid/cagette.git"
-  },
-  "bugs": {
-    "url": "https://github.com/bablukid/cagette/issues"
-  },
-  "version": "1.11.1"
-}

src/App.hx

@@ -203,7 +203,7 @@ class App extends sugoi.BaseApp {
 		out.set("percent", "Pourcentage");
 		out.set("pinned", "Mets en avant les produits");
 
-		out.set("CagetteNetwork", "Me lister dans l'annuaire des groupes Cagette.net");
+		out.set("CagetteNetwork", "Me lister dans l'annuaire des groupes");
 		out.set("unitType", "Unité");
 		out.set("qt", "Quantité");
 		out.set("Unit", "Pièce");
@@ -280,7 +280,7 @@ class App extends sugoi.BaseApp {
 		var e = new sugoi.mail.Mail();
 		e.setSubject(subject);
 		e.setRecipient(to);
-		e.setSender(App.config.get("default_email"), t._("Cagette.net"));
+		e.setSender(App.config.get("default_email"), t._("CagettePéi"));
 		var html = App.current.processTemplate("mail/message.mtt", {text: html, group: group});
 		e.setHtmlBody(html);
 		App.sendMail(e);

src/controller/Contract.hx

@@ -30,7 +30,7 @@ class Contract extends Controller {
 	@tpl("contract/default.mtt")
 	function doDefault() {
 		// Create the list of links to change the language
-		var langs = App.config.get("langs").split(";");
+		var langs = App.config.get("langs", "fr").split(";");
 		var langNames = App.config.get("langnames", "Français").split(";");
 		var i = 0;
 		var langLinks = "";

src/controller/Group.hx

@@ -54,7 +54,7 @@ class Group extends controller.Controller
 			form.addElement(new StringInput("userLastName", t._("Your lastname") ,"",true));
 			form.addElement(new StringInput("userEmail", t._("Your e-mail"), "", true));
 		}
-		form.addElement(new sugoi.form.elements.TextArea("msg", t._("Leave a message")));
+		form.addElement(new sugoi.form.elements.TextArea("msg", t._("Leave a message"),"",false));
 
 		if (form.isValid()){
 			try{

src/controller/Main.hx

@@ -1,4 +1,5 @@
 package controller;
+
 import db.Distribution;
 import db.UserContract;
 import haxe.Json;
@@ -9,12 +10,10 @@ import Common;
 import tools.ArrayTool;
 
 class Main extends Controller {
-	
-	
 	/**
 	 * public pages
 	 */
-	function doGroup(d:haxe.web.Dispatch){
+	function doGroup(d:haxe.web.Dispatch) {
 		d.dispatch(new controller.Group());
 	}
 
@@ -26,49 +25,52 @@ class Main extends Controller {
 		view.category = 'home';
 
 		var group = app.getCurrentGroup();
-		if ( app.user!=null && group == null) {			
+		if (app.user != null && group == null) {
 			throw Redirect("/user/choose");
-		}else if (app.user == null && (group==null || group.regOption!=db.Amap.RegOption.Open) ) {
+		} else if (app.user == null && (group == null || group.regOption != db.Amap.RegOption.Open)) {
+			if (db.Amap.manager.get(1, false) != null)
+				throw Redirect("/group/1");
+			else
 				throw Redirect("/user/login");
 		}
 
 		view.amap = group;
 
-		//contract with open orders
+		// contract with open orders
 		var openContracts = Lambda.filter(group.getActiveContracts(), function(c) return c.isUserOrderAvailable());
 		view.openContracts = openContracts;
 
-		//register to become "distributor"
+		// register to become "distributor"
-		view.contractsWithDistributors = app.user==null ? [] : Lambda.filter(app.user.amap.getActiveContracts(), function(c) return c.distributorNum > 0);
+		view.contractsWithDistributors = app.user == null ? [] : Lambda.filter(app.user.amap.getActiveContracts(), function(c) return c.distributorNum > 0);
 
-		//freshly created group
+		// freshly created group
 		view.newGroup = app.session.data.newGroup == true;
 
 		var n = Date.now();
 		var now = new Date(n.getFullYear(), n.getMonth(), n.getDate(), 0, 0, 0);
 		var in3Month = DateTools.delta(now, 1000.0 * 60 * 60 * 24 * 30 * 3);
 
-		var distribs = MultiDistrib.getFromTimeRange(group,now,in3Month);
+		var distribs = MultiDistrib.getFromTimeRange(group, now, in3Month);
 		view.distribs = distribs;
 
-		//view functions
+		// view functions
 		view.getWhosTurn = function(orderId:Int, distrib:Distribution) {
 			return db.UserContract.manager.get(orderId, false).getWhosTurn(distrib);
 		}
 
-		//event for additionnal blocks on home page
+		// event for additionnal blocks on home page
 		var e = Blocks([], "home");
 		app.event(e);
 		view.blocks = e.getParameters()[0];
 
-		//message if phone is required
+		// message if phone is required
-		if(app.user!=null && app.user.amap.flags.has(db.Amap.AmapFlags.PhoneRequired) && app.user.phone==null){
+		if (app.user != null && app.user.amap.flags.has(db.Amap.AmapFlags.PhoneRequired) && app.user.phone == null) {
-			app.session.addMessage(t._("Members of this group should provide a phone number. <a href='/account/edit'>Please click here to update your account</a>."),true);
+			app.session.addMessage(t._("Members of this group should provide a phone number. <a href='/account/edit'>Please click here to update your account</a>."),
+				true);
+		}
 	}
 
-	}
+	// login and stuff
-	
-	//login and stuff
 	function doUser(d:Dispatch) {
 		d.dispatch(new controller.User());
 	}
@@ -81,26 +83,19 @@ class Main extends Controller {
 	 *  JSON REST API Entry point
 	 */
 	function doApi(d:Dispatch) {
-				
 		try {
-
 			d.dispatch(new controller.Api());
-
+		} catch (e:tink.core.Error) {
-		}catch (e:tink.core.Error){
+			// manage tink Errors (service errors)
-
-			//manage tink Errors (service errors)
 			sugoi.Web.setReturnCode(e.code);
-			Sys.print(Json.stringify( {error:{code:e.code,message:e.message,stack:e.exceptionStack}} ));
+			Sys.print(Json.stringify({error: {code: e.code, message: e.message, stack: e.exceptionStack}}));
-			
+		} catch (e:Dynamic) {
-		}catch (e:Dynamic){
+			// manage other errors
-
-			//manage other errors			
 			sugoi.Web.setReturnCode(500);
-			var stack = if ( App.config.DEBUG ) haxe.CallStack.toString(haxe.CallStack.exceptionStack()) else "";
+			var stack = if (App.config.DEBUG) haxe.CallStack.toString(haxe.CallStack.exceptionStack()) else "";
 			App.current.logError(e, stack);
-			Sys.print(Json.stringify( {error:{code:500,message : Std.string(e), stack:stack }} ));
+			Sys.print(Json.stringify({error: {code: 500, message: Std.string(e), stack: stack}}));
 		}
-		
 	}
 
 	@tpl("cssDemo.mtt")
@@ -113,15 +108,13 @@ class Main extends Controller {
 		d.dispatch(new controller.Install());
 	}
 
-
 	function doP(d:Dispatch) {
-		
 		/*
 			* Invalid array access
-Stack (ADMIN|DEBUG)
+			Stack (ADMIN|DEBUG)
 
-Called from C:\HaxeToolkit\haxe\std/haxe/web/Dispatch.hx line 463
+			Called from C:\HaxeToolkit\haxe\std/haxe/web/Dispatch.hx line 463
-Called from controller/Main.hx line 117
+			Called from controller/Main.hx line 117
 			*
 			var plugin = d.parts.shift();
 			for ( p in App.plugins) {
@@ -139,7 +132,6 @@ Called from controller/Main.hx line 117
 		d.dispatch(new controller.Plugin());
 	}
 
-
 	@logged
 	function doMember(d:Dispatch) {
 		view.category = 'members';
@@ -148,10 +140,17 @@ Called from controller/Main.hx line 117
 
 	@logged
 	function doStats(d:Dispatch) {
+		App.log('doStats called');
 		view.category = 'stats';
 		d.dispatch(new Stats());
 	}
 
+	function doMentions(d:Dispatch) {
+		App.log('do Mentions called');
+		view.category = 'mentions';
+		d.dispatch(new MentionsLegales());
+	}
+
 	@logged
 	function doAccount(d:Dispatch) {
 		view.category = 'account';
@@ -237,8 +236,7 @@ Called from controller/Main.hx line 117
 	}
 
 	@logged
-	function doValidate(date:Date, place:db.Place, user:db.User, d:haxe.web.Dispatch){
+	function doValidate(date:Date, place:db.Place, user:db.User, d:haxe.web.Dispatch) {
-		
 		var v = new controller.Validate();
 		v.date = date;
 		v.place = place;
@@ -253,9 +251,7 @@ Called from controller/Main.hx line 117
 
 	@admin
 	function doDb(d:Dispatch) {
-		d.parts = []; //disable haxe.web.Dispatch
+		d.parts = []; // disable haxe.web.Dispatch
 		sys.db.Admin.handler();
 	}
-	
-	
 }

src/controller/MentionsLegales.hx

@@ -0,0 +1,10 @@
+package controller;
+
+class MentionsLegales extends Controller {
+	public function new() {
+		super();
+	}
+
+	@tpl("mentions_legales/default.mtt")
+	function doDefault() {}
+}

src/controller/User.hx

@@ -30,6 +30,21 @@ class User extends Controller {
 		}
 	}
 
+	@tpl("user/cookieConsent.mtt")
+	function doCookieConsent() {
+		App.log("Cookie Consent called!");
+		// if (App.current.user != null) {
+		// 	throw Redirect('/');
+		// }
+
+		// if its needed to redirect after login
+		if (app.params.exists("redirect")) {
+			view.redirect = app.params.exists("redirect");
+		} else {
+			view.redirect = "/";
+		}
+	}
+
 	/**
 	 * Choose which group to connect to.
 	 */

src/controller/admin/Admin.hx

@@ -1,19 +1,18 @@
 package controller.admin;
+
 import haxe.web.Dispatch;
 import Common;
 
 class Admin extends Controller {
-	
 	public function new() {
 		super();
 		view.category = 'admin';
 
-		//trigger a "Nav" event
+		// trigger a "Nav" event
 		var nav = new Array<Link>();
-		var e = Nav(nav,"admin");
+		var e = Nav(nav, "admin");
 		app.event(e);
 		view.nav = e.getParameters()[0];
-		
 	}
 
 	@tpl("admin/default.mtt")
@@ -24,44 +23,36 @@ class Admin extends Controller {
 	@tpl("admin/emails.mtt")
 	function doEmails() {
 		var browse = function(index:Int, limit:Int) {
-			return sugoi.db.BufferedMail.manager.search($sdate==null,{limit:[index,limit],orderBy:-cdate},false);
+			return sugoi.db.BufferedMail.manager.search($sdate == null, {limit: [index, limit], orderBy: -cdate}, false);
 		}
 
-		var count = sugoi.db.BufferedMail.manager.count($sdate==null);
+		var count = sugoi.db.BufferedMail.manager.count($sdate == null);
-		view.browser = new sugoi.tools.ResultsBrowser(count,10,browse);
+		view.browser = new sugoi.tools.ResultsBrowser(count, 10, browse);
 		view.num = count;
-
 	}
 
 	@tpl("form.mtt")
 	function doSmtp() {
-		
 		var f = new sugoi.form.Form("emails");
-		var data = [
+		var data = [{label: "SMTP", value: "smtp"}, {label: "Mandrill API", value: "mandrill"},];
-			{label:"SMTP",value:"smtp"},
-			{label:"Mandrill API",value:"mandrill"},
-		];
 
-		var mailer = sugoi.db.Variable.get("mailer")==null ? "smtp" : sugoi.db.Variable.get("mailer");
+		var mailer = sugoi.db.Variable.get("mailer") == null ? "smtp" : sugoi.db.Variable.get("mailer");
-		var host = sugoi.db.Variable.get("smtp_host")==null ? App.config.get("smtp_host") : sugoi.db.Variable.get("smtp_host");
+		var host = sugoi.db.Variable.get("smtp_host") == null ? "<SMTP_SERVER>" : sugoi.db.Variable.get("smtp_host");
-		var port = sugoi.db.Variable.get("smtp_port")==null ? App.config.get("smtp_port") : sugoi.db.Variable.get("smtp_port");
+		var port = sugoi.db.Variable.get("smtp_port") == null ? "587" : sugoi.db.Variable.get("smtp_port");
-		var user = sugoi.db.Variable.get("smtp_user")==null ? App.config.get("smtp_user") : sugoi.db.Variable.get("smtp_user");
+		var user = sugoi.db.Variable.get("smtp_user") == null ? "" : sugoi.db.Variable.get("smtp_user");
-		var pass = sugoi.db.Variable.get("smtp_pass")==null ? App.config.get("smtp_pass") : sugoi.db.Variable.get("smtp_pass");
+		var pass = sugoi.db.Variable.get("smtp_pass") == null ? "" : sugoi.db.Variable.get("smtp_pass");
 
-		
+		f.addElement(new sugoi.form.elements.StringSelect("mailer", "Mailer", data, mailer));
-		f.addElement(new sugoi.form.elements.StringSelect("mailer", "Mailer", data,  mailer ));
 		f.addElement(new sugoi.form.elements.StringInput("smtp_host", "host", host));
 		f.addElement(new sugoi.form.elements.StringInput("smtp_port", "port", port));
 		f.addElement(new sugoi.form.elements.StringInput("smtp_user", "user", user));
 		f.addElement(new sugoi.form.elements.StringInput("smtp_pass", "pass", pass));
 
-		
+		if (f.isValid()) {
-		if (f.isValid()){
+			for (k in ["mailer", "smtp_host", "smtp_port", "smtp_user", "smtp_pass"]) {
-			for ( k in ["mailer","smtp_host","smtp_port","smtp_user","smtp_pass"]){
 				sugoi.db.Variable.set(k, f.getValueOf(k));
 			}
-			throw Ok("/admin/emails", t._("Configuration updated") );
+			throw Ok("/admin/emails", t._("Configuration updated"));
-			
 		}
 
 		view.title = t._("Email service configuration");
@@ -72,67 +63,60 @@ class Admin extends Controller {
 		d.dispatch(new controller.admin.Plugins());
 	}
 
-	
 	@tpl("admin/taxo.mtt")
-	function doTaxo(){
+	function doTaxo() {
-		
 		view.categ = db.TxpCategory.manager.all();
-		
 	}
 
 	/**
 	 *  Display errors logged in DB
 	 */
 	@tpl("admin/errors.mtt")
-	function doErrors( args:{?user: Int, ?like: String, ?empty:Bool} ) {
+	function doErrors(args:{?user:Int, ?like:String, ?empty:Bool}) {
 		view.now = Date.now();
 
-		view.u = args.user!=null ? db.User.manager.get(args.user,false) : null;
+		view.u = args.user != null ? db.User.manager.get(args.user, false) : null;
-		view.like = args.like!=null ? args.like : "";
+		view.like = args.like != null ? args.like : "";
 
 		var sql = "";
-		if( args.user!=null ) sql += " AND uid="+args.user;
+		if (args.user != null)
-		//if( args.like!=null && args.like != "" ) sql += " AND error like "+sys.db.Manager.cnx.quote("%"+args.like+"%");
+			sql += " AND uid=" + args.user;
+		// if( args.like!=null && args.like != "" ) sql += " AND error like "+sys.db.Manager.cnx.quote("%"+args.like+"%");
 		if (args.empty) {
 			sys.db.Manager.cnx.request("truncate table Error");
 		}
 
-		var errorsStats = sys.db.Manager.cnx.request("select count(id) as c, DATE_FORMAT(date,'%y-%m-%d') as day from Error where date > NOW()- INTERVAL 1 MONTH "+sql+" group by day order by day").results();
+		var errorsStats = sys.db.Manager.cnx.request("select count(id) as c, DATE_FORMAT(date,'%y-%m-%d') as day from Error where date > NOW()- INTERVAL 1 MONTH "
+			+ sql
+			+ " group by day order by day")
+			.results();
 		view.errorsStats = errorsStats;
 
-		view.browser = new sugoi.tools.ResultsBrowser(
+		view.browser = new sugoi.tools.ResultsBrowser(sugoi.db.Error.manager.unsafeCount("SELECT count(*) FROM Error WHERE 1 " + sql), 20,
-			sugoi.db.Error.manager.unsafeCount("SELECT count(*) FROM Error WHERE 1 "+sql),
+			function(start, limit) {
-			20,
+				return sugoi.db.Error.manager.unsafeObjects("SELECT * FROM Error WHERE 1 " + sql + " ORDER BY date DESC LIMIT " + start + "," + limit, false);
-			function(start, limit) {  return sugoi.db.Error.manager.unsafeObjects("SELECT * FROM Error WHERE 1 "+sql+" ORDER BY date DESC LIMIT "+start+","+limit,false); }
+			});
-		);
 	}
 
 	@tpl("admin/graph.mtt")
-	function doGraph(?key:String,?year:Int,?month:Int){
+	function doGraph(?key:String, ?year:Int, ?month:Int) {
+		var from = new Date(year, month, 1, 0, 0, 0);
+		var to = new Date(year, month + 1, 0, 23, 59, 59);
 
-
+		if (app.params.exists("recompute")) {
-		var from = new Date(year,month,1,0,0,0);
+			switch (key) {
-		var to = new Date(year,month+1,0,23,59,59);
-
-		if(app.params.exists("recompute")){
-
-			switch(key){
 				case "basket":
-					for( d in 1...to.getDate()){
+					for (d in 1...to.getDate()) {
-						var _from = new Date(year,month,d,0,0,0);
+						var _from = new Date(year, month, d, 0, 0, 0);
-						var _to = new Date(year,month,d,23,59,59);
+						var _to = new Date(year, month, d, 23, 59, 59);
-						var value = db.Basket.manager.count($cdate>=_from && $cdate<=_to);
+						var value = db.Basket.manager.count($cdate >= _from && $cdate <= _to);
-						var g = db.Graph.record(key,value, _from );
+						var g = db.Graph.record(key, value, _from);
 						// trace(value,_from,g);
-						
+					}
+			}
 		}
 
-
+		var data = db.Graph.getRange(key, from, to);
-			}
-
-		}
-
-		var data = db.Graph.getRange(key,from,to);
 		view.data = data;
 		view.from = from;
 		view.to = to;
@@ -140,55 +124,46 @@ class Admin extends Controller {
 
 		var averageValue = 0.0;
 		var total = 0.0;
-		for( d in data) total += d.value;
+		for (d in data)
-		averageValue = total/data.length;
+			total += d.value;
+		averageValue = total / data.length;
 		view.total = total;
 		view.averageValue = averageValue;
-
-
-
-
 	}
 
 	function doFixDistribValidation() {
-
 		Sys.println("===== Liste des distributions ayant été re-validées ====<br>");
 
-		//Get the current group
+		// Get the current group
 		var group = app.user.amap;
-		//Get all the contracts for this given group
+		// Get all the contracts for this given group
-		var contractIds = Lambda.map(group.getContracts(),function(x) return x.id);
+		var contractIds = Lambda.map(group.getContracts(), function(x) return x.id);
-		//Get all the validated distributions for this given group
+		// Get all the validated distributions for this given group
-		var validatedDistribs = db.Distribution.manager.search( ($contractId in contractIds) && $validated == true, {orderBy:date}, false);
+		var validatedDistribs = db.Distribution.manager.search(($contractId in contractIds) && $validated == true, {orderBy: date}, false);
-		for (distrib in validatedDistribs){
+		for (distrib in validatedDistribs) {
-
 			service.PaymentService.validateDistribution(distrib);
 			Sys.println(distrib.toString() + "<br>");
-
 		}
 
 		Sys.println("===== Fin de la liste ====");
-
 	}
 
 	function doCheckDistribValidation() {
-
 		Sys.println("===== Liste des distributions validées ayant des opérations/paiements non validés ====<br>");
 
-		//Get the current group
+		// Get the current group
 		var group = app.user.amap;
-		//Get all the contracts for this given group
+		// Get all the contracts for this given group
-		var contractIds = Lambda.map(group.getContracts(),function(x) return x.id);
+		var contractIds = Lambda.map(group.getContracts(), function(x) return x.id);
-		//Get all the validated distributions for this given group
+		// Get all the validated distributions for this given group
-		var validatedDistribs = db.Distribution.manager.search( ($contractId in contractIds) && $validated == true, {orderBy:date}, false);
+		var validatedDistribs = db.Distribution.manager.search(($contractId in contractIds) && $validated == true, {orderBy: date}, false);
-		for (distrib in validatedDistribs){
+		for (distrib in validatedDistribs) {
-
+			for (user in distrib.getUsers()) {
-			for (user in distrib.getUsers()){
-		
 				var basket = db.Basket.get(user, distrib.place, distrib.date);
-				if (basket == null || basket.isValidated()) continue;
+				if (basket == null || basket.isValidated())
+					continue;
 
-				for (order in basket.getOrders()){
+				for (order in basket.getOrders()) {
 					if (!order.paid) {
 						Sys.println(order.distribution.toString() + "<br>");
 						Sys.println(order.toString() + "<br>");
@@ -196,28 +171,22 @@ class Admin extends Controller {
 				}
 
 				var operation = basket.getOrderOperation(false);
-				if (operation != null){
+				if (operation != null) {
-					
 					if (operation.pending) {
 						Sys.println(distrib.toString() + "<br>");
 						Sys.println(operation.toString() + "<br>");
 					}
 
-					for ( payment in basket.getPayments()){
+					for (payment in basket.getPayments()) {
-
+						if (payment.pending) {
-						if (payment.pending){
 							Sys.println(distrib.toString() + "<br>");
 							Sys.println(payment.toString() + "<br>");
 						}
 					}
 				}
-
 			}
 		}
 
 		Sys.println("===== Fin de la liste ====");
-
 	}
-
 }
-

src/form/ColorRadioGroup.hx

@@ -1,38 +1,34 @@
 package form;
+
 import sugoi.form.elements.RadioGroup;
 import Common;
 
-class ColorRadioGroup extends RadioGroup
+class ColorRadioGroup extends RadioGroup {
-{
+	public function new(name:String, label:String, selected:String) {
-
-	public function new(name:String, label:String,selected:String) 
-	{
 		var data = [];
 		var i = 0;
 		for (c in db.CategoryGroup.COLORS) {
-			data.push( { value:Std.string(c), label:Std.string(i) } );
+			data.push({value: Std.string(c), label: Std.string(i)});
 			i++;
 		}
 
 		super(name, label, data, selected, "1", false, true);
 	}
 
-	override public function render():String
+	override public function render():String {
-	{
 		var s = "";
-		var n = parentForm.name + "_" +name;
+		var n = parentForm.name + "_" + name;
 
 		var c = 0;
-		if (data != null)
+		if (data != null) {
-		{
+			for (row in data) {
-			for (row in data)
+				var radio = "<input type=\"radio\" name=\"" + n + "\" id=\"" + n + c + "\" value=\"" + row.label + "\" "
-			{
+					+ (row.label == Std.string(value) ? "checked" : "") + " />\n";
+				var img = "<div style='margin-right:16px;width:32px;height:32px;background:"
+					+ App.current.view.intToHex(Std.parseInt(row.value))
+					+ ";'></div>";
 
-				var radio = "<input type=\"radio\" name=\""+n+"\" id=\""+n+c+"\" value=\"" + row.label + "\" " + (row.label == Std.string(value) ? "checked":"") +" />\n";
+				s += "<label for=\"" + n + c + "\" class='checkbox' style='display: inline-block;'>" + radio + " " + img + " </label>";
-				
-				var img = "<div style='margin-right:16px;width:32px;height:32px;background:"+App.current.view.intToHex(Std.parseInt(row.value))+";'></div>";
-				
-				s += "<label for=\"" + n+c + "\" class='checkbox' style='display: inline-block;'>"+radio + " "+img+" </label>";
 
 				c++;
 			}
@@ -40,7 +36,4 @@ class ColorRadioGroup extends RadioGroup
 
 		return s;
 	}
-	
-	
-	
 }

src/service/WaitingListService.hx

@@ -13,6 +13,8 @@ class WaitingListService{
 		var w = new db.WaitingList();
 		w.user = user;
 		w.group = group;
+		if (message == null ) message = "";
+		//message = "souscription = " + message;
 		w.message = message;
 		w.insert();
 

src/sugoi/BaseView.hx

@@ -20,12 +20,14 @@ class BaseView implements Dynamic {
 		this.HOST = App.config.HOST;
 		this.DATA_HOST = App.config.DATA_HOST;
 		this.DEBUG = App.config.DEBUG;
+		this.BANDEAU_REGION = App.config.BANDEAU_REGION;
 		this.NAME = App.config.NAME;
 		this.isAdmin = app.user != null && app.user.isAdmin();
 
 		//Access basic functions in views
 		this.Std = Std;
 		this.Math = Math;
+		this.Config = App.config;
 
 
 		if ( App.config.SQL_LOG  ) {

src/sugoi/Config.hx

@@ -11,6 +11,7 @@ class Config {
 	public var TPL:String;
 	public var TPL_TMP:String;
 	public var DEBUG:Bool;
+	public var BANDEAU_REGION:Bool;
 	public var HOST:String;
 	public var NAME:String;
 	public var KEY:String;
@@ -28,6 +29,7 @@ class Config {
 		TPL = PATH + "lang/" + LANG + "/tpl/";
 		TPL_TMP = PATH + "lang/" + LANG + "/tmp/";
 		DEBUG = get("debug", "0") == "1";
+		BANDEAU_REGION = get("bandeau_region", "0") == "1";
 		HOST = get("host");
 		KEY = get("key");
 		DATA_HOST = get("dataHost", "data." + HOST);

www/file/.htaccess

@@ -0,0 +1 @@
+ErrorDocument 404 /index.n

www/lang/texts_fr.po

@@ -14,6 +14,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Poedit 2.0.6\n"
 
+
 #: src/payment/Cash.hx:294
 msgid "Cash"
 msgstr "Espèces / Carte Bancaire"