tagged as 1.13.0

.gitignore

@@ -25,8 +25,6 @@ lang/es/tmp/*.n
 
 www/lang/*.mo
 
-www/file/*
-
 www/js/app.js
 www/js/libs.js
 

.semver_git_tag

@@ -1 +1 @@
-1.11.1
+1.13.0

Makefile

@@ -20,7 +20,7 @@ install_dev:
 	#set config file to debug=1
 	#@sed -e 's?debug=.*?debug="1"?g' --in-place config.xml
 	#install haxe dependencies in .haxelib
-	haxelib newrepo 
+	haxelib newrepo
 	haxelib -always install cagette.hxml
 	haxelib -always install cagetteJs.hxml
 	#template tools
@@ -47,7 +47,7 @@ compile:
 	echo "compile CagettePéi core"; \
 	haxe cagette.hxml; \
 	fi
-	
+
 
 #compile SASS files to CSS
 css:
@@ -64,17 +64,18 @@ frontend:
 	chown www-data:www-data tmp
 
 #update POT file from source
-i18n:	
+i18n:
 	haxe potGeneration.hxml
 
 #compile templates in each language, required for production env.
-templates:	
+templates:
 	mkdir -p lang/master/tmp
 	haxe cagette.hxml -D i18n_generation
 	@make LANG=fr ctemplates
-	msgfmt www/lang/texts_fr.po -o www/lang/texts_fr.mo 
+	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
 ```
 

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.13.0"}
-  "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

@@ -14,66 +14,66 @@ class Group extends controller.Controller
 	 */
 	@tpl('group/view.mtt')
 	function doDefault(group:db.Amap){
-		
+
 		if (group.regOption == db.Amap.RegOption.Open) {
 			app.session.data.amapId = group.id;
 			throw Redirect("/");
 		}
-		
+
 		view.group = group;
 		view.contracts = group.getActiveContracts();
 		view.pageTitle = group.name;
 		group.getMainPlace(); //just to update cache
 		if (app.user != null){
-			
+
 			view.isMember = Lambda.has(app.user.getAmaps(), group);
 		}
 	}
-	
+
 	/**
 	 * Register to a waiting list.
 	 * the user can be logged or not !
 	 */
 	@tpl('form.mtt')
 	function doList(group:db.Amap){
-		
+
 		//checks
 		if (group.regOption != db.Amap.RegOption.WaitingList) throw Redirect("/group/" + group.id);
 		if (app.user != null) {
 			try{
 				WaitingListService.canRegister(app.user,group);
-			}catch(e:tink.core.Error){				
+			}catch(e:tink.core.Error){
 				throw Error("/group/" + group.id,e.message);
 			}
 		}
-		
+
 		//build form
-		var form = new sugoi.form.Form("reg");				
+		var form = new sugoi.form.Form("reg");
 		if (app.user == null){
 			form.addElement(new StringInput("userFirstName", t._("Your firstname"),"",true));
 			form.addElement(new StringInput("userLastName", t._("Your lastname") ,"",true));
-			form.addElement(new StringInput("userEmail", t._("Your e-mail"), "", 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{
 				if (app.user == null){
 					var f = form;
 					var user = service.UserService.softRegistration(f.getValueOf("userFirstName"),f.getValueOf("userLastName"), f.getValueOf("userEmail") );
-					db.User.login(user, user.email);				
+					db.User.login(user, user.email);
-				}			
+				}
-				
+
 				WaitingListService.registerToWl(app.user,group,form.getValueOf("msg"));
 				throw Ok("/group/" + group.id,t._("Your subscription to the waiting list has been recorded. You will receive an e-mail as soon as your request is processed.") );
 			}catch(e:tink.core.Error){
 				throw Error("/group/list/" + group.id,e.message);
 			}
-			
+
 		}
-		
+
 		view.title = t._("Subscription to \"::groupeName::\" waiting list", {groupeName:group.name});
-		view.form = form;		
+		view.form = form;
 	}
 
 	/**
@@ -82,27 +82,27 @@ class Group extends controller.Controller
 	function doListCancel(group:db.Amap){
 		try{
 			WaitingListService.removeFromWl(app.user,group);
-		}catch(e:tink.core.Error){				
+		}catch(e:tink.core.Error){
 			throw Error("/group/" + group.id,e.message);
 		}
 		throw Ok("/group/" + group.id,t._("You've been removed from the waiting list"));
 	}
-	
+
-	
+
 	/**
 	 * 	Register direclty in an open group
-	 * 
+	 *
 	 * 	the user can be logged or not !
-	
+
 	@tpl('form.mtt')
 	function doRegister(group:db.Amap){
-		
+
 		if (group.regOption != db.Amap.RegOption.Open) throw Redirect("/group/" + group.id);
-		if (app.user != null){			
+		if (app.user != null){
-			if ( db.UserAmap.manager.select($amapId == group.id && $user == app.user) != null) throw Error("/group/" + group.id, t._("You are already member of this group."));			
+			if ( db.UserAmap.manager.select($amapId == group.id && $user == app.user) != null) throw Error("/group/" + group.id, t._("You are already member of this group."));
 		}
-		
+
-		var form = new sugoi.form.Form("reg");	
+		var form = new sugoi.form.Form("reg");
 		form.submitButtonLabel = t._("Join the group");
 		form.addElement(new sugoi.form.elements.Html("html",t._("Confirm your subscription to \"::groupName::\"", {groupName:group.name})));
 		if (app.user == null){
@@ -110,15 +110,15 @@ class Group extends controller.Controller
 			form.addElement(new StringInput("userLastName", t._("Your lastname"), "", true));
 			var em = new StringInput("userEmail", t._("Your e-mail"), "", true);
 			em.addValidator(new EmailValidator());
-			form.addElement(em);		
+			form.addElement(em);
-			form.addElement(new StringInput("address", t._("Address"), "", true));					
+			form.addElement(new StringInput("address", t._("Address"), "", true));
-			form.addElement(new StringInput("zipCode", t._("Zip code"), "", true));		
+			form.addElement(new StringInput("zipCode", t._("Zip code"), "", true));
-			form.addElement(new StringInput("city", t._("City"), "", true));		
+			form.addElement(new StringInput("city", t._("City"), "", true));
-			form.addElement(new StringInput("phone", t._("Phone"), "", true));		
+			form.addElement(new StringInput("phone", t._("Phone"), "", true));
 		}
-		
+
 		if (form.isValid()){
-			
+
 			if (app.user == null){
 				var f = form;
 				var user = new db.User();
@@ -129,92 +129,92 @@ class Group extends controller.Controller
 				user.zipCode = f.getValueOf("zipCode");
 				user.city = f.getValueOf("city");
 				user.phone = f.getValueOf("phone");
-				
+
 				if ( db.User.getSameEmail(user.email).length > 0 ) {
 					throw Ok("/user/login",t._("You already subscribed to Cagette.net, please log in on this page"));
 				}
-				
+
-				user.insert();				
+				user.insert();
 				app.session.setUser(user);
-				
+
-			}			
+			}
-			
+
 			var w = new db.UserAmap();
 			w.user = app.user;
 			w.amap = group;
 			w.insert();
-			
+
 			throw Ok("/user/choose", t._("Your subscription has been taken into account"));
 		}
-		
+
 		view.title = t._("Subscription to \"::groupName::\"", {groupName:group.name});
 		view.form = form;
-		
+
 	}*/
-	
+
 	/**
 	 * create a new group
 	 */
 	@tpl("form.mtt")
 	function doCreate() {
-		
+
 		view.title = t._("Create a new Cagette Group");
 
 		var f = new sugoi.form.Form("c");
 		f.addElement(new StringInput("name", t._("Name of your group"), "", true));
-		
+
 		//group type
 		var data = [
 			{label:t._("CSA"),value:"0"},
 			{label:t._("Grouped orders"),value:"1"},
 			{label:t._("Farmers collective"),value:"2"},
 			{label:t._("Farm shop"),value:"3"},
-		];	
+		];
 		var gt = new sugoi.form.elements.RadioGroup("type", t._("Group type"), data ,"1","1",true,true,true);
 		f.addElement(gt);
-		
+
 		if (f.checkToken()) {
-			
+
 			var user = app.user;
-			
+
 			var g = new db.Amap();
 			g.name = f.getValueOf("name");
 			g.contact = user;
-			
+
 			var type:db.Amap.GroupType = Type.createEnumIndex(db.Amap.GroupType, Std.parseInt(f.getValueOf("type")) );
-			
+
 			switch(type){
-			case null : 
+			case null :
 				throw "unknown group type";
-			case db.Amap.GroupType.Amap : 
+			case db.Amap.GroupType.Amap :
 				g.flags.set(db.Amap.AmapFlags.HasMembership);
 				g.regOption = db.Amap.RegOption.WaitingList;
-				
+
 			case db.Amap.GroupType.GroupedOrders :
 				g.flags.set(db.Amap.AmapFlags.ShopMode);
 				g.flags.set(db.Amap.AmapFlags.HasMembership);
 				g.regOption = db.Amap.RegOption.WaitingList;
-				
+
-			case db.Amap.GroupType.ProducerDrive : 
+			case db.Amap.GroupType.ProducerDrive :
 				g.flags.set(db.Amap.AmapFlags.ShopMode);
 				g.regOption = db.Amap.RegOption.Open;
 				g.flags.set(db.Amap.AmapFlags.PhoneRequired);
-				
+
-			case db.Amap.GroupType.FarmShop : 
+			case db.Amap.GroupType.FarmShop :
 				g.flags.set(db.Amap.AmapFlags.ShopMode);
 				g.regOption = db.Amap.RegOption.Open;
 				g.flags.set(db.Amap.AmapFlags.PhoneRequired);
 			}
-			
+
 			g.groupType = type;
 			g.insert();
-			
+
 			var ua = new db.UserAmap();
 			ua.user = user;
 			ua.amap = g;
 			ua.rights = [db.UserAmap.Right.GroupAdmin,db.UserAmap.Right.Membership,db.UserAmap.Right.Messages,db.UserAmap.Right.ContractAdmin(null)];
 			ua.insert();
-			
+
 			//example datas
 			var place = new db.Place();
 			place.name = t._("Market square");
@@ -222,7 +222,7 @@ class Group extends controller.Controller
 			place.city = "St Martin de la Cagette";
 			place.amap = g;
 			place.insert();
-			
+
 			//contrat AMAP
 			var vendor = new db.Vendor();
 			vendor.amap = g;
@@ -230,8 +230,8 @@ class Group extends controller.Controller
 			vendor.zipCode = "000";
 			vendor.city = "Langon";
 			vendor.email = "jean@cagette.net";
-			vendor.insert();			
+			vendor.insert();
-			
+
 			if (type == Amap){
 				var contract = new db.Contract();
 				contract.name = t._("CSA contract Vegetables - Example");
@@ -244,32 +244,32 @@ class Group extends controller.Controller
 				contract.contact = user;
 				contract.distributorNum = 2;
 				contract.insert();
-				
+
 				var p = new db.Product();
 				p.name = t._("Big basket of vegetables");
 				p.price = 15;
 				p.organic = true;
 				p.contract = contract;
 				p.insert();
-				
+
 				var p = new db.Product();
 				p.name = t._("Small basket of vegetables");
 				p.price = 10;
 				p.organic = true;
 				p.contract = contract;
 				p.insert();
-			
+
 				OrderService.make(user, 1, p, null, true);
-				
+
 				var d = new db.Distribution();
 				d.contract = contract;
 				d.date = DateTools.delta(Date.now(), 1000.0 * 60 * 60 * 24 * 14);
 				d.end = DateTools.delta(d.date, 1000.0 * 60 * 90);
 				d.place = place;
 				d.insert();
-				
+
 			}
-			
+
 			//contrat variable
 			var vendor = new db.Vendor();
 			vendor.amap = g;
@@ -277,8 +277,8 @@ class Group extends controller.Controller
 			vendor.zipCode = "000";
 			vendor.city = t._("Bazas");
 			vendor.email = "galinette@cagette.net";
-			vendor.insert();			
+			vendor.insert();
-			
+
 			var contract = new db.Contract();
 			contract.name = t._("Chicken Contract - Example");
 			contract.description = t._("Example of contract with variable orders. It is allowed to order something else at every delivery.");
@@ -291,7 +291,7 @@ class Group extends controller.Controller
 			contract.distributorNum = 2;
 			contract.flags.set(db.Contract.ContractFlags.UsersCanOrder);
 			contract.insert();
-			
+
 			var egg = new db.Product();
 			egg.name = t._("12 eggs");
 			egg.price = 5;
@@ -299,7 +299,7 @@ class Group extends controller.Controller
 			egg.organic = true;
 			egg.contract = contract;
 			egg.insert();
-			
+
 			var p = new db.Product();
 			p.name = t._("Chicken");
 			//p.type = 2;
@@ -307,7 +307,7 @@ class Group extends controller.Controller
 			p.organic = true;
 			p.contract = contract;
 			p.insert();
-			
+
 			var d = new db.Distribution();
 			d.contract = contract;
 			d.orderStartDate = Date.now();
@@ -316,36 +316,36 @@ class Group extends controller.Controller
 			d.end = DateTools.delta(d.date, 1000.0 * 60 * 90);
 			d.place = place;
 			d.insert();
-			
+
 			OrderService.make(user, 2, egg, d.id);
 			OrderService.make(user, 1, p, d.id);
-			
+
 			App.current.session.data.amapId  = g.id;
 			app.session.data.newGroup = true;
 			throw Redirect("/");
 		}
-		
+
 		view.form= f;
-		
+
 	}
-	
+
 	/**
 		Displays a google map in a popup
 	**/
 	@tpl('group/place.mtt')
 	public function doPlace(place:db.Place){
 		view.place = place;
-		
+
 		//build adress for google maps
 		var addr = "";
 		if (place.address1 != null) addr += place.address1;
 		if (place.address2 != null) addr += ", " + place.address2;
 		if (place.zipCode != null) addr += " " + place.zipCode;
 		if (place.city != null) addr += " " + place.city;
-		
+
 		view.addr = view.escapeJS(addr);
 	}
-	
+
 	/**
 	 * Groups map
 	 */
@@ -353,16 +353,16 @@ class Group extends controller.Controller
 	public function doMap(?args:{?lat:Float,?lng:Float,?address:String}){
 
 		view.container = "container-fluid";
-		
+
 		//if no param is sent, focus on Paris
 		if (args == null || (args.address == null && args.lat == null && args.lng == null)){
 			args = {lat:48.855675, lng:2.3472365};
 		}
-		
+
 		view.lat = args.lat;
 		view.lng = args.lng;
-		view.address = args.address;		
+		view.address = args.address;
 	}
-	
+
-	
+
 }

src/controller/Main.hx

@@ -9,10 +9,10 @@ import Common;
 import tools.ArrayTool;
 
 class Main extends Controller {
-	
+
-	
+
 	/**
-	 * public pages 
+	 * public pages
 	 */
 	function doGroup(d:haxe.web.Dispatch){
 		d.dispatch(new controller.Group());
@@ -24,23 +24,24 @@ class Main extends Controller {
 	@tpl("home.mtt")
 	function doDefault() {
 		view.category = 'home';
-		
+
-		var group = app.getCurrentGroup();		
+		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) ) {
-			throw Redirect("/user/login");
+			//throw Redirect("/user/login");
+			throw Redirect("/group/1");
 		}
 
 		view.amap = group;
-		
+
 		//contract with open orders
 		var openContracts = Lambda.filter(group.getActiveContracts(), function(c) return c.isUserOrderAvailable());
 		view.openContracts = openContracts;
-		
+
 		//register to become "distributor"
 		view.contractsWithDistributors = app.user==null ? [] : Lambda.filter(app.user.amap.getActiveContracts(), function(c) return c.distributorNum > 0);
-		
+
 		//freshly created group
 		view.newGroup = app.session.data.newGroup == true;
 
@@ -50,12 +51,12 @@ class Main extends Controller {
 
 		var distribs = MultiDistrib.getFromTimeRange(group,now,in3Month);
 		view.distribs = distribs;
-		
+
 		//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
 		var e = Blocks([], "home");
 		app.event(e);
@@ -67,21 +68,21 @@ class Main extends Controller {
 		}
 
 	}
-	
+
 	//login and stuff
 	function doUser(d:Dispatch) {
 		d.dispatch(new controller.User());
 	}
-	
+
 	function doCron(d:Dispatch) {
 		d.dispatch(new controller.Cron());
 	}
-	
+
 	/**
 	 *  JSON REST API Entry point
 	 */
 	function doApi(d:Dispatch) {
-				
+
 		try {
 
 			d.dispatch(new controller.Api());
@@ -91,38 +92,38 @@ class Main extends Controller {
 			//manage tink Errors (service errors)
 			sugoi.Web.setReturnCode(e.code);
 			Sys.print(Json.stringify( {error:{code:e.code,message:e.message,stack:e.exceptionStack}} ));
-			
+
 		}catch (e:Dynamic){
 
-			//manage other errors			
+			//manage other errors
-			sugoi.Web.setReturnCode(500);			
+			sugoi.Web.setReturnCode(500);
 			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 }} ));
 		}
-		
+
 	}
-	
+
 	@tpl("cssDemo.mtt")
 	function doCssdemo() {
 		view.category = 'home';
 	}
-	
+
 	@tpl("form.mtt")
 	function doInstall(d:Dispatch) {
 		d.dispatch(new controller.Install());
 	}
-	
+
 
 	function doP(d:Dispatch) {
-		
+
 		/*
 		 * Invalid array access
 Stack (ADMIN|DEBUG)
 
 Called from C:\HaxeToolkit\haxe\std/haxe/web/Dispatch.hx line 463
 Called from controller/Main.hx line 117
-		 * 
+		 *
 		var plugin = d.parts.shift();
 		for ( p in App.plugins) {
 			var n = Type.getClassName(Type.getClass(p)).toLowerCase();
@@ -132,26 +133,26 @@ Called from controller/Main.hx line 117
 				return;
 			}
 		}
-		
+
 		throw Error("/","Plugin '"+plugin+"' introuvable.");
 		*/
-		
+
 		d.dispatch(new controller.Plugin());
 	}
-	
+
 
 	@logged
 	function doMember(d:Dispatch) {
 		view.category = 'members';
 		d.dispatch(new controller.Member());
 	}
-	
+
 	@logged
 	function doStats(d:Dispatch) {
 		view.category = 'stats';
 		d.dispatch(new Stats());
 	}
-	
+
 	@logged
 	function doAccount(d:Dispatch) {
 		view.category = 'account';
@@ -163,31 +164,31 @@ Called from controller/Main.hx line 117
 		view.category = 'contractadmin';
 		d.dispatch(new controller.Vendor());
 	}
-	
+
 	@logged
 	function doPlace(d:Dispatch) {
 		view.category = 'contractadmin';
 		d.dispatch(new controller.Place());
 	}
-	
+
 	@logged
 	function doTransaction(d:Dispatch) {
 		view.category = 'members';
 		d.dispatch(new controller.Transaction());
 	}
-	
+
 	@logged
 	function doDistribution(d:Dispatch) {
 		view.category = 'contractadmin';
 		d.dispatch(new controller.Distribution());
 	}
-	
+
 	@logged
 	function doMembership(d:Dispatch) {
 		view.category = 'members';
 		d.dispatch(new controller.Membership());
 	}
-	
+
 	function doShop(d:Dispatch) {
 		view.category = 'shop';
 		d.dispatch(new controller.Shop());
@@ -199,63 +200,63 @@ Called from controller/Main.hx line 117
 		view.place = place;
 		view.date = date;
 	}
-	
+
 	@logged
 	function doProduct(d:Dispatch) {
 		view.category = 'contractadmin';
 		d.dispatch(new controller.Product());
 	}
-	
+
 	@logged
 	function doAmap(d:Dispatch) {
 		view.category = 'amap';
 		d.dispatch(new controller.Amap());
 	}
-	
+
 	@logged
 	function doContract(d:Dispatch) {
 		view.category = 'contract';
 		d.dispatch(new Contract());
 	}
-	
+
 	@logged
 	function doContractAdmin(d:Dispatch) {
 		view.category = 'contractadmin';
 		d.dispatch(new ContractAdmin());
 	}
-	
+
 	@logged
 	function doMessages(d:Dispatch) {
 		view.category = 'messages';
 		d.dispatch(new Messages());
 	}
-	
+
 	@logged
 	function doAmapadmin(d:Dispatch) {
 		view.category = 'amapadmin';
 		d.dispatch(new AmapAdmin());
 	}
-	
+
 	@logged
 	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;
-		v.user = user;		
+		v.user = user;
 		d.dispatch(v);
 	}
-	
+
 	@admin
 	function doAdmin(d:Dispatch) {
 		d.dispatch(new controller.admin.Admin());
 	}
-	
+
 	@admin
 	function doDb(d:Dispatch) {
 		d.parts = []; //disable haxe.web.Dispatch
 		sys.db.Admin.handler();
 	}
-	
+
-	
+
 }

src/controller/admin/Admin.hx

@@ -1,138 +1,122 @@
 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")
 	function doDefault() {
 		view.now = Date.now();
 	}
-	
+
 	@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 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 ? "587" : sugoi.db.Variable.get("smtp_port");
-		var mailer = sugoi.db.Variable.get("mailer")==null ? "smtp" : sugoi.db.Variable.get("mailer");
+		var user = sugoi.db.Variable.get("smtp_user") == null ? "" : sugoi.db.Variable.get("smtp_user");
-		var host = sugoi.db.Variable.get("smtp_host")==null ? App.config.get("smtp_host") : sugoi.db.Variable.get("smtp_host");
+		var pass = sugoi.db.Variable.get("smtp_pass") == null ? "" : sugoi.db.Variable.get("smtp_pass");
-		var port = sugoi.db.Variable.get("smtp_port")==null ? App.config.get("smtp_port") : 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");
+		f.addElement(new sugoi.form.elements.StringSelect("mailer", "Mailer", data, mailer));
-		var pass = sugoi.db.Variable.get("smtp_pass")==null ? App.config.get("smtp_pass") : sugoi.db.Variable.get("smtp_pass");
-		
-		
-		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");
 		view.form = f;
 	}
-	
+
 	function doPlugins(d:Dispatch) {
 		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,84 +124,69 @@ 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() {
 
+	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>");
-					}		
+					}
 				}
 
 				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()){
 
-						if (payment.pending){
+					for (payment in basket.getPayments()) {
+						if (payment.pending) {
 							Sys.println(distrib.toString() + "<br>");
 							Sys.println(payment.toString() + "<br>");
 						}
-					}	
+					}
 				}
-
 			}
 		}
 
 		Sys.println("===== Fin de la liste ====");
-
 	}
-
 }
-

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();
 
@@ -39,7 +41,7 @@ class WaitingListService{
 
 	public static function canRegister(user:db.User,group:db.Amap){
 		var t  = sugoi.i18n.Locale.texts;
-		
+
 		if ( db.WaitingList.manager.select($amapId == group.id && $user == user) != null) {
 			throw new Error(t._("You are already in the waiting list of this group"));
 		}
@@ -91,7 +93,7 @@ class WaitingListService{
 				group
 			);
 		}
-			
+
 		wl.delete();
 	}
 
@@ -108,9 +110,9 @@ class WaitingListService{
 			var ua = new db.UserAmap();
 			ua.amap = wl.group;
 			ua.user = wl.user;
-			ua.insert();	
+			ua.insert();
 		}
-		
+
 		wl.delete();
 
 		//email the requester
@@ -131,7 +133,7 @@ class WaitingListService{
 				group
 			);
 		}
-			
+
 		wl.delete();
 	}
 

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"