Merge branch 'master' of artcode.re:cagetters/cagette

logo change
Update 'README.md'
2021-02-26 09:42:22 +04:00 · 2021-02-26 09:41:37 +04:00 · 2021-02-25 20:46:03 +04:00 · 2021-01-21 12:07:59 +04:00 · 2021-01-21 11:57:08 +04:00 · 2020-12-09 23:05:00 +04:00
19 changed files with 2909 additions and 2904 deletions
@@ -2,7 +2,6 @@
 *.php
 config.xml
 www/plugin/*
 Makefile
 tmp/*
 *node_modules*
 *.map
@@ -33,5 +32,6 @@ www/js/libs.js
 www/css/.sass-cache
 www/css/*.css
 !www/css/bootstrap.min.css
@@ -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
+	#copy config file from template first time only
-	cp config.xml.dist config.xml	
+	@if [ ! -f config.xml ]; then \
 	cp config.xml.dist config.xml; \
 	fi
 	@if [ $(ENV) = "dev" ]; then \
 	make install_dev; \
 	fi
@@ -15,7 +18,7 @@ install:
 #setup dev environnement from source
 install_dev:
 	#set config file to debug=1
-	@sed -e 's?debug=.*?debug="1"?g' --in-place config.xml
+	#@sed -e 's?debug=.*?debug="1"?g' --in-place config.xml
 	#install haxe dependencies in .haxelib
 	haxelib newrepo 
 	haxelib -always install cagette.hxml
@@ -37,6 +40,7 @@ install_dev:
 	@make css
 	@make compile
 	@make frontend
 	@make templates
 	@echo "Well, it looks like everything is fine : librairies are installed, backend and frontend has been compiled !"
@@ -62,6 +66,8 @@ frontend:
 	else \
 	haxe cagetteJs.hxml; \
 	fi
 	mkdir -p tmp
 	chown www-data:www-data tmp
 #update POT file from source
 i18n:	
@@ -69,13 +75,15 @@ i18n:
 #compile templates in each language, required for production env.
 templates:	
 	mkdir -p lang/master/tmp
 	haxe cagette.hxml -D i18n_generation
 	@make LANG=fr ctemplates
-	@make LANG=en ctemplates
+	msgfmt www/lang/texts_fr.po -o www/lang/texts_fr.mo 
-	@make LANG=de ctemplates
+	chown www-data:www-data -R www
 ctemplates:
-	(cd lang/$(LANG)/tpl; temploc2 -macros macros.mtt -output ../tmp/ *.mtt */*.mtt */*/*.mtt */*/*/*.mtt */*/*/*/*.mtt)
+#	(cd lang/$(LANG)/tpl; temploc2 -macros macros.mtt -output ../tmp/ *.mtt */*.mtt */*/*.mtt */*/*/*.mtt */*/*/*/*.mtt)
 	(cd lang/$(LANG)/tpl; temploc2 -macros macros.mtt -output ../tmp/ *.mtt */*.mtt */*/*.mtt)
 #Compile and run unit tests	
 tests: 
@@ -1,17 +1,5 @@
-# Cagette.net
+# Cagette péi
 Le logiciel libre des circuits courts.
-[![Build Status](https://travis-ci.org/bablukid/cagette.svg?branch=master)](https://travis-ci.org/bablukid/cagette)
+Fourche du logiciel [Cagette.net](https://github.com/CagetteNet) à partir de la version 0.9.2 Novembre 2018
 http://www.cagette.net
 Documentation : http://www.cagette.net/wiki
 English : 
 Cagette.net is an open source web app to help people build a better and sustainable food system.
 Some people call it a "foodhub" : A mix between a groupware and a marketplace, helping consumers to order food from local farmers and producers.
 ## Build & install 
 Read the Developer page on the wiki to know more about this : http://wiki.cagette.net/dev:index
@@ -1,16 +1,33 @@
-lib templo:3.0.0
+# LOCKED LIBS
-lib hxevents:0.4.0
+-lib asys:0.3.0
 -lib thx.semver:0.2.2
 -lib thx.csv:0.2.0
 -lib datetime:3.1.1
 -lib history:0.0.1
 -lib hscript:2.3.0
 -lib hxevents:0.4.0
 -lib mime:0.1.2
 -lib modular:0.10.15
 -lib smtpmailer:0.4.0
 -lib templo:3.0.0
 -lib thx.core:0.43.0
 -lib thx.csv:0.2.0
 -lib thx.semver:0.2.2
 -lib tink_await:0.6.0
 -lib tink_chunk:0.3.1
 -lib tink_core:1.18.0
 -lib tink_io:0.5.0
 -lib tink_json:0.9.0
 -lib tink_macro:0.21.1
 -lib tink_priority:0.1.4
 -lib tink_streams:0.2.1
 -lib tink_syntaxhub:0.4.3
 -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
 ## SCRIPT
 -cp common
 -cp src
 -cp lang/master/tpl
@@ -7,6 +7,11 @@
 -lib react-router-4:0.2.3
 -lib modular:0.10.15
 -lib tink_json:0.9.0
 -lib tink_core:1.18.0
 -lib tink_io:0.5.0
 -lib tink_streams:0.2.1
 -lib thx.core:0.43.0
 -lib asys:0.3.0
 -main App
 -debug
 -js www/js/app.js
@@ -1,29 +1,19 @@
 <config
 	database="mysql://<USER>:<PASSWORD>@<HOST>/<DBNAME>"
 	host="<URL without http>"
 	name = "<HTML head title>"
 	default_email = "<default email>"
 	key="carotteMagique"
 	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"
 />
@@ -164,7 +164,13 @@ class ShopCart
 		var groups = new Map<Int,{name:String,products:Array<ProductInfo>}>();
 		var pinned = new Map<Int,{name:String,products:Array<ProductInfo>}>();
-		var firstCategGroup = this.categories[0].categs;
+
 		trace(this.categories);
 		var firstCategGroup = null;
 		if (this.categories.length > 0){
 			firstCategGroup = this.categories[0].categs;
 		}
 		//trace(firstCategGroup);
 		//trace(pinnedCategories);
@@ -181,7 +187,7 @@ class ShopCart
 			for ( categ in p.categories){
-				if (Lambda.find(firstCategGroup, function(c) return c.id == categ) != null){
+				if (firstCategGroup != null && Lambda.find(firstCategGroup, function(c) return c.id == categ) != null){
 					//is in this category group
 					var g = groups.get(categ);
@@ -1 +0,0 @@
 This is where the compiled templates are.
@@ -1 +0,0 @@
 This is where the compiled templates are.
@@ -1 +0,0 @@
 This is where the compiled templates are.
@@ -112,17 +112,6 @@
 			})
 			//tracking 24x7
 			var rumMOKey='1d36c37d438ba069db210c73cb74308d';
 			(function(){
 				if(window.performance && window.performance.timing && window.performance.navigation) {
 					var site24x7_rum_beacon=document.createElement('script');
 					site24x7_rum_beacon.async=true;
 					site24x7_rum_beacon.setAttribute('src','//static.site24x7rum.com/beacon/site24x7rum-min.js?appKey='+rumMOKey);
 					document.getElementsByTagName('head')[0].appendChild(site24x7_rum_beacon);
 				}
 			})(window)
 		</script>
 	</body>
@@ -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>
@@ -141,10 +141,6 @@
 						<li> 
 							<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> 
 						</li>
 						<li>
 							::if (user!=null && user.isAmapManager()):: <a href="https://cagette.uservoice.com" target="_blank">::_("Propose features")::</a>  ::end::
 						</li>
@@ -201,7 +197,7 @@
 			<!--
 			::raw _("Cagette.net is made by <a href='https://www.alilo.fr' target='_blank'><img src='/img/alilo-trans-black.png' /></a>")::<br/>
 			-->
-			<span>version ::VERSION::-::getPlatform()::</span>
+			<span>version ::VERSION::</span>
 		</div>
 		<div class="row">
@@ -17,7 +17,7 @@ table.table td{
 <hr/>
 <div style="color:#666;font-size:12px;">
-	::_("This e-mail was sent from"):: <a href="http://::HOST::">::_("Cagette.net")::</a>.
+	::_("This e-mail was sent from"):: <a href="http://::HOST::">::group.name::</a>.
 	::if group!=null::
 		<br/>
@@ -16,7 +16,8 @@ class App extends sugoi.BaseApp {
 	 * @doc https://github.com/fponticelli/thx.semver
 	 */ 
 	//public static var VERSION = ([0,9,2]  : Version).withPre("july");
-	public static var VERSION = ([0,9,2]  : Version).withPre(MyMacros.getGitShortSHA(), MyMacros.getGitCommitDate());
+	//public static var VERSION = ([0,9,2]  : Version).withPre(MyMacros.getGitShortSHA(), MyMacros.getGitCommitDate());
 	public static var VERSION = "cagette-péi " + MyMacros.getGitCommitDate();
 	public function new(){
 		super();
@@ -20,7 +20,8 @@ class MyMacros {
 	    commitDate = StringTools.replace(commitDate, " ", ".");
 	    commitDate = StringTools.replace(commitDate, "-", ".");
 	    commitDate = StringTools.replace(commitDate, ":", ".");
-	    commitDate = commitDate.substr(0,16);
+	    //commitDate = commitDate.substr(0,16);
 	    commitDate = commitDate.substr(0,10);
 	    // Generates a string expression
 	    return macro $v{commitDate};
@@ -16,7 +16,7 @@ msgstr ""
 #: src/payment/Cash.hx:294
 msgid "Cash"
-msgstr "Espèces"
+msgstr "Espèces / Carte Bancaire"
 #: src/payment/Cash.hx:323 src/payment/MoneyPot.hx:349
 msgid "Pay by cash at product distribution"
@@ -126,7 +126,7 @@ msgstr ""
 #: src/controller/Transaction.hx:8875
 msgid "Cash for the order of ::date::"
-msgstr "Espèces pour la commande du ::date::"
+msgstr "Espèces/CB pour la commande du ::date::"
 #: src/controller/Transaction.hx:9203
 msgid "Cash payment"
@@ -595,7 +595,7 @@ msgstr "Cet email n'est lié à aucun compte connu"
 #: src/controller/Member.hx:11229 src/db/User.hx:14677
 #: lang/master/tpl/design.mtt:4888 lang/master/tpl/mail/design.mtt:279
 msgid "Cagette.net"
-msgstr "Cagette.net"
+msgstr "CagettePéi"
 #: src/controller/User.hx:3419
 msgid "Password change"
@@ -741,19 +741,19 @@ msgstr ""
 #: src/controller/Member.hx:11303
 msgid "Change your e-mail in your account Cagette.net"
-msgstr "Changement d'email sur votre compte Cagette.net"
+msgstr "Changement d'email sur votre compte CagettePéi"
 #: src/controller/Member.hx:11447 src/controller/Member.hx:11975
 msgid ""
 " just modified your e-mail in your account Cagette.net.<br/>Your e-mail is "
 "now:"
 msgstr ""
-" vient de modifier votre email dans votre compte Cagette.net.<br/>Votre "
+" vient de modifier votre email dans votre compte CagetteiPéi.<br/>Votre "
 "email est maintenant:"
 #: src/controller/Member.hx:11833
 msgid "Change the e-mail of your account Cagette.net"
-msgstr "Changement d'email sur votre compte Cagette.net"
+msgstr "Changement d'email sur votre compte CagettePéi"
 #: src/controller/Member.hx:12173
 msgid "This member has beed updated"
@@ -1414,7 +1414,7 @@ msgid ""
 "<li>Confirm the reception of payments (checks, cash, transfers) in order to "
 "mark orders as 'paid'</li></ul>"
 msgstr ""
-"<li>Confirmer la réception des paiements (chèques, espèces, virements) afin "
+"<li>Confirmer la réception des paiements (chèques, espèces/CB, virements) afin "
 "de classer les commandes comme 'payées'</li></ul>"
 #: src/controller/Cron.hx:11190
@@ -2199,7 +2199,7 @@ msgstr "Invitation"
 #: src/db/User.hx:14547
 msgid "Invitation Cagette.net"
-msgstr "Invitation Cagette.net"
+msgstr "Invitation CagettePéi"
 #: src/db/User.hx:15848 lang/master/tpl/member/import.mtt:717
 #: lang/master/tpl/member/import.mtt:1429
@@ -2439,7 +2439,7 @@ msgstr "Votre commande a été enregistrée !"
 #: lang/master/tpl/transaction/cash.mtt:339
 msgid "You chose to pay by cash at the product distribution"
-msgstr "Vous avez choisi de payer en espèce lors de la distribution"
+msgstr "Vous avez choisi de payer en espèce ou CB lors de la distribution"
 #: lang/master/tpl/transaction/cash.mtt:430
 msgid "Please prepare the following amount for the distribution :"
@@ -2600,7 +2600,7 @@ msgstr "Solde"
 #: lang/master/tpl/home.mtt:233
 msgid "Welcome to Cagette.net !"
-msgstr "Bienvenue sur Cagette.net !"
+msgstr "Bienvenue sur CagettePéi !"
 #: lang/master/tpl/home.mtt:287
 msgid ""
@@ -4555,7 +4555,7 @@ msgstr "http://www.cagette.net"
 #: lang/master/tpl/group/view.mtt:5060
 msgid "Cagette.net, the free software of food direct-selling"
-msgstr "Cagette.net, le logiciel libre du circuit court"
+msgstr "CagettePéi, logiciel libre du circuit court pour la Réunion"
 #: lang/master/tpl/design.mtt:903
 msgid "Change group"
Author	SHA1	Message	Date
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
CAGETTE DEPLOYER	93f3d362a4	fix empty categories	2020-12-09 23:04:20 +04:00
artnuc.ct9	1b84212da5	create tmp	2020-11-26 22:35:21 +04:00
ct9.lxd	b646670848	fix Makefile + locked libraries	2020-11-13 07:43:33 +00:00
ct9.lxd	9f43fded15	no more site24	2020-11-12 18:07:36 +00:00
ct9.lxd	1537bcd54b	README	2020-11-12 18:02:33 +00:00
ct9.lxd	31caa5e6b3	full compilation + bootstrap	2020-11-12 17:58:16 +00:00
cagette@ct8	407405389d	cagette-péi	2020-11-11 18:05:57 +04:00
cagette@ct8	a2b9bf3e54	simplify template master	2020-11-11 17:50:50 +04:00
cagette@ct8	c3eb0a1a80	Makefile	2020-09-28 17:13:53 +00:00
cagette@ct8	4c8941a829	espece et carte bancaire	2020-09-28 17:06:45 +00:00