full compilation + bootstrap

.gitignore

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

Makefile

@@ -15,7 +15,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
@@ -70,12 +70,16 @@ i18n:
 #compile templates in each language, required for production env.
 templates:	
 	haxe cagette.hxml -D i18n_generation
+	mkdir -p lang/master/tmp
 	@make LANG=fr ctemplates
-	@make LANG=en ctemplates
+	#@make LANG=en ctemplates
-	@make LANG=de ctemplates
+	#@make LANG=de ctemplates
+	msgfmt www/lang/texts_fr.po -o www/lang/texts_fr.mo 
+	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: 

cagette.hxml

@@ -6,6 +6,9 @@
 -lib hscript:2.3.0
 -lib smtpmailer:0.4.0
 -lib tink_json:0.9.0
+-lib tink_io:0.5.0
+-lib tink_streams:0.2.1
+
 
 -lib sugoi:git:git@artcode.re:cagetters/sugoi.git
 -lib record-macros:git:git@artcode.re:cagetters/record-macros.git

cagetteJs.hxml

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

lang/de/tmp/README.md

@@ -1 +0,0 @@
-This is where the compiled templates are.

lang/en/tmp/README.md

@@ -1 +0,0 @@
-This is where the compiled templates are.

lang/master/tmp/README.md

@@ -1 +0,0 @@
-This is where the compiled templates are.

lang/master/tpl/design.mtt

@@ -201,7 +201,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">

src/App.hx

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

src/MyMacros.hx

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

www/lang/texts_fr.po

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