fix Makefile conflict

This commit is contained in:
artnuc.ct9
2021-01-21 12:07:59 +04:00
2 changed files with 11 additions and 3 deletions
+2
View File
@@ -66,6 +66,8 @@ frontend:
else \
haxe cagetteJs.hxml; \
fi
mkdir -p tmp
chown www-data:www-data tmp
#update POT file from source
i18n:
+9 -3
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);
@@ -442,4 +448,4 @@ class ShopCart
}
}
}