Compare commits

..
2 Commits
Author SHA1 Message Date
CAGETTE DEPLOYER 93f3d362a4 fix empty categories 2020-12-09 23:04:20 +04:00
ct9.lxd b646670848 fix Makefile + locked libraries 2020-11-13 07:43:33 +00:00
3 changed files with 31 additions and 12 deletions
+2 -3
View File
@@ -37,6 +37,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 !"
@@ -69,11 +70,9 @@ i18n:
#compile templates in each language, required for production env.
templates:
haxe cagette.hxml -D i18n_generation
mkdir -p lang/master/tmp
haxe cagette.hxml -D i18n_generation
@make LANG=fr ctemplates
#@make LANG=en ctemplates
#@make LANG=de ctemplates
msgfmt www/lang/texts_fr.po -o www/lang/texts_fr.mo
chown www-data:www-data -R www
+20 -6
View File
@@ -1,19 +1,33 @@
-lib templo:3.0.0
-lib hxevents:0.4.0
-lib thx.semver:0.2.2
-lib thx.csv:0.2.0
# LOCKED LIBS
-lib asys:0.3.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 tink_json:0.9.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
+8 -2
View File
@@ -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);