Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
 pvincent
|
286bfd14ea | ||
|
pvincent
|
068288ddd1 | ||
|
pvincent
|
30d4c85250 | ||
|
pvincent
|
6170e5f499 | ||
|
pvincent
|
b1d56d85c0 | ||
|
pvincent
|
3c76533541 | ||
|
pvincent
|
076c03d6c6 | ||
|
beta3:ct7
|
4f1b4d90a6 | ||
|
beta3:ct7
|
10f916f262 | ||
|
artnuc.ct9
|
744581bad9 | ||
|
artnuc.ct9
|
b80fe490dc |
@@ -0,0 +1 @@
|
|||||||
|
1.5.3
|
||||||
+3
-3
@@ -23,9 +23,9 @@
|
|||||||
-lib tink_typecrawler:0.7.0
|
-lib tink_typecrawler:0.7.0
|
||||||
|
|
||||||
## GIT
|
## GIT
|
||||||
-lib sugoi:git:git@artcode.re:cagetters/sugoi.git
|
-lib sugoi:git:https://git.artcode.re/cagetters/sugoi.git
|
||||||
-lib record-macros:git:git@artcode.re:cagetters/record-macros.git
|
-lib record-macros:git:https://git.artcode.re/cagetters/record-macros.git
|
||||||
-lib dbadmin:git:git@artcode.re:cagetters/dbadmin.git
|
-lib dbadmin:git:https://git.artcode.re/cagetters/dbadmin.git
|
||||||
|
|
||||||
## SCRIPT
|
## SCRIPT
|
||||||
-cp common
|
-cp common
|
||||||
|
|||||||
+2
-2
@@ -1,8 +1,8 @@
|
|||||||
-dce no
|
-dce no
|
||||||
-cp common
|
-cp common
|
||||||
-cp js
|
-cp js
|
||||||
-lib sugoi:git:git@artcode.re:cagetters/sugoi.git
|
-lib sugoi:git:https://git.artcode.re/cagetters/sugoi.git
|
||||||
-lib hxleaflet:git:git@artcode.re:cagetters/hxleaflet.git
|
-lib hxleaflet:git:https://git.artcode.re/cagetters/hxleaflet.git
|
||||||
-lib react:1.4.0
|
-lib react:1.4.0
|
||||||
-lib react-router-4:0.2.3
|
-lib react-router-4:0.2.3
|
||||||
-lib modular:0.10.15
|
-lib modular:0.10.15
|
||||||
|
|||||||
+5
-5
@@ -1,11 +1,11 @@
|
|||||||
<config
|
<config
|
||||||
|
|
||||||
database="mysql://<USER>:<PASSWORD>@<HOST>/<DBNAME>"
|
database = "mysql://<USER>:<PASSWORD>@<HOST>/<DBNAME>"
|
||||||
host="<URL without http>"
|
host = "<URL without http>"
|
||||||
name = "<HTML head title>"
|
name = "<HTML head title>"
|
||||||
default_email = "<default email>"
|
default_email = "<EMAIL>"
|
||||||
|
webmaster_email = "<EMAIL>"
|
||||||
key="carotteMagique"
|
key = "<SECRET_PHRASE>"
|
||||||
|
|
||||||
maintain="0"
|
maintain="0"
|
||||||
cache="1"
|
cache="1"
|
||||||
|
|||||||
+1
-1
@@ -47,5 +47,5 @@
|
|||||||
"bugs": {
|
"bugs": {
|
||||||
"url": "https://github.com/bablukid/cagette/issues"
|
"url": "https://github.com/bablukid/cagette/issues"
|
||||||
},
|
},
|
||||||
"version": "1.4.11"
|
"version": "1.5.3"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -87,6 +87,17 @@ class Distribution extends Controller
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function getUser(uid:Int):db.User {
|
||||||
|
return db.User.manager.get(uid, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
function getBasket(userId, placeId, date){
|
||||||
|
var user = getUser(userId);
|
||||||
|
var place = db.Place.manager.get(placeId, false);
|
||||||
|
return db.Basket.getOrCreate(user, place, date);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attendance sheet to print ( mutidistrib )
|
* Attendance sheet to print ( mutidistrib )
|
||||||
*/
|
*/
|
||||||
@@ -174,18 +185,25 @@ class Distribution extends Controller
|
|||||||
var data = new Array<Dynamic>();
|
var data = new Array<Dynamic>();
|
||||||
|
|
||||||
for (o in orders3) {
|
for (o in orders3) {
|
||||||
|
|
||||||
|
|
||||||
|
var basket = getBasket(o.userId,view.place.id,view.date);
|
||||||
|
|
||||||
data.push( {
|
data.push( {
|
||||||
"name":o.userName,
|
"NUM": basket.num,
|
||||||
"productName":o.productName,
|
"ADHERENT":o.userName,
|
||||||
"price":view.formatNum(o.productPrice),
|
"PRODUIT":o.productName,
|
||||||
"quantity":o.quantity,
|
"QTÉ":o.quantity,
|
||||||
"fees":view.formatNum(o.fees),
|
// "price":view.formatNum(o.productPrice),
|
||||||
"total":view.formatNum(o.total),
|
// "fees":view.formatNum(o.fees),
|
||||||
"paid":o.paid
|
// "total":view.formatNum(o.total),
|
||||||
|
// "paid":o.paid
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
sugoi.tools.Csv.printCsvDataFromObjects(data, ["name", "productName", "price", "quantity","fees","total", "paid"],"Export-commandes-"+date.toString().substr(0,10)+"-Cagette");
|
sugoi.tools.Csv.printCsvDataFromObjects(data, ["NUM","ADHERENT", "PRODUIT", "QTÉ"],"Export-commandes-"+date.toString().substr(0,10)+"-Cagette");
|
||||||
|
//sugoi.tools.Csv.printCsvDataFromObjects(data, ["NUM","ADHERENT", "PRODUIT", "QTÉ","price","fees","total","paid"],"Export-commandes-"+date.toString().substr(0,10)+"-Cagette");
|
||||||
|
//sugoi.tools.Csv.printCsvDataFromObjects(data, ["NUM","ADHERENT", "PRODUIT", "price", "quantity","fees","total", "paid"],"Export-commandes-"+date.toString().substr(0,10)+"-Cagette");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user