Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into routing-per-role

app/utils/const_data/consts.go

@@ -10,6 +10,9 @@ const ADMIN_NOTIFICATION_LANGUAGE = 2
 // CATEGORY_TREE_ROOT_ID corresponds to id_category in ps_category which has is_root_category=1
 const CATEGORY_TREE_ROOT_ID = 2
 
+// since arrays can not be const
+var CATEGORY_BLACKLIST = []uint{250}
+
 const MAX_AMOUNT_OF_CARTS_PER_USER = 10
 const DEFAULT_NEW_CART_NAME = "new cart"
 
@@ -27,24 +30,4 @@ const NON_ALNUM_REGEX = `[^a-z0-9]+`
 const MULTI_DASH_REGEX = `-+`
 const SLUG_REGEX = `^[a-z0-9]+(?:-[a-z0-9]+)*$`
 
-// Currently supports only German+Polish specific cases
-var TRANSLITERATION_TABLE = map[rune]string{
-	// German
-	'ä': "ae",
-	'ö': "oe",
-	'ü': "ue",
-	'ß': "ss",
-
-	// Polish
-	'ą': "a",
-	'ć': "c",
-	'ę': "e",
-	'ł': "l",
-	'ń': "n",
-	'ó': "o",
-	'ś': "s",
-	'ż': "z",
-	'ź': "z",
-}
-
 const UNLOGGED_USER_ROLE_ID = 4

app/utils/localeExtractor/localeExtractor.go

@@ -22,14 +22,6 @@ func GetUserID(c fiber.Ctx) (uint, bool) {
 	return user_locale.User.ID, true
 }
 
-func GetOriginalUserRole(c fiber.Ctx) (model.Role, bool) {
-	user_locale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
-	if !ok || user_locale.OriginalUser == nil || user_locale.OriginalUser.Role == nil {
-		return model.Role{}, false
-	}
-	return *user_locale.OriginalUser.Role, true
-}
-
 func GetCustomer(c fiber.Ctx) (*model.Customer, bool) {
 	user_locale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
 	if !ok || user_locale.User == nil {