cagettepéi

Makefile

@@ -41,7 +41,7 @@ install_dev:
 #compile backend to Neko
 compile:
 	@if [ $(PLUGINS) = 1 ]; then \
-	echo "compile Cagette.net with plugins"; \
+	echo "compile CagettePéi plugins"; \
 	haxe cagetteAllPlugins.hxml; \
 	else \
 	echo "compile CagettePéi core"; \
@@ -74,7 +74,7 @@ templates:
 	@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
+	chown www-data:www-data -R lang/fr
 
 ctemplates:
 	(cd lang/$(LANG)/tpl; temploc2 -macros macros.mtt -output ../tmp/ *.mtt */*.mtt */*/*.mtt)

js/react/user/LoginBox.hx

@@ -1,4 +1,5 @@
 package react.user;
+
 import react.ReactComponent;
 import react.ReactMacro.jsx;
 import Common;
@@ -19,13 +20,12 @@ typedef LoginBoxState = {
  * Login Box
  * @author fbarbut
  */
-class LoginBox extends react.ReactComponentOfPropsAndState<LoginBoxProps,LoginBoxState>
-{
-
-	public function new(props:LoginBoxProps) 
-	{
-		if (props.redirectUrl == null) props.redirectUrl = "/";
-		if (props.message == "") props.message = null;
+class LoginBox extends react.ReactComponentOfPropsAndState<LoginBoxProps, LoginBoxState> {
+	public function new(props:LoginBoxProps) {
+		if (props.redirectUrl == null)
+			props.redirectUrl = "/";
+		if (props.message == "")
+			props.message = null;
 		super(props);
 		this.state = {email: "", password: "", error: null};
 	}
@@ -35,7 +35,6 @@ class LoginBox extends react.ReactComponentOfPropsAndState<LoginBoxProps,LoginBo
 	}
 
 	override public function render() {
-		
 		return jsx('<div onKeyPress=$onKeyPress>
 			<$Error error="${state.error}" />
 			<$Message message="${props.message}" />
@@ -62,7 +61,7 @@ class LoginBox extends react.ReactComponentOfPropsAndState<LoginBoxProps,LoginBo
 			<!--
 			<hr/>
 			<p className="text-center">
-				<b>C\'est votre première visite sur Cagette.net ?</b>&nbsp;&nbsp;
+				<b>C\'est votre première visite sur CagettePéi ?</b>&nbsp;&nbsp;
 				<a onClick={registerBox} className="btn btn-default"><span className="glyphicon glyphicon-chevron-right"></span> S\'inscrire</a>
 			</p>
 			-->
@@ -85,7 +84,6 @@ class LoginBox extends react.ReactComponentOfPropsAndState<LoginBoxProps,LoginBo
 	 * displays a registerBox
 	 */
 	public function registerBox() {
-		
 		var body = js.Browser.document.querySelector('#myModal .modal-body');
 		ReactDOM.unmountComponentAtNode(body);
 
@@ -94,7 +92,6 @@ class LoginBox extends react.ReactComponentOfPropsAndState<LoginBoxProps,LoginBo
 	}
 
 	public function submit(?e:js.html.Event) {
-		
 		if (state.email == "") {
 			setError("Veuillez saisir votre email");
 			return;
@@ -111,29 +108,28 @@ class LoginBox extends react.ReactComponentOfPropsAndState<LoginBoxProps,LoginBo
 			el.classList.add("disabled");
 		}
 
-		
 		var req = new haxe.Http("/api/user/login");
 		req.addParameter("email", state.email);
 		req.addParameter("password", state.password);
 		req.addParameter("redirecturl", props.redirectUrl);
 
 		req.onData = req.onError = function(d) {
-			
 			var d = req.responseData;
 
-			if(e!=null) el.classList.remove("disabled");
+			if (e != null)
+				el.classList.remove("disabled");
 
 			var d = haxe.Json.parse(d);
-			if (Reflect.hasField(d, "error"))	setError(d.error.message);
-			if (Reflect.hasField(d, "success")) js.Browser.window.location.href = props.redirectUrl;
+			if (Reflect.hasField(d, "error"))
+				setError(d.error.message);
+			if (Reflect.hasField(d, "success"))
+				js.Browser.window.location.href = props.redirectUrl;
 		}
 		req.request(true);
 	}
 
 	function onKeyPress(e:js.html.KeyboardEvent) {
-		if(e.key=="Enter") submit();
+		if (e.key == "Enter")
+			submit();
 	}
-	
-	
-	
 }

lang/master/tpl/base.mtt

@@ -11,7 +11,7 @@
 			::end::
 		</title>
 		
-		<!-- Cagette CSS -->
+		<!-- CagettePéi CSS -->
 		<link rel="stylesheet" type="text/css" href="/css/::getVariable('css')::/style.css"/>
 		<!--
 			<link rel="stylesheet" type="text/css" href="/css/::getVariable('css')::/shop.css"/>

lang/master/tpl/design.mtt

@@ -14,7 +14,7 @@
 					<h1>::groupName::</h1>
 				::else::
 					<div style="margin-bottom:22px;" >
-							<a href="https://git.artcode.re/cagetters/cagette" target="_blank">
+							<a href="https://git.artcode.re/cagetters/cagettepei" target="_blank">
 								<img src="/img/logo3.png" alt="::NAME::" />
 							</a>
 					</div>		
@@ -121,7 +121,7 @@
 		<!--<div class="row">
 			<div class="col-md-12 alert-danger text-center" style="border-radius: 8px;margin:8px 0;padding:8px 0;">
 				<span class="glyphicon glyphicon-cog"></span>
-				Attention : Cagette.net sera indisponible le <b>mardi 7 août de 9:00 à 11:00</b>.
+				Attention : CagettePéi sera indisponible le <b>mardi 7 août de 9:00 à 11:00</b>.
 				<br/>
 				Nous déménageons sur un nouveau serveur pour plus de rapidité et de fiabilité.
 			</div>

src/App.hx

@@ -287,7 +287,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"), "Cagette.net");
+		e.setSender(App.config.get("default_email"), t._("Cagette.net"));
 		var html = App.current.processTemplate("mail/message.mtt", {text: html, group: group});
 		e.setHtmlBody(html);
 		App.sendMail(e);

src/controller/Cron.hx

@@ -77,7 +77,7 @@ class Cron extends Controller {
 			}
 
 			var m = new Mail();
-			m.setSender(App.config.get("default_email"), "Cagette.net");
+			m.setSender(App.config.get("default_email"), t._("Cagette.net"));
 			m.addRecipient(App.config.get("webmaster_email"));
 			m.setSubject(App.config.NAME + " Errors");
 			m.setHtmlBody(app.processTemplate("mail/message.mtt", {text: report.toString()}));
@@ -306,7 +306,7 @@ class Cron extends Controller {
 
 					try {
 						var m = new Mail();
-						m.setSender(App.config.get("default_email"), "Cagette.net");
+						m.setSender(App.config.get("default_email"), t._("Cagette.net"));
 						if (group.contact != null)
 							m.setReplyTo(group.contact.email, group.name);
 						m.addRecipient(u.user.email, u.user.getName());

src/controller/Member.hx

@@ -1,4 +1,5 @@
 package controller;
+
 import Common;
 import haxe.Utf8;
 import sugoi.form.Form;
@@ -6,14 +7,11 @@ import sugoi.form.elements.Selectbox;
 import sugoi.form.validators.EmailValidator;
 import sugoi.tools.Utils;
 
-
-class Member extends Controller
-{
-
-	public function new()
-	{
+class Member extends Controller {
+	public function new() {
 		super();
-		if (!app.user.canAccessMembership()) throw Redirect("/");
+		if (!app.user.canAccessMembership())
+			throw Redirect("/");
 	}
 
 	@logged
@@ -25,65 +23,73 @@ class Member extends Controller
 		var uids = db.UserAmap.manager.search($amap == app.user.getAmap(), false);
 		var uids = Lambda.map(uids, function(ua) return ua.user.id);
 		if (args != null && args.search != null) {
-			
 			// SEARCH
 			browse = function(index:Int, limit:Int) {
 				var search = "%" + StringTools.trim(args.search) + "%";
-				return db.User.manager.search( 
-					($lastName.like(search) ||
-					$lastName2.like(search) || 
-					$address1.like(search) ||
-					$address2.like(search) ||
-					$firstName.like(search) ||
-					$firstName2.like(search)					
-					) && $id in uids , { orderBy:-id }, false);
+				return db.User.manager.search(($lastName.like(search) || $lastName2.like(search) || $address1.like(search) || $address2.like(search)
+					|| $firstName.like(search) || $firstName2.like(search))
+					&& $id in uids,
+					{
+						orderBy: -id
+					}, false);
 			}
 			view.search = args.search;
-			
 		} else if (args != null && args.select != null) {
-			
 			// SELECTION
 
 			switch (args.select) {
 				case "nocontract":
 					if (app.params.exists("csv")) {
-						sugoi.tools.Csv.printCsvDataFromObjects(Lambda.array(db.User.getUsers_NoContracts()), ["firstName", "lastName", "email"], t._("Without contracts"));
+						sugoi.tools.Csv.printCsvDataFromObjects(Lambda.array(db.User.getUsers_NoContracts()), ["firstName", "lastName", "email"],
+							t._("Without contracts"));
 						return;
 					} else {
-						browse = function(index:Int, limit:Int) { return db.User.getUsers_NoContracts(index, limit); }	
+						browse = function(index:Int, limit:Int) {
+							return db.User.getUsers_NoContracts(index, limit);
+						}
 					}
 				case "contract":
-					
 					if (app.params.exists("csv")) {
-						sugoi.tools.Csv.printCsvDataFromObjects(Lambda.array(db.User.getUsers_Contracts()), ["firstName", "lastName", "email"], t._("With orders"));
+						sugoi.tools.Csv.printCsvDataFromObjects(Lambda.array(db.User.getUsers_Contracts()), ["firstName", "lastName", "email"],
+							t._("With orders"));
 						return;
 					} else {
-						browse = function(index:Int, limit:Int) { return db.User.getUsers_Contracts(index, limit); }	
+						browse = function(index:Int, limit:Int) {
+							return db.User.getUsers_Contracts(index, limit);
+						}
 					}
 
 				case "nomembership":
 					if (app.params.exists("csv")) {
-						sugoi.tools.Csv.printCsvDataFromObjects(Lambda.array(db.User.getUsers_NoMembership()), ["firstName", "lastName", "email"], t._("Memberships to be renewed"));
+						sugoi.tools.Csv.printCsvDataFromObjects(Lambda.array(db.User.getUsers_NoMembership()), ["firstName", "lastName", "email"],
+							t._("Memberships to be renewed"));
 						return;
 					} else {
-						browse = function(index:Int, limit:Int) { return db.User.getUsers_NoMembership(index, limit); }
+						browse = function(index:Int, limit:Int) {
+							return db.User.getUsers_NoMembership(index, limit);
+						}
 					}
 				case "newusers":
 					if (app.params.exists("csv")) {
-						sugoi.tools.Csv.printCsvDataFromObjects(Lambda.array(db.User.getUsers_NewUsers()), ["firstName", "lastName", "email"], t._("Never connected"));
+						sugoi.tools.Csv.printCsvDataFromObjects(Lambda.array(db.User.getUsers_NewUsers()), ["firstName", "lastName", "email"],
+							t._("Never connected"));
 						return;
 					} else {
-						browse = function(index:Int, limit:Int) { return db.User.getUsers_NewUsers(index, limit); }
+						browse = function(index:Int, limit:Int) {
+							return db.User.getUsers_NewUsers(index, limit);
+						}
 					}
 				default:
 					throw t._("Unknown selection");
 			}
 			view.select = args.select;
-			
 		} else {
 			if (app.params.exists("csv")) {
-				var headers = ["firstName", "lastName", "email","phone", "firstName2", "lastName2","email2","phone2", "address1","address2","zipCode","city"];
-				sugoi.tools.Csv.printCsvDataFromObjects(Lambda.array(db.User.manager.search( $id in uids, {orderBy:lastName}, false)), headers, t._("Members"));
+				var headers = [
+					"firstName", "lastName", "email", "phone", "firstName2", "lastName2", "email2", "phone2", "address1", "address2", "zipCode", "city"
+				];
+				sugoi.tools.Csv.printCsvDataFromObjects(Lambda.array(db.User.manager.search($id in uids, {orderBy: lastName}, false)), headers,
+					t._("Members"));
 				return;
 			} else {
 				// default display
@@ -103,14 +109,12 @@ class Member extends Controller
 		}
 
 		view.waitingList = db.WaitingList.manager.count($group == app.user.amap);
-		
 	}
 
 	/**
 	 * Move to waiting list
 	 */
 	function doMovetowl(u:db.User) {
-		
 		var ua = db.UserAmap.get(u, app.user.amap, true);
 		ua.delete();
 
@@ -120,8 +124,6 @@ class Member extends Controller
 		wl.insert();
 
 		throw Ok("/member", u.getName() + " " + t._("is now on waiting list."));
-		
-		
 	}
 
 	/**
@@ -129,18 +131,13 @@ class Member extends Controller
 	 */
 	@tpl('member/waiting.mtt')
 	function doWaiting(?args:{?add:db.User, ?remove:db.User}) {
-		
 		if (args != null) {
 			if (args.add != null) {
-				
 				service.WaitingListService.approveRequest(args.add, app.user.amap);
 				throw Ok("/member/waiting", t._("Membership request accepted"));
-				
 			} else if (args.remove != null) {
-				
 				service.WaitingListService.cancelRequest(args.remove, app.user.amap);
 				throw Ok("/member/waiting", t._("Membership request refused"));
-				
 			}
 		}
 
@@ -151,21 +148,17 @@ class Member extends Controller
 	 * Send an invitation to a new member
 	 */
 	function doInviteMember(u:db.User) {
-		
 		if (checkToken()) {
 			u.sendInvitation(app.user.amap);
 			throw Ok('/member/view/' + u.id, t._("Invitation sent."));
 		}
-		
 	}
 
 	/**
 	 * Invite 'never logged' users
 	 */
 	function doInvite() {
-		
 		if (checkToken()) {
-			
 			var users = db.User.getUsers_NewUsers();
 			try {
 				for (u in users) {
@@ -181,16 +174,14 @@ class Member extends Controller
 
 			throw Ok('/member', t._("Congratulations, you just sent <b>::userLength::</b> invitations", {userLength: users.length}));
 		}
-		
 	}
 
-	
 	@tpl("member/view.mtt")
 	function doView(member:db.User) {
-		
 		view.member = member;
 		var userAmap = db.UserAmap.get(member, app.user.amap);
-		if (userAmap == null) throw Error("/member", t._("This person does not belong to your group"));
+		if (userAmap == null)
+			throw Error("/member", t._("This person does not belong to your group"));
 
 		view.userAmap = userAmap;
 		view.canLoginAs = (db.UserAmap.manager.count($userId == member.id) == 1 && app.user.isAmapManager()) || app.user.isAdmin();
@@ -199,12 +190,16 @@ class Member extends Controller
 		var row = {constOrders: new Array<UserOrder>(), varOrders: new Map<String, Array<UserOrder>>()};
 
 		// commandes fixes
-		var contracts = db.Contract.manager.search($type == db.Contract.TYPE_CONSTORDERS && $amap == app.user.amap && $endDate > DateTools.delta(Date.now(),-1000.0*60*60*24*30), false);
+		var contracts = db.Contract.manager.search($type == db.Contract.TYPE_CONSTORDERS
+			&& $amap == app.user.amap
+			&& $endDate > DateTools.delta(Date.now(), -1000.0 * 60 * 60 * 24 * 30), false);
 		var orders = member.getOrdersFromContracts(contracts);
 		row.constOrders = service.OrderService.prepare(orders);
 
 		// commandes variables groupées par date de distrib
-		var contracts = db.Contract.manager.search($type == db.Contract.TYPE_VARORDER && $amap == app.user.amap && $endDate > DateTools.delta(Date.now(),-1000.0*60*60*24*30), false);
+		var contracts = db.Contract.manager.search($type == db.Contract.TYPE_VARORDER
+			&& $amap == app.user.amap
+			&& $endDate > DateTools.delta(Date.now(), -1000.0 * 60 * 60 * 24 * 30), false);
 		var distribs = new Map<String, List<db.UserContract>>();
 		for (c in contracts) {
 			var ds = c.getDistribs();
@@ -215,9 +210,9 @@ class Member extends Controller
 					if (!distribs.exists(k)) {
 						distribs.set(k, orders);
 					} else {
-						
 						var v = distribs.get(k);
-						for ( o in orders  ) v.add(o);
+						for (o in orders)
+							v.add(o);
 						distribs.set(k, v);
 					}
 				}
@@ -229,10 +224,8 @@ class Member extends Controller
 			row.varOrders.set(k, d2);
 		}
 
-		
 		view.userContracts = row;
 		checkToken(); // to insert a token in tpl
-		
 	}
 
 	/**
@@ -241,12 +234,13 @@ class Member extends Controller
 	 * @param	amap
 	 */
 	function doLoginas(member:db.User, amap:db.Amap) {
-	
 		if (!app.user.isAdmin()) {
-			if (!app.user.isAmapManager()) return;
-			if (member.isAdmin()) return;
-			if ( db.UserAmap.manager.count($userId == member.id) > 1 ) return;
-			
+			if (!app.user.isAmapManager())
+				return;
+			if (member.isAdmin())
+				return;
+			if (db.UserAmap.manager.count($userId == member.id) > 1)
+				return;
 		}
 
 		App.current.session.setUser(member);
@@ -256,20 +250,26 @@ class Member extends Controller
 
 	@tpl('member/lastMessages.mtt')
 	function doLastMessages(member:db.User) {
-		
-		var out = new Array<{date:Date,subject:String,success:String,failure:String}>();
+		var out = new Array<{
+			date:Date,
+			subject:String,
+			success:String,
+			failure:String
+		}>();
 		var threeMonth = DateTools.delta(Date.now(), -1000.0 * 60 * 60 * 24 * 30.5 * 3);
 
 		for (m in sugoi.db.BufferedMail.manager.search($remoteId == app.user.amap.id && $cdate > threeMonth, {limit: 10, orderBy: -cdate})) {
-			
 			var status:sugoi.mail.IMailer.MailerResult = m.status;
 
 			if (status != null && status.get(member.email) != null) {
-				
 				var r = m.getMailerResultMessage(member.email);
-				out.push( {date:m.cdate,subject:m.title,success:r.success,failure:r.failure} );	
+				out.push({
+					date: m.cdate,
+					subject: m.title,
+					success: r.success,
+					failure: r.failure
+				});
 			}
-			
 		}
 		view.emails = out;
 	}
@@ -279,8 +279,8 @@ class Member extends Controller
 	 */
 	@tpl('form.mtt')
 	function doEdit(member:db.User) {
-		
-		if (member.isAdmin() && !app.user.isAdmin()) throw Error("/", t._("You cannot modify the account of an administrator"));
+		if (member.isAdmin() && !app.user.isAdmin())
+			throw Error("/", t._("You cannot modify the account of an administrator"));
 
 		var form = sugoi.form.Form.fromSpod(member);
 
@@ -290,7 +290,6 @@ class Member extends Controller
 		form.removeElement(form.getElement("ldate"));
 		form.removeElement(form.getElement("apiKey"));
 
-		
 		var isReg = member.isFullyRegistred();
 		var groupNum = db.UserAmap.manager.count($userId == member.id);
 
@@ -310,7 +309,6 @@ class Member extends Controller
 		}
 
 		if (form.checkToken()) {
-			
 			if (app.user.amap.flags.has(db.Amap.AmapFlags.PhoneRequired) && form.getValueOf("phone") == null) {
 				throw Error("/member/edit/" + member.id, t._("Phone number is required in this group."));
 			}
@@ -320,17 +318,16 @@ class Member extends Controller
 			// check that the given emails are not already used elsewhere
 			var sim = db.User.getSameEmail(member.email, member.email2);
 			for (s in sim) {
-				if (s.id == member.id) sim.remove(s);
+				if (s.id == member.id)
+					sim.remove(s);
 			}
 			if (sim.length > 0) {
-				
 				// Let's merge the 2 users if it has no orders.
 				var id = sim.first().id;
 				if (db.UserContract.manager.search($userId == id || $userId2 == id, false).length == 0) {
 					// merge
 					member.merge(sim.first());
 					app.session.addMessage(t._("This e-mail was used by another user account. As this user account was not used, it has been merged into the current user account."));
-					
 				} else {
 					var str = t._("Warning, this e-mail or this name already exists for another account : ");
 					str += Lambda.map(sim, function(u) return "<a href='/member/view/" + u.id + "'>" + u.getCoupleName() + "</a>").join(",");
@@ -339,28 +336,33 @@ class Member extends Controller
 				}
 			}
 
-			if (!isReg) member.setPass(form.getValueOf("pass"));
+			if (!isReg)
+				member.setPass(form.getValueOf("pass"));
 
 			member.update();
 
 			if (!App.config.DEBUG && groupNum == 1) {
-				
 				// warn the user that his email has been updated
 				if (form.getValueOf("email") != member.email) {
 					var m = new sugoi.mail.Mail();
 					m.setSender(App.config.get("default_email"), t._("Cagette.net"));
 					m.addRecipient(member.email);
 					m.setSubject(t._("Change your e-mail in your account Cagette.net"));
-					m.setHtmlBody( app.processTemplate("mail/message.mtt", { text:app.user.getName() + t._(" just modified your e-mail in your account Cagette.net.<br/>Your e-mail is now:")+form.getValueOf("email")  } ) );
+					m.setHtmlBody(app.processTemplate("mail/message.mtt",
+						{text: app.user.getName()
+							+ t._(" just modified your e-mail in your account Cagette.net.<br/>Your e-mail is now:")
+							+ form.getValueOf("email")}));
 					App.sendMail(m);
-					
 				}
 				if (form.getValueOf("email2") != member.email2 && member.email2 != null) {
 					var m = new sugoi.mail.Mail();
-					m.setSender(App.config.get("default_email"),"Cagette.net");
+					m.setSender(App.config.get("default_email"), t._("Cagette.net"));
 					m.addRecipient(member.email2);
 					m.setSubject(t._("Change the e-mail of your account Cagette.net"));
-					m.setHtmlBody( app.processTemplate("mail/message.mtt", { text:app.user.getName() +t._(" just modified your e-mail in your account Cagette.net.<br/>Your e-mail is now:")+form.getValueOf("email2")  } ) );
+					m.setHtmlBody(app.processTemplate("mail/message.mtt",
+						{text: app.user.getName()
+							+ t._(" just modified your e-mail in your account Cagette.net.<br/>Your e-mail is now:")
+							+ form.getValueOf("email2")}));
 					App.sendMail(m);
 				}
 			}
@@ -369,19 +371,24 @@ class Member extends Controller
 		}
 
 		view.form = form;
-		
 	}
 
 	/**
 	 * Remove a user from this group
 	 */
 	function doDelete(user:db.User, ?args:{confirm:Bool, token:String}) {
-		
 		if (checkToken()) {
-			if (!app.user.canAccessMembership()) throw t._("You cannot do that.");
-			if (user.id == app.user.id) throw Error("/member/view/" + user.id, t._("You cannot delete yourself."));
+			if (!app.user.canAccessMembership())
+				throw t._("You cannot do that.");
+			if (user.id == app.user.id)
+				throw Error("/member/view/" + user.id, t._("You cannot delete yourself."));
 			if (Lambda.count(user.getOrders(app.user.amap), function(x) return x.quantity > 0) > 0 && !args.confirm) {
-				throw Error("/member/view/"+user.id, t._("Warning, this account has orders. <a class='btn btn-default btn-xs' href='/member/delete/::userid::?token=::argstoken::&confirm=1'>Remove anyway</a>", {userid:user.id, argstoken:args.token}));
+				throw Error("/member/view/" + user.id,
+					t._("Warning, this account has orders. <a class='btn btn-default btn-xs' href='/member/delete/::userid::?token=::argstoken::&confirm=1'>Remove anyway</a>",
+						{
+							userid: user.id,
+							argstoken: args.token
+						}));
 			}
 
 			var ua = db.UserAmap.get(user, app.user.amap, true);
@@ -398,8 +405,8 @@ class Member extends Controller
 
 	@tpl('form.mtt')
 	function doMerge(user:db.User) {
-		
-		if (!app.user.canAccessMembership()) throw Error("/","Action interdite");
+		if (!app.user.canAccessMembership())
+			throw Error("/", "Action interdite");
 
 		view.title = t._("Merge an account with another one");
 		view.text = t._("This action allows you to merge two accounts (when you have duplicates in the database for example).<br/>Contracts of account 2 will be moved to account 1, and account 2 will be deleted. Warning, it is not possible to cancel this action.");
@@ -414,7 +421,6 @@ class Member extends Controller
 		form.addElement(mlist);
 
 		if (form.checkToken()) {
-		
 			var m1 = Std.parseInt(form.getElement("member1").value);
 			var m2 = Std.parseInt(form.getElement("member2").value);
 			var m1 = db.User.manager.get(m1, true);
@@ -426,8 +432,10 @@ class Member extends Controller
 			// change usercontracts
 			var contracts = db.UserContract.manager.search($user == m2 || $user2 == m2, true);
 			for (c in contracts) {
-				if (c.user.id == m2.id) c.user = m1;
-				if (c.user2!=null && c.user2.id == m2.id) c.user2 = m1;
+				if (c.user.id == m2.id)
+					c.user = m1;
+				if (c.user2 != null && c.user2.id == m2.id)
+					c.user2 = m1;
 				c.update();
 			}
 
@@ -453,27 +461,23 @@ class Member extends Controller
 			m2.delete();
 
 			throw Ok("/member/view/" + m1.id, t._("Both accounts have been merged"));
-			
-			
 		}
 
 		view.form = form;
-		
 	}
 
-	
 	@tpl('member/import.mtt')
 	function doImport(?args:{confirm:Bool}) {
-		
 		var step = 1;
 		var request = Utils.getMultipart(1024 * 1024 * 4); // 4mb
 
 		// on recupere le contenu de l'upload
 		var data = request.get("file");
 		if (data != null) {
-			
 			var csv = new sugoi.tools.Csv();
-			csv.setHeaders([t._("Firstname"), t._("Lastname"), t._("E-mail"), t._("Mobile phone"), t._("Partner's firstname"), t._("Partner's lastname"), t._("Partner's e-mail"), t._("Partner's Mobile phone"), t._("Address 1"), t._("Address 2"), t._("Post code"), t._("City")]);
+			csv.setHeaders([
+				t._("Firstname"), t._("Lastname"), t._("E-mail"), t._("Mobile phone"), t._("Partner's firstname"), t._("Partner's lastname"),
+				t._("Partner's e-mail"), t._("Partner's Mobile phone"), t._("Address 1"), t._("Address 2"), t._("Post code"), t._("City")]);
 
 			// utf8 encode if needed
 			try {
@@ -491,17 +495,20 @@ class Member extends Controller
 
 			// cleaning
 			for (user in unregistred.copy()) {
-				
 				// check nom+prenom
 				if (user[0] == null || user[1] == null) {
 					throw Error("/member/import", t._("You must fill the name and the firstname of the person. This line is incomplete: ") + user);
 				}
 				if (user[2] == null) {
-					throw Error("/member/import", t._("Each person must have an e-mail to be able to log in. ::user0:: ::user1:: don't have one. ", {user0:user[0], user1:user[1]}) +user);
+					throw Error("/member/import",
+						t._("Each person must have an e-mail to be able to log in. ::user0:: ::user1:: don't have one. ",
+							{user0: user[0], user1: user[1]}) + user);
 				}
 				// uppercase du nom
-				if (user[1] != null) user[1] = user[1].toUpperCase();
-				if (user[5] != null) user[5] = user[5].toUpperCase();
+				if (user[1] != null)
+					user[1] = user[1].toUpperCase();
+				if (user[5] != null)
+					user[5] = user[5].toUpperCase();
 				// lowercase email
 				if (user[2] != null) {
 					user[2] = user[2].toLowerCase();
@@ -515,7 +522,6 @@ class Member extends Controller
 
 			// utf-8 check
 			for (row in unregistred.copy()) {
-				
 				for (i in 0...row.length) {
 					var t = row[i];
 					if (t != "" && t != null) {
@@ -548,7 +554,6 @@ class Member extends Controller
 				}
 			}
 
-			
 			app.session.data.csvUnregistered = unregistred;
 			app.session.data.csvRegistered = registred;
 
@@ -557,13 +562,12 @@ class Member extends Controller
 			step = 2;
 		}
 
-		
 		if (args != null && args.confirm) {
-			
 			// import unregistered members
 			var i:Iterable<Dynamic> = cast app.session.data.csvUnregistered;
 			for (u in i) {
-				if (u[0] == null || u[0] == "null" || u[0] == "") continue;
+				if (u[0] == null || u[0] == "null" || u[0] == "")
+					continue;
 
 				var user = new db.User();
 				user.firstName = u[0];
@@ -579,7 +583,8 @@ class Member extends Controller
 				user.email2 = u[6];
 				if (user.email2 != null && user.email2 != "null" && !EmailValidator.check(user.email2)) {
 					App.log(u);
-					throw t._("The E-mail of the partner of ::userFirstName:: ::userLastName:: '::userEmail::' is invalid, please check your file", {userFirstName:user.firstName, userLastName:user.lastName, userEmail:user.email2});
+					throw t._("The E-mail of the partner of ::userFirstName:: ::userLastName:: '::userEmail::' is invalid, please check your file",
+						{userFirstName: user.firstName, userLastName: user.lastName, userEmail: user.email2});
 				}
 				user.phone2 = u[7];
 				user.address1 = u[8];
@@ -601,7 +606,8 @@ class Member extends Controller
 				var email2 = u[6];
 
 				var us = db.User.getSameEmail(email, email2);
-				var userAmaps = db.UserAmap.manager.search($amap == app.user.amap && $userId in Lambda.map(us, function(u) return u.id), false);
+				var userAmaps = db.UserAmap.manager.search($amap == app.user.amap
+					&& $userId in Lambda.map(us, function(u) return u.id), false);
 
 				// member exists but is not member of this group.
 				if (userAmaps.length == 0) {
@@ -630,8 +636,8 @@ class Member extends Controller
 
 	@tpl("user/insert.mtt")
 	public function doInsert() {
-		
-		if (!app.user.canAccessMembership()) throw Error("/", t._("Forbidden action"));
+		if (!app.user.canAccessMembership())
+			throw Error("/", t._("Forbidden action"));
 
 		var m = new db.User();
 		var form = sugoi.form.Form.fromSpod(m);
@@ -645,17 +651,16 @@ class Member extends Controller
 		form.getElement("email2").addValidator(new EmailValidator());
 
 		if (form.isValid()) {
-			
 			// check doublon de User et de UserAmap
 			var userSims = db.User.getSameEmail(form.getValueOf("email"), form.getValueOf("email2"));
 			view.userSims = userSims;
-			var userAmaps = db.UserAmap.manager.search($amap == app.user.amap && $userId in Lambda.map(userSims, function(u) return u.id), false);
+			var userAmaps = db.UserAmap.manager.search($amap == app.user.amap
+				&& $userId in Lambda.map(userSims, function(u) return u.id), false);
 			view.userAmaps = userAmaps;
 
 			if (userAmaps.length > 0) {
 				// user deja enregistré dans cette amap
 				throw Error('/member/view/' + userAmaps.first().user.id, t._("This person is already member of this group"));
-				
 			} else if (userSims.length > 0) {
 				// des users existent avec ce nom ,
 				// if (userSims.length == 1) {
@@ -672,7 +677,6 @@ class Member extends Controller
 				}*/
 				return;
 			} else {
-				
 				if (app.user.amap.flags.has(db.Amap.AmapFlags.PhoneRequired) && form.getValueOf("phone") == null) {
 					throw Error("/member/insert", t._("Phone number is required in this group."));
 				}
@@ -691,29 +695,30 @@ class Member extends Controller
 
 				if (form.getValueOf("warnAmapManager") == "1") {
 					var url = "http://" + App.config.HOST + "/member/view/" + u.id;
-					var text = t._("::admin:: just keyed-in contact details of a new member: <br/><strong>::newMember::</strong><br/> <a href='::url::'>See contact details</a>",{admin:app.user.getName(),newMember:u.getCoupleName(),url:url});
-					App.quickMail(
-						app.user.getAmap().contact.email,
-						app.user.amap.name +" - "+ t._("New member") + " : " + u.getCoupleName(),
-						app.processTemplate("mail/message.mtt", { text:text } ) 
-					);
+					var text = t._("::admin:: just keyed-in contact details of a new member: <br/><strong>::newMember::</strong><br/> <a href='::url::'>See contact details</a>",
+						{
+							admin: app.user.getName(),
+							newMember: u.getCoupleName(),
+							url: url
+						});
+					App.quickMail(app.user.getAmap().contact.email, app.user.amap.name + " - " + t._("New member") + " : " + u.getCoupleName(),
+						app.processTemplate("mail/message.mtt", {
+							text: text
+						}));
 				}
 
 				throw Ok('/member/', t._("This person is now member of the group"));
-				
 			}
 		}
 
 		view.form = form;
 	}
 
-	
 	/**
 	 * user payments history
 	 */
 	@tpl('member/payments.mtt')
 	function doPayments(m:db.User) {
-		
 		service.PaymentService.updateUserBalance(m, app.user.amap);
 		var browse:Int->Int->List<Dynamic>;
 
@@ -737,5 +742,4 @@ class Member extends Controller
 		view.credit = db.UserAmap.manager.search($amap == app.user.amap && $balance > 0, false);
 		view.debt = db.UserAmap.manager.search($amap == app.user.amap && $balance < 0, false);
 	}
-	
 }

src/service/OrderService.hx

@@ -1,4 +1,5 @@
 package service;
+
 import Common;
 import tink.core.Error;
 
@@ -6,9 +7,7 @@ import tink.core.Error;
  * Order Service
  * @author web-wizard,fbarbut
  */
-class OrderService
-{
-
+class OrderService {
 	static function canHaveFloatQt(product:db.Product):Bool {
 		return product.hasFloatQt || product.wholesale || product.variablePrice;
 	}
@@ -20,11 +19,12 @@ class OrderService
 	 * @param	productId
 	 */
 	public static function make(user:db.User, quantity:Float, product:db.Product, ?distribId:Int, ?paid:Bool, ?user2:db.User, ?invert:Bool):db.UserContract {
-		
 		var t = sugoi.i18n.Locale.texts;
 
-		if(product.contract.type==db.Contract.TYPE_VARORDER && distribId==null) throw "You have to provide a distribId";
-		if(quantity==null) throw "Quantity is null";
+		if (product.contract.type == db.Contract.TYPE_VARORDER && distribId == null)
+			throw "You have to provide a distribId";
+		if (quantity == null)
+			throw "Quantity is null";
 
 		// quantity
 		if (!canHaveFloatQt(product)) {
@@ -35,7 +35,8 @@ class OrderService
 
 		// multiweight : make one row per product
 		if (product.multiWeight && quantity > 1.0) {
-			if (product.multiWeight && quantity != Math.abs(quantity)) throw t._("multi-weighing products should be ordered only with integer quantities");
+			if (product.multiWeight && quantity != Math.abs(quantity))
+				throw t._("multi-weighing products should be ordered only with integer quantities");
 
 			var o = null;
 			for (i in 0...Math.round(quantity)) {
@@ -45,7 +46,8 @@ class OrderService
 		}
 
 		// checks
-		if (quantity <= 0) return null;
+		if (quantity <= 0)
+			return null;
 
 		// check for previous orders on the same distrib
 		var prevOrders = new List<db.UserContract>();
@@ -66,10 +68,13 @@ class OrderService
 		o.user = user;
 		if (user2 != null) {
 			o.user2 = user2;
-			if (invert != null) o.flags.set(InvertSharedOrder);
+			if (invert != null)
+				o.flags.set(InvertSharedOrder);
 		}
-		if (paid != null) o.paid = paid;
-		if (distribId != null) o.distribution = db.Distribution.manager.get(distribId);
+		if (paid != null)
+			o.paid = paid;
+		if (distribId != null)
+			o.distribution = db.Distribution.manager.get(distribId);
 
 		// cumulate quantities if there is a similar previous order
 		if (prevOrders.length > 0 && !product.multiWeight) {
@@ -97,7 +102,8 @@ class OrderService
 				// trace("stock for "+quantity+" x "+product.name);
 				if (o.product.stock == 0) {
 					if (App.current.session != null) {
-						App.current.session.addMessage(t._("There is no more '::productName::' in stock, we removed it from your order", {productName:o.product.name}), true);
+						App.current.session.addMessage(t._("There is no more '::productName::' in stock, we removed it from your order",
+							{productName: o.product.name}), true);
 					}
 					o.quantity -= quantity;
 					if (o.quantity <= 0) {
@@ -110,14 +116,14 @@ class OrderService
 					o.update();
 
 					if (App.current.session != null) {
-						var msg = t._("We reduced your order of '::productName::' to quantity ::oQuantity:: because there is no available products anymore", {productName:o.product.name, oQuantity:o.quantity});
+						var msg = t._("We reduced your order of '::productName::' to quantity ::oQuantity:: because there is no available products anymore",
+							{productName: o.product.name, oQuantity: o.quantity});
 						App.current.session.addMessage(msg, true);
 					}
 					o.product.lock();
 					o.product.stock = 0;
 					o.product.update();
 					App.current.event(StockMove({product: o.product, move: 0 - (quantity - canceled)}));
-					
 				} else {
 					o.product.lock();
 					o.product.stock -= quantity;
@@ -129,18 +135,17 @@ class OrderService
 		return o;
 	}
 
-
 	/**
 	 * Edit an existing order (quantity)
 	 */
 	public static function edit(order:db.UserContract, newquantity:Float, ?paid:Bool, ?user2:db.User, ?invert:Bool) {
-		
 		var t = sugoi.i18n.Locale.texts;
 
 		order.lock();
 
 		// quantity
-		if (newquantity == null) newquantity = 0;
+		if (newquantity == null)
+			newquantity = 0;
 		if (!canHaveFloatQt(order.product)) {
 			if (!tools.FloatTool.isInt(newquantity)) {
 				throw new tink.core.Error(t._("Error : product \"::product::\" quantity should be integer", {product: order.product.name}));
@@ -151,14 +156,17 @@ class OrderService
 		if (paid != null) {
 			order.paid = paid;
 		} else {
-			if (order.quantity < newquantity) order.paid = false;	
+			if (order.quantity < newquantity)
+				order.paid = false;
 		}
 
 		// shared order
 		if (user2 != null) {
 			order.user2 = user2;
-			if (invert == true) order.flags.set(InvertSharedOrder);
-			if (invert == false) order.flags.unset(InvertSharedOrder);
+			if (invert == true)
+				order.flags.set(InvertSharedOrder);
+			if (invert == false)
+				order.flags.unset(InvertSharedOrder);
 		} else {
 			order.user2 = null;
 			order.flags.unset(InvertSharedOrder);
@@ -170,32 +178,30 @@ class OrderService
 			var c = order.product.contract;
 
 			if (c.hasStockManagement()) {
-				
 				if (newquantity < order.quantity) {
-
 					// on commande moins que prévu : incrément de stock
 					order.product.lock();
 					order.product.stock += (order.quantity - newquantity);
 					e = StockMove({product: order.product, move: 0 - (order.quantity - newquantity)});
-					
 				} else {
-				
 					// on commande plus que prévu : décrément de stock
 					var addedquantity = newquantity - order.quantity;
 
 					if (order.product.stock - addedquantity < 0) {
-						
 						// stock is not enough, reduce order
 						newquantity = order.quantity + order.product.stock;
-						if( App.current.session!=null) App.current.session.addMessage(t._("We reduced your order of '::productName::' to quantity ::oQuantity:: because there is no available products anymore", {productName:order.product.name, oQuantity:newquantity}), true);
+						if (App.current.session != null)
+							App.current.session.addMessage(t._("We reduced your order of '::productName::' to quantity ::oQuantity:: because there is no available products anymore",
+								{
+								productName: order.product.name,
+								oQuantity: newquantity
+							}), true);
 
 						e = StockMove({product: order.product, move: 0 - order.product.stock});
 
 						order.product.lock();
 						order.product.stock = 0;
-						
 					} else {
-						
 						// stock is big enough
 						order.product.lock();
 						order.product.stock -= addedquantity;
@@ -222,36 +228,34 @@ class OrderService
 		return order;
 	}
 
-
 	/**
 	 *  Delete an order
 	 */
 	public static function delete(order:db.UserContract) {
 		var t = sugoi.i18n.Locale.texts;
 
-		if(order==null) throw new Error(t._("This order has already been deleted."));
+		if (order == null)
+			throw new Error(t._("This order has already been deleted."));
 
 		order.lock();
 
 		if (order.quantity == 0) {
-
 			var contract = order.product.contract;
 			var user = order.user;
 
 			// Amap Contract
 			if (contract.type == db.Contract.TYPE_CONSTORDERS) {
-
 				order.delete();
 
 				if (contract.amap.hasPayments()) {
 					var orders = contract.getUserOrders(user);
 					if (orders.length == 0) {
 						var operation = db.Operation.findCOrderTransactionFor(contract, user);
-						if(operation!=null) operation.delete();
-					}
+						if (operation != null)
+							operation.delete();
 					}
 				}
-			else { //Variable orders contract
+			} else { // Variable orders contract
 
 				// Get the basket for this user
 				var place = order.distribution.place;
@@ -262,18 +266,16 @@ class OrderService
 					// Check if it is the last order, if yes then delete the related operation
 					if (orders.length == 1 && orders.first().id == order.id) {
 						var operation = db.Operation.findVOrderTransactionFor(order.distribution.getKey(), user, place.amap);
-						if(operation!=null) operation.delete();
+						if (operation != null)
+							operation.delete();
 					}
-
 				}
 
 				order.delete();
 			}
-		}
-		else {
+		} else {
 			throw new Error(t._("Deletion not possible: quantity is not zero."));
 		}
-
 	}
 
 	/**
@@ -285,7 +287,6 @@ class OrderService
 		var view = App.current.view;
 		var t = sugoi.i18n.Locale.texts;
 		for (o in orders) {
-		
 			var x:UserOrder = cast {};
 			x.id = o.id;
 			x.userId = o.user.id;
@@ -312,7 +313,6 @@ class OrderService
 			x.product = o.product.infos();
 			x.product.price = o.productPrice; // do not use current price, but price of the order
 
-			
 			x.quantity = o.quantity;
 
 			// smartQt
@@ -336,12 +336,10 @@ class OrderService
 			var c = o.product.contract;
 
 			if (o.feesRate != 0) {
-				
 				x.fees = x.subTotal * (o.feesRate / 100);
 				x.percentageName = c.percentageName;
 				x.percentageValue = o.feesRate;
 				x.total = x.subTotal + x.fees;
-				
 			} else {
 				x.total = x.subTotal;
 			}
@@ -377,15 +375,15 @@ class OrderService
 		return orders;
 	}
 
-
 	/**
 	 *  Send an order-by-products report to the coordinator
 	 */
 	public static function sendOrdersByProductReport(d:db.Distribution) {
+		var t = sugoi.i18n.Locale.texts;
 
 		var m = new sugoi.mail.Mail();
 		m.addRecipient(d.contract.contact.email, d.contract.contact.getName());
-		m.setSender(App.config.get("default_email"),"Cagette.net");
+		m.setSender(App.config.get("default_email"), t._("Cagette.net"));
 		m.setSubject('[${d.contract.amap.name}] Distribution du ${App.current.view.dDate(d.date)} (${d.contract.name})');
 		var orders = service.ReportService.getOrdersByProduct(d);
 
@@ -402,24 +400,22 @@ class OrderService
 
 		m.setHtmlBody(html);
 		App.sendMail(m);
-
 	}
 
-
 	/**
 	 *  Order summary for a member
 	 *  WARNING : its for one distrib, not for a whole basket !
 	 */
 	public static function sendOrderSummaryToMembers(d:db.Distribution) {
-
+		var t = sugoi.i18n.Locale.texts;
 		var title = '[${d.contract.amap.name}] Votre commande pour le ${App.current.view.dDate(d.date)} (${d.contract.name})';
 
 		for (user in d.getUsers()) {
-
 			var m = new sugoi.mail.Mail();
 			m.addRecipient(user.email, user.getName(), user.id);
-			if(user.email2!=null) m.addRecipient(user.email2 , user.getName(),user.id);
-			m.setSender(App.config.get("default_email"),"Cagette.net");
+			if (user.email2 != null)
+				m.addRecipient(user.email2, user.getName(), user.id);
+			m.setSender(App.config.get("default_email"), t._("Cagette.net"));
 			m.setSubject(title);
 			var orders = prepare(d.contract.getUserOrders(user, d));
 
@@ -437,22 +433,31 @@ class OrderService
 			m.setHtmlBody(html);
 			App.sendMail(m);
 		}
-		
 	}
 
-	
-
 	public static function sort(orders:Array<UserOrder>) {
-		
 		// order by lastname (+lastname2 if exists), then contract
 		orders.sort(function(a, b) {
-			
-			if (a.userName + a.userId + a.userName2 + a.userId2 + a.contractId > b.userName + b.userId + b.userName2 + b.userId2 + b.contractId ) {
-				
+			if (a.userName
+				+ a.userId
+				+ a.userName2
+				+ a.userId2
+				+ a.contractId > b.userName
+					+ b.userId
+					+ b.userName2
+					+ b.userId2
+					+ b.contractId) {
 				return 1;
 			}
-			if (a.userName + a.userId + a.userName2 + a.userId2 + a.contractId < b.userName + b.userId + b.userName2 + b.userId2 + b.contractId ) {
-				 
+			if (a.userName
+				+ a.userId
+				+ a.userName2
+				+ a.userId2
+				+ a.contractId < b.userName
+					+ b.userId
+					+ b.userName2
+					+ b.userId2
+					+ b.contractId) {
 				return -1;
 			}
 			return 0;
@@ -460,9 +465,4 @@ class OrderService
 
 		return orders;
 	}
-	
-	
-
-
-	
 }