cagetters
/
cagettepei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

cagettepéi

master
pvincent 3 years ago
parent
c23e3533d8
commit
ef7b09454c
8 changed files with 686 additions and 686 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Makefile
  2. 72
      js/react/user/LoginBox.hx
  3. 2
      lang/master/tpl/base.mtt
  4. 4
      lang/master/tpl/design.mtt
  5. 2
      src/App.hx
  6. 4
      src/controller/Cron.hx
  7. 566
      src/controller/Member.hx
  8. 346
      src/service/OrderService.hx

4
Makefile
View File

@ -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)

72
js/react/user/LoginBox.hx
View File

@ -1,4 +1,5 @@
package react.user;
import react.ReactComponent;
import react.ReactMacro.jsx;
import Common;
@ -19,23 +20,21 @@ 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};
this.state = {email: "", password: "", error: null};
}
function setError(err:String){
this.setState(cast {error:err});
function setError(err:String) {
this.setState(cast {error: err});
}
override public function render(){
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>
-->
@ -72,11 +71,11 @@ class LoginBox extends react.ReactComponentOfPropsAndState<LoginBoxProps,LoginBo
/**
* @doc https://facebook.github.io/react/docs/forms.html
*/
function onChange(e:js.html.Event){
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;
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);
}
@ -84,56 +83,53 @@ class LoginBox extends react.ReactComponentOfPropsAndState<LoginBoxProps,LoginBo
/**
* displays a registerBox
*/
public function registerBox(){
public function registerBox() {
var body = js.Browser.document.querySelector('#myModal .modal-body');
ReactDOM.unmountComponentAtNode( body );
ReactDOM.unmountComponentAtNode(body);
js.Browser.document.querySelector("#myModal .modal-title").innerHTML = "Inscription";
ReactDOM.render(jsx('<$RegisterBox redirectUrl="${props.redirectUrl}" phoneRequired="${props.phoneRequired}"/>'), body );
ReactDOM.render(jsx('<$RegisterBox redirectUrl="${props.redirectUrl}" phoneRequired="${props.phoneRequired}"/>'), body);
}
public function submit(?e:js.html.Event){
if (state.email == ""){
public function submit(?e:js.html.Event) {
if (state.email == "") {
setError("Veuillez saisir votre email");
return;
}
if (state.password == ""){
if (state.password == "") {
setError("Veuillez saisir votre mot de passe");
return;
}
//lock button
var el: js.html.Element = null;
if(e!=null){
// lock button
var el:js.html.Element = null;
if (e != null) {
el = cast e.target;
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){
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();
function onKeyPress(e:js.html.KeyboardEvent) {
if (e.key == "Enter")
submit();
}
}

2
lang/master/tpl/base.mtt
View File

@ -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"/>

4
lang/master/tpl/design.mtt
View File

@ -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>

2
src/App.hx
View File

@ -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);

4
src/controller/Cron.hx
View File

@ -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());

566
src/controller/Member.hx
View File

@ -1,4 +1,5 @@
package controller;
import Common;
import haxe.Utf8;
import sugoi.form.Form;
@ -6,111 +7,114 @@ 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
@tpl('member/default.mtt')
function doDefault(?args: { ?search:String, ?select:String } ) {
function doDefault(?args:{?search:String, ?select:String}) {
checkToken();
var browse:Int->Int->List<Dynamic>;
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
// 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);
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);
}
view.search = args.search;
} else if (args != null && args.select != null) {
// SELECTION
}else if(args!=null && args.select!=null){
//SELECTION
switch(args.select) {
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); }
} else {
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); }
} else {
browse = function(index:Int, limit:Int) {
return db.User.getUsers_Contracts(index, limit);
}
}
case "nomembership" :
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); }
} else {
browse = function(index:Int, limit:Int) {
return db.User.getUsers_NoMembership(index, limit);
}
}
case "newusers" :
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); }
} else {
browse = function(index:Int, limit:Int) {
return db.User.getUsers_NewUsers(index, limit);
}
}
default:
throw t._("Unknown selection");
}
view.select = args.select;
}else {
} 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
} else {
// default display
browse = function(index:Int, limit:Int) {
return db.User.manager.search( $id in uids, { limit:[index,limit], orderBy:lastName }, false);
return db.User.manager.search($id in uids, {limit: [index, limit], orderBy: lastName}, false);
}
}
}
var count = uids.length;
var rb = new sugoi.tools.ResultsBrowser(count, (args.select!=null||args.search!=null)?1000:10, browse);
var rb = new sugoi.tools.ResultsBrowser(count, (args.select != null || args.search != null) ? 1000 : 10, browse);
view.members = rb;
if (args.select == null || args.select != "newusers") {
//count new users
// count new users
view.newUsers = db.User.getUsers_NewUsers().length;
}
view.waitingList = db.WaitingList.manager.count($group == app.user.amap);
}
/**
* Move to waiting list
*/
function doMovetowl(u:db.User){
function doMovetowl(u:db.User) {
var ua = db.UserAmap.get(u, app.user.amap, true);
ua.delete();
@ -119,93 +123,84 @@ class Member extends Controller
wl.group = app.user.amap;
wl.insert();
throw Ok("/member", u.getName() +" "+ t._("is now on waiting list.") );
throw Ok("/member", u.getName() + " " + t._("is now on waiting list."));
}
/**
* Display waiting list
*/
@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") );
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"));
}
}
view.waitingList = db.WaitingList.manager.search($group == app.user.amap,{orderBy:-date});
view.waitingList = db.WaitingList.manager.search($group == app.user.amap, {orderBy: -date});
}
/**
* Send an invitation to a new member
*/
function doInviteMember(u:db.User){
if (checkToken() ) {
function doInviteMember(u:db.User) {
if (checkToken()) {
u.sendInvitation(app.user.amap);
throw Ok('/member/view/'+u.id, t._("Invitation sent.") );
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) {
try {
for (u in users) {
u.sendInvitation(app.user.amap);
Sys.sleep(0.2);
}
}catch (e:String){
if (e.indexOf("curl") >-1) {
} catch (e:String) {
if (e.indexOf("curl") > -1) {
App.current.logError(e, haxe.CallStack.toString(haxe.CallStack.exceptionStack()));
throw Error("/member", t._("An error occurred while sending emails, please retry"));
}
}
throw Ok('/member', t._("Congratulations, you just sent <b>::userLength::</b> invitations", {userLength:users.length}));
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();
//orders
var row = { constOrders:new Array<UserOrder>(), varOrders:new Map<String,Array<UserOrder>>() };
// orders
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);
// 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 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 distribs = new Map<String,List<db.UserContract>>();
// 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 distribs = new Map<String, List<db.UserContract>>();
for (c in contracts) {
var ds = c.getDistribs();
for (d in ds) {
@ -214,25 +209,23 @@ class Member extends Controller
if (orders.length > 0) {
if (!distribs.exists(k)) {
distribs.set(k, orders);
}else {
} else {
var v = distribs.get(k);
for ( o in orders ) v.add(o);
for (o in orders)
v.add(o);
distribs.set(k, v);
}
}
}
}
for ( k in distribs.keys()){
for (k in distribs.keys()) {
var d = distribs.get(k);
var d2 = service.OrderService.prepare(d);
row.varOrders.set(k,d2);
row.varOrders.set(k, d2);
}
view.userContracts = row;
checkToken(); //to insert a token in tpl
checkToken(); // to insert a token in tpl
}
/**
@ -241,35 +234,42 @@ 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.isAdmin()) {
if (!app.user.isAmapManager())
return;
if (member.isAdmin())
return;
if (db.UserAmap.manager.count($userId == member.id) > 1)
return;
}
App.current.session.setUser(member);
App.current.session.data.amapId = amap.id;
throw Redirect("/member/view/" + member.id );
throw Redirect("/member/view/" + member.id);
}
@tpl('member/lastMessages.mtt')
function doLastMessages(member:db.User){
var out = new Array<{date:Date,subject:String,success:String,failure:String}>();
function doLastMessages(member:db.User) {
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 ){
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,127 +279,134 @@ 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);
//cleaning
form.removeElement( form.getElement("rights") );
form.removeElement( form.getElement("lang") );
form.removeElement( form.getElement("ldate") );
form.removeElement( form.getElement("apiKey") );
// cleaning
form.removeElement(form.getElement("rights"));
form.removeElement(form.getElement("lang"));
form.removeElement(form.getElement("ldate"));
form.removeElement(form.getElement("apiKey"));
var isReg = member.isFullyRegistred();
var groupNum = db.UserAmap.manager.count($userId == member.id);
//an administrator can modify a user's email only if he's not member elsewhere
if (groupNum > 1){
// an administrator can modify a user's email only if he's not member elsewhere
if (groupNum > 1) {
form.removeElementByName("email");
form.removeElementByName("email2");
app.session.addMessage(t._("For security reasons, you cannot modify the e-mail of this person because this person is a member of more than 1 group."));
}
//an administrator can modify a user's pass only if he's a not registred user.
if (!isReg){
// an administrator can modify a user's pass only if he's a not registred user.
if (!isReg) {
app.session.addMessage(t._("This person did not define yet a password. You are exceptionaly authorized to do it. Please don't forget to tell this person."));
form.getElement("pass").required = false;
}else{
form.removeElement( form.getElement("pass") );
} else {
form.removeElement(form.getElement("pass"));
}
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."));
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."));
}
form.toSpod(member);
//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);
// 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 (sim.length > 0) {
//Let's merge the 2 users if it has no orders.
// 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() );
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(",");
str += " "+t._("These accounts can't be merged because the second account has orders");
str += " " + t._("These accounts can't be merged because the second account has orders");
throw Error("/member/edit/" + member.id, str);
}
}
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
// 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) {
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);
}
}
throw Ok('/member/view/'+member.id, t._("This member has beed updated"));
throw Ok('/member/view/' + member.id, t._("This member has beed updated"));
}
view.form = form;
}
/**
* Remove a user from this group
*/
function doDelete(user:db.User,?args:{confirm:Bool,token:String}) {
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 ( 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}));
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
}));
}
var ua = db.UserAmap.get(user, app.user.amap, true);
if (ua != null) {
ua.delete();
throw Ok("/member", t._("::user:: has been removed from your group",{user:user.getName()}));
}else {
throw Error("/member", t._("This person does not belong to \"::amapname::\"", {amapname:app.user.amap.name}));
throw Ok("/member", t._("::user:: has been removed from your group", {user: user.getName()}));
} else {
throw Error("/member", t._("This person does not belong to \"::amapname::\"", {amapname: app.user.amap.name}));
}
}else {
throw Redirect("/member/view/"+user.id);
} else {
throw Redirect("/member/view/" + user.id);
}
}
@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.");
@ -407,80 +414,77 @@ class Member extends Controller
var form = new Form("merge");
var members = app.user.amap.getMembers();
var members = Lambda.array(Lambda.map(members, function(x) return { key:Std.string(x.id), value:x.getName() } ));
var members = Lambda.array(Lambda.map(members, function(x) return {key: Std.string(x.id), value: x.getName()}));
var mlist = new Selectbox("member1", t._("Account 1"), members, Std.string(user.id));
form.addElement( mlist );
form.addElement(mlist);
var mlist = new Selectbox("member2", t._("Account 2"), members);
form.addElement( mlist );
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);
var m2 = db.User.manager.get(m2,true);
var m1 = db.User.manager.get(m1, true);
var m2 = db.User.manager.get(m2, true);
//if (m1.amapId != m2.amapId) throw "ils ne sont pas de la même amap !";
// if (m1.amapId != m2.amapId) throw "ils ne sont pas de la même amap !";
//on prend tout à m2 pour donner à m1
//change usercontracts
var contracts = db.UserContract.manager.search($user==m2 || $user2==m2,true);
// on prend tout à m2 pour donner à m1
// 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();
}
//group memberships
// group memberships
var adh = db.UserAmap.manager.search($user == m2, true);
for ( a in adh) {
for (a in adh) {
a.user = m1;
a.update();
}
//change contacts
var contacts = db.Contract.manager.search($contact==m2,true);
// change contacts
var contacts = db.Contract.manager.search($contact == m2, true);
for (c in contacts) {
c.contact = m1;
c.update();
}
//if (m2.amap.contact == m2) {
//m1.amap.lock();
//m1.amap.contact = m1;
//m1.amap.update();
//}
// if (m2.amap.contact == m2) {
// m1.amap.lock();
// m1.amap.contact = m1;
// m1.amap.update();
// }
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 } ) {
function doImport(?args:{confirm:Bool}) {
var step = 1;
var request = Utils.getMultipart(1024 * 1024 * 4); //4mb
var request = Utils.getMultipart(1024 * 1024 * 4); // 4mb
//on recupere le contenu de l'upload
// on recupere le contenu de l'upload
var data = request.get("file");
if ( data != null) {
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{
if (!haxe.Utf8.validate(data)){
// utf8 encode if needed
try {
if (!haxe.Utf8.validate(data)) {
data = haxe.Utf8.encode(data);
}
}catch (e:Dynamic){ }
} catch (e:Dynamic) {}
var unregistred = csv.importDatas(data);
/*var checkEmail = function(email){
@ -489,55 +493,57 @@ class Member extends Controller
}
}*/
//cleaning
for ( user in unregistred.copy() ) {
//check nom+prenom
// 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();
//lowercase email
if (user[2] != null){
// uppercase du nom
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();
//checkEmail(user[2]);
// checkEmail(user[2]);
}
if (user[6] != null){
if (user[6] != null) {
user[6] = user[6].toLowerCase();
//checkEmail(user[6]);
// checkEmail(user[6]);
}
}
//utf-8 check
for ( row in unregistred.copy()) {
for ( i in 0...row.length) {
// utf-8 check
for (row in unregistred.copy()) {
for (i in 0...row.length) {
var t = row[i];
if (t != "" && t != null) {
try{
try {
if (!Utf8.validate(t)) {
t = Utf8.encode(t);
}
}catch (e:Dynamic) {}
} catch (e:Dynamic) {}
row[i] = t;
}
}
}
//put already registered people in another list
// put already registered people in another list
var registred = [];
for (r in unregistred.copy()) {
//var firstName = r[0];
//var lastName = r[1];
// var firstName = r[0];
// var lastName = r[1];
var email = r[2];
//var firstName2 = r[4];
//var lastName2 = r[5];
// var firstName2 = r[4];
// var lastName2 = r[5];
var email2 = r[6];
var us = db.User.getSameEmail(email, email2);
@ -548,7 +554,6 @@ class Member extends Controller
}
}
app.session.data.csvUnregistered = unregistred;
app.session.data.csvRegistered = registred;
@ -557,20 +562,19 @@ class Member extends Controller
step = 2;
}
if (args != null && args.confirm) {
//import unregistered members
var i : Iterable<Dynamic> = cast app.session.data.csvUnregistered;
// 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];
user.lastName = u[1];
user.email = u[2];
if (user.email != null && user.email != "null" &&!EmailValidator.check(user.email)) {
throw t._("The E-mail ::useremail:: is invalid, please modify your file", {useremail:user.email});
if (user.email != null && user.email != "null" && !EmailValidator.check(user.email)) {
throw t._("The E-mail ::useremail:: is invalid, please modify your file", {useremail: user.email});
}
user.phone = u[3];
@ -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];
@ -594,16 +599,17 @@ class Member extends Controller
ua.insert();
}
//import registered members
var i : Iterable<Array<String>> = cast app.session.data.csvRegistered;
// import registered members
var i:Iterable<Array<String>> = cast app.session.data.csvRegistered;
for (u in i) {
var email = u[2];
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.
// member exists but is not member of this group.
if (userAmaps.length == 0) {
var ua = new db.UserAmap();
ua.user = us.first();
@ -620,7 +626,7 @@ class Member extends Controller
}
if (step == 1) {
//reset import when back to import page
// reset import when back to import page
app.session.data.csvUnregistered = null;
app.session.data.csvRegistered = null;
}
@ -630,60 +636,58 @@ 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);
form.removeElement(form.getElement("lang"));
form.removeElement(form.getElement("rights"));
form.removeElement(form.getElement("pass"));
form.removeElement(form.getElement("ldate") );
form.removeElement( form.getElement("apiKey") );
form.removeElement(form.getElement("ldate"));
form.removeElement(form.getElement("apiKey"));
form.addElement(new sugoi.form.elements.Checkbox("warnAmapManager", t._("Send an E-mail to the person in charge of the group"), true));
form.getElement("email").addValidator(new EmailValidator());
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"));
// 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
// 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) {
// si yen a qu'un on l'inserte
var ua = new db.UserAmap();
ua.user = userSims.first();
ua.amap = app.user.amap;
ua.insert();
throw Ok('/member/', t._("This person already had an account on Cagette.net, and is now member of your group."));
} else if (userSims.length > 0) {
// des users existent avec ce nom ,
// if (userSims.length == 1) {
// si yen a qu'un on l'inserte
var ua = new db.UserAmap();
ua.user = userSims.first();
ua.amap = app.user.amap;
ua.insert();
throw Ok('/member/', t._("This person already had an account on Cagette.net, and is now member of your group."));
/*}else {
//demander validation avant d'inserer le userAmap
//TODO
throw Error('/member', t._("Not possible to add this person because there are already some people in the database having the same firstname and name. Please contact the administrator.")+userSims);
}*/
return;
}else {
if (app.user.amap.flags.has(db.Amap.AmapFlags.PhoneRequired) && form.getValueOf("phone") == null ){
} 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."));
}
//insert user
// insert user
var u = new db.User();
form.toSpod(u);
u.lang = app.user.lang;
u.insert();
//insert userAmap
// insert userAmap
var ua = new db.UserAmap();
ua.user = u;
ua.amap = app.user.getAmap();
@ -691,38 +695,39 @@ 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){
function doPayments(m:db.User) {
service.PaymentService.updateUserBalance(m, app.user.amap);
var browse:Int->Int->List<Dynamic>;
var browse:Int->Int->List<Dynamic>;
//default display
// default display
browse = function(index:Int, limit:Int) {
return db.Operation.getOperationsWithIndex(m,app.user.amap,index,limit,true);
return db.Operation.getOperationsWithIndex(m, app.user.amap, index, limit, true);
}
var count = db.Operation.countOperations(m,app.user.amap);
var count = db.Operation.countOperations(m, app.user.amap);
var rb = new sugoi.tools.ResultsBrowser(count, 10, browse);
view.rb = rb;
view.member = m;
@ -732,10 +737,9 @@ class Member extends Controller
}
@tpl('member/balance.mtt')
function doBalance(){
function doBalance() {
view.balanced = db.UserAmap.manager.search($amap == app.user.amap && $balance == 0.0, false);
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);
}
}

346
src/service/OrderService.hx
View File

@ -1,4 +1,5 @@
package service;
import Common;
import tink.core.Error;
@ -6,10 +7,8 @@ import tink.core.Error;
* Order Service
* @author web-wizard,fbarbut
*/
class OrderService
{
static function canHaveFloatQt(product:db.Product):Bool{
class OrderService {
static function canHaveFloatQt(product:db.Product):Bool {
return product.hasFloatQt || product.wholesale || product.variablePrice;
}
@ -20,42 +19,45 @@ 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) ){
if( !tools.FloatTool.isInt(quantity) ) {
throw new tink.core.Error(t._("Error : product \"::product::\" quantity should be integer",{product:product.name}));
// quantity
if (!canHaveFloatQt(product)) {
if (!tools.FloatTool.isInt(quantity)) {
throw new tink.core.Error(t._("Error : product \"::product::\" quantity should be integer", {product: product.name}));
}
}
//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");
// 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");
var o = null;
for ( i in 0...Math.round(quantity)){
for (i in 0...Math.round(quantity)) {
o = make(user, 1, product, distribId, paid, user2, invert);
}
return o;
}
//checks
if (quantity <= 0) return null;
// checks
if (quantity <= 0)
return null;
//check for previous orders on the same distrib
// check for previous orders on the same distrib
var prevOrders = new List<db.UserContract>();
if (distribId == null) {
prevOrders = db.UserContract.manager.search($product==product && $user==user, true);
}else {
prevOrders = db.UserContract.manager.search($product==product && $user==user && $distributionId==distribId, true);
prevOrders = db.UserContract.manager.search($product == product && $user == user, true);
} else {
prevOrders = db.UserContract.manager.search($product == product && $user == user && $distributionId == distribId, true);
}
//Create order object
// Create order object
var o = new db.UserContract();
o.product = product;
o.quantity = quantity;
@ -66,23 +68,26 @@ 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
// cumulate quantities if there is a similar previous order
if (prevOrders.length > 0 && !product.multiWeight) {
for (prevOrder in prevOrders) {
//if (!prevOrder.paid) {
o.quantity += prevOrder.quantity;
prevOrder.delete();
//}
// if (!prevOrder.paid) {
o.quantity += prevOrder.quantity;
prevOrder.delete();
// }
}
}
//create a basket object
if (distribId != null){
// create a basket object
if (distribId != null) {
var dist = o.distribution;
var basket = db.Basket.getOrCreate(user, dist.place, dist.date);
o.basket = basket;
@ -90,129 +95,130 @@ class OrderService
o.insert();
//Stocks
// Stocks
if (o.product.stock != null) {
var c = o.product.contract;
if (c.hasStockManagement()) {
//trace("stock for "+quantity+" x "+product.name);
// 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 ) {
if (o.quantity <= 0) {
o.delete();
return null;
}
}else if (o.product.stock - quantity < 0) {
} else if (o.product.stock - quantity < 0) {
var canceled = quantity - o.product.stock;
o.quantity -= canceled;
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 {
App.current.event(StockMove({product: o.product, move: 0 - (quantity - canceled)}));
} else {
o.product.lock();
o.product.stock -= quantity;
o.product.update();
App.current.event(StockMove({product:o.product, move:0 - quantity}));
App.current.event(StockMove({product: o.product, move: 0 - quantity}));
}
}
}
return o;
}
/**
* Edit an existing order (quantity)
*/
public static function edit(order:db.UserContract, newquantity:Float, ?paid:Bool , ?user2:db.User,?invert:Bool) {
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 ( !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}));
// quantity
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}));
}
}
//paid
// paid
if (paid != null) {
order.paid = paid;
}else {
if (order.quantity < newquantity) order.paid = false;
} else {
if (order.quantity < newquantity)
order.paid = false;
}
//shared order
if (user2 != null){
// shared order
if (user2 != null) {
order.user2 = user2;
if (invert == true) order.flags.set(InvertSharedOrder);
if (invert == false) order.flags.unset(InvertSharedOrder);
}else{
if (invert == true)
order.flags.set(InvertSharedOrder);
if (invert == false)
order.flags.unset(InvertSharedOrder);
} else {
order.user2 = null;
order.flags.unset(InvertSharedOrder);
}
//stocks
var e : Event = null;
// stocks
var e:Event = null;
if (order.product.stock != null) {
var c = order.product.contract;
if (c.hasStockManagement()) {
if (newquantity < order.quantity) {
//on commande moins que prévu : incrément de stock
// 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
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
// 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 });
e = StockMove({product: order.product, move: 0 - order.product.stock});
order.product.lock();
order.product.stock = 0;
}else{
//stock is big enough
} else {
// stock is big enough
order.product.lock();
order.product.stock -= addedquantity;
e = StockMove({ product:order.product, move: 0 - addedquantity });
e = StockMove({product: order.product, move: 0 - addedquantity});
}
}
order.product.update();
}
}
//update order
// update order
if (newquantity == 0) {
order.quantity = 0;
order.paid = true;
order.update();
}else {
} else {
order.quantity = newquantity;
order.update();
}
@ -222,58 +228,54 @@ 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 ) {
// Amap Contract
if (contract.type == db.Contract.TYPE_CONSTORDERS) {
order.delete();
if( contract.amap.hasPayments() ){
if (contract.amap.hasPayments()) {
var orders = contract.getUserOrders(user);
if( orders.length == 0 ){
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
// Get the basket for this user
var place = order.distribution.place;
var basket = db.Basket.get(user, place, order.distribution.date);
if( contract.amap.hasPayments() ){
if (contract.amap.hasPayments()) {
var orders = basket.getOrders();
//Check if it is the last order, if yes then delete the related operation
if( orders.length == 1 && orders.first().id==order.id ){
// 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,21 +287,20 @@ class OrderService
var view = App.current.view;
var t = sugoi.i18n.Locale.texts;
for (o in orders) {
var x : UserOrder = cast { };
var x:UserOrder = cast {};
x.id = o.id;
x.userId = o.user.id;
x.userName = o.user.getCoupleName();
x.userEmail = o.user.email;
//shared order
if (o.user2 != null){
// shared order
if (o.user2 != null) {
x.userId2 = o.user2.id;
x.userName2 = o.user2.getCoupleName();
x.userEmail2 = o.user2.email;
}
//deprecated
// deprecated
x.productId = o.product.id;
x.productRef = o.product.ref;
x.productQt = o.product.qt;
@ -308,45 +309,42 @@ class OrderService
x.productImage = o.product.getImage();
x.productHasFloatQt = o.product.hasFloatQt;
x.productHasVariablePrice = o.product.variablePrice;
//new way
// new way
x.product = o.product.infos();
x.product.price = o.productPrice;//do not use current price, but price of the order
x.product.price = o.productPrice; // do not use current price, but price of the order
x.quantity = o.quantity;
//smartQt
if (x.quantity == 0.0){
// smartQt
if (x.quantity == 0.0) {
x.smartQt = t._("Canceled");
}else if(x.productHasFloatQt || x.productHasVariablePrice || o.product.wholesale){
} else if (x.productHasFloatQt || x.productHasVariablePrice || o.product.wholesale) {
x.smartQt = view.smartQt(x.quantity, x.productQt, x.productUnit);
}else{
} else {
x.smartQt = Std.string(x.quantity);
}
//product name.
if ( x.productHasVariablePrice || x.productQt==null || x.productUnit==null ){
// product name.
if (x.productHasVariablePrice || x.productQt == null || x.productUnit == null) {
x.productName = o.product.name;
}else{
x.productName = o.product.name + " " + view.formatNum(x.productQt) +" "+ view.unit(x.productUnit,x.productQt>1);
} else {
x.productName = o.product.name + " " + view.formatNum(x.productQt) + " " + view.unit(x.productUnit, x.productQt > 1);
}
x.subTotal = o.quantity * o.productPrice;
var c = o.product.contract;
if ( o.feesRate!=0 ) {
x.fees = x.subTotal * (o.feesRate/100);
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 {
} else {
x.total = x.subTotal;
}
//flags
// flags
x.paid = o.paid;
x.invertSharedOrder = o.flags.has(InvertSharedOrder);
x.contractId = c.id;
@ -363,12 +361,12 @@ class OrderService
* Confirms an order : create real orders from tmp orders in session
* @param order
*/
public static function confirmSessionOrder(tmpOrder:OrderInSession){
public static function confirmSessionOrder(tmpOrder:OrderInSession) {
var orders = [];
var user = db.User.manager.get(tmpOrder.userId);
for (o in tmpOrder.products){
for (o in tmpOrder.products) {
o.product = db.Product.manager.get(o.productId);
orders.push( make(user, o.quantity, o.product, o.distributionId) );
orders.push(make(user, o.quantity, o.product, o.distributionId));
}
App.current.event(MakeOrder(orders));
@ -377,82 +375,89 @@ class OrderService
return orders;
}
/**
* Send an order-by-products report to the coordinator
*/
public static function sendOrdersByProductReport(d:db.Distribution){
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.addRecipient(d.contract.contact.email, d.contract.contact.getName());
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);
var html = App.current.processTemplate("mail/ordersByProduct.mtt", {
contract:d.contract,
distribution:d,
orders:orders,
formatNum:App.current.view.formatNum,
currency:App.current.view.currency,
dDate:App.current.view.dDate,
hHour:App.current.view.hHour,
group:d.contract.amap
} );
contract: d.contract,
distribution: d,
orders: orders,
formatNum: App.current.view.formatNum,
currency: App.current.view.currency,
dDate: App.current.view.dDate,
hHour: App.current.view.hHour,
group: d.contract.amap
});
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){
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() ){
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");
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"), t._("Cagette.net"));
m.setSubject(title);
var orders = prepare(d.contract.getUserOrders(user,d));
var orders = prepare(d.contract.getUserOrders(user, d));
var html = App.current.processTemplate("mail/orderSummaryForMember.mtt", {
contract:d.contract,
distribution:d,
orders:orders,
formatNum:App.current.view.formatNum,
currency:App.current.view.currency,
dDate:App.current.view.dDate,
hHour:App.current.view.hHour,
group:d.contract.amap
} );
contract: d.contract,
distribution: d,
orders: orders,
formatNum: App.current.view.formatNum,
currency: App.current.view.currency,
dDate: App.current.view.dDate,
hHour: App.current.view.hHour,
group: d.contract.amap
});
m.setHtmlBody(html);
App.sendMail(m);
}
}
public static function sort(orders:Array<UserOrder>){
//order by lastname (+lastname2 if exists), then contract
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;
}
}
Write Preview
Loading…
Cancel
Save