tagged as 1.5.2

change: config.xml.dist
fix: git missing
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 · 2021-08-12 15:40:09 +04:00 · 2021-03-10 21:54:53 +04:00
16 changed files with 93 additions and 1196 deletions
@@ -0,0 +1 @@
+1.5.2
@@ -6,8 +6,11 @@ ENV?="dev"
 #To compile project with plugins, add PLUGINS=1 or type `export PLUGINS=1`

 install:
-	#copy config file from template
-	cp config.xml.dist config.xml	
+	#copy config file from template first time only
+	@if [ ! -f config.xml ]; then \
+	cp config.xml.dist config.xml; \
+	fi
+
 	@if [ $(ENV) = "dev" ]; then \
 	make install_dev; \
 	fi
@@ -47,7 +50,7 @@ compile:
 	echo "compile Cagette.net with plugins"; \
 	haxe cagetteAllPlugins.hxml; \
 	else \
-	echo "compile Cagette.net core"; \
+	echo "compile CagettePéi core"; \
 	haxe cagette.hxml; \
 	fi
 	
@@ -63,6 +66,8 @@ frontend:
 	else \
 	haxe cagetteJs.hxml; \
 	fi
+	mkdir -p tmp
+	chown www-data:www-data tmp

 #update POT file from source
 i18n:	
@@ -1,4 +1,8 @@
 # Cagette péi

-Fourche du logiciel Cagette.net à partir de la version 0.9.2 Novembre 2018
+Fourche du logiciel [Cagette.net](https://github.com/CagetteNet) à partir de la version 0.9.2 Novembre 2018
+
+Certaines portions du code source de Cagette.net n'étant plus disponibles en téléchargement, 
+j'ai repris sur la base d'un existant pour adapter au marché local réunionnais et leurs AMAPéi.
+

@@ -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//hxleaflet.git
 -lib react:1.4.0
 -lib react-router-4:0.2.3
 -lib modular:0.10.15
@@ -1,29 +1,19 @@
 <config
+
+	database = "mysql://<USER>:<PASSWORD>@<HOST>/<DBNAME>"
+	host = "<URL without http>"
+	name = "<HTML head title>"
+	default_email = "<EMAIL>"
+	webmaster_email = "<EMAIL>"
+	key = "<SECRET_PHRASE>"
+	
+	maintain="0"
+	cache="1"
+	cachetpl="0"
+	debug="0"
+	sqllog="0"
+	
 	lang="fr"
 	langs="fr"
  	langnames="Français"
-
-	host="www.amapeisudreunion.com"
-	name = "AMAPEI Sud Réunion"
-	default_email = "admin@amapeisudreunion.com"
-	webmaster_email = "postmaster@amapeisudreunion.com"
-	
-	database="mysql://cagette:cagette@ct1/cagette"
-	sqllog="0"
-	
-	debug="0"
-	cache="1"
-	maintain="0"
-	cachetpl="0"
-	key="carotteMagique"
-	
-	smtp_host="localhost"
-	smtp_port="25"
-	smtp_user=""
-	smtp_pass=""
-
-	mt.net.form.Form.HTML5 = "1"
-	mt.net.form.Form.USE_TWITTER_BOOTSTRAP = "1"
-	
-	google_geocoding_key="googlekey"
 />
@@ -14,7 +14,7 @@
 					<h1>::groupName::</h1>
 				::else::
 					<div style="margin-bottom:22px;" >
-							<a href="http://www.cagette.net" target="_blank">
+							<a href="https://git.artcode.re/cagetters/cagette" target="_blank">
 								<img src="/img/logo3.png" alt="::NAME::" />
 							</a>
 					</div>		
@@ -130,7 +130,7 @@
 		<div class="row" id="footer">
 			
 				<div class="col-md-9" >
-					<a href="http://www.cagette.net" target="_blank">
+					<a href="https://git.artcode.re/cagetters/cagette" target="_blank">
 						<img src="/img/logo.png" alt="::_("Cagette.net")::"/>
 					</a>  
 				</div>
@@ -142,13 +142,11 @@
 							<a href="http://www.cagette.net/wiki" target="_blank">::_("Documentation")::</a> 
 						</li>
 						<li>
-							<a href="https://www.cagette.pro" target="_blank">Formations pour producteurs</a> 
+							<a href="https://pad1.zourit.net/p/4a3b09afd25b4fdcb3f0a9598db21e61" target="_blank">Proposer une amélioration</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">Soumettre une anomalie</a>
 						</li>
-
 					</ul>
 					
 					<!--<p style="position: absolute;display: block;top: 96px;width: 700px;">
@@ -17,11 +17,11 @@ table.table td{
 <hr/>

 <div style="color:#666;font-size:12px;">
-	::_("This e-mail was sent from"):: <a href="http://::HOST::">::_("Cagette.net")::</a>.
+    &gt; ::_("This e-mail was sent from"):: <a href="http://::raw HOST::">::_("Cagette.net")::</a>.

 	::if group!=null::
 		<br/>
-		::_("You receive this message because you are part of"):: <b>::group.name::</b>
+		::_("You receive this message because you are part of"):: <b>::_("Cagette.net")::</b>
 	::end::

 	::if list!=null::
@@ -32,7 +32,7 @@ table.table td{
 	::if group!=null::
 	<div style="width:50%;max-width:300px;margin: 12px auto;padding: 8px;text-decoration: none;background: #070;border-radius: 3px;text-align: center;">
 		<a href="http://::HOST::/group/::group.id::" style="color: white;font-weight: bold;text-decoration: none;font-size:1.2em;">
-			&rarr; ::group.name::
+			&rarr; ::_("Cagette.net")::
 		</a>
 	</div>
 	::end::
@@ -2,7 +2,7 @@

 <div style="max-width:400px;margin:auto;border:solid 1px #AAA;border-radius:8px;padding:12px;text-align:center;font-family:Arial;">
 	
-	<img src="http://::HOST::/img/logo2.png" title="Cagette.net" />
+	<img src="http://::HOST::/img/logo2.png" title="CagettePéi" />
 	
 	<p>
 		::_("Hello"):: $$nullSafe(::name::),
@@ -1,9 +1,7 @@
 {
-  "name": "Cagette.net",
+  "name": "CagettePei",
  "description": "le logiciel libre du circuit court",
-  "author": "François Barbut <francois@alilo.fr>",
-  "license": "GPL-2.0",
-  "homepage": "http://www.cagette.net",
+  "license": "AGPL-3.0",
  "dependencies": {
    "bootstrap": "^3.3.4",
    "eonasdan-bootstrap-datetimepicker": "^4.7.14",
@@ -48,5 +46,6 @@
  },
  "bugs": {
    "url": "https://github.com/bablukid/cagette/issues"
-  }
+  },
+  "version": "1.5.2"
 }
@@ -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 )
 	 */
@@ -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	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
artnuc.ct9	d8c72cf249	tagged as 1.4.10	2021-03-05 10:45:11 +04:00
artnuc.ct9	c4250cc201	package.json	2021-03-05 10:44:58 +04:00
artnuc.ct9	f54f78b03e	tagged as 1.4.9	2021-03-05 10:43:09 +04:00
artnuc.ct9	97a9c1c4e3	newlogo	2021-03-05 10:33:07 +04:00
artnuc.ct9	6ca6e89cd5	gt symbol	2021-03-04 20:47:54 +04:00
artnuc.ct9	f5d09537b9	no more XXX	2021-03-04 20:30:31 +04:00
artnuc.ct9	a5c34cc6a0	XXX	2021-03-04 20:27:52 +04:00
artnuc.ct9	5c9fe38c4b	Makefile	2021-03-04 20:20:33 +04:00
artnuc.ct9	feff65ab36	email cagettePéi	2021-03-04 19:57:04 +04:00
artnuc.ct9	c8a354e868	logo espace + police gras	2021-02-26 11:22:53 +04:00
artnuc.ct9	ccd46e79fc	README plus complet	2021-02-26 11:19:27 +04:00
artnuc.ct9	6c6eec0b78	fix group.name undefined	2021-02-26 10:55:43 +04:00
artnuc.ct9	7662ce8771	Merge branch 'master' of artcode.re:cagetters/cagette	2021-02-26 09:42:22 +04:00
artnuc.ct9	8c8e9352d3	logo change	2021-02-26 09:41:37 +04:00
pvincent	6e28c2a5db	Update 'README.md'	2021-02-25 20:46:03 +04:00
artnuc.ct9	33d97a2f93	fix Makefile conflict	2021-01-21 12:07:59 +04:00
artnuc.ct9	5f6c97d146	dont mess with config file	2021-01-21 11:57:08 +04:00
CAGETTE DEPLOYER	e9a7ccad4a	Merge branch 'master' of artcode.re:cagetters/cagette	2020-12-09 23:05:00 +04:00
artnuc.ct9	1b84212da5	create tmp	2020-11-26 22:35:21 +04:00