tagged as 1.5.3

fix: cagetteJs.hxml
tagged as 1.5.2
2021-08-12 21:31:45 +04:00 · 2021-08-12 21:31:37 +04:00 · 2021-08-12 21:29:21 +04:00 · 2021-08-12 21:29:14 +04:00 · 2021-08-12 21:25:59 +04:00 · 2021-08-12 15:40:56 +04:00
7 changed files with 42 additions and 21 deletions
@@ -0,0 +1 @@
+1.5.3
@@ -23,9 +23,9 @@
 -lib tink_typecrawler:0.7.0

 ## GIT
-lib sugoi:git:git@artcode.re:cagetters/sugoi.git
-lib record-macros:git:git@artcode.re:cagetters/record-macros.git
-lib dbadmin:git:git@artcode.re:cagetters/dbadmin.git
+-lib sugoi:git:https://git.artcode.re/cagetters/sugoi.git
+-lib record-macros:git:https://git.artcode.re/cagetters/record-macros.git
+-lib dbadmin:git:https://git.artcode.re/cagetters/dbadmin.git

 ## SCRIPT
 -cp common
@@ -1,8 +1,8 @@
 -dce no
 -cp common
 -cp js
-lib sugoi:git:git@artcode.re:cagetters/sugoi.git
-lib hxleaflet:git:git@artcode.re:cagetters/hxleaflet.git
+-lib sugoi:git:https://git.artcode.re/cagetters/sugoi.git
+-lib hxleaflet:git:https://git.artcode.re/cagetters/hxleaflet.git
 -lib react:1.4.0
 -lib react-router-4:0.2.3
 -lib modular:0.10.15
@@ -1,11 +1,11 @@
 <config

-	database="mysql://<USER>:<PASSWORD>@<HOST>/<DBNAME>"
-	host="<URL without http>"
+	database = "mysql://<USER>:<PASSWORD>@<HOST>/<DBNAME>"
+	host = "<URL without http>"
 	name = "<HTML head title>"
-	default_email = "<default email>"
-	
-	key="carotteMagique"
+	default_email = "<EMAIL>"
+	webmaster_email = "<EMAIL>"
+	key = "<SECRET_PHRASE>"
 	
 	maintain="0"
 	cache="1"
@@ -142,9 +142,11 @@
 							<a href="http://www.cagette.net/wiki" target="_blank">::_("Documentation")::</a> 
 						</li>
 						<li>
-							::if (user!=null && user.isAmapManager()):: <a href="https://cagette.uservoice.com" target="_blank">::_("Propose features")::</a>  ::end::
+							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Proposer une amélioration</a>
+						</li>
+						<li>
+							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Soumettre une anomalie</a>
 						</li>
-
 					</ul>
 					
 					<!--<p style="position: absolute;display: block;top: 96px;width: 700px;">
@@ -47,5 +47,5 @@
  "bugs": {
    "url": "https://github.com/bablukid/cagette/issues"
  },
-  "version": "1.4.10"
+  "version": "1.5.3"
 }
@@ -86,6 +86,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 )
@@ -174,18 +185,25 @@ class Distribution extends Controller
 				var data = new Array<Dynamic>();
 				
 				for (o in orders3) {
+
+
+					var basket = getBasket(o.userId,view.place.id,view.date);
+					
 					data.push( { 
-						"name":o.userName,
-						"productName":o.productName,
-						"price":view.formatNum(o.productPrice),
-						"quantity":o.quantity,
-						"fees":view.formatNum(o.fees),
-						"total":view.formatNum(o.total),
-						"paid":o.paid
+						"NUM": basket.num,
+						"ADHERENT":o.userName,
+						"PRODUIT":o.productName,
+						"QTÉ":o.quantity,
+//                        "price":view.formatNum(o.productPrice),
+//                        "fees":view.formatNum(o.fees),
+//                        "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;	
 			}
 		}
Author	SHA1	Message	Date
pvincent	286bfd14ea	tagged as 1.5.3	2021-08-12 21:31:45 +04:00
pvincent	068288ddd1	fix: cagetteJs.hxml	2021-08-12 21:31:37 +04:00
pvincent	30d4c85250	tagged as 1.5.2	2021-08-12 21:29:21 +04:00
pvincent	6170e5f499	change: config.xml.dist	2021-08-12 21:29:14 +04:00
pvincent	b1d56d85c0	fix: git missing	2021-08-12 21:25:59 +04:00
pvincent	3c76533541	git via https	2021-08-12 15:40:56 +04:00
pvincent	076c03d6c6	git via https	2021-08-12 15:40:09 +04:00
beta3:ct7	4f1b4d90a6	tagged as 1.5.1	2021-03-10 21:54:53 +04:00
beta3:ct7	10f916f262	export commande moins de colonnes (special Maddie)	2021-03-10 21:54:21 +04:00
artnuc.ct9	744581bad9	tagged as 1.5.0	2021-03-10 21:40:13 +04:00
artnuc.ct9	b80fe490dc	export commandes à la Maddie, orienté numéro commande	2021-03-10 21:39:49 +04:00
artnuc.ct9	179e35a88b	tagged as 1.4.11	2021-03-05 11:37:03 +04:00
artnuc.ct9	28b825db07	zouritpad link	2021-03-05 11:36:49 +04:00