Compare commits

..
7 Commits
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
6 changed files with 18 additions and 16 deletions
+1
View File
@@ -0,0 +1 @@
1.5.2
+3 -3
View File
@@ -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
View File
@@ -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//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
View File
@@ -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
View File
@@ -47,5 +47,5 @@
"bugs": { "bugs": {
"url": "https://github.com/bablukid/cagette/issues" "url": "https://github.com/bablukid/cagette/issues"
}, },
"version": "1.5.0" "version": "1.5.2"
} }
+6 -5
View File
@@ -194,14 +194,15 @@ class Distribution extends Controller
"ADHERENT":o.userName, "ADHERENT":o.userName,
"PRODUIT":o.productName, "PRODUIT":o.productName,
"QTÉ":o.quantity, "QTÉ":o.quantity,
"price":view.formatNum(o.productPrice), // "price":view.formatNum(o.productPrice),
"fees":view.formatNum(o.fees), // "fees":view.formatNum(o.fees),
"total":view.formatNum(o.total), // "total":view.formatNum(o.total),
"paid":o.paid // "paid":o.paid
}); });
} }
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", "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"); //sugoi.tools.Csv.printCsvDataFromObjects(data, ["NUM","ADHERENT", "PRODUIT", "price", "quantity","fees","total", "paid"],"Export-commandes-"+date.toString().substr(0,10)+"-Cagette");
return; return;
} }