cagetters/cagettepei
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix Makefile conflict

Browse Source
This commit is contained in:
artnuc.ct9
2021-01-21 12:07:59 +04:00
parent 5f6c97d146 e9a7ccad4a
commit 33d97a2f93
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+2
View File
@@ -66,6 +66,8 @@ frontend:
else \ else \
haxe cagetteJs.hxml; \ haxe cagetteJs.hxml; \
fi fi
mkdir -p tmp
chown www-data:www-data tmp
#update POT file from source #update POT file from source
i18n: i18n:
js/ShopCart.hx
+9 -3
View File
@@ -164,7 +164,13 @@ class ShopCart
var groups = new Map<Int,{name:String,products:Array<ProductInfo>}>(); var groups = new Map<Int,{name:String,products:Array<ProductInfo>}>();
var pinned = 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(firstCategGroup);
//trace(pinnedCategories); //trace(pinnedCategories);
@@ -181,7 +187,7 @@ class ShopCart
for ( categ in p.categories){ 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 //is in this category group
var g = groups.get(categ); var g = groups.get(categ);
@@ -442,4 +448,4 @@ class ShopCart
} }
} }