merge and small bugfix

Reviewed-on: #74
Reviewed-by: goc_daniel <goc_daniel@ma-al.com>

.env

@@ -63,4 +63,7 @@ FILE_MAAL_PL_PASSWORD=1FnwqcEgIUjQHjt1
 IMAGE_PREFIX=https://www.naluconcept.com # remove prefix to serv them from same host as presta
 CORS_ORGIN=https://www.naluconcept.com
 
-DSN=root:Maal12345678@tcp(localhost:3306)/nalu
+DSN=root:Maal12345678@tcp(localhost:3306)/nalu
+
+LOG_LEVEL=warn
+LOG_COLORIZE=true

app/cmd/cmds/startServer.go

@@ -4,8 +4,11 @@ import (
 	"log"
 	"os"
 
+	"git.ma-al.com/goc_daniel/b2b/app/config"
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/web"
+
 	"git.ma-al.com/goc_daniel/b2b/app/service/langsService"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/version"
 	"github.com/spf13/cobra"
 )
@@ -21,6 +24,8 @@ var (
 				return
 			}
 
+			logger.Init("b2b", nil, config.Get().Log.LogLevel, config.Get().Log.LogColorize)
+
 			// Create and setup the server
 			server := web.New()
 

app/config/config.go

@@ -28,6 +28,7 @@ type Config struct {
 	Cors            CorsConfig
 	MeiliSearch     MeiliSearchConfig
 	Storage         StorageConfig
+	Log             LogConfig
 }
 
 type I18n struct {
@@ -87,6 +88,11 @@ type AppConfig struct {
 	BaseURL     string `env:"APP_BASE_URL,http://localhost:5173"`
 }
 
+type LogConfig struct {
+	LogLevel    string `env:"LOG_LEVEL,warn"`
+	LogColorize bool   `env:"LOG_COLORIZE,true"`
+}
+
 type EmailConfig struct {
 	SMTPHost     string `env:"EMAIL_SMTP_HOST,localhost"`
 	SMTPPort     int    `env:"EMAIL_SMTP_PORT,587"`
@@ -209,6 +215,11 @@ func load() *Config {
 	if err != nil {
 		slog.Error("not possible to load env variables for storage : ", err.Error(), "")
 	}
+
+	err = loadEnv(&cfg.Log)
+	if err != nil {
+		slog.Error("not possible to load env variables for logger : ", err.Error(), "")
+	}
 	cfg.Storage.RootFolder = ResolveRelativePath(cfg.Storage.RootFolder)
 
 	return cfg

app/delivery/middleware/auth.go

@@ -7,6 +7,7 @@ import (
 	"time"
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/service/authService"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
@@ -16,9 +17,8 @@ import (
 )
 
 // AuthMiddleware creates authentication middleware
-func AuthMiddleware() fiber.Handler {
+func Authenticate() fiber.Handler {
 	authService := authService.NewAuthService()
-
 	return func(c fiber.Ctx) error {
 		// Get token from Authorization header
 		authHeader := c.Get("Authorization")
@@ -26,17 +26,13 @@ func AuthMiddleware() fiber.Handler {
 			// Try to get from cookie
 			authHeader = c.Cookies("access_token")
 			if authHeader == "" {
-				return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-					"error": "authorization token required",
-				})
+				return c.Next()
 			}
 		} else {
 			// Extract token from "Bearer <token>"
 			parts := strings.Split(authHeader, " ")
 			if len(parts) != 2 || parts[0] != "Bearer" {
-				return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-					"error": "invalid authorization header format",
-				})
+				return c.Next()
 			}
 			authHeader = parts[1]
 		}
@@ -44,24 +40,18 @@ func AuthMiddleware() fiber.Handler {
 		// Validate token
 		claims, err := authService.ValidateToken(authHeader)
 		if err != nil {
-			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-				"error": "invalid or expired token",
-			})
+			return c.Next()
 		}
 
 		// Get user from database
 		user, err := authService.GetUserByID(claims.UserID)
 		if err != nil {
-			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
-				"error": "user not found",
-			})
+			return c.Next()
 		}
 
 		// Check if user is active
 		if !user.IsActive {
-			return c.Status(fiber.StatusForbidden).JSON(fiber.Map{
-				"error": "user account is inactive",
-			})
+			return c.Next()
 		}
 
 		// Create locale. LangID is overwritten by auth Token
@@ -79,10 +69,8 @@ func AuthMiddleware() fiber.Handler {
 		}
 
 		// We now populate the target user
-		if model.CustomerRole(user.Role.Name) != model.RoleAdmin {
-			return c.Status(fiber.StatusForbidden).JSON(fiber.Map{
-				"error": "admin access required",
-			})
+		if !userLocale.OriginalUser.HasPermission(perms.Teleport) {
+			return c.Next()
 		}
 
 		targetUserID, err := strconv.Atoi(targetUserIDAttribute)
@@ -115,22 +103,14 @@ func AuthMiddleware() fiber.Handler {
 	}
 }
 
-// RequireAdmin creates admin-only middleware
-func RequireAdmin() fiber.Handler {
+func Authorize() fiber.Handler {
 	return func(c fiber.Ctx) error {
-		originalUserRole, ok := localeExtractor.GetOriginalUserRole(c)
+		_, ok := localeExtractor.GetUserID(c)
 		if !ok {
 			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 				"error": "not authenticated",
 			})
 		}
-
-		if model.CustomerRole(originalUserRole.Name) != model.RoleAdmin {
-			return c.Status(fiber.StatusForbidden).JSON(fiber.Map{
-				"error": "admin access required",
-			})
-		}
-
 		return c.Next()
 	}
 }

app/delivery/middleware/permissions.go

@@ -2,27 +2,27 @@ package middleware
 
 import (
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
-	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
 	"github.com/gofiber/fiber/v3"
 )
 
 func Require(p perms.Permission) fiber.Handler {
 	return func(c fiber.Ctx) error {
-		u := c.Locals("user")
-		if u == nil {
-			return c.SendStatus(fiber.StatusUnauthorized)
-		}
-
-		user, ok := u.(*model.UserSession)
+		user, ok := localeExtractor.GetCustomer(c)
 		if !ok {
-			return c.SendStatus(fiber.StatusInternalServerError)
+			return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
 		}
 
-		for _, perm := range user.Permissions {
-			if perm == p {
+		for _, perm := range user.Role.Permissions {
+			if perm.Name == p {
 				return c.Next()
 			}
 		}
-		return c.SendStatus(fiber.StatusForbidden)
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrForbidden)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrForbidden)))
 	}
 }

app/delivery/middleware/perms/permissions.go

@@ -3,10 +3,16 @@ package perms
 type Permission string
 
 const (
-	UserReadAny     Permission = "user.read.any"
-	UserWriteAny    Permission = "user.write.any"
-	UserDeleteAny   Permission = "user.delete.any"
-	CurrencyWrite   Permission = "currency.write"
-	ViewAllOrders   Permission = "orders.view"
-	ModifyAllOrders Permission = "orders.modify"
+	UserReadAny                 Permission = "user.read.any"
+	UserWriteAny                Permission = "user.write.any"
+	UserDeleteAny               Permission = "user.delete.any"
+	CurrencyWrite               Permission = "currency.write"
+	SpecificPriceManage         Permission = "specific_price.manage"
+	WebdavCreateToken           Permission = "webdav.create_token"
+	ProductTranslationSave      Permission = "product_translation.save"
+	ProductTranslationTranslate Permission = "product_translation.translate"
+	SearchCreateIndex           Permission = "search.create_index"
+	OrdersViewAll               Permission = "orders.view_all"
+	OrdersModifyAll             Permission = "orders.modify_all"
+	Teleport                    Permission = "teleport"
 )

app/delivery/web/api/public/auth.go

@@ -1,7 +1,6 @@
 package public
 
 import (
-	"log"
 	"strconv"
 	"time"
 
@@ -11,6 +10,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/authService"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -49,7 +49,7 @@ func AuthHandlerRoutes(r fiber.Router) fiber.Router {
 	r.Get("/google", handler.GoogleLogin)
 	r.Get("/google/callback", handler.GoogleCallback)
 
-	authProtected := r.Group("", middleware.AuthMiddleware())
+	authProtected := r.Group("", middleware.Authorize())
 	authProtected.Get("/me", handler.Me)
 	authProtected.Post("/update-choice", handler.UpdateJWTToken)
 
@@ -178,7 +178,13 @@ func (h *AuthHandler) ForgotPassword(c fiber.Ctx) error {
 	// Request password reset - always return success to prevent email enumeration
 	err := h.authService.RequestPasswordReset(req.Email)
 	if err != nil {
-		log.Printf("Password reset request error: %v", err)
+
+		logger.Warn("password reset request failed",
+			"handler", "AuthHandler.ForgotPassword",
+
+			"email", req.Email,
+			"error", err.Error(),
+		)
 	}
 
 	return c.JSON(fiber.Map{
@@ -307,7 +313,6 @@ func (h *AuthHandler) Register(c fiber.Ctx) error {
 	// Attempt registration
 	err := h.authService.Register(&req)
 	if err != nil {
-		log.Printf("Register error: %v", err)
 		return c.Status(responseErrors.GetErrorStatus(err)).JSON(fiber.Map{
 			"error": responseErrors.GetErrorCode(c, err),
 		})
@@ -447,7 +452,6 @@ func (h *AuthHandler) GoogleCallback(c fiber.Ctx) error {
 
 	response, rawRefreshToken, err := h.authService.HandleGoogleCallback(code)
 	if err != nil {
-		log.Printf("Google OAuth callback error: %v", err)
 		return c.Status(responseErrors.GetErrorStatus(err)).JSON(fiber.Map{
 			"error": responseErrors.GetErrorCode(c, err),
 		})

app/delivery/web/api/public/routing.go

@@ -2,6 +2,7 @@ package public
 
 import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/menuService"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
@@ -31,12 +32,21 @@ func RoutingHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *RoutingHandler) GetRouting(c fiber.Ctx) error {
-	lang_id, ok := localeExtractor.GetLangID(c)
+	langId, ok := localeExtractor.GetLangID(c)
 	if !ok {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
 	}
-	menu, err := h.menuService.GetRoutes(lang_id)
+
+	var roleId uint
+	customer, ok := localeExtractor.GetCustomer(c)
+	if !ok {
+		roleId = constdata.UNLOGGED_USER_ROLE_ID
+	} else {
+		roleId = customer.RoleID
+	}
+
+	menu, err := h.menuService.GetRoutes(langId, roleId)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))

app/delivery/web/api/restricted/addresses.go

@@ -6,6 +6,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/addressesService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -45,6 +46,13 @@ func (h *AddressesHandler) GetTemplate(c fiber.Ctx) error {
 
 	template, err := h.addressesService.GetTemplate(uint(country_id))
 	if err != nil {
+
+		logger.Error("failed to get address template",
+			"handler", "AddressesHandler.GetTemplate",
+
+			"country_id", country_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -74,6 +82,13 @@ func (h *AddressesHandler) AddNewAddress(c fiber.Ctx) error {
 
 	err = h.addressesService.AddNewAddress(userID, address_info, uint(country_id))
 	if err != nil {
+
+		logger.Error("failed to add new address",
+			"handler", "AddressesHandler.AddNewAddress",
+
+			"user_id", userID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -110,6 +125,14 @@ func (h *AddressesHandler) ModifyAddress(c fiber.Ctx) error {
 
 	err = h.addressesService.ModifyAddress(userID, uint(address_id), address_info, uint(country_id))
 	if err != nil {
+
+		logger.Error("failed to modify address",
+			"handler", "AddressesHandler.ModifyAddress",
+
+			"user_id", userID,
+			"address_id", address_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -126,6 +149,13 @@ func (h *AddressesHandler) RetrieveAddressesInfo(c fiber.Ctx) error {
 
 	addresses, err := h.addressesService.RetrieveAddresses(userID)
 	if err != nil {
+
+		logger.Error("failed to retrieve addresses",
+			"handler", "AddressesHandler.RetrieveAddressesInfo",
+
+			"user_id", userID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -149,6 +179,14 @@ func (h *AddressesHandler) DeleteAddress(c fiber.Ctx) error {
 
 	err = h.addressesService.DeleteAddress(userID, uint(address_id))
 	if err != nil {
+
+		logger.Error("failed to delete address",
+			"handler", "AddressesHandler.DeleteAddress",
+
+			"user_id", userID,
+			"address_id", address_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/carts.go

@@ -6,6 +6,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/cartsService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -29,10 +30,12 @@ func CartsHandlerRoutes(r fiber.Router) fiber.Router {
 	handler := NewCartsHandler()
 
 	r.Get("/add-new-cart", handler.AddNewCart)
+	r.Delete("/remove-cart", handler.RemoveCart)
 	r.Get("/change-cart-name", handler.ChangeCartName)
 	r.Get("/retrieve-carts-info", handler.RetrieveCartsInfo)
 	r.Get("/retrieve-cart", handler.RetrieveCart)
 	r.Get("/add-product-to-cart", handler.AddProduct)
+	r.Delete("/remove-product-from-cart", handler.RemoveProduct)
 
 	return r
 }
@@ -44,8 +47,16 @@ func (h *CartsHandler) AddNewCart(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
 	}
 
-	new_cart, err := h.cartsService.CreateNewCart(userID)
+	name := c.Query("name")
+	new_cart, err := h.cartsService.CreateNewCart(userID, name)
 	if err != nil {
+
+		logger.Error("failed to create cart",
+			"handler", "CartsHandler.AddNewCart",
+
+			"user_id", userID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -53,6 +64,37 @@ func (h *CartsHandler) AddNewCart(c fiber.Ctx) error {
 	return c.JSON(response.Make(&new_cart, 0, i18n.T_(c, response.Message_OK)))
 }
 
+func (h *CartsHandler) RemoveCart(c fiber.Ctx) error {
+	userID, ok := localeExtractor.GetUserID(c)
+	if !ok {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	cart_id_attribute := c.Query("cart_id")
+	cart_id, err := strconv.Atoi(cart_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	err = h.cartsService.RemoveCart(userID, uint(cart_id))
+	if err != nil {
+
+		logger.Error("failed to remove cart",
+			"handler", "CartsHandler.RemoveCart",
+
+			"user_id", userID,
+			"cart_id", cart_id,
+			"error", err.Error(),
+		)
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
+}
+
 func (h *CartsHandler) ChangeCartName(c fiber.Ctx) error {
 	userID, ok := localeExtractor.GetUserID(c)
 	if !ok {
@@ -71,6 +113,14 @@ func (h *CartsHandler) ChangeCartName(c fiber.Ctx) error {
 
 	err = h.cartsService.UpdateCartName(userID, uint(cart_id), new_name)
 	if err != nil {
+
+		logger.Error("failed to update cart name",
+			"handler", "CartsHandler.ChangeCartName",
+
+			"user_id", userID,
+			"cart_id", cart_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -87,6 +137,13 @@ func (h *CartsHandler) RetrieveCartsInfo(c fiber.Ctx) error {
 
 	carts_info, err := h.cartsService.RetrieveCartsInfo(userID)
 	if err != nil {
+
+		logger.Error("failed to retrieve carts info",
+			"handler", "CartsHandler.RetrieveCartsInfo",
+
+			"user_id", userID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -110,6 +167,14 @@ func (h *CartsHandler) RetrieveCart(c fiber.Ctx) error {
 
 	cart, err := h.cartsService.RetrieveCart(userID, uint(cart_id))
 	if err != nil {
+
+		logger.Error("failed to retrieve cart",
+			"handler", "CartsHandler.RetrieveCart",
+
+			"user_id", userID,
+			"cart_id", cart_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -117,6 +182,7 @@ func (h *CartsHandler) RetrieveCart(c fiber.Ctx) error {
 	return c.JSON(response.Make(cart, 0, i18n.T_(c, response.Message_OK)))
 }
 
+// adds or sets given amount of products to the cart
 func (h *CartsHandler) AddProduct(c fiber.Ctx) error {
 	userID, ok := localeExtractor.GetUserID(c)
 	if !ok {
@@ -159,8 +225,78 @@ func (h *CartsHandler) AddProduct(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
 
-	err = h.cartsService.AddProduct(userID, uint(cart_id), uint(product_id), product_attribute_id, uint(amount))
+	set_amount_attribute := c.Query("set_amount")
+	set_amount, err := strconv.ParseBool(set_amount_attribute)
 	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	err = h.cartsService.AddProduct(userID, uint(cart_id), uint(product_id), product_attribute_id, amount, set_amount)
+	if err != nil {
+
+		logger.Error("failed to add product to cart",
+			"handler", "CartsHandler.AddProduct",
+
+			"user_id", userID,
+			"cart_id", cart_id,
+			"product_id", product_id,
+			"error", err.Error(),
+		)
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
+}
+
+// removes product from the cart.
+func (h *CartsHandler) RemoveProduct(c fiber.Ctx) error {
+	userID, ok := localeExtractor.GetUserID(c)
+	if !ok {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	cart_id_attribute := c.Query("cart_id")
+	cart_id, err := strconv.Atoi(cart_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	product_id_attribute := c.Query("product_id")
+	product_id, err := strconv.Atoi(product_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	product_attribute_id_attribute := c.Query("product_attribute_id")
+	var product_attribute_id *uint
+	if product_attribute_id_attribute == "" {
+		product_attribute_id = nil
+	} else {
+		val, err := strconv.Atoi(product_attribute_id_attribute)
+		if err != nil {
+			return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+		}
+		uval := uint(val)
+		product_attribute_id = &uval
+	}
+
+	err = h.cartsService.RemoveProduct(userID, uint(cart_id), uint(product_id), product_attribute_id)
+	if err != nil {
+
+		logger.Error("failed to remove product from cart",
+			"handler", "CartsHandler.RemoveProduct",
+
+			"user_id", userID,
+			"cart_id", cart_id,
+			"product_id", product_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/currency.go

@@ -9,6 +9,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/service/currencyService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -46,6 +47,12 @@ func (h *CurrencyHandler) PostCurrencyRate(c fiber.Ctx) error {
 
 	err := h.CurrencyService.CreateCurrencyRate(&currencyRate)
 	if err != nil {
+
+		logger.Error("failed to create currency rate",
+			"handler", "CurrencyHandler.PostCurrencyRate",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -63,6 +70,13 @@ func (h *CurrencyHandler) GetCurrencyRate(c fiber.Ctx) error {
 
 	currency, err := h.CurrencyService.GetCurrency(uint(id))
 	if err != nil {
+
+		logger.Error("failed to get currency",
+			"handler", "CurrencyHandler.GetCurrencyRate",
+
+			"currency_id", id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 

app/delivery/web/api/restricted/customer.go

@@ -3,11 +3,13 @@ package restricted
 import (
 	"strconv"
 
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware"
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/service/customerService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/query_params"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
@@ -30,7 +32,8 @@ func CustomerHandlerRoutes(r fiber.Router) fiber.Router {
 	handler := NewCustomerHandler()
 
 	r.Get("", handler.customerData)
-	r.Get("/list", handler.listCustomers)
+	r.Get("/list", middleware.Require(perms.UserReadAny), handler.listCustomers)
+	r.Patch("/no-vat", middleware.Require(perms.UserWriteAny), handler.setCustomerNoVatStatus)
 	return r
 }
 
@@ -62,6 +65,13 @@ func (h *customerHandler) customerData(fc fiber.Ctx) error {
 
 	customer, err := h.service.GetById(customerId)
 	if err != nil {
+
+		logger.Error("failed to get customer",
+			"handler", "customerHandler.customerData",
+
+			"customer_id", customerId,
+			"error", err.Error(),
+		)
 		return fc.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, err)))
 	}
@@ -75,10 +85,6 @@ func (h *customerHandler) listCustomers(fc fiber.Ctx) error {
 		return fc.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, responseErrors.ErrBadAttribute)))
 	}
-	if !user.HasPermission(perms.UserReadAny) {
-		return fc.Status(fiber.StatusForbidden).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, responseErrors.ErrForbidden)))
-	}
 
 	p, filt, err := query_params.ParseFilters[model.Customer](fc, columnMappingListUsers)
 	if err != nil {
@@ -87,15 +93,15 @@ func (h *customerHandler) listCustomers(fc fiber.Ctx) error {
 	}
 
 	search := fc.Query("search")
-	if search != "" {
-		if !user.HasPermission(perms.UserReadAny) {
-			return fc.Status(fiber.StatusForbidden).
-				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, responseErrors.ErrForbidden)))
-		}
-	}
 
 	customer, err := h.service.Find(user.LangID, p, filt, search)
 	if err != nil {
+
+		logger.Error("failed to list customers",
+			"handler", "customerHandler.listCustomers",
+
+			"error", err.Error(),
+		)
 		return fc.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, err)))
 	}
@@ -109,3 +115,35 @@ var columnMappingListUsers map[string]string = map[string]string{
 	"first_name": "users.first_name",
 	"last_name":  "users.last_name",
 }
+
+func (h *customerHandler) setCustomerNoVatStatus(fc fiber.Ctx) error {
+	user, ok := localeExtractor.GetCustomer(fc)
+	if !ok || user == nil {
+		return fc.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, responseErrors.ErrInvalidBody)))
+	}
+
+	var req struct {
+		CustomerID uint `json:"customer_id"`
+		IsNoVat    bool `json:"is_no_vat"`
+	}
+
+	if err := fc.Bind().Body(&req); err != nil {
+		return fc.Status(responseErrors.GetErrorStatus(responseErrors.ErrJSONBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, responseErrors.ErrJSONBody)))
+	}
+
+	if err := h.service.SetCustomerNoVatStatus(req.CustomerID, req.IsNoVat); err != nil {
+
+		logger.Error("failed to set customer no vat status",
+			"handler", "customerHandler.setCustomerNoVatStatus",
+
+			"customer_id", req.CustomerID,
+			"error", err.Error(),
+		)
+		return fc.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(fc, err)))
+	}
+
+	return fc.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(fc, response.Message_OK)))
+}

app/delivery/web/api/restricted/localeSelector.go

@@ -3,6 +3,7 @@ package restricted
 import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/localeSelectorService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -34,6 +35,12 @@ func LocaleSelectorHandlerRoutes(r fiber.Router) fiber.Router {
 func (h *LocaleSelectorHandler) GetLanguages(c fiber.Ctx) error {
 	languages, err := h.localeSelectorService.GetLanguages()
 	if err != nil {
+
+		logger.Error("failed to get languages",
+			"handler", "LocaleSelectorHandler.GetLanguages",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -44,6 +51,12 @@ func (h *LocaleSelectorHandler) GetLanguages(c fiber.Ctx) error {
 func (h *LocaleSelectorHandler) GetCountries(c fiber.Ctx) error {
 	countries, err := h.localeSelectorService.GetCountriesAndCurrencies()
 	if err != nil {
+
+		logger.Error("failed to get countries",
+			"handler", "LocaleSelectorHandler.GetCountries",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/menu.go

@@ -6,6 +6,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/menuService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -49,6 +50,12 @@ func (h *MenuHandler) GetCategoryTree(c fiber.Ctx) error {
 
 	category_tree, err := h.menuService.GetCategoryTree(uint(root_category_id), lang_id)
 	if err != nil {
+
+		logger.Error("failed to get category tree",
+			"handler", "MenuHandler.GetCategoryTree",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -79,6 +86,12 @@ func (h *MenuHandler) GetBreadcrumb(c fiber.Ctx) error {
 
 	breadcrumb, err := h.menuService.GetBreadcrumb(uint(root_category_id), uint(category_id), lang_id)
 	if err != nil {
+
+		logger.Error("failed to get breadcrumb",
+			"handler", "MenuHandler.GetBreadcrumb",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -94,6 +107,12 @@ func (h *MenuHandler) GetTopMenu(c fiber.Ctx) error {
 	}
 	menu, err := h.menuService.GetTopMenu(customer.LangID, customer.RoleID)
 	if err != nil {
+
+		logger.Error("failed to get top menu",
+			"handler", "MenuHandler.GetTopMenu",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/orders.go

@@ -7,6 +7,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/orderService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/query_params"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
@@ -53,6 +54,12 @@ func (h *OrdersHandler) ListOrders(c fiber.Ctx) error {
 
 	list, err := h.ordersService.Find(user, paging, filters)
 	if err != nil {
+
+		logger.Error("failed to list orders",
+			"handler", "OrdersHandler.ListOrders",
+
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -66,6 +73,11 @@ var columnMappingListOrders map[string]string = map[string]string{
 	"name":       "b2b_customer_orders.name",
 	"country_id": "b2b_customer_orders.country_id",
 	"status":     "b2b_customer_orders.status",
+	"base_price": "b2b_customer_orders.base_price",
+	"tax_incl":   "b2b_customer_orders.tax_incl",
+	"tax_excl":   "b2b_customer_orders.tax_excl",
+	"created_at": "b2b_customer_orders.created_at",
+	"updated_at": "b2b_customer_orders.updated_at",
 }
 
 func (h *OrdersHandler) PlaceNewOrder(c fiber.Ctx) error {
@@ -99,6 +111,13 @@ func (h *OrdersHandler) PlaceNewOrder(c fiber.Ctx) error {
 
 	err = h.ordersService.PlaceNewOrder(userID, uint(cart_id), name, uint(country_id), address_info)
 	if err != nil {
+
+		logger.Error("failed to place order",
+			"handler", "OrdersHandler.PlaceNewOrder",
+
+			"user_id", userID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -136,6 +155,13 @@ func (h *OrdersHandler) ChangeOrderAddress(c fiber.Ctx) error {
 
 	err = h.ordersService.ChangeOrderAddress(user, uint(order_id), uint(country_id), address_info)
 	if err != nil {
+
+		logger.Error("failed to change order address",
+			"handler", "OrdersHandler.ChangeOrderAddress",
+
+			"order_id", order_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -163,6 +189,13 @@ func (h *OrdersHandler) ChangeOrderStatus(c fiber.Ctx) error {
 
 	err = h.ordersService.ChangeOrderStatus(user, uint(order_id), status)
 	if err != nil {
+
+		logger.Error("failed to change order status",
+			"handler", "OrdersHandler.ChangeOrderStatus",
+
+			"order_id", order_id,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/product.go

@@ -4,10 +4,12 @@ import (
 	"strconv"
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
-	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
 	"git.ma-al.com/goc_daniel/b2b/app/service/productService"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/query_params"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
@@ -34,6 +36,7 @@ func ProductsHandlerRoutes(r fiber.Router) fiber.Router {
 
 	r.Get("/:id/:country_id/:quantity", handler.GetProductJson)
 	r.Get("/list", handler.ListProducts)
+	r.Get("/list-variants/:product_id", handler.ListProductVariants)
 	r.Post("/favorite/:product_id", handler.AddToFavorites)
 	r.Delete("/favorite/:product_id", handler.RemoveFromFavorites)
 
@@ -70,8 +73,17 @@ func (h *ProductsHandler) GetProductJson(c fiber.Ctx) error {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
-	productJson, err := h.productService.GetJSON(p_id_product, int(customer.LangID), int(customer.ID), b2b_id_country, p_quantity)
+	productJson, err := h.productService.Get(uint(p_id_product), customer.LangID, customer.ID, uint(b2b_id_country), uint(p_quantity))
 	if err != nil {
+		logger.Error("failed to get product",
+			"handler", "ProductsHandler.GetProductJson",
+			"product_id", p_id_product,
+			"lang_id", customer.LangID,
+			"customer_id", customer.ID,
+			"b2b_id_country", b2b_id_country,
+			"quantity", p_quantity,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -80,26 +92,27 @@ func (h *ProductsHandler) GetProductJson(c fiber.Ctx) error {
 }
 
 func (h *ProductsHandler) ListProducts(c fiber.Ctx) error {
-	paging, filters, err := query_params.ParseFilters[model.Product](c, columnMappingListProducts)
+	paging, filters, err := query_params.ParseFilters[dbmodel.PsProduct](c, columnMappingListProducts)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
-	id_lang, ok := localeExtractor.GetLangID(c)
-	if !ok {
+	customer, ok := localeExtractor.GetCustomer(c)
+	if !ok || customer == nil {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
 
-	userID, ok := localeExtractor.GetUserID(c)
-	if !ok {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
-	}
-
-	list, err := h.productService.Find(id_lang, userID, paging, filters)
+	list, err := h.productService.Find(customer.LangID, customer.ID, paging, filters, customer, constdata.DEFAULT_PRODUCT_QUANTITY, constdata.SHOP_ID)
 	if err != nil {
+
+		logger.Error("failed to list products",
+			"handler", "ProductsHandler.ListProducts",
+			"lang_id", customer.LangID,
+			"customer_id", customer.ID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -107,14 +120,16 @@ func (h *ProductsHandler) ListProducts(c fiber.Ctx) error {
 	return c.JSON(response.Make(&list.Items, int(list.Count), i18n.T_(c, response.Message_OK)))
 }
 
+// These are all the filterable fields
 var columnMappingListProducts map[string]string = map[string]string{
-	"product_id":    "ps.id_product",
-	"name":          "pl.name",
-	"reference":     "p.reference",
-	"category_name": "cl.name",
-	"category_id":   "cp.id_category",
-	"quantity":      "sa.quantity",
-	"is_favorite":   "ps.is_favorite",
+	"product_id":  "bp.product_id",
+	"name":        "bp.name",
+	"reference":   "bp.reference",
+	"category_id": "bp.category_id",
+	"quantity":    "bp.quantity",
+	"is_favorite": "bp.is_favorite",
+	"is_new":      "bp.is_new",
+	"is_oem":      "bp.is_oem",
 }
 
 func (h *ProductsHandler) AddToFavorites(c fiber.Ctx) error {
@@ -134,6 +149,13 @@ func (h *ProductsHandler) AddToFavorites(c fiber.Ctx) error {
 
 	err = h.productService.AddToFavorites(userID, uint(productID))
 	if err != nil {
+
+		logger.Error("failed to add to favorites",
+			"handler", "ProductsHandler.AddToFavorites",
+			"user_id", userID,
+			"product_id", productID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -158,9 +180,48 @@ func (h *ProductsHandler) RemoveFromFavorites(c fiber.Ctx) error {
 
 	err = h.productService.RemoveFromFavorites(userID, uint(productID))
 	if err != nil {
+		logger.Error("failed to remove from favorites",
+			"handler", "ProductsHandler.RemoveFromFavorites",
+			"user_id", userID,
+			"product_id", productID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
 	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
 }
+
+func (h *ProductsHandler) ListProductVariants(c fiber.Ctx) error {
+	productIDStr := c.Params("product_id")
+
+	productID, err := strconv.Atoi(productIDStr)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	customer, ok := localeExtractor.GetCustomer(c)
+	if !ok || customer == nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	list, err := h.productService.GetProductAttributes(customer.LangID, uint(productID), constdata.SHOP_ID, customer.ID, customer.CountryID, constdata.DEFAULT_PRODUCT_QUANTITY)
+	if err != nil {
+
+		logger.Error("failed to list product variants",
+			"handler", "ProductsHandler.ListProductVariants",
+			"product_id", productID,
+			"customer_id", customer.ID,
+			"lang_id", customer.LangID,
+			"country_id", customer.CountryID,
+			"error", err.Error(),
+		)
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&list, len(list), i18n.T_(c, response.Message_OK)))
+}

app/delivery/web/api/restricted/productTranslation.go

@@ -4,10 +4,12 @@ import (
 	"strconv"
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
-	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware"
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
 	"git.ma-al.com/goc_daniel/b2b/app/service/productTranslationService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -35,8 +37,8 @@ func ProductTranslationHandlerRoutes(r fiber.Router) fiber.Router {
 	handler := NewProductTranslationHandler()
 
 	r.Get("/get-product-description", handler.GetProductDescription)
-	r.Post("/save-product-description", handler.SaveProductDescription)
-	r.Get("/translate-product-description", handler.TranslateProductDescription)
+	r.Post("/save-product-description", middleware.Require(perms.ProductTranslationSave), handler.SaveProductDescription)
+	r.Get("/translate-product-description", middleware.Require(perms.ProductTranslationTranslate), handler.TranslateProductDescription)
 
 	return r
 }
@@ -65,6 +67,13 @@ func (h *ProductTranslationHandler) GetProductDescription(c fiber.Ctx) error {
 
 	description, err := h.productTranslationService.GetProductDescription(userID, uint(productID), uint(productLangID))
 	if err != nil {
+
+		logger.Error("failed to get product description",
+			"handler", "ProductTranslationHandler.GetProductDescription",
+
+			"product_id", productID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -80,12 +89,6 @@ func (h *ProductTranslationHandler) SaveProductDescription(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
 	}
 
-	userRole, ok := localeExtractor.GetOriginalUserRole(c)
-	if !ok || model.CustomerRole(userRole.Name) != model.RoleAdmin {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrAdminAccessRequired)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrAdminAccessRequired)))
-	}
-
 	productID_attribute := c.Query("productID")
 	productID, err := strconv.Atoi(productID_attribute)
 	if err != nil {
@@ -108,6 +111,13 @@ func (h *ProductTranslationHandler) SaveProductDescription(c fiber.Ctx) error {
 
 	err = h.productTranslationService.SaveProductDescription(userID, uint(productID), uint(productLangID), updates)
 	if err != nil {
+
+		logger.Error("failed to save product description",
+			"handler", "ProductTranslationHandler.SaveProductDescription",
+
+			"product_id", productID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -123,12 +133,6 @@ func (h *ProductTranslationHandler) TranslateProductDescription(c fiber.Ctx) err
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
 	}
 
-	userRole, ok := localeExtractor.GetOriginalUserRole(c)
-	if !ok || model.CustomerRole(userRole.Name) != model.RoleAdmin {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrAdminAccessRequired)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrAdminAccessRequired)))
-	}
-
 	productID_attribute := c.Query("productID")
 	productID, err := strconv.Atoi(productID_attribute)
 	if err != nil {
@@ -158,6 +162,13 @@ func (h *ProductTranslationHandler) TranslateProductDescription(c fiber.Ctx) err
 
 	description, err := h.productTranslationService.TranslateProductDescription(userID, uint(productID), uint(productFromLangID), uint(productToLangID), aiModel)
 	if err != nil {
+
+		logger.Error("failed to translate product description",
+			"handler", "ProductTranslationHandler.TranslateProductDescription",
+
+			"product_id", productID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/search.go

@@ -2,13 +2,14 @@ package restricted
 
 import (
 	"encoding/json"
-	"fmt"
 
-	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware"
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
 	"git.ma-al.com/goc_daniel/b2b/app/service/meiliService"
 	searchservice "git.ma-al.com/goc_daniel/b2b/app/service/searchService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -30,7 +31,7 @@ func NewMeiliSearchHandler() *MeiliSearchHandler {
 func MeiliSearchHandlerRoutes(r fiber.Router) fiber.Router {
 	handler := NewMeiliSearchHandler()
 
-	r.Get("/create-index", handler.CreateIndex)
+	r.Get("/create-index", middleware.Require(perms.SearchCreateIndex), handler.CreateIndex)
 	r.Post("/search", handler.Search)
 	r.Post("/settings", handler.GetSettings)
 
@@ -44,15 +45,15 @@ func (h *MeiliSearchHandler) CreateIndex(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
 
-	userRole, ok := localeExtractor.GetOriginalUserRole(c)
-	if !ok || model.CustomerRole(userRole.Name) != model.RoleAdmin {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrAdminAccessRequired)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrAdminAccessRequired)))
-	}
-
 	err := h.meiliService.CreateIndex(id_lang)
 	if err != nil {
-		fmt.Printf("CreateIndex error: %v\n", err)
+
+		logger.Error("failed to create search index",
+			"handler", "MeiliSearchHandler.CreateIndex",
+
+			"lang_id", id_lang,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -77,6 +78,13 @@ func (h *MeiliSearchHandler) Search(c fiber.Ctx) error {
 
 	result, err := h.searchService.Search(index, c.Body(), id_lang)
 	if err != nil {
+
+		logger.Error("failed to search",
+			"handler", "MeiliSearchHandler.Search",
+
+			"index", index,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -85,6 +93,13 @@ func (h *MeiliSearchHandler) Search(c fiber.Ctx) error {
 		if createErr := h.meiliService.CreateIndex(id_lang); createErr == nil {
 			result, err = h.searchService.Search(index, c.Body(), id_lang)
 			if err != nil {
+
+				logger.Error("failed to search after index creation",
+					"handler", "MeiliSearchHandler.Search",
+
+					"index", index,
+					"error", err.Error(),
+				)
 				return c.Status(responseErrors.GetErrorStatus(err)).
 					JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 			}
@@ -105,6 +120,13 @@ func (h *MeiliSearchHandler) GetSettings(c fiber.Ctx) error {
 
 	result, err := h.searchService.GetIndexSettings(index)
 	if err != nil {
+
+		logger.Error("failed to get index settings",
+			"handler", "MeiliSearchHandler.GetSettings",
+
+			"index", index,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/api/restricted/specificPrice.go

@@ -0,0 +1,208 @@
+package restricted
+
+import (
+	"strconv"
+
+	"git.ma-al.com/goc_daniel/b2b/app/config"
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware"
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/service/specificPriceService"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
+	"github.com/gofiber/fiber/v3"
+)
+
+type SpecificPriceHandler struct {
+	SpecificPriceService *specificPriceService.SpecificPriceService
+	config               *config.Config
+}
+
+func NewSpecificPriceHandler() *SpecificPriceHandler {
+	SpecificPriceService := specificPriceService.New()
+	return &SpecificPriceHandler{
+		SpecificPriceService: SpecificPriceService,
+		config:               config.Get(),
+	}
+}
+
+func SpecificPriceHandlerRoutes(r fiber.Router) fiber.Router {
+	handler := NewSpecificPriceHandler()
+
+	r.Post("/", middleware.Require(perms.SpecificPriceManage), handler.Create)
+	r.Put("/:id", middleware.Require(perms.SpecificPriceManage), handler.Update)
+	r.Delete("/:id", middleware.Require(perms.SpecificPriceManage), handler.Delete)
+	r.Get("/", middleware.Require(perms.SpecificPriceManage), handler.List)
+	r.Get("/:id", middleware.Require(perms.SpecificPriceManage), handler.GetByID)
+	r.Patch("/:id/activate", middleware.Require(perms.SpecificPriceManage), handler.Activate)
+	r.Patch("/:id/deactivate", middleware.Require(perms.SpecificPriceManage), handler.Deactivate)
+
+	return r
+}
+
+func (h *SpecificPriceHandler) Create(c fiber.Ctx) error {
+	var pr model.SpecificPrice
+	if err := c.Bind().Body(&pr); err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	result, err := h.SpecificPriceService.Create(c.Context(), &pr)
+	if err != nil {
+
+		logger.Error("failed to create specific price",
+			"handler", "SpecificPriceHandler.Create",
+
+			"error", err.Error(),
+		)
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&result, 1, i18n.T_(c, response.Message_OK)))
+}
+
+func (h *SpecificPriceHandler) Update(c fiber.Ctx) error {
+	idStr := c.Params("id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	var pr model.SpecificPrice
+	if err := c.Bind().Body(&pr); err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	result, err := h.SpecificPriceService.Update(c.Context(), id, &pr)
+	if err != nil {
+
+		logger.Error("failed to update specific price",
+			"handler", "SpecificPriceHandler.Update",
+
+			"specific_price_id", id,
+			"error", err.Error(),
+		)
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&result, 1, i18n.T_(c, response.Message_OK)))
+}
+
+func (h *SpecificPriceHandler) List(c fiber.Ctx) error {
+	result, err := h.SpecificPriceService.List(c.Context())
+	if err != nil {
+
+		logger.Error("failed to list specific prices",
+			"handler", "SpecificPriceHandler.List",
+
+			"error", err.Error(),
+		)
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&result, 1, i18n.T_(c, response.Message_OK)))
+}
+
+func (h *SpecificPriceHandler) GetByID(c fiber.Ctx) error {
+	idStr := c.Params("id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	result, err := h.SpecificPriceService.GetByID(c.Context(), id)
+	if err != nil {
+
+		logger.Error("failed to get specific price",
+			"handler", "SpecificPriceHandler.GetByID",
+
+			"specific_price_id", id,
+			"error", err.Error(),
+		)
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&result, 1, i18n.T_(c, response.Message_OK)))
+}
+
+func (h *SpecificPriceHandler) Activate(c fiber.Ctx) error {
+	idStr := c.Params("id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	err = h.SpecificPriceService.SetActive(c.Context(), id, true)
+	if err != nil {
+
+		logger.Error("failed to activate specific price",
+			"handler", "SpecificPriceHandler.Activate",
+
+			"specific_price_id", id,
+			"error", err.Error(),
+		)
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
+}
+
+func (h *SpecificPriceHandler) Deactivate(c fiber.Ctx) error {
+	idStr := c.Params("id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	err = h.SpecificPriceService.SetActive(c.Context(), id, false)
+	if err != nil {
+
+		logger.Error("failed to deactivate specific price",
+			"handler", "SpecificPriceHandler.Deactivate",
+
+			"specific_price_id", id,
+			"error", err.Error(),
+		)
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
+}
+
+func (h *SpecificPriceHandler) Delete(c fiber.Ctx) error {
+	idStr := c.Params("id")
+	id, err := strconv.ParseUint(idStr, 10, 64)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	err = h.SpecificPriceService.Delete(c.Context(), id)
+	if err != nil {
+
+		logger.Error("failed to delete specific price",
+			"handler", "SpecificPriceHandler.Delete",
+
+			"specific_price_id", id,
+			"error", err.Error(),
+		)
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
+}

app/delivery/web/api/restricted/storage.go

@@ -4,10 +4,12 @@ import (
 	"strconv"
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
-	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware"
+	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
 	"git.ma-al.com/goc_daniel/b2b/app/service/storageService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -34,7 +36,7 @@ func StorageHandlerRoutes(r fiber.Router) fiber.Router {
 	r.Get("/download-file/*", handler.DownloadFile)
 
 	// for admins only
-	r.Get("/create-new-webdav-token", handler.CreateNewWebdavToken)
+	r.Get("/create-new-webdav-token", middleware.Require(perms.WebdavCreateToken), handler.CreateNewWebdavToken)
 
 	return r
 }
@@ -51,6 +53,12 @@ func (h *StorageHandler) ListContent(c fiber.Ctx) error {
 	entries_in_list, err := h.storageService.ListContent(abs_path)
 
 	if err != nil {
+
+		logger.Error("failed to list storage content",
+			"handler", "StorageHandler.ListContent",
+			"path", abs_path,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -67,6 +75,12 @@ func (h *StorageHandler) DownloadFile(c fiber.Ctx) error {
 
 	f, filename, filesize, err := h.storageService.DownloadFilePrep(abs_path)
 	if err != nil {
+
+		logger.Error("failed to prepare file download",
+			"handler", "StorageHandler.DownloadFile",
+			"path", abs_path,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
@@ -84,14 +98,14 @@ func (h *StorageHandler) CreateNewWebdavToken(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
 	}
 
-	userRole, ok := localeExtractor.GetOriginalUserRole(c)
-	if !ok || model.CustomerRole(userRole.Name) != model.RoleAdmin {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrAdminAccessRequired)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrAdminAccessRequired)))
-	}
-
 	new_token, err := h.storageService.NewWebdavToken(userID)
 	if err != nil {
+
+		logger.Error("failed to create webdav token",
+			"handler", "StorageHandler.CreateNewWebdavToken",
+			"user_id", userID,
+			"error", err.Error(),
+		)
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}

app/delivery/web/init.go

@@ -86,9 +86,10 @@ func (s *Server) Setup() error {
 
 	// API routes
 	s.api = s.app.Group("/api/v1")
+	s.api.Use(middleware.Authenticate())
 	s.public = s.api.Group("/public")
 	s.restricted = s.api.Group("/restricted")
-	s.restricted.Use(middleware.AuthMiddleware())
+	s.restricted.Use(middleware.Authorize())
 	s.webdav = s.api.Group("/webdav")
 	s.webdav.Use(middleware.Webdav())
 
@@ -136,6 +137,9 @@ func (s *Server) Setup() error {
 	orders := s.restricted.Group("/orders")
 	restricted.OrdersHandlerRoutes(orders)
 
+	specificPrice := s.restricted.Group("/specific-price")
+	restricted.SpecificPriceHandlerRoutes(specificPrice)
+
 	// addresses (restricted)
 	addresses := s.restricted.Group("/addresses")
 	restricted.AddressesHandlerRoutes(addresses)
@@ -163,16 +167,6 @@ func (s *Server) Setup() error {
 	// 	})
 	// })
 
-	// // Admin routes example
-	// admin := s.api.Group("/admin")
-	// admin.Use(middleware.AuthMiddleware())
-	// admin.Use(middleware.RequireAdmin())
-	// admin.Get("/users", func(c fiber.Ctx) error {
-	// 	return c.JSON(fiber.Map{
-	// 		"message": "Admin area - user management",
-	// 	})
-	// })
-
 	//  keep this at the end because its wilderange
 	general.InitBo(s.App())
 

app/model/category.go

@@ -10,7 +10,8 @@ type ScannedCategory struct {
 	LinkRewrite string `gorm:"column:link_rewrite"`
 	IsoCode     string `gorm:"column:iso_code"`
 
-	Visited bool //this is for internal backend use only
+	Visited bool   // this is for internal backend use only
+	Filter  string // filter applicable to this category
 }
 
 type Category struct {
@@ -25,6 +26,7 @@ type CategoryParams struct {
 	CategoryID  uint   `json:"category_id" form:"category_id"`
 	LinkRewrite string `json:"link_rewrite" form:"link_rewrite"`
 	Locale      string `json:"locale" form:"locale"`
+	Filter      string `json:"filter" form:"filter"`
 }
 
 type CategoryInBreadcrumb struct {

app/model/countries.go

@@ -1,15 +1,13 @@
 package model
 
-import "git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
-
 // Represents a country together with its associated currency
 type Country struct {
 	ID   uint   `gorm:"primaryKey;column:id" json:"id"`
 	Name string `gorm:"column:name" json:"name"`
 	Flag string `gorm:"size:16;not null;column:flag" json:"flag"`
 
-	PSCurrencyID uint                `gorm:"column:currency_id" json:"currency_id"`
-	PSCurrency   *dbmodel.PsCurrency `gorm:"foreignKey:PSCurrencyID;references:IDCurrency" json:"ps_currency"`
+	CurrencyID uint      `gorm:"column:b2b_id_currency" json:"currency_id"`
+	Currency   *Currency `gorm:"foreignKey:CurrencyID" json:"currency,omitempty"`
 }
 
 func (Country) TableName() string {

app/model/customer.go

@@ -31,9 +31,11 @@ type Customer struct {
 	LastLoginAt              *time.Time     `json:"last_login_at,omitempty"`
 	LangID                   uint           `gorm:"default:2" json:"lang_id"`    // User's preferred language
 	CountryID                uint           `gorm:"default:2" json:"country_id"` // User's selected country
+	Country                  *Country       `gorm:"foreignKey:CountryID" json:"country,omitempty"`
 	CreatedAt                time.Time      `json:"created_at"`
 	UpdatedAt                time.Time      `json:"updated_at"`
 	DeletedAt                gorm.DeletedAt `gorm:"index" json:"-"`
+	IsNoVat                  bool           `gorm:"default:false" json:"is_no_vat"`
 }
 
 func (u *Customer) HasPermission(permission perms.Permission) bool {

app/model/order.go

@@ -1,5 +1,7 @@
 package model
 
+import "time"
+
 type CustomerOrder struct {
 	OrderID         uint             `gorm:"column:order_id;primaryKey;autoIncrement" json:"order_id"`
 	UserID          uint             `gorm:"column:user_id;not null;index" json:"user_id"`
@@ -8,6 +10,11 @@ type CustomerOrder struct {
 	AddressString   string           `gorm:"column:address_string;not null" json:"address_string"`
 	AddressUnparsed *AddressUnparsed `gorm:"-" json:"address_unparsed"`
 	Status          string           `gorm:"column:status;size:50;not null" json:"status"`
+	BasePrice       float64          `gorm:"column:base_price;type:decimal(10,2);not null" json:"base_price"`
+	TaxIncl         float64          `gorm:"column:tax_incl;type:decimal(10,2);not null" json:"tax_incl"`
+	TaxExcl         float64          `gorm:"column:tax_excl;type:decimal(10,2);not null" json:"tax_excl"`
+	CreatedAt       time.Time        `gorm:"column:created_at;not null" json:"created_at"`
+	UpdatedAt       time.Time        `gorm:"column:updated_at;not null" json:"updated_at"`
 	Products        []OrderProduct   `gorm:"foreignKey:OrderID;references:OrderID" json:"products"`
 }
 

app/model/product.go

@@ -1,76 +1,19 @@
 package model
 
-// Product contains each and every column from the table ps_product.
-type Product struct {
-	ProductID              uint    `gorm:"column:id_product;primaryKey" json:"product_id" form:"product_id"`
-	SupplierID             uint    `gorm:"column:id_supplier" json:"supplier_id" form:"supplier_id"`
-	ManufacturerID         uint    `gorm:"column:id_manufacturer" json:"manufacturer_id" form:"manufacturer_id"`
-	CategoryDefaultID      uint    `gorm:"column:id_category_default" json:"category_default_id" form:"category_default_id"`
-	ShopDefaultID          uint    `gorm:"column:id_shop_default" json:"shop_default_id" form:"shop_default_id"`
-	TaxRulesGroupID        uint    `gorm:"column:id_tax_rules_group" json:"tax_rules_group_id" form:"tax_rules_group_id"`
-	OnSale                 uint    `gorm:"column:on_sale" json:"on_sale" form:"on_sale"`
-	OnlineOnly             uint    `gorm:"column:online_only" json:"online_only" form:"online_only"`
-	EAN13                  string  `gorm:"column:ean13;type:varchar(13)" json:"ean13" form:"ean13"`
-	ISBN                   string  `gorm:"column:isbn;type:varchar(32)" json:"isbn" form:"isbn"`
-	UPC                    string  `gorm:"column:upc;type:varchar(12)" json:"upc" form:"upc"`
-	EkoTax                 float32 `gorm:"column:eko_tax;type:decimal(20,6)" json:"eko_tax" form:"eko_tax"`
-	Quantity               uint    `gorm:"column:quantity" json:"quantity" form:"quantity"`
-	MinimalQuantity        uint    `gorm:"column:minimal_quantity" json:"minimal_quantity" form:"minimal_quantity"`
-	LowStockThreshold      uint    `gorm:"column:low_stock_threshold" json:"low_stock_threshold" form:"low_stock_threshold"`
-	LowStockAlert          uint    `gorm:"column:low_stock_alert" json:"low_stock_alert" form:"low_stock_alert"`
-	Price                  float32 `gorm:"column:price;type:decimal(20,6)" json:"price" form:"price"`
-	WholesalePrice         float32 `gorm:"column:wholesale_price;type:decimal(20,6)" json:"wholesale_price" form:"wholesale_price"`
-	Unity                  string  `gorm:"column:unity;type:varchar(255)" json:"unity" form:"unity"`
-	UnitPriceRatio         float32 `gorm:"column:unit_price_ratio;type:decimal(20,6)" json:"unit_price_ratio" form:"unit_price_ratio"`
-	UnitID                 uint    `gorm:"column:id_unit;primaryKey" json:"unit_id" form:"unit_id"`
-	AdditionalShippingCost float32 `gorm:"column:additional_shipping_cost;type:decimal(20,2)" json:"additional_shipping_cost" form:"additional_shipping_cost"`
-	Reference              string  `gorm:"column:reference;type:varchar(64)" json:"reference" form:"reference"`
-	SupplierReference      string  `gorm:"column:supplier_reference;type:varchar(64)" json:"supplier_reference" form:"supplier_reference"`
-	Location               string  `gorm:"column:location;type:varchar(64)" json:"location" form:"location"`
-
-	Width                   float32 `gorm:"column:width;type:decimal(20,6)" json:"width" form:"width"`
-	Height                  float32 `gorm:"column:height;type:decimal(20,6)" json:"height" form:"height"`
-	Depth                   float32 `gorm:"column:depth;type:decimal(20,6)" json:"depth" form:"depth"`
-	Weight                  float32 `gorm:"column:weight;type:decimal(20,6)" json:"weight" form:"weight"`
-	OutOfStock              uint    `gorm:"column:out_of_stock" json:"out_of_stock" form:"out_of_stock"`
-	AdditionalDeliveryTimes uint    `gorm:"column:additional_delivery_times" json:"additional_delivery_times" form:"additional_delivery_times"`
-	QuantityDiscount        uint    `gorm:"column:quantity_discount" json:"quantity_discount" form:"quantity_discount"`
-	Customizable            uint    `gorm:"column:customizable" json:"customizable" form:"customizable"`
-	UploadableFiles         uint    `gorm:"column:uploadable_files" json:"uploadable_files" form:"uploadable_files"`
-	TextFields              uint    `gorm:"column:text_fields" json:"text_fields" form:"text_fields"`
-
-	Active            uint   `gorm:"column:active" json:"active" form:"active"`
-	RedirectType      string `gorm:"column:redirect_type;type:enum('','404','301-product','302-product','301-category','302-category')" json:"redirect_type" form:"redirect_type"`
-	TypeRedirectedID  int    `gorm:"column:id_type_redirected" json:"type_redirected_id" form:"type_redirected_id"`
-	AvailableForOrder uint   `gorm:"column:available_for_order" json:"available_for_order" form:"available_for_order"`
-	AvailableDate     string `gorm:"column:available_date;type:date" json:"available_date" form:"available_date"`
-	ShowCondition     uint   `gorm:"column:show_condition" json:"show_condition" form:"show_condition"`
-	Condition         string `gorm:"column:condition;type:enum('new','used','refurbished')" json:"condition" form:"condition"`
-	ShowPrice         uint   `gorm:"column:show_price" json:"show_price" form:"show_price"`
-
-	Indexed                 uint   `gorm:"column:indexed" json:"indexed" form:"indexed"`
-	Visibility              string `gorm:"column:visibility;type:enum('both','catalog','search','none')" json:"visibility" form:"visibility"`
-	CacheIsPack             uint   `gorm:"column:cache_is_pack" json:"cache_is_pack" form:"cache_is_pack"`
-	CacheHasAttachments     uint   `gorm:"column:cache_has_attachments" json:"cache_has_attachments" form:"cache_has_attachments"`
-	IsVirtual               uint   `gorm:"column:is_virtual" json:"is_virtual" form:"is_virtual"`
-	CacheDefaultAttribute   uint   `gorm:"column:cache_default_attribute" json:"cache_default_attribute" form:"cache_default_attribute"`
-	DateAdd                 string `gorm:"column:date_add;type:datetime" json:"date_add" form:"date_add"`
-	DateUpd                 string `gorm:"column:date_upd;type:datetime" json:"date_upd" form:"date_upd"`
-	AdvancedStockManagement uint   `gorm:"column:advanced_stock_management" json:"advanced_stock_management" form:"advanced_stock_management"`
-	PackStockType           uint   `gorm:"column:pack_stock_type" json:"pack_stock_type" form:"pack_stock_type"`
-	State                   uint   `gorm:"column:state" json:"state" form:"state"`
-	DeliveryDays            uint   `gorm:"column:delivery_days" json:"delivery_days" form:"delivery_days"`
-}
 type ProductInList struct {
-	ProductID      uint   `gorm:"column:product_id" json:"product_id" form:"product_id"`
-	Name           string `gorm:"column:name" json:"name" form:"name"`
-	LinkRewrite    string `gorm:"column:link_rewrite" json:"link_rewrite"`
-	ImageLink      string `gorm:"column:image_link" json:"image_link"`
-	CategoryName   string `gorm:"column:category_name" json:"category_name" form:"category_name"`
-	Reference      string `gorm:"column:reference" json:"reference"`
-	VariantsNumber uint   `gorm:"column:variants_number" json:"variants_number"`
-	Quantity       int64  `gorm:"column:quantity" json:"quantity"`
-	IsFavorite     bool   `gorm:"column:is_favorite" json:"is_favorite"`
+	ProductID      uint    `gorm:"column:product_id" json:"product_id" form:"product_id"`
+	Name           string  `gorm:"column:name" json:"name" form:"name"`
+	LinkRewrite    string  `gorm:"column:link_rewrite" json:"link_rewrite"`
+	ImageLink      string  `gorm:"column:image_link" json:"image_link"`
+	CategoryName   string  `gorm:"column:category_name" json:"category_name" form:"category_name"`
+	Reference      string  `gorm:"column:reference" json:"reference"`
+	VariantsNumber uint    `gorm:"column:variants_number" json:"variants_number"`
+	Quantity       int64   `gorm:"column:quantity" json:"quantity"`
+	PriceTaxExcl   float64 `gorm:"column:price_tax_excl" json:"price_tax_excl"`
+	PriceTaxIncl   float64 `gorm:"column:price_tax_incl" json:"price_tax_incl"`
+	IsFavorite     bool    `gorm:"column:is_favorite" json:"is_favorite"`
+	IsNew          bool    `gorm:"column:is_new" json:"is_new"`
+	IsOEM          bool    `gorm:"column:is_oem" json:"is_oem"`
 }
 
 type ProductFilters struct {

app/model/routing.go

@@ -7,7 +7,6 @@ type Route struct {
 	Component string  `gorm:"type:varchar(255);not null;comment:path to component file" json:"component"`
 	Meta      *string `gorm:"type:longtext;default:'{}'" json:"meta,omitempty"`
 	Active    *bool   `gorm:"type:tinyint;default:1" json:"active,omitempty"`
-	SortOrder *int    `gorm:"type:int;default:0" json:"sort_order,omitempty"`
 }
 
 func (Route) TableName() string {

app/model/specificPrice.go

@@ -0,0 +1,29 @@
+package model
+
+import "time"
+
+type SpecificPrice struct {
+	ID                  uint64     `gorm:"primaryKey;autoIncrement" json:"id"`
+	Name                string     `gorm:"type:varchar(255);not null" json:"name"`
+	ValidFrom           *time.Time `gorm:"null" json:"valid_from"`
+	ValidTill           *time.Time `gorm:"null" json:"valid_till"`
+	HasExpirationDate   bool       `gorm:"default:false" json:"has_expiration_date"`
+	ReductionType       string     `gorm:"type:enum('amount','percentage');not null" json:"reduction_type"`
+	Price               *float64   `gorm:"type:decimal(10,2);null" json:"price"`
+	CurrencyID          *uint64    `gorm:"column:b2b_id_currency;null" json:"currency_id"`
+	PercentageReduction *float64   `gorm:"type:decimal(5,2);null" json:"percentage_reduction"`
+	FromQuantity        uint32     `gorm:"default:1" json:"from_quantity"`
+	IsActive            bool       `gorm:"default:true" json:"is_active"`
+	CreatedAt           *time.Time `gorm:"null" json:"created_at"`
+	UpdatedAt           *time.Time `gorm:"null" json:"updated_at"`
+
+	ProductIDs          []uint64 `gorm:"-" json:"product_ids"`
+	CategoryIDs         []uint64 `gorm:"-" json:"category_ids"`
+	ProductAttributeIDs []uint64 `gorm:"-" json:"product_attribute_ids"`
+	CountryIDs          []uint64 `gorm:"-" json:"country_ids"`
+	CustomerIDs         []uint64 `gorm:"-" json:"customer_ids"`
+}
+
+func (SpecificPrice) TableName() string {
+	return "b2b_specific_price"
+}

app/repos/cartsRepo/cartsRepo.go

@@ -1,21 +1,26 @@
 package cartsRepo
 
 import (
+	"errors"
+
 	"git.ma-al.com/goc_daniel/b2b/app/db"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
+	"gorm.io/gorm"
 )
 
 type UICartsRepo interface {
 	CartsAmount(user_id uint) (uint, error)
-	CreateNewCart(user_id uint) (model.CustomerCart, error)
+	CreateNewCart(user_id uint, name string) (model.CustomerCart, error)
 	RemoveCart(user_id uint, cart_id uint) error
 	UserHasCart(user_id uint, cart_id uint) (bool, error)
 	UpdateCartName(user_id uint, cart_id uint, new_name string) error
 	RetrieveCartsInfo(user_id uint) ([]model.CustomerCart, error)
 	RetrieveCart(user_id uint, cart_id uint) (*model.CustomerCart, error)
 	CheckProductExists(product_id uint, product_attribute_id *uint) (bool, error)
-	AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount uint) error
+	AddProduct(cart_id uint, product_id uint, product_attribute_id *uint, amount uint, set_amount bool) error
+	RemoveProduct(cart_id uint, product_id uint, product_attribute_id *uint) error
 }
 
 type CartsRepo struct{}
@@ -37,10 +42,7 @@ func (repo *CartsRepo) CartsAmount(user_id uint) (uint, error) {
 	return amt, err
 }
 
-func (repo *CartsRepo) CreateNewCart(user_id uint) (model.CustomerCart, error) {
-	var name string
-	name = constdata.DEFAULT_NEW_CART_NAME
-
+func (repo *CartsRepo) CreateNewCart(user_id uint, name string) (model.CustomerCart, error) {
 	cart := model.CustomerCart{
 		UserID: user_id,
 		Name:   &name,
@@ -129,14 +131,61 @@ func (repo *CartsRepo) CheckProductExists(product_id uint, product_attribute_id
 	}
 }
 
-func (repo *CartsRepo) AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount uint) error {
-	product := model.CartProduct{
-		CartID:             cart_id,
-		ProductID:          product_id,
-		ProductAttributeID: product_attribute_id,
-		Amount:             amount,
-	}
-	err := db.DB.Create(&product).Error
+func (repo *CartsRepo) AddProduct(cart_id uint, product_id uint, product_attribute_id *uint, amount uint, set_amount bool) error {
+	var product model.CartProduct
 
-	return err
+	err := db.DB.
+		Where(&model.CartProduct{
+			CartID:             cart_id,
+			ProductID:          product_id,
+			ProductAttributeID: product_attribute_id,
+		}).
+		First(&product).Error
+
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			if amount < 1 {
+				return responseErrors.ErrAmountMustBePositive
+			} else if amount > constdata.MAX_AMOUNT_OF_PRODUCT_IN_CART {
+				return responseErrors.ErrAmountMustBeReasonable
+			}
+
+			product = model.CartProduct{
+				CartID:             cart_id,
+				ProductID:          product_id,
+				ProductAttributeID: product_attribute_id,
+				Amount:             amount,
+			}
+
+			return db.DB.Create(&product).Error
+		}
+
+		// Some other DB error
+		return err
+	}
+
+	// Product already exists in cart
+	if set_amount {
+		product.Amount = amount
+	} else {
+		product.Amount = product.Amount + amount
+	}
+
+	if product.Amount < 1 {
+		return responseErrors.ErrAmountMustBePositive
+	} else if product.Amount > constdata.MAX_AMOUNT_OF_PRODUCT_IN_CART {
+		return responseErrors.ErrAmountMustBeReasonable
+	}
+
+	return db.DB.Save(&product).Error
+}
+
+func (repo *CartsRepo) RemoveProduct(cart_id uint, product_id uint, product_attribute_id *uint) error {
+	return db.DB.
+		Where(&model.CartProduct{
+			CartID:             cart_id,
+			ProductID:          product_id,
+			ProductAttributeID: product_attribute_id,
+		}).
+		Delete(&model.CartProduct{}).Error
 }

app/repos/categoriesRepo/categoriesRepo.go

@@ -1,48 +0,0 @@
-package categoriesRepo
-
-import (
-	"git.ma-al.com/goc_daniel/b2b/app/db"
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
-	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
-)
-
-type UICategoriesRepo interface {
-	GetAllCategories(idLang uint) ([]model.ScannedCategory, error)
-}
-
-type CategoriesRepo struct{}
-
-func New() UICategoriesRepo {
-	return &CategoriesRepo{}
-}
-
-func (r *CategoriesRepo) GetAllCategories(idLang uint) ([]model.ScannedCategory, error) {
-	var allCategories []model.ScannedCategory
-
-	categoryTbl := (&dbmodel.PsCategory{}).TableName()
-	categoryLangTbl := (&dbmodel.PsCategoryLang{}).TableName()
-	categoryShopTbl := (&dbmodel.PsCategoryShop{}).TableName()
-	langTbl := (&dbmodel.PsLang{}).TableName()
-
-	err := db.Get().
-		Model(dbmodel.PsCategory{}).
-		Select(`
-			ps_category.id_category AS category_id,
-			ps_category_lang.name AS name,
-			ps_category.active AS active,
-			ps_category_shop.position AS position,
-			ps_category.id_parent AS id_parent,
-			ps_category.is_root_category AS is_root_category,
-			ps_category_lang.link_rewrite AS link_rewrite,
-			ps_lang.iso_code AS iso_code
-		`).
-		Joins(`LEFT JOIN `+categoryLangTbl+` ON `+categoryLangTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryLangTbl+`.id_shop = ? AND `+categoryLangTbl+`.id_lang = ?`,
-			constdata.SHOP_ID, idLang).
-		Joins(`LEFT JOIN `+categoryShopTbl+` ON `+categoryShopTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryShopTbl+`.id_shop = ?`,
-			constdata.SHOP_ID).
-		Joins(`JOIN ` + langTbl + ` ON ` + langTbl + `.id_lang = ` + categoryLangTbl + `.id_lang`).
-		Scan(&allCategories).Error
-
-	return allCategories, err
-}

app/repos/categoryRepo/categoryRepo.go

@@ -2,11 +2,14 @@ package categoryrepo
 
 import (
 	"git.ma-al.com/goc_daniel/b2b/app/db"
+	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 )
 
 type UICategoryRepo interface {
 	GetCategoryTranslations(ids []uint, idLang uint) (map[uint]string, error)
+	RetrieveMenuCategories(idLang uint) ([]model.ScannedCategory, error)
 }
 
 type CategoryRepo struct{}
@@ -42,3 +45,33 @@ func (r *CategoryRepo) GetCategoryTranslations(ids []uint, idLang uint) (map[uin
 
 	return translations, nil
 }
+
+func (r *CategoryRepo) RetrieveMenuCategories(idLang uint) ([]model.ScannedCategory, error) {
+	var allCategories []model.ScannedCategory
+
+	categoryTbl := (&dbmodel.PsCategory{}).TableName()
+	categoryLangTbl := (&dbmodel.PsCategoryLang{}).TableName()
+	categoryShopTbl := (&dbmodel.PsCategoryShop{}).TableName()
+	langTbl := (&dbmodel.PsLang{}).TableName()
+
+	err := db.Get().
+		Model(dbmodel.PsCategory{}).
+		Select(`
+			ps_category.id_category AS category_id,
+			ps_category_lang.name AS name,
+			ps_category.active AS active,
+			ps_category_shop.position AS position,
+			ps_category.id_parent AS id_parent,
+			ps_category.is_root_category AS is_root_category,
+			ps_category_lang.link_rewrite AS link_rewrite,
+			ps_lang.iso_code AS iso_code
+		`).
+		Joins(`LEFT JOIN `+categoryLangTbl+` ON `+categoryLangTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryLangTbl+`.id_shop = ? AND `+categoryLangTbl+`.id_lang = ?`,
+			constdata.SHOP_ID, idLang).
+		Joins(`LEFT JOIN `+categoryShopTbl+` ON `+categoryShopTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryShopTbl+`.id_shop = ?`,
+			constdata.SHOP_ID).
+		Joins(`JOIN ` + langTbl + ` ON ` + langTbl + `.id_lang = ` + categoryLangTbl + `.id_lang`).
+		Scan(&allCategories).Error
+
+	return allCategories, err
+}

app/repos/customerRepo/customerRepo.go

@@ -1,6 +1,7 @@
 package customerRepo
 
 import (
+	"fmt"
 	"strings"
 
 	"git.ma-al.com/goc_daniel/b2b/app/db"
@@ -16,6 +17,7 @@ type UICustomerRepo interface {
 	Find(langId uint, p find.Paging, filt *filters.FiltersList, search string) (*find.Found[model.UserInList], error)
 	Save(customer *model.Customer) error
 	Create(customer *model.Customer) error
+	SetCustomerNoVatStatus(customerID uint, isNoVat bool) error
 }
 
 type CustomerRepo struct{}
@@ -80,13 +82,16 @@ func (repo *CustomerRepo) Find(langId uint, p find.Paging, filt *filters.Filters
 		for _, word := range words {
 
 			conditions = append(conditions, `
-			(LOWER(first_name) LIKE ? OR
+			(
+			 id = ? OR
+			 LOWER(first_name) LIKE ? OR
 			 LOWER(last_name) LIKE ? OR
 			 LOWER(email) LIKE ?)
 		`)
 
+			args = append(args, strings.ToLower(word))
 			for range 3 {
-				args = append(args, "%"+strings.ToLower(word)+"%")
+				args = append(args, fmt.Sprintf("%%%s%%", strings.ToLower(word)))
 			}
 		}
 
@@ -111,87 +116,6 @@ func (repo *CustomerRepo) Create(customer *model.Customer) error {
 	return db.DB.Create(customer).Error
 }
 
-// func (repo *CustomerRepo) Search(
-// 	customerId uint,
-// 	partnerCode string,
-// 	p find.Paging,
-// 	filt *filters.FiltersList,
-// 	search string,
-// ) (found find.Found[model.UserInList], err error) {
-// 	words := strings.Fields(search)
-// 	if len(words) > 5 {
-// 		words = words[:5]
-// 	}
-
-// 	query := ctx.DB().
-// 		Model(&model.Customer{}).
-// 		Select("customer.id AS id, customer.first_name as first_name, customer.last_name as last_name, customer.phone_number AS phone_number, customer.email AS email, count(distinct investment_plan_contract.id) as iiplan_purchases, count(distinct `order`.id) as single_purchases, entity.name as entity_name").
-// 		Where("customer.id <> ?", customerId).
-// 		Where("(customer.id IN (SELECT id FROM customer WHERE partner_code IN (WITH RECURSIVE partners AS (SELECT code AS dst FROM partner WHERE code = ? UNION SELECT code FROM partner JOIN partners ON partners.dst = partner.superior_code) SELECT dst FROM partners)) OR customer.recommender_code = ?)", partnerCode, partnerCode).
-// 		Scopes(view.CustomerListQuery())
-
-// 	var conditions []string
-// 	var args []interface{}
-// 	for _, word := range words {
-
-// 		conditions = append(conditions, `
-// 			(LOWER(first_name) LIKE ? OR
-// 			 LOWER(last_name) LIKE ? OR
-// 			 phone_number LIKE ? OR
-// 			 LOWER(email) LIKE ?)
-// 		`)
-
-// 		for i := 0; i < 4; i++ {
-// 			args = append(args, "%"+strings.ToLower(word)+"%")
-// 		}
-// 	}
-
-// 	finalQuery := strings.Join(conditions, " AND ")
-
-// 	query = query.Where(finalQuery, args...).
-// 		Scopes(filt.All()...)
-
-// 	found, err = find.Paginate[V](ctx, p, query)
-
-// 	return found, errs.Recorded(span, err)
-// }
-
-// func (repo *ListRepo) ListUsers(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.UserInList], error) {
-// 	var list []model.UserInList
-// 	var total int64
-
-// 	query := db.Get().
-// 		Table("b2b_customers AS users").
-// 		Select(`
-// 			users.id AS id,
-// 			users.email AS email,
-// 			users.first_name AS first_name,
-// 			users.last_name AS last_name,
-// 			users.role AS role
-// 		`)
-
-// 	// Apply all filters
-// 	if filt != nil {
-// 		filt.ApplyAll(query)
-// 	}
-
-// 	//  run counter first as query is without limit and offset
-// 	err := query.Count(&total).Error
-// 	if err != nil {
-// 		return find.Found[model.UserInList]{}, err
-// 	}
-
-// 	err = query.
-// 		Order("users.id DESC").
-// 		Limit(p.Limit()).
-// 		Offset(p.Offset()).
-// 		Find(&list).Error
-// 	if err != nil {
-// 		return find.Found[model.UserInList]{}, err
-// 	}
-
-// 	return find.Found[model.UserInList]{
-// 		Items: list,
-// 		Count: uint(total),
-// 	}, nil
-// }
+func (repo *CustomerRepo) SetCustomerNoVatStatus(customerID uint, isNoVat bool) error {
+	return db.DB.Model(&model.Customer{}).Where("id = ?", customerID).Update("is_no_vat", isNoVat).Error
+}

app/repos/localeSelectorRepo/localeSelectorRepo.go

@@ -3,6 +3,7 @@ package localeSelectorRepo
 import (
 	"git.ma-al.com/goc_daniel/b2b/app/db"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
 )
 
 type UILocaleSelectorRepo interface {
@@ -25,7 +26,9 @@ func (r *LocaleSelectorRepo) GetLanguages() ([]model.Language, error) {
 func (r *LocaleSelectorRepo) GetCountriesAndCurrencies() ([]model.Country, error) {
 	var countries []model.Country
 	err := db.Get().
-		Preload("PSCurrency").
+		Select("*").
+		Preload("Currency").
+		Joins("LEFT JOIN " + dbmodel.TableNamePsCountryLang + " AS cl ON cl." + dbmodel.PsCountryLangCols.IDCountry.Col() + " = b2b_countries.ps_id_country AND cl." + dbmodel.PsCountryLangCols.IDLang.Col() + " = 2").
 		Find(&countries).Error
 	return countries, err
 }

app/repos/ordersRepo/ordersRepo.go

@@ -1,6 +1,8 @@
 package ordersRepo
 
 import (
+	"time"
+
 	"git.ma-al.com/goc_daniel/b2b/app/db"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
@@ -11,7 +13,7 @@ import (
 type UIOrdersRepo interface {
 	UserHasOrder(user_id uint, order_id uint) (bool, error)
 	Find(user_id uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.CustomerOrder], error)
-	PlaceNewOrder(cart *model.CustomerCart, name string, country_id uint, address_info string) error
+	PlaceNewOrder(cart *model.CustomerCart, name string, country_id uint, address_info string, base_price float64, tax_incl float64, tax_excl float64) error
 	ChangeOrderAddress(order_id uint, country_id uint, address_info string) error
 	ChangeOrderStatus(order_id uint, status string) error
 }
@@ -69,7 +71,7 @@ func (repo *OrdersRepo) Find(user_id uint, p find.Paging, filt *filters.FiltersL
 	}, nil
 }
 
-func (repo *OrdersRepo) PlaceNewOrder(cart *model.CustomerCart, name string, country_id uint, address_info string) error {
+func (repo *OrdersRepo) PlaceNewOrder(cart *model.CustomerCart, name string, country_id uint, address_info string, base_price float64, tax_incl float64, tax_excl float64) error {
 	order := model.CustomerOrder{
 		UserID:        cart.UserID,
 		Name:          name,
@@ -87,6 +89,12 @@ func (repo *OrdersRepo) PlaceNewOrder(cart *model.CustomerCart, name string, cou
 		})
 	}
 
+	order.CreatedAt = time.Now()
+	order.UpdatedAt = time.Now()
+	order.BasePrice = base_price
+	order.TaxIncl = tax_incl
+	order.TaxExcl = tax_excl
+
 	return db.DB.Create(&order).Error
 }
 
@@ -97,6 +105,7 @@ func (repo *OrdersRepo) ChangeOrderAddress(order_id uint, country_id uint, addre
 		Updates(map[string]interface{}{
 			"country_id":     country_id,
 			"address_string": address_info,
+			"updated_at":     time.Now(),
 		}).
 		Error
 }
@@ -105,6 +114,9 @@ func (repo *OrdersRepo) ChangeOrderStatus(order_id uint, status string) error {
 	return db.DB.
 		Table("b2b_customer_orders").
 		Where("order_id = ?", order_id).
-		Update("status", status).
+		Updates(map[string]interface{}{
+			"status":     status,
+			"updated_at": time.Now(),
+		}).
 		Error
 }

app/repos/productDescriptionRepo/productDescriptionRepo.go

@@ -9,7 +9,6 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
-	"github.com/WinterYukky/gorm-extra-clause-plugin/exclause"
 	"gorm.io/gorm"
 )
 
@@ -17,7 +16,6 @@ type UIProductDescriptionRepo interface {
 	GetProductDescription(productID uint, productid_lang uint) (*model.ProductDescription, error)
 	CreateIfDoesNotExist(productID uint, productid_lang uint) error
 	UpdateFields(productID uint, productid_lang uint, updates map[string]string) error
-	GetMeiliProducts(id_lang uint, offset, limit int) ([]model.MeiliSearchProduct, error)
 }
 
 type ProductDescriptionRepo struct{}
@@ -118,108 +116,3 @@ func (r *ProductDescriptionRepo) UpdateFields(productID uint, productid_lang uin
 
 	return nil
 }
-
-// GetMeiliProductsBatchedScanned returns a batch of products with LIMIT/OFFSET pagination
-// The scanning is done inside the repo to keep the service layer cleaner
-func (r *ProductDescriptionRepo) GetMeiliProducts(id_lang uint, offset, limit int) ([]model.MeiliSearchProduct, error) {
-
-	var products []model.MeiliSearchProduct
-
-	err := db.Get().
-		Table("ps_product_shop ps").
-		Select(`
-        ps.id_product AS id_product,
-        pl.name AS name,
-        TRIM(REGEXP_REPLACE(REGEXP_REPLACE(pl.description_short, '<[^>]*>', ' '), '[[:space:]]+', ' ')) AS description,
-        p.ean13,
-        p.reference,
-        ps.price,
-        ps.id_category_default AS id_category,
-        cl.name AS cat_name,
-        cl.link_rewrite AS l_rew,
-        COALESCE(vary.attributes, JSON_OBJECT()) AS attr,
-        COALESCE(feat.features, JSON_OBJECT()) AS feat,
-        img.id_image,
-        cat.category_ids,
-        (SELECT COUNT(*) FROM ps_product_attribute_shop pas2 WHERE pas2.id_product = ps.id_product AND pas2.id_shop = ?) AS variations
-    `, constdata.SHOP_ID).
-		Joins("JOIN ps_product p ON p.id_product = ps.id_product").
-		Joins("JOIN ps_product_lang pl ON pl.id_product = ps.id_product AND pl.id_shop = ? AND pl.id_lang = ?", constdata.SHOP_ID, id_lang).
-		Joins("JOIN ps_category_lang cl ON cl.id_category = ps.id_category_default AND cl.id_shop = ? AND cl.id_lang = ?", constdata.SHOP_ID, id_lang).
-		Joins("LEFT JOIN variations vary ON vary.id_product = ps.id_product").
-		Joins("LEFT JOIN features feat ON feat.id_product = ps.id_product").
-		Joins("LEFT JOIN images img ON img.id_product = ps.id_product").
-		Joins("LEFT JOIN categories cat ON cat.id_product = ps.id_product").
-		Joins("JOIN products_page pp ON pp.id_product = ps.id_product").
-		Where("ps.active = ?", 1).
-		Order("ps.id_product").
-		Clauses(exclause.With{CTEs: []exclause.CTE{
-			{
-				Name: "products_page",
-				Subquery: exclause.Subquery{
-					DB: db.Get().
-						Model(&dbmodel.PsProductShop{}).
-						Select("id_product, price").
-						Where("id_shop = ? AND active = 1", constdata.SHOP_ID).
-						Order("id_product").
-						Limit(limit).
-						Offset(offset),
-				},
-			},
-			{
-				Name: "variation_attributes",
-				Subquery: exclause.Subquery{
-					DB: db.Get().
-						Table("ps_product_attribute_shop pas"). // <- explicit alias here
-						Select(`
-							pas.id_product,
-							pag.id_attribute_group AS attribute_name,
-							JSON_ARRAYAGG(DISTINCT pa.id_attribute) AS attribute_values
-						`).
-						Joins("JOIN ps_product_attribute_combination ppac ON ppac.id_product_attribute = pas.id_product_attribute").
-						Joins("JOIN ps_attribute pa ON pa.id_attribute = ppac.id_attribute").
-						Joins("JOIN ps_attribute_group pag ON pag.id_attribute_group = pa.id_attribute_group").
-						Where("pas.id_shop = ?", constdata.SHOP_ID).
-						Group("pas.id_product, pag.id_attribute_group"),
-				},
-			},
-			{
-				Name: "variations",
-				Subquery: exclause.Subquery{
-					DB: db.Get().
-						Table("variation_attributes").
-						Select("id_product, JSON_OBJECTAGG(attribute_name, attribute_values) AS attributes").
-						Group("id_product"),
-				},
-			},
-			{
-				Name: "features",
-				Subquery: exclause.Subquery{
-					DB: db.Get().
-						Table("ps_feature_product pfp"). // <- explicit alias
-						Select("pfp.id_product, JSON_OBJECTAGG(pfp.id_feature, pfp.id_feature_value) AS features").
-						Group("pfp.id_product"),
-				},
-			},
-			{
-				Name: "images",
-				Subquery: exclause.Subquery{
-					DB: db.Get().
-						Model(&dbmodel.PsImageShop{}).
-						Select("id_product, id_image").
-						Where("id_shop = ? AND cover = 1", constdata.SHOP_ID),
-				},
-			},
-			{
-				Name: "categories",
-				Subquery: exclause.Subquery{
-					DB: db.Get().
-						Model(&dbmodel.PsCategoryProduct{}).
-						Select("id_product, JSON_ARRAYAGG(id_category) AS category_ids").
-						Group("id_product"),
-				},
-			},
-		}}).Find(&products).Error
-
-	return products, err
-}

app/repos/productsRepo/productsRepo.go

@@ -2,7 +2,6 @@ package productsRepo
 
 import (
 	"encoding/json"
-	"fmt"
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
 	"git.ma-al.com/goc_daniel/b2b/app/db"
@@ -10,13 +9,18 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
+	"git.ma-al.com/goc_daniel/b2b/app/view"
 	"git.ma-al.com/goc_marek/gormcol"
 	"github.com/WinterYukky/gorm-extra-clause-plugin/exclause"
 )
 
 type UIProductsRepo interface {
-	GetJSON(p_id_product, p_id_shop, p_id_lang, p_id_customer, b2b_id_country, p_quantity int) (*json.RawMessage, error)
-	Find(id_lang, userID uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error)
+	// GetJSON(p_id_product, p_id_shop, p_id_lang, p_id_customer, b2b_id_country, p_quantity int) (*json.RawMessage, error)
+	Find(id_lang uint, userID uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.ProductInList], error)
+	GetProductVariants(langID uint, productID uint, shopID uint, customerID uint, countryID uint, quantity uint) ([]view.ProductAttribute, error)
+	GetBase(p_id_product, p_id_shop, p_id_lang, p_id_customer uint) (view.Product, error)
+	GetPrice(p_id_product uint, productAttributeID *uint, p_id_shop uint, p_id_customer uint, p_id_country uint, p_quantity uint) (view.Price, error)
+	GetVariants(p_id_product, p_id_shop, p_id_lang, p_id_customer, p_id_country, p_quantity uint) ([]view.ProductAttribute, error)
 	AddToFavorites(userID uint, productID uint) error
 	RemoveFromFavorites(userID uint, productID uint) error
 	ExistsInFavorites(userID uint, productID uint) (bool, error)
@@ -29,105 +33,238 @@ func New() UIProductsRepo {
 	return &ProductsRepo{}
 }
 
-func (repo *ProductsRepo) GetJSON(p_id_product, p_id_shop, p_id_lang, p_id_customer, b2b_id_country, p_quantity int) (*json.RawMessage, error) {
-	var productStr string // ← Scan as string first
+func (repo *ProductsRepo) GetBase(p_id_product, p_id_shop, p_id_lang, p_id_customer uint) (view.Product, error) {
+	var result view.Product
 
-	err := db.DB.Raw(`CALL get_full_product(?,?,?,?,?,?)`,
-		p_id_product, p_id_shop, p_id_lang, p_id_customer, b2b_id_country, p_quantity).
-		Scan(&productStr).
-		Error
+	err := db.DB.Raw(`CALL get_product_base(?,?,?,?)`,
+		p_id_product, p_id_shop, p_id_lang, p_id_customer).
+		Scan(&result).Error
 
-	if err != nil {
-		return nil, err
-	}
-
-	if !json.Valid([]byte(productStr)) {
-		return nil, fmt.Errorf("invalid json returned from stored procedure")
-	}
-
-	raw := json.RawMessage(productStr)
-	return &raw, nil
+	return result, err
 }
 
-func (repo *ProductsRepo) Find(id_lang, userID uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error) {
-	var list []model.ProductInList
-	var total int64
+func (repo *ProductsRepo) GetPrice(
+	p_id_product uint, productAttributeID *uint, p_id_shop uint, p_id_customer uint, p_id_country uint, p_quantity uint,
+) (view.Price, error) {
 
-	query := db.Get().
-		Table(gormcol.Field.Tab(dbmodel.PsProductShopCols.Active)+" AS ps").
-		Select(`
-			ps.id_product AS product_id,
-			pl.name AS name,
-			pl.link_rewrite AS link_rewrite,
-			CONCAT(?, '/', ims.id_image, '-small_default/', pl.link_rewrite, '.webp') AS image_link,
-			cl.name AS category_name,
-			p.reference AS reference,
-			COALESCE(v.variants_number, 0) AS variants_number,
-			sa.quantity AS quantity,
-			COALESCE(f.is_favorite, 0) AS is_favorite
-    	`, config.Get().Image.ImagePrefix).
-		Joins("JOIN "+dbmodel.PsProductCols.IDProduct.Tab()+" p ON p.id_product = ps.id_product").
-		Joins("JOIN ps_product_lang pl ON pl.id_product = ps.id_product AND pl.id_lang = ?", id_lang).
-		Joins("JOIN ps_image_shop ims ON ims.id_product = ps.id_product AND ims.cover = 1").
-		Joins("JOIN ps_category_lang cl ON cl.id_category = ps.id_category_default AND cl.id_lang = ?", id_lang).
-		Joins("JOIN ps_category_product cp ON cp.id_product = ps.id_product").
-		Joins("LEFT JOIN variants v ON v.id_product = ps.id_product").
-		Joins("LEFT JOIN favorites f ON f.id_product = ps.id_product").
-		Joins("LEFT JOIN ps_stock_available sa ON sa.id_product = ps.id_product AND sa.id_product_attribute = 0").
-		Where("ps.active = ?", 1).
-		Group("ps.id_product").
+	type row struct {
+		Price json.RawMessage `gorm:"column:price"`
+	}
+
+	var r row
+	err := db.DB.Raw(`
+        SELECT fn_product_price(?,?,?,?,?,?) AS price`,
+		p_id_product, p_id_shop, p_id_customer, p_id_country, p_quantity, productAttributeID).
+		Scan(&r).Error
+
+	if err != nil {
+		return view.Price{}, err
+	}
+
+	var temp struct {
+		Base         json.Number `json:"base"`
+		FinalTaxExcl json.Number `json:"final_tax_excl"`
+		FinalTaxIncl json.Number `json:"final_tax_incl"`
+		TaxRate      json.Number `json:"tax_rate"`
+		Priority     json.Number `json:"priority"`
+	}
+
+	if err := json.Unmarshal(r.Price, &temp); err != nil {
+		return view.Price{}, err
+	}
+
+	price := view.Price{
+		Base:         mustParseFloat(temp.Base),
+		FinalTaxExcl: mustParseFloat(temp.FinalTaxExcl),
+		FinalTaxIncl: mustParseFloat(temp.FinalTaxIncl),
+		TaxRate:      mustParseFloat(temp.TaxRate),
+		Priority:     mustParseInt(temp.Priority),
+	}
+
+	return price, nil
+}
+func mustParseFloat(n json.Number) float64 {
+	f, _ := n.Float64()
+	return f
+}
+
+func mustParseInt(n json.Number) int {
+	i, _ := n.Int64()
+	return int(i)
+}
+func (repo *ProductsRepo) GetVariants(p_id_product, p_id_shop, p_id_lang, p_id_customer, p_id_country, p_quantity uint) ([]view.ProductAttribute, error) {
+
+	var results []view.ProductAttribute
+
+	err := db.DB.Raw(`
+		CALL get_product_variants(?,?,?,?,?,?)`,
+		p_id_product, p_id_shop, p_id_lang, p_id_customer, p_id_country, p_quantity).
+		Scan(&results).Error
+
+	return results, err
+}
+
+func (repo *ProductsRepo) Find(langID uint, userID uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.ProductInList], error) {
+	query := db.DB.
+		Table("base_products AS bp").
 		Clauses(exclause.With{
 			CTEs: []exclause.CTE{
-				{
-					Name: "variants",
-					Subquery: exclause.Subquery{
-						DB: db.Get().
-							Model(&dbmodel.PsProductAttributeShop{}).
-							Select("id_product", "COUNT(*) AS variants_number").
-							Group("id_product"),
-					},
-				},
-
 				{
 					Name: "favorites",
 					Subquery: exclause.Subquery{
-						DB: db.Get().
+						DB: db.DB.
 							Table("b2b_favorites").
 							Select(`
-								product_id AS id_product,
+								product_id AS product_id,
 								COUNT(*) > 0 AS is_favorite
 							`).
 							Where("user_id = ?", userID).
 							Group("product_id"),
 					},
 				},
+				{
+					Name: "oems",
+					Subquery: exclause.Subquery{
+						DB: db.DB.
+							Table("b2b_oems").
+							Select(`
+								product_id AS product_id,
+								COUNT(*) > 0 AS is_customers_oem
+							`).
+							Where("user_id = ?", userID).
+							Group("product_id"),
+					},
+				},
+				{
+					Name: "new_product_days",
+					Subquery: exclause.Subquery{
+						DB: db.DB.
+							Table("ps_configuration").
+							Select("CAST(value AS SIGNED) AS days").
+							Where("name = ?", "PS_NB_DAYS_NEW_PRODUCT"),
+					},
+				},
+				{
+					Name: "variants",
+					Subquery: exclause.Subquery{
+						DB: db.DB.
+							Table("ps_product_attribute_shop").
+							Select("id_product, COUNT(*) AS variants_number").
+							Group("id_product"),
+					},
+				},
+				{
+					Name: "base_products",
+					Subquery: exclause.Subquery{
+						DB: db.DB.
+							Table(gormcol.Field.Tab(dbmodel.PsProductShopCols.Active)+" AS ps").
+							Select(`
+								ps.id_product AS product_id,
+								pl.name AS name,
+								ps.id_category_default AS category_id,
+								p.reference AS reference,
+								p.is_oem AS is_oem,
+								sa.quantity AS quantity,
+								COALESCE(f.is_favorite, 0) AS is_favorite,
+								CASE
+									WHEN ps.date_add >= DATE_SUB(
+										NOW(),
+										INTERVAL COALESCE(npd.days, 20) DAY
+									) AND ps.active = 1
+									THEN 1
+									ELSE 0
+								END AS is_new
+							`).
+							Joins("JOIN "+dbmodel.PsProductCols.IDProduct.Tab()+" p ON p.id_product = ps.id_product").
+							Joins("JOIN ps_product_lang pl ON pl.id_product = ps.id_product AND pl.id_lang = ?", langID).
+							Joins("LEFT JOIN favorites f ON f.product_id = ps.id_product").
+							Joins("LEFT JOIN ps_stock_available sa ON sa.id_product = ps.id_product AND sa.id_product_attribute = 0").
+							Joins("LEFT JOIN new_product_days npd ON 1 = 1").
+							Joins("LEFT JOIN oems ON oems.product_id = ps.id_product").
+							Where("ps.active = ?", 1).
+							Where("(p.is_oem = 0 OR oems.is_customers_oem > 0)").
+							Group("ps.id_product"),
+					},
+				},
 			},
 		}).
-		Order("ps.id_product DESC")
+		Select(`
+			bp.product_id AS product_id,
+			bp.name AS name,
+			pl.link_rewrite AS link_rewrite,
+			CONCAT(?, '/', ims.id_image, '-small_default/', pl.link_rewrite, '.webp') AS image_link,
+			cl.name AS category_name,
+			bp.reference AS reference,
+			COALESCE(v.variants_number, 0) AS variants_number,
+			bp.quantity AS quantity,
+			bp.is_favorite AS is_favorite,
+			bp.is_new AS is_new,
+			bp.is_oem AS is_oem
+		`, config.Get().Image.ImagePrefix).
+		Joins("JOIN ps_product_lang pl ON pl.id_product = bp.product_id AND pl.id_lang = ?", langID).
+		Joins("JOIN ps_image_shop ims ON ims.id_product = bp.product_id AND ims.cover = 1").
+		Joins("JOIN ps_category_lang cl ON cl.id_category = bp.category_id AND cl.id_lang = ?", langID).
+		Joins("LEFT JOIN variants v ON v.id_product = bp.product_id").
+		Order("bp.product_id DESC")
 
-	// Apply all filters
-	if filt != nil {
-		filt.ApplyAll(query)
-	}
+	query = query.Scopes(filt.All()...)
 
-	//  run counter first as query is without limit and offset
-	err := query.Count(&total).Error
+	list, err := find.Paginate[model.ProductInList](langID, p, query)
 	if err != nil {
-		return find.Found[model.ProductInList]{}, err
+		return nil, err
 	}
+	return &list, nil
+}
+
+func (repo *ProductsRepo) GetProductVariants(langID uint, productID uint, shopID uint, customerID uint, countryID uint, quantity uint) ([]view.ProductAttribute, error) {
+	var result []view.ProductAttribute
+	err := db.DB.
+		Raw(`
+			CALL get_product_attributes_with_price(?, ?, ?, ?, ?, ?)
+		`,
+			langID,
+			productID,
+			shopID,
+			customerID,
+			countryID,
+			quantity,
+		).
+		Scan(&result).Error
 
-	err = query.
-		Limit(p.Limit()).
-		Offset(p.Offset()).
-		Find(&list).Error
 	if err != nil {
-		return find.Found[model.ProductInList]{}, err
+		return nil, err
 	}
 
-	return find.Found[model.ProductInList]{
-		Items: list,
-		Count: uint(total),
-	}, nil
+	return result, nil
+}
+
+func (repo *ProductsRepo) PopulateProductPrice(product *model.ProductInList, targetCustomer *model.Customer, quantity int, shopID uint) error {
+	row := db.Get().Raw(
+		"CALL get_product_price(?, ?, ?, ?, ?)",
+		product.ProductID,
+		shopID,
+		targetCustomer.ID,
+		targetCustomer.CountryID,
+		quantity,
+	).Row()
+
+	var (
+		id   uint
+		base float64
+		excl float64
+		incl float64
+		tax  float64
+	)
+
+	err := row.Scan(&id, &base, &excl, &incl, &tax)
+	if err != nil {
+		return err
+	}
+
+	product.PriceTaxExcl = excl
+	product.PriceTaxIncl = incl
+	return nil
+
 }
 
 func (repo *ProductsRepo) AddToFavorites(userID uint, productID uint) error {

app/repos/routesRepo/routesRepo.go

@@ -7,7 +7,7 @@ import (
 )
 
 type UIRoutesRepo interface {
-	GetRoutes(langId uint) ([]model.Route, error)
+	GetRoutes(langId uint, roleId uint) ([]model.Route, error)
 	GetTopMenu(id uint, roleId uint) ([]model.B2BTopMenu, error)
 }
 
@@ -17,13 +17,18 @@ func New() UIRoutesRepo {
 	return &RoutesRepo{}
 }
 
-func (p *RoutesRepo) GetRoutes(langId uint) ([]model.Route, error) {
+func (p *RoutesRepo) GetRoutes(langId uint, roleId uint) ([]model.Route, error) {
 	routes := []model.Route{}
-	err := db.DB.Find(&routes, model.Route{Active: nullable.GetNil(true)}).Error
-	if err != nil {
-		return nil, err
-	}
-	return routes, nil
+
+	err := db.
+		Get().
+		Model(model.Route{}).
+		Joins("JOIN b2b_route_roles rr ON rr.route_id = b2b_routes.id").
+		Where(model.Route{Active: nullable.GetNil(true)}).
+		Where("rr.role_id = ?", roleId).
+		Find(&routes).Error
+
+	return routes, err
 }
 
 func (p *RoutesRepo) GetTopMenu(langId uint, roleId uint) ([]model.B2BTopMenu, error) {

app/repos/searchRepo/searchRepo.go

@@ -7,7 +7,11 @@ import (
 	"net/http"
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
+	"git.ma-al.com/goc_daniel/b2b/app/db"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"github.com/WinterYukky/gorm-extra-clause-plugin/exclause"
 )
 
 type SearchProxyResponse struct {
@@ -17,6 +21,7 @@ type SearchProxyResponse struct {
 
 type UISearchRepo interface {
 	Search(index string, body []byte) (*SearchProxyResponse, error)
+	GetMeiliProducts(id_lang uint, offset, limit int) ([]model.MeiliSearchProduct, error)
 	GetIndexSettings(index string) (*SearchProxyResponse, error)
 	GetRoutes(langId uint) ([]model.Route, error)
 }
@@ -80,3 +85,108 @@ func (r *SearchRepo) doRequest(method, url string, body []byte) (*SearchProxyRes
 func (r *SearchRepo) GetRoutes(langId uint) ([]model.Route, error) {
 	return nil, nil
 }
+
+// GetMeiliProductsProducts returns a batch of products with LIMIT/OFFSET pagination
+// The scanning is done inside the repo to keep the service layer cleaner
+func (r *SearchRepo) GetMeiliProducts(id_lang uint, offset, limit int) ([]model.MeiliSearchProduct, error) {
+
+	var products []model.MeiliSearchProduct
+
+	err := db.Get().
+		Table("ps_product_shop ps").
+		Select(`
+        ps.id_product AS id_product,
+        pl.name AS name,
+        TRIM(REGEXP_REPLACE(REGEXP_REPLACE(pl.description_short, '<[^>]*>', ' '), '[[:space:]]+', ' ')) AS description,
+        p.ean13,
+        p.reference,
+        ps.price,
+        ps.id_category_default AS id_category,
+        cl.name AS cat_name,
+        cl.link_rewrite AS l_rew,
+        COALESCE(vary.attributes, JSON_OBJECT()) AS attr,
+        COALESCE(feat.features, JSON_OBJECT()) AS feat,
+        img.id_image,
+        cat.category_ids,
+        (SELECT COUNT(*) FROM ps_product_attribute_shop pas2 WHERE pas2.id_product = ps.id_product AND pas2.id_shop = ?) AS variations
+    `, constdata.SHOP_ID).
+		Joins("JOIN ps_product p ON p.id_product = ps.id_product").
+		Joins("JOIN ps_product_lang pl ON pl.id_product = ps.id_product AND pl.id_shop = ? AND pl.id_lang = ?", constdata.SHOP_ID, id_lang).
+		Joins("JOIN ps_category_lang cl ON cl.id_category = ps.id_category_default AND cl.id_shop = ? AND cl.id_lang = ?", constdata.SHOP_ID, id_lang).
+		Joins("LEFT JOIN variations vary ON vary.id_product = ps.id_product").
+		Joins("LEFT JOIN features feat ON feat.id_product = ps.id_product").
+		Joins("LEFT JOIN images img ON img.id_product = ps.id_product").
+		Joins("LEFT JOIN categories cat ON cat.id_product = ps.id_product").
+		Joins("JOIN products_page pp ON pp.id_product = ps.id_product").
+		Where("ps.active = ?", 1).
+		Order("ps.id_product").
+		Clauses(exclause.With{CTEs: []exclause.CTE{
+			{
+				Name: "products_page",
+				Subquery: exclause.Subquery{
+					DB: db.Get().
+						Model(&dbmodel.PsProductShop{}).
+						Select("id_product, price").
+						Where("id_shop = ? AND active = 1", constdata.SHOP_ID).
+						Order("id_product").
+						Limit(limit).
+						Offset(offset),
+				},
+			},
+			{
+				Name: "variation_attributes",
+				Subquery: exclause.Subquery{
+					DB: db.Get().
+						Table("ps_product_attribute_shop pas"). // <- explicit alias here
+						Select(`
+							pas.id_product,
+							pag.id_attribute_group AS attribute_name,
+							JSON_ARRAYAGG(DISTINCT pa.id_attribute) AS attribute_values
+						`).
+						Joins("JOIN ps_product_attribute_combination ppac ON ppac.id_product_attribute = pas.id_product_attribute").
+						Joins("JOIN ps_attribute pa ON pa.id_attribute = ppac.id_attribute").
+						Joins("JOIN ps_attribute_group pag ON pag.id_attribute_group = pa.id_attribute_group").
+						Where("pas.id_shop = ?", constdata.SHOP_ID).
+						Group("pas.id_product, pag.id_attribute_group"),
+				},
+			},
+			{
+				Name: "variations",
+				Subquery: exclause.Subquery{
+					DB: db.Get().
+						Table("variation_attributes").
+						Select("id_product, JSON_OBJECTAGG(attribute_name, attribute_values) AS attributes").
+						Group("id_product"),
+				},
+			},
+			{
+				Name: "features",
+				Subquery: exclause.Subquery{
+					DB: db.Get().
+						Table("ps_feature_product pfp"). // <- explicit alias
+						Select("pfp.id_product, JSON_OBJECTAGG(pfp.id_feature, pfp.id_feature_value) AS features").
+						Group("pfp.id_product"),
+				},
+			},
+			{
+				Name: "images",
+				Subquery: exclause.Subquery{
+					DB: db.Get().
+						Model(&dbmodel.PsImageShop{}).
+						Select("id_product, id_image").
+						Where("id_shop = ? AND cover = 1", constdata.SHOP_ID),
+				},
+			},
+			{
+				Name: "categories",
+				Subquery: exclause.Subquery{
+					DB: db.Get().
+						Model(&dbmodel.PsCategoryProduct{}).
+						Select("id_product, JSON_ARRAYAGG(id_category) AS category_ids").
+						Group("id_product"),
+				},
+			},
+		}}).Find(&products).Error
+
+	return products, err
+}

app/repos/specificPriceRepo/specificPriceRepo.go

@@ -0,0 +1,247 @@
+package specificPriceRepo
+
+import (
+	"context"
+	"errors"
+	"time"
+
+	"git.ma-al.com/goc_daniel/b2b/app/db"
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"gorm.io/gorm"
+)
+
+type UISpecificPriceRepo interface {
+	Create(ctx context.Context, pr *model.SpecificPrice) error
+	Update(ctx context.Context, pr *model.SpecificPrice) error
+	Delete(ctx context.Context, id uint64) error
+	GetByID(ctx context.Context, id uint64) (*model.SpecificPrice, error)
+	List(ctx context.Context) ([]*model.SpecificPrice, error)
+	SetActive(ctx context.Context, id uint64, active bool) error
+}
+
+type SpecificPriceRepo struct{}
+
+func New() UISpecificPriceRepo {
+	return &SpecificPriceRepo{}
+}
+
+func (repo *SpecificPriceRepo) Create(ctx context.Context, pr *model.SpecificPrice) error {
+	return db.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		now := time.Now()
+		pr.CreatedAt = &now
+
+		if err := tx.Create(pr).Error; err != nil {
+			return err
+		}
+
+		return repo.insertRelations(tx, pr)
+	})
+}
+
+func (repo *SpecificPriceRepo) Update(ctx context.Context, pr *model.SpecificPrice) error {
+	return db.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		now := time.Now()
+		pr.UpdatedAt = &now
+
+		if err := tx.Save(pr).Error; err != nil {
+			return err
+		}
+
+		if err := repo.clearRelations(tx, pr.ID); err != nil {
+			return err
+		}
+
+		return repo.insertRelations(tx, pr)
+	})
+}
+
+func (repo *SpecificPriceRepo) GetByID(ctx context.Context, id uint64) (*model.SpecificPrice, error) {
+	var pr model.SpecificPrice
+	err := db.DB.WithContext(ctx).Where("id = ?", id).First(&pr).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, nil
+		}
+		return nil, err
+	}
+
+	if err := repo.loadRelations(ctx, &pr); err != nil {
+		return nil, err
+	}
+
+	return &pr, nil
+}
+
+func (repo *SpecificPriceRepo) List(ctx context.Context) ([]*model.SpecificPrice, error) {
+	var specificPrices []*model.SpecificPrice
+	err := db.DB.WithContext(ctx).Find(&specificPrices).Error
+	if err != nil {
+		return nil, err
+	}
+
+	for i := range specificPrices {
+		if err := repo.loadRelations(ctx, specificPrices[i]); err != nil {
+			return nil, err
+		}
+	}
+
+	return specificPrices, nil
+}
+
+func (repo *SpecificPriceRepo) SetActive(ctx context.Context, id uint64, active bool) error {
+	return db.DB.WithContext(ctx).Model(&model.SpecificPrice{}).Where("id = ?", id).Update("is_active", active).Error
+}
+
+func (repo *SpecificPriceRepo) Delete(ctx context.Context, id uint64) error {
+	return db.DB.WithContext(ctx).Transaction(func(tx *gorm.DB) error {
+		if err := tx.Exec("DELETE FROM b2b_specific_price_product WHERE b2b_specific_price_id = ?", id).Error; err != nil {
+			return err
+		}
+		if err := tx.Exec("DELETE FROM b2b_specific_price_category WHERE b2b_specific_price_id = ?", id).Error; err != nil {
+			return err
+		}
+		if err := tx.Exec("DELETE FROM b2b_specific_price_product_attribute WHERE b2b_specific_price_id = ?", id).Error; err != nil {
+			return err
+		}
+		if err := tx.Exec("DELETE FROM b2b_specific_price_country WHERE b2b_specific_price_id = ?", id).Error; err != nil {
+			return err
+		}
+		if err := tx.Exec("DELETE FROM b2b_specific_price_customer WHERE b2b_specific_price_id = ?", id).Error; err != nil {
+			return err
+		}
+		if err := tx.Delete(&model.SpecificPrice{}, "id = ?", id).Error; err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func (repo *SpecificPriceRepo) insertRelations(tx *gorm.DB, pr *model.SpecificPrice) error {
+	if len(pr.ProductIDs) > 0 {
+		for _, productID := range pr.ProductIDs {
+			if err := tx.Exec(`
+				INSERT INTO b2b_specific_price_product (b2b_specific_price_id, id_product) VALUES (?, ?)
+			`, pr.ID, productID).Error; err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(pr.CategoryIDs) > 0 {
+		for _, categoryID := range pr.CategoryIDs {
+			if err := tx.Exec(`
+				INSERT INTO b2b_specific_price_category (b2b_specific_price_id, id_category) VALUES (?, ?)
+			`, pr.ID, categoryID).Error; err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(pr.ProductAttributeIDs) > 0 {
+		for _, attrID := range pr.ProductAttributeIDs {
+			if err := tx.Exec(`
+				INSERT INTO b2b_specific_price_product_attribute (b2b_specific_price_id, id_product_attribute) VALUES (?, ?)
+			`, pr.ID, attrID).Error; err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(pr.CountryIDs) > 0 {
+		for _, countryID := range pr.CountryIDs {
+			if err := tx.Exec(`
+				INSERT INTO b2b_specific_price_country (b2b_specific_price_id, b2b_id_country) VALUES (?, ?)
+			`, pr.ID, countryID).Error; err != nil {
+				return err
+			}
+		}
+	}
+
+	if len(pr.CustomerIDs) > 0 {
+		for _, customerID := range pr.CustomerIDs {
+			if err := tx.Exec(`
+				INSERT INTO b2b_specific_price_customer (b2b_specific_price_id, b2b_id_customer) VALUES (?, ?)
+			`, pr.ID, customerID).Error; err != nil {
+				return err
+			}
+		}
+	}
+
+	return nil
+}
+
+func (repo *SpecificPriceRepo) clearRelations(tx *gorm.DB, id uint64) error {
+	if err := tx.Exec("DELETE FROM b2b_specific_price_product WHERE b2b_specific_price_id = ?", id).Error; err != nil {
+		return err
+	}
+	if err := tx.Exec("DELETE FROM b2b_specific_price_category WHERE b2b_specific_price_id = ?", id).Error; err != nil {
+		return err
+	}
+	if err := tx.Exec("DELETE FROM b2b_specific_price_product_attribute WHERE b2b_specific_price_id = ?", id).Error; err != nil {
+		return err
+	}
+	if err := tx.Exec("DELETE FROM b2b_specific_price_country WHERE b2b_specific_price_id = ?", id).Error; err != nil {
+		return err
+	}
+	if err := tx.Exec("DELETE FROM b2b_specific_price_customer WHERE b2b_specific_price_id = ?", id).Error; err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (repo *SpecificPriceRepo) loadRelations(ctx context.Context, pr *model.SpecificPrice) error {
+	var err error
+
+	var productIDs []struct {
+		IDProduct uint64 `gorm:"column:id_product"`
+	}
+	if err = db.DB.WithContext(ctx).Table("b2b_specific_price_product").Where("b2b_specific_price_id = ?", pr.ID).Select("id_product").Scan(&productIDs).Error; err != nil {
+		return err
+	}
+	for _, p := range productIDs {
+		pr.ProductIDs = append(pr.ProductIDs, p.IDProduct)
+	}
+
+	var categoryIDs []struct {
+		IDCategory uint64 `gorm:"column:id_category"`
+	}
+	if err = db.DB.WithContext(ctx).Table("b2b_specific_price_category").Where("b2b_specific_price_id = ?", pr.ID).Select("id_category").Scan(&categoryIDs).Error; err != nil {
+		return err
+	}
+	for _, c := range categoryIDs {
+		pr.CategoryIDs = append(pr.CategoryIDs, c.IDCategory)
+	}
+
+	var attrIDs []struct {
+		IDAttr uint64 `gorm:"column:id_product_attribute"`
+	}
+	if err = db.DB.WithContext(ctx).Table("b2b_specific_price_product_attribute").Where("b2b_specific_price_id = ?", pr.ID).Select("id_product_attribute").Scan(&attrIDs).Error; err != nil {
+		return err
+	}
+	for _, a := range attrIDs {
+		pr.ProductAttributeIDs = append(pr.ProductAttributeIDs, a.IDAttr)
+	}
+
+	var countryIDs []struct {
+		IDCountry uint64 `gorm:"column:b2b_id_country"`
+	}
+	if err = db.DB.WithContext(ctx).Table("b2b_specific_price_country").Where("b2b_specific_price_id = ?", pr.ID).Select("b2b_id_country").Scan(&countryIDs).Error; err != nil {
+		return err
+	}
+	for _, c := range countryIDs {
+		pr.CountryIDs = append(pr.CountryIDs, c.IDCountry)
+	}
+
+	var customerIDs []struct {
+		IDCustomer uint64 `gorm:"column:b2b_id_customer"`
+	}
+	if err = db.DB.WithContext(ctx).Table("b2b_specific_price_customer").Where("b2b_specific_price_id = ?", pr.ID).Select("b2b_id_customer").Scan(&customerIDs).Error; err != nil {
+		return err
+	}
+	for _, c := range customerIDs {
+		pr.CustomerIDs = append(pr.CustomerIDs, c.IDCustomer)
+	}
+
+	return nil
+}

app/service/authService/auth.go

@@ -15,12 +15,14 @@ import (
 	roleRepo "git.ma-al.com/goc_daniel/b2b/app/repos/rolesRepo"
 	"git.ma-al.com/goc_daniel/b2b/app/service/emailService"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
 
 	"github.com/dlclark/regexp2"
 	"github.com/golang-jwt/jwt/v5"
 	"golang.org/x/crypto/bcrypt"
 	"gorm.io/gorm"
+	"gorm.io/gorm/clause"
 )
 
 // JWTClaims represents the JWT claims
@@ -67,22 +69,47 @@ func (s *AuthService) Login(req *model.LoginRequest) (*model.AuthResponse, strin
 	// Find user by email
 	if err := s.db.Preload("Role.Permissions").Where("email = ?", req.Email).First(&user).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
+			logger.Info("login failed - invalid credentials",
+				"service", "AuthService.Login",
+				"email", req.Email,
+				"reason", "user not found",
+			)
 			return nil, "", responseErrors.ErrInvalidCredentials
 		}
+		logger.Error("login failed - database error",
+			"service", "AuthService.Login",
+			"email", req.Email,
+			"error", err.Error(),
+		)
 		return nil, "", fmt.Errorf("database error: %w", err)
 	}
 	// Check if user is active
 	if !user.IsActive {
+		logger.Info("login failed - user inactive",
+			"service", "AuthService.Login",
+			"email", req.Email,
+			"reason", "user account is inactive",
+		)
 		return nil, "", responseErrors.ErrUserInactive
 	}
 
 	// Check if email is verified
 	if !user.EmailVerified {
+		logger.Info("login failed - email not verified",
+			"service", "AuthService.Login",
+			"email", req.Email,
+			"reason", "email not verified",
+		)
 		return nil, "", responseErrors.ErrEmailNotVerified
 	}
 
 	// Verify password
 	if err := bcrypt.CompareHashAndPassword([]byte(user.Password), []byte(req.Password)); err != nil {
+		logger.Info("login failed - invalid credentials",
+			"service", "AuthService.Login",
+			"email", req.Email,
+			"reason", "wrong password",
+		)
 		return nil, "", responseErrors.ErrInvalidCredentials
 	}
 
@@ -93,22 +120,38 @@ func (s *AuthService) Login(req *model.LoginRequest) (*model.AuthResponse, strin
 	if req.LangID != nil {
 		_, err := s.GetLangISOCode(*req.LangID)
 		if err != nil {
+			logger.Warn("login failed - invalid language ID",
+				"service", "AuthService.Login",
+				"email", req.Email,
+				"reason", "invalid language ID",
+			)
 			return nil, "", responseErrors.ErrBadLangID
 		}
 		user.LangID = *req.LangID
 	}
 
+	user.Country = nil
 	s.db.Save(&user)
 
 	// Generate access token (JWT)
 	accessToken, err := s.generateAccessToken(&user)
 	if err != nil {
+		logger.Error("login failed - token generation error",
+			"service", "AuthService.Login",
+			"email", req.Email,
+			"error", err.Error(),
+		)
 		return nil, "", fmt.Errorf("failed to generate access token: %w", err)
 	}
 
 	// Generate opaque refresh token and store in DB
 	rawRefreshToken, err := s.createRefreshToken(user.ID)
 	if err != nil {
+		logger.Error("login failed - refresh token creation error",
+			"service", "AuthService.Login",
+			"email", req.Email,
+			"error", err.Error(),
+		)
 		return nil, "", fmt.Errorf("failed to create refresh token: %w", err)
 	}
 
@@ -169,6 +212,11 @@ func (s *AuthService) Register(req *model.RegisterRequest) error {
 	}
 
 	if err := s.db.Create(&user).Error; err != nil {
+		logger.Error("registration failed - database error",
+			"service", "AuthService.Register",
+			"email", req.Email,
+			"error", err.Error(),
+		)
 		return fmt.Errorf("failed to create user: %w", err)
 	}
 
@@ -180,8 +228,11 @@ func (s *AuthService) Register(req *model.RegisterRequest) error {
 	}
 
 	if err := s.email.SendVerificationEmail(user.Email, user.EmailVerificationToken, baseURL, lang); err != nil {
-		// Log error but don't fail registration - user can request resend
-		_ = err
+		logger.Warn("failed to send verification email",
+			"service", "AuthService.Register",
+			"email", req.Email,
+			"error", err.Error(),
+		)
 	}
 
 	return nil
@@ -209,6 +260,7 @@ func (s *AuthService) CompleteRegistration(req *model.CompleteRegistrationReques
 	user.EmailVerificationToken = ""
 	user.EmailVerificationExpires = nil
 
+	user.Country = nil
 	if err := s.db.Save(&user).Error; err != nil {
 		return nil, "", fmt.Errorf("failed to update user: %w", err)
 	}
@@ -277,6 +329,7 @@ func (s *AuthService) RequestPasswordReset(emailAddr string) error {
 	user.PasswordResetToken = token
 	user.PasswordResetExpires = &expiresAt
 	user.LastPasswordResetRequest = &now
+	user.Country = nil
 	if err := s.db.Save(&user).Error; err != nil {
 		return fmt.Errorf("failed to save reset token: %w", err)
 	}
@@ -303,6 +356,10 @@ func (s *AuthService) ResetPassword(token, newPassword string) error {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return responseErrors.ErrInvalidResetToken
 		}
+		logger.Error("password reset failed - database error",
+			"service", "AuthService.ResetPassword",
+			"error", err.Error(),
+		)
 		return fmt.Errorf("database error: %w", err)
 	}
 
@@ -327,7 +384,12 @@ func (s *AuthService) ResetPassword(token, newPassword string) error {
 	user.PasswordResetToken = ""
 	user.PasswordResetExpires = nil
 
+	user.Country = nil
 	if err := s.db.Save(&user).Error; err != nil {
+		logger.Error("password reset failed - database error",
+			"service", "AuthService.ResetPassword",
+			"error", err.Error(),
+		)
 		return fmt.Errorf("failed to update password: %w", err)
 	}
 
@@ -436,7 +498,7 @@ func (s *AuthService) RevokeAllRefreshTokens(userID uint) {
 // GetUserByID retrieves a user by ID
 func (s *AuthService) GetUserByID(userID uint) (*model.Customer, error) {
 	var user model.Customer
-	if err := s.db.Preload("Role.Permissions").First(&user, userID).Error; err != nil {
+	if err := s.db.Preload("Role.Permissions").Preload(clause.Associations).First(&user, userID).Error; err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			return nil, responseErrors.ErrUserNotFound
 		}
@@ -538,6 +600,7 @@ func (s *AuthService) UpdateJWTToken(user *model.Customer) (string, error) {
 	}
 
 	// Save the updated user
+	user.Country = nil
 	if err := s.db.Save(user).Error; err != nil {
 		return "", fmt.Errorf("database error: %w", err)
 	}

app/service/authService/google_oauth.go

@@ -8,10 +8,12 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"strings"
 	"time"
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
 	"git.ma-al.com/goc_daniel/b2b/app/view"
 	"golang.org/x/oauth2"
@@ -77,12 +79,20 @@ func (s *AuthService) HandleGoogleCallback(code string) (*model.AuthResponse, st
 	// Find or create user
 	user, err := s.findOrCreateGoogleUser(userInfo)
 	if err != nil {
+		if strings.Contains(err.Error(), "database") {
+			logger.Error("google oauth callback failed - database error",
+				"service", "AuthService.HandleGoogleCallback",
+				"email", userInfo.Email,
+				"error", err.Error(),
+			)
+		}
 		return nil, "", err
 	}
 
 	// Update last login
 	now := time.Now()
 	user.LastLoginAt = &now
+	user.Country = nil
 	s.db.Save(user)
 
 	// Generate access token (JWT)

app/service/cartsService/cartsService.go

@@ -4,6 +4,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/repos/cartsRepo"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
 )
 
@@ -17,7 +18,7 @@ func New() *CartsService {
 	}
 }
 
-func (s *CartsService) CreateNewCart(user_id uint) (model.CustomerCart, error) {
+func (s *CartsService) CreateNewCart(user_id uint, name string) (model.CustomerCart, error) {
 	var cart model.CustomerCart
 
 	customers_carts_amount, err := s.repo.CartsAmount(user_id)
@@ -28,8 +29,21 @@ func (s *CartsService) CreateNewCart(user_id uint) (model.CustomerCart, error) {
 		return cart, responseErrors.ErrMaxAmtOfCartsReached
 	}
 
+	if name == "" {
+		name = constdata.DEFAULT_NEW_CART_NAME
+	}
+
 	// create new cart for customer
-	cart, err = s.repo.CreateNewCart(user_id)
+	cart, err = s.repo.CreateNewCart(user_id, name)
+	if err != nil {
+		return cart, err
+	}
+
+	logger.Info("cart created",
+		"service", "cartsService",
+		"user_id", user_id,
+		"cart_id", cart.CartID,
+	)
 
 	return cart, nil
 }
@@ -74,7 +88,7 @@ func (s *CartsService) RetrieveCart(user_id uint, cart_id uint) (*model.Customer
 	return s.repo.RetrieveCart(user_id, cart_id)
 }
 
-func (s *CartsService) AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount uint) error {
+func (s *CartsService) AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount int, set_amount bool) error {
 	exists, err := s.repo.UserHasCart(user_id, cart_id)
 	if err != nil {
 		return err
@@ -91,5 +105,17 @@ func (s *CartsService) AddProduct(user_id uint, cart_id uint, product_id uint, p
 		return responseErrors.ErrProductOrItsVariationDoesNotExist
 	}
 
-	return s.repo.AddProduct(user_id, cart_id, product_id, product_attribute_id, amount)
+	return s.repo.AddProduct(cart_id, product_id, product_attribute_id, uint(amount), set_amount)
+}
+
+func (s *CartsService) RemoveProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint) error {
+	exists, err := s.repo.UserHasCart(user_id, cart_id)
+	if err != nil {
+		return err
+	}
+	if !exists {
+		return responseErrors.ErrUserHasNoSuchCart
+	}
+
+	return s.repo.RemoveProduct(cart_id, product_id, product_attribute_id)
 }

app/service/customerService/customerService.go

@@ -24,3 +24,7 @@ func (s *CustomerService) GetById(id uint) (*model.Customer, error) {
 func (s *CustomerService) Find(langId uint, p find.Paging, filt *filters.FiltersList, search string) (*find.Found[model.UserInList], error) {
 	return s.repo.Find(langId, p, filt, search)
 }
+
+func (s *CustomerService) SetCustomerNoVatStatus(customerID uint, isNoVat bool) error {
+	return s.repo.SetCustomerNoVatStatus(customerID, isNoVat)
+}

app/service/meiliService/meiliService.go

@@ -6,7 +6,7 @@ import (
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/app/repos/productDescriptionRepo"
+	searchrepo "git.ma-al.com/goc_daniel/b2b/app/repos/searchRepo"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"github.com/meilisearch/meilisearch-go"
 )
@@ -20,8 +20,8 @@ type MeiliIndexSettings struct {
 }
 
 type MeiliService struct {
-	productDescriptionRepo productDescriptionRepo.UIProductDescriptionRepo
-	meiliClient            meilisearch.ServiceManager
+	searchRepo  searchrepo.UISearchRepo
+	meiliClient meilisearch.ServiceManager
 }
 
 func New() *MeiliService {
@@ -32,8 +32,8 @@ func New() *MeiliService {
 	)
 
 	return &MeiliService{
-		meiliClient:            client,
-		productDescriptionRepo: productDescriptionRepo.New(),
+		meiliClient: client,
+		searchRepo:  searchrepo.New(),
 	}
 }
 
@@ -50,7 +50,7 @@ func (s *MeiliService) CreateIndex(id_lang uint) error {
 
 	for {
 		// Get batch of products from repo (includes scanning)
-		products, err := s.productDescriptionRepo.GetMeiliProducts(id_lang, offset, batchSize)
+		products, err := s.searchRepo.GetMeiliProducts(id_lang, offset, batchSize)
 		if err != nil {
 			return fmt.Errorf("failed to get products batch at offset %d: %w", offset, err)
 		}

app/service/menuService/menuService.go

@@ -3,31 +3,45 @@ package menuService
 import (
 	"slices"
 	"sort"
+	"strconv"
 
 	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/app/repos/categoriesRepo"
+	categoryrepo "git.ma-al.com/goc_daniel/b2b/app/repos/categoryRepo"
 	routesRepo "git.ma-al.com/goc_daniel/b2b/app/repos/routesRepo"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
 )
 
 type MenuService struct {
-	categoriesRepo categoriesRepo.UICategoriesRepo
-	routesRepo     routesRepo.UIRoutesRepo
+	categoryRepo categoryrepo.UICategoryRepo
+	routesRepo   routesRepo.UIRoutesRepo
 }
 
 func New() *MenuService {
 	return &MenuService{
-		categoriesRepo: categoriesRepo.New(),
-		routesRepo:     routesRepo.New(),
+		categoryRepo: categoryrepo.New(),
+		routesRepo:   routesRepo.New(),
 	}
 }
 
 func (s *MenuService) GetCategoryTree(root_category_id uint, id_lang uint) (*model.Category, error) {
-	all_categories, err := s.categoriesRepo.GetAllCategories(id_lang)
+	all_categories, err := s.categoryRepo.RetrieveMenuCategories(id_lang)
 	if err != nil {
 		return &model.Category{}, err
 	}
 
+	// remove blacklisted categories
+	// to do so, we detach them from the main tree
+	for i := 0; i < len(all_categories); i++ {
+		if slices.Contains(constdata.CATEGORY_BLACKLIST, all_categories[i].CategoryID) {
+			all_categories[i].ParentID = all_categories[i].CategoryID
+		}
+	}
+
+	iso_code := all_categories[0].IsoCode
+	s.appendAdditional(&all_categories, id_lang, iso_code)
+
 	// find the root
 	root_index := 0
 	root_found := false
@@ -88,8 +102,8 @@ func (s *MenuService) createTree(index int, all_categories *([]model.ScannedCate
 	return node, true
 }
 
-func (s *MenuService) GetRoutes(id_lang uint) ([]model.Route, error) {
-	return s.routesRepo.GetRoutes(id_lang)
+func (s *MenuService) GetRoutes(id_lang, roleId uint) ([]model.Route, error) {
+	return s.routesRepo.GetRoutes(id_lang, roleId)
 }
 
 func (s *MenuService) scannedToNormalCategory(scanned model.ScannedCategory) model.Category {
@@ -98,7 +112,7 @@ func (s *MenuService) scannedToNormalCategory(scanned model.ScannedCategory) mod
 	normal.CategoryID = scanned.CategoryID
 	normal.Label = scanned.Name
 	// normal.Active = scanned.Active == 1
-	normal.Params = model.CategoryParams{CategoryID: normal.CategoryID, LinkRewrite: scanned.LinkRewrite, Locale: scanned.IsoCode}
+	normal.Params = model.CategoryParams{CategoryID: normal.CategoryID, LinkRewrite: scanned.LinkRewrite, Locale: scanned.IsoCode, Filter: scanned.Filter}
 	normal.Children = []model.Category{}
 	return normal
 }
@@ -114,11 +128,14 @@ func (a ByPosition) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 func (a ByPosition) Less(i, j int) bool { return a[i].Position < a[j].Position }
 
 func (s *MenuService) GetBreadcrumb(root_category_id uint, start_category_id uint, id_lang uint) ([]model.CategoryInBreadcrumb, error) {
-	all_categories, err := s.categoriesRepo.GetAllCategories(id_lang)
+	all_categories, err := s.categoryRepo.RetrieveMenuCategories(id_lang)
 	if err != nil {
 		return []model.CategoryInBreadcrumb{}, err
 	}
 
+	iso_code := all_categories[0].IsoCode
+	s.appendAdditional(&all_categories, id_lang, iso_code)
+
 	breadcrumb := []model.CategoryInBreadcrumb{}
 
 	start_index := 0
@@ -211,3 +228,57 @@ func (s *MenuService) GetTopMenu(languageId uint, roleId uint) ([]*model.B2BTopM
 
 	return roots, nil
 }
+
+func (s *MenuService) appendAdditional(all_categories *[]model.ScannedCategory, id_lang uint, iso_code string) {
+	for i := 0; i < len(*all_categories); i++ {
+		(*all_categories)[i].Filter = "category_id_eq=" + strconv.Itoa(int((*all_categories)[i].CategoryID))
+	}
+
+	// the new products category
+	var new_products_category model.ScannedCategory
+	new_products_category.CategoryID = constdata.ADDITIONAL_CATEGORIES_INDEX + 1
+	new_products_category.Name = "New Products"
+	new_products_category.Active = 1
+	new_products_category.Position = 10
+	new_products_category.ParentID = 2
+	new_products_category.IsRoot = 0
+	new_products_category.LinkRewrite = i18n.T___(id_lang, "category.new_products")
+	new_products_category.IsoCode = iso_code
+
+	new_products_category.Visited = false
+	new_products_category.Filter = "is_new_eq=true"
+
+	*all_categories = append(*all_categories, new_products_category)
+
+	// the oem products category
+	var oem_products_category model.ScannedCategory
+	oem_products_category.CategoryID = constdata.ADDITIONAL_CATEGORIES_INDEX + 2
+	oem_products_category.Name = "OEM Products"
+	oem_products_category.Active = 1
+	oem_products_category.Position = 11
+	oem_products_category.ParentID = 2
+	oem_products_category.IsRoot = 0
+	oem_products_category.LinkRewrite = i18n.T___(id_lang, "category.oem_products")
+	oem_products_category.IsoCode = iso_code
+
+	oem_products_category.Visited = false
+	oem_products_category.Filter = "is_oem_eq=true"
+
+	*all_categories = append(*all_categories, oem_products_category)
+
+	// the favorite products category
+	var favorite_products_category model.ScannedCategory
+	favorite_products_category.CategoryID = constdata.ADDITIONAL_CATEGORIES_INDEX + 3
+	favorite_products_category.Name = "Favourite Products" // British English version.
+	favorite_products_category.Active = 1
+	favorite_products_category.Position = 12
+	favorite_products_category.ParentID = 2
+	favorite_products_category.IsRoot = 0
+	favorite_products_category.LinkRewrite = i18n.T___(id_lang, "category.favorite_products")
+	favorite_products_category.IsoCode = iso_code
+
+	favorite_products_category.Visited = false
+	favorite_products_category.Filter = "is_favorite_eq=true"
+
+	*all_categories = append(*all_categories, favorite_products_category)
+}

app/service/orderService/orderService.go

@@ -1,15 +1,17 @@
 package orderService
 
 import (
-	"fmt"
 	"strconv"
 
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware/perms"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/repos/cartsRepo"
 	"git.ma-al.com/goc_daniel/b2b/app/repos/ordersRepo"
+	"git.ma-al.com/goc_daniel/b2b/app/repos/productsRepo"
 	"git.ma-al.com/goc_daniel/b2b/app/service/addressesService"
 	"git.ma-al.com/goc_daniel/b2b/app/service/emailService"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/logger"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -18,6 +20,7 @@ import (
 type OrderService struct {
 	ordersRepo       ordersRepo.UIOrdersRepo
 	cartsRepo        cartsRepo.UICartsRepo
+	productsRepo     productsRepo.UIProductsRepo
 	addressesService *addressesService.AddressesService
 	emailService     *emailService.EmailService
 }
@@ -26,13 +29,14 @@ func New() *OrderService {
 	return &OrderService{
 		ordersRepo:       ordersRepo.New(),
 		cartsRepo:        cartsRepo.New(),
+		productsRepo:     productsRepo.New(),
 		addressesService: addressesService.New(),
 		emailService:     emailService.NewEmailService(),
 	}
 }
 
 func (s *OrderService) Find(user *model.Customer, p find.Paging, filt *filters.FiltersList) (*find.Found[model.CustomerOrder], error) {
-	if !user.HasPermission(perms.ViewAllOrders) {
+	if !user.HasPermission(perms.OrdersViewAll) {
 		// append filter to view only this user's orders
 		idStr := strconv.FormatUint(uint64(user.ID), 10)
 		filt.Append(filters.Where("b2b_customer_orders.user_id = " + idStr))
@@ -45,9 +49,12 @@ func (s *OrderService) Find(user *model.Customer, p find.Paging, filt *filters.F
 
 	for i := 0; i < len(list.Items); i++ {
 		address_unparsed, err := s.addressesService.ValidateAddressJson(list.Items[i].AddressString, list.Items[i].CountryID)
-		// log such errors
 		if err != nil {
-			fmt.Printf("err: %v\n", err)
+			logger.Warn("failed to validate address",
+				"service", "orderService",
+				"order_id", list.Items[i].OrderID,
+				"error", err.Error(),
+			)
 		}
 
 		list.Items[i].AddressUnparsed = &address_unparsed
@@ -82,8 +89,10 @@ func (s *OrderService) PlaceNewOrder(user_id uint, cart_id uint, name string, co
 		name = *cart.Name
 	}
 
+	base_price, tax_incl, tax_excl, err := s.getOrderTotalPrice(user_id, cart_id, country_id)
+
 	// all checks passed
-	err = s.ordersRepo.PlaceNewOrder(cart, name, country_id, address_info)
+	err = s.ordersRepo.PlaceNewOrder(cart, name, country_id, address_info, base_price, tax_incl, tax_excl)
 	if err != nil {
 		return err
 	}
@@ -92,16 +101,23 @@ func (s *OrderService) PlaceNewOrder(user_id uint, cart_id uint, name string, co
 	// if no error is returned, remove the cart. This should be smooth
 	err = s.cartsRepo.RemoveCart(user_id, cart_id)
 	if err != nil {
-		// Log error but don't fail placing order
-		_ = err
+		logger.Warn("failed to remove cart after order placement",
+			"service", "orderService",
+			"user_id", user_id,
+			"cart_id", cart_id,
+			"error", err.Error(),
+		)
 	}
 
 	// send email to admin
 	go func(user_id uint) {
 		err := s.emailService.SendNewOrderPlacedNotification(user_id)
 		if err != nil {
-			// Log error but don't fail placing order
-			_ = err
+			logger.Warn("failed to send new order notification",
+				"service", "orderService",
+				"user_id", user_id,
+				"error", err.Error(),
+			)
 		}
 	}(user_id)
 
@@ -114,7 +130,7 @@ func (s *OrderService) ChangeOrderAddress(user *model.Customer, order_id uint, c
 		return err
 	}
 
-	if !user.HasPermission(perms.ModifyAllOrders) {
+	if !user.HasPermission(perms.OrdersModifyAll) {
 		exists, err := s.ordersRepo.UserHasOrder(user.ID, order_id)
 		if err != nil {
 			return err
@@ -128,8 +144,9 @@ func (s *OrderService) ChangeOrderAddress(user *model.Customer, order_id uint, c
 	return s.ordersRepo.ChangeOrderAddress(order_id, country_id, address_info)
 }
 
+// This is obiously just an initial version of this function
 func (s *OrderService) ChangeOrderStatus(user *model.Customer, order_id uint, status string) error {
-	if !user.HasPermission(perms.ModifyAllOrders) {
+	if !user.HasPermission(perms.OrdersModifyAll) {
 		exists, err := s.ordersRepo.UserHasOrder(user.ID, order_id)
 		if err != nil {
 			return err
@@ -142,3 +159,27 @@ func (s *OrderService) ChangeOrderStatus(user *model.Customer, order_id uint, st
 
 	return s.ordersRepo.ChangeOrderStatus(order_id, status)
 }
+
+func (s *OrderService) getOrderTotalPrice(user_id uint, cart_id uint, country_id uint) (float64, float64, float64, error) {
+	cart, err := s.cartsRepo.RetrieveCart(user_id, cart_id)
+	if err != nil {
+		return 0.0, 0.0, 0.0, err
+	}
+
+	base_price := 0.0
+	tax_incl := 0.0
+	tax_excl := 0.0
+
+	for _, product := range cart.Products {
+		prices, err := s.productsRepo.GetPrice(product.ProductID, product.ProductAttributeID, constdata.SHOP_ID, user_id, country_id, product.Amount)
+		if err != nil {
+			return 0.0, 0.0, 0.0, err
+		}
+
+		base_price += prices.Base
+		tax_incl += prices.FinalTaxIncl
+		tax_excl += prices.FinalTaxExcl
+	}
+
+	return base_price, tax_incl, tax_excl, nil
+}

app/service/productService/productService.go

@@ -2,6 +2,7 @@ package productService
 
 import (
 	"encoding/json"
+	"errors"
 
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/repos/productsRepo"
@@ -9,6 +10,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
+	"git.ma-al.com/goc_daniel/b2b/app/view"
 )
 
 type ProductService struct {
@@ -21,17 +23,108 @@ func New() *ProductService {
 	}
 }
 
-func (s *ProductService) GetJSON(p_id_product, p_id_lang, p_id_customer, b2b_id_country, p_quantity int) (*json.RawMessage, error) {
-	products, err := s.productsRepo.GetJSON(p_id_product, constdata.SHOP_ID, p_id_lang, p_id_customer, b2b_id_country, p_quantity)
+func (s *ProductService) Get(
+	p_id_product, p_id_lang, p_id_customer, b2b_id_country, p_quantity uint,
+) (*json.RawMessage, error) {
+
+	product, err := s.productsRepo.GetBase(p_id_product, constdata.SHOP_ID, p_id_lang, p_id_customer)
 	if err != nil {
-		return products, err
+		return nil, err
 	}
 
-	return products, nil
+	price, err := s.productsRepo.GetPrice(p_id_product, nil, constdata.SHOP_ID, p_id_customer, b2b_id_country, p_quantity)
+	if err != nil {
+		return nil, err
+	}
+
+	variants, err := s.productsRepo.GetVariants(p_id_product, constdata.SHOP_ID, p_id_lang, p_id_customer, b2b_id_country, p_quantity)
+	if err != nil {
+		return nil, err
+	}
+
+	result := view.ProductFull{
+		Product:  product,
+		Price:    price,
+		Variants: variants,
+	}
+
+	if len(variants) > 0 {
+		result.Variants = variants
+	}
+
+	jsonBytes, err := json.Marshal(result)
+	if err != nil {
+		return nil, err
+	}
+
+	raw := json.RawMessage(jsonBytes)
+	return &raw, nil
 }
 
-func (s *ProductService) Find(id_lang, userID uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.ProductInList], error) {
-	return s.productsRepo.Find(id_lang, userID, p, filters)
+func (s *ProductService) Find(
+	idLang uint,
+	userID uint,
+	p find.Paging,
+	filters *filters.FiltersList,
+	customer *model.Customer,
+	quantity uint,
+	shopID uint,
+) (*find.Found[model.ProductInList], error) {
+
+	if customer == nil || customer.Country == nil {
+		return nil, errors.New("customer is nil or missing fields")
+	}
+
+	found, err := s.productsRepo.Find(idLang, userID, p, filters)
+	if err != nil {
+		return nil, err
+	}
+
+	// 1. collect simple products (no variants)
+	simpleProductIndexes := make([]int, 0, len(found.Items))
+
+	for i := range found.Items {
+		if found.Items[i].VariantsNumber <= 0 {
+			simpleProductIndexes = append(simpleProductIndexes, i)
+		}
+	}
+
+	// 2. resolve prices ONLY for simple products
+	for _, i := range simpleProductIndexes {
+		price, err := s.productsRepo.GetPrice(
+			found.Items[i].ProductID,
+			nil,
+			shopID,
+			customer.ID,
+			customer.CountryID,
+			quantity,
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		found.Items[i].PriceTaxExcl = price.FinalTaxExcl
+		found.Items[i].PriceTaxIncl = price.FinalTaxIncl
+	}
+
+	return found, nil
+}
+
+func (s *ProductService) GetProductAttributes(
+	langID uint,
+	productID uint,
+	shopID uint,
+	customerID uint,
+	countryID uint,
+	quantity uint,
+) ([]view.ProductAttribute, error) {
+	variants, err := s.productsRepo.GetVariants(productID, constdata.SHOP_ID, langID, customerID, countryID, quantity)
+	if err != nil {
+		return nil, err
+	}
+
+	return variants, nil
+
 }
 
 func (s *ProductService) AddToFavorites(userID uint, productID uint) error {

app/service/productTranslationService/sanitizeURLSlug.go

@@ -4,6 +4,7 @@ import (
 	"strings"
 	"unicode"
 
+	"git.ma-al.com/goc_daniel/b2b/app/db"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"github.com/dlclark/regexp2"
 	"golang.org/x/text/runes"
@@ -22,7 +23,7 @@ func SanitizeSlug(s string) string {
 	s = strings.TrimSpace(strings.ToLower(s))
 
 	// First apply explicit transliteration for language-specific letters.
-	s = transliterateWithTable(s)
+	s = transliterateSlug(s)
 
 	// Then normalize and strip any remaining combining marks.
 	s = removeDiacritics(s)
@@ -40,19 +41,17 @@ func SanitizeSlug(s string) string {
 	return s
 }
 
-func transliterateWithTable(s string) string {
-	var b strings.Builder
-	b.Grow(len(s))
+func transliterateSlug(s string) string {
+	var cleared string
 
-	for _, r := range s {
-		if repl, ok := constdata.TRANSLITERATION_TABLE[r]; ok {
-			b.WriteString(repl)
-		} else {
-			b.WriteRune(r)
-		}
+	err := db.DB.Raw("SELECT slugify_eu(?)", s).Scan(&cleared).Error
+	if err != nil {
+		// log error
+		_ = err
+		return s
 	}
 
-	return b.String()
+	return cleared
 }
 
 func removeDiacritics(s string) string {

app/service/specificPriceService/specificPriceService.go

@@ -0,0 +1,124 @@
+package specificPriceService
+
+import (
+	"context"
+
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/repos/specificPriceRepo"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
+)
+
+type SpecificPriceService struct {
+	specificPriceRepo specificPriceRepo.UISpecificPriceRepo
+}
+
+func New() *SpecificPriceService {
+	return &SpecificPriceService{
+		specificPriceRepo: specificPriceRepo.New(),
+	}
+}
+
+func (s *SpecificPriceService) Create(ctx context.Context, pr *model.SpecificPrice) (*model.SpecificPrice, error) {
+	if err := s.validateRequest(pr); err != nil {
+		return nil, err
+	}
+
+	if err := s.specificPriceRepo.Create(ctx, pr); err != nil {
+		return nil, err
+	}
+
+	return pr, nil
+}
+
+func (s *SpecificPriceService) Update(ctx context.Context, id uint64, pr *model.SpecificPrice) (*model.SpecificPrice, error) {
+	existing, err := s.specificPriceRepo.GetByID(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+	if existing == nil {
+		return nil, responseErrors.ErrSpecificPriceNotFound
+	}
+
+	if err := s.validateUpdateRequest(pr); err != nil {
+		return nil, err
+	}
+
+	pr.ID = id
+
+	if err := s.specificPriceRepo.Update(ctx, pr); err != nil {
+		return nil, err
+	}
+
+	return pr, nil
+}
+
+func (s *SpecificPriceService) GetByID(ctx context.Context, id uint64) (*model.SpecificPrice, error) {
+	pr, err := s.specificPriceRepo.GetByID(ctx, id)
+	if err != nil {
+		return nil, err
+	}
+	if pr == nil {
+		return nil, responseErrors.ErrSpecificPriceNotFound
+	}
+	return pr, nil
+}
+
+func (s *SpecificPriceService) List(ctx context.Context) ([]*model.SpecificPrice, error) {
+	return s.specificPriceRepo.List(ctx)
+}
+
+func (s *SpecificPriceService) SetActive(ctx context.Context, id uint64, active bool) error {
+	pr, err := s.specificPriceRepo.GetByID(ctx, id)
+	if err != nil {
+		return err
+	}
+	if pr == nil {
+		return responseErrors.ErrSpecificPriceNotFound
+	}
+
+	return s.specificPriceRepo.SetActive(ctx, id, active)
+}
+
+func (s *SpecificPriceService) Delete(ctx context.Context, id uint64) error {
+	pr, err := s.specificPriceRepo.GetByID(ctx, id)
+	if err != nil {
+		return err
+	}
+	if pr == nil {
+		return responseErrors.ErrSpecificPriceNotFound
+	}
+
+	return s.specificPriceRepo.Delete(ctx, id)
+}
+
+func (s *SpecificPriceService) validateRequest(pr *model.SpecificPrice) error {
+	if pr.ReductionType != "amount" && pr.ReductionType != "percentage" {
+		return responseErrors.ErrInvalidReductionType
+	}
+
+	if pr.ReductionType == "percentage" && pr.PercentageReduction == nil {
+		return responseErrors.ErrPercentageRequired
+	}
+
+	if pr.ReductionType == "amount" && pr.Price == nil {
+		return responseErrors.ErrPriceRequired
+	}
+
+	return nil
+}
+
+func (s *SpecificPriceService) validateUpdateRequest(pr *model.SpecificPrice) error {
+	if pr.ReductionType != "" && pr.ReductionType != "amount" && pr.ReductionType != "percentage" {
+		return responseErrors.ErrInvalidReductionType
+	}
+
+	if pr.ReductionType == "percentage" && pr.PercentageReduction == nil {
+		return responseErrors.ErrPercentageRequired
+	}
+
+	if pr.ReductionType == "amount" && pr.Price == nil {
+		return responseErrors.ErrPriceRequired
+	}
+
+	return nil
+}

app/utils/const_data/consts.go

@@ -3,14 +3,20 @@ package constdata
 // PASSWORD_VALIDATION_REGEX is used by the frontend (JavaScript supports lookaheads).
 const PASSWORD_VALIDATION_REGEX = `^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}$`
 const SHOP_ID = 1
+const DEFAULT_PRODUCT_QUANTITY = 1
 const SHOP_DEFAULT_LANGUAGE = 1
 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
+const ADDITIONAL_CATEGORIES_INDEX = 10000
+
+// 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"
+const MAX_AMOUNT_OF_PRODUCT_IN_CART = 1024
 
 const MAX_AMOUNT_OF_ADDRESSES_PER_USER = 10
 
@@ -29,22 +35,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 {

app/utils/logger/logger.go

@@ -0,0 +1,151 @@
+package logger
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"log/slog"
+	"os"
+	"strings"
+)
+
+var L *slog.Logger
+
+const (
+	reset  = "\033[0m"
+	red    = "\033[31m"
+	yellow = "\033[33m"
+	green  = "\033[32m"
+	blue   = "\033[36m"
+	gray   = "\033[90m"
+)
+
+type consoleHandler struct {
+	w        io.Writer
+	colorize bool
+}
+
+func (h *consoleHandler) Enabled(ctx context.Context, level slog.Level) bool {
+	return true
+}
+
+func (h *consoleHandler) Handle(ctx context.Context, r slog.Record) error {
+	level := r.Level.String()
+	color := reset
+
+	switch r.Level {
+	case slog.LevelError:
+		color = red
+	case slog.LevelWarn:
+		color = yellow
+	case slog.LevelInfo:
+		color = blue
+	case slog.LevelDebug:
+		color = gray
+	}
+
+	var msg string
+	if h.colorize {
+		msg = fmt.Sprintf("%s%s%s %s%s%s %s%s%s",
+			reset, r.Time.Format("15:04:05"), reset,
+			color, level, reset,
+			reset, r.Message, reset)
+	} else {
+		msg = fmt.Sprintf("%s %s %s", r.Time.Format("15:04:05"), level, r.Message)
+	}
+
+	var pairs []string
+	r.Attrs(func(attr slog.Attr) bool {
+		if h.colorize {
+			pairs = append(pairs, fmt.Sprintf("%s%s=%s%v%s", green, attr.Key, reset, attr.Value, reset))
+		} else {
+			pairs = append(pairs, fmt.Sprintf("%s=%v", attr.Key, attr.Value))
+		}
+		return true
+	})
+
+	if len(pairs) > 0 {
+		msg += " " + strings.Join(pairs, " ")
+	}
+
+	fmt.Fprintln(h.w, msg)
+	return nil
+}
+
+func (h *consoleHandler) WithAttrs(attrs []slog.Attr) slog.Handler {
+	return &consoleHandler{w: h.w, colorize: h.colorize}
+}
+
+func (h *consoleHandler) WithGroup(name string) slog.Handler {
+	return &consoleHandler{w: h.w, colorize: h.colorize}
+}
+
+func Init(service string, output io.Writer, level string, colorize bool) {
+	if output == nil {
+		output = os.Stderr
+	}
+
+	var lvl slog.Level
+	switch level {
+	case "debug":
+		lvl = slog.LevelDebug
+	case "warn":
+		lvl = slog.LevelWarn
+	case "error":
+		lvl = slog.LevelError
+	default:
+		lvl = slog.LevelInfo
+	}
+
+	if colorize {
+		L = slog.New(&consoleHandler{w: output, colorize: true}).With("service", service, "level", lvl.String())
+	} else {
+		L = slog.New(slog.NewJSONHandler(output, &slog.HandlerOptions{
+			Level:     lvl,
+			AddSource: false,
+			ReplaceAttr: func(groups []string, a slog.Attr) slog.Attr {
+				if a.Key == slog.TimeKey && groups == nil {
+					a.Key = "timestamp"
+				}
+				if a.Key == slog.LevelKey {
+					a.Key = "level"
+				}
+				if a.Key == slog.MessageKey {
+					a.Key = "message"
+				}
+				return a
+			},
+		})).With("service", service)
+	}
+}
+
+func Info(msg string, args ...any) {
+	if L != nil {
+		L.Info(msg, args...)
+	}
+}
+
+func Warn(msg string, args ...any) {
+	if L != nil {
+		L.Warn(msg, args...)
+	}
+}
+
+func Error(msg string, args ...any) {
+	if L != nil {
+		L.Error(msg, args...)
+	}
+}
+
+func Debug(msg string, args ...any) {
+	if L != nil {
+		L.Debug(msg, args...)
+	}
+}
+
+func With(args ...any) *slog.Logger {
+	if L == nil {
+		return nil
+	}
+	return L.With(args...)
+}

app/utils/responseErrors/responseErrors.go

@@ -65,11 +65,19 @@ var (
 	ErrMaxAmtOfCartsReached              = errors.New("maximal amount of carts reached")
 	ErrUserHasNoSuchCart                 = errors.New("user does not have cart with given id")
 	ErrProductOrItsVariationDoesNotExist = errors.New("product or its variation with given ids does not exist")
+	ErrAmountMustBePositive              = errors.New("amount must be positive")
+	ErrAmountMustBeReasonable            = errors.New("amount must be reasonable")
 
 	// Typed errors for orders handler
 	ErrEmptyCart          = errors.New("the cart is empty")
 	ErrUserHasNoSuchOrder = errors.New("user does not have order with given id")
 
+	// Typed errors for price reduction handler
+	ErrInvalidReductionType  = errors.New("invalid reduction type: must be 'amount' or 'percentage'")
+	ErrPercentageRequired    = errors.New("percentage_reduction required when reduction_type is percentage")
+	ErrPriceRequired         = errors.New("price required when reduction_type is amount")
+	ErrSpecificPriceNotFound = errors.New("price reduction not found")
+
 	// Typed errors for storage
 	ErrAccessDenied             = errors.New("access denied!")
 	ErrFolderDoesNotExist       = errors.New("folder does not exist")
@@ -199,6 +207,10 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 		return i18n.T_(c, "error.err_user_has_no_such_cart")
 	case errors.Is(err, ErrProductOrItsVariationDoesNotExist):
 		return i18n.T_(c, "error.err_product_or_its_variation_does_not_exist")
+	case errors.Is(err, ErrAmountMustBePositive):
+		return i18n.T_(c, "error.err_amount_must_be_positive")
+	case errors.Is(err, ErrAmountMustBeReasonable):
+		return i18n.T_(c, "error.err_amount_must_be_reasonable")
 
 	case errors.Is(err, ErrEmptyCart):
 		return i18n.T_(c, "error.err_cart_is_empty")
@@ -216,6 +228,15 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 	case errors.Is(err, ErrMissingFileFieldDocument):
 		return i18n.T_(c, "error.err_missing_file_field_document")
 
+	case errors.Is(err, ErrInvalidReductionType):
+		return i18n.T_(c, "error.invalid_reduction_type")
+	case errors.Is(err, ErrPercentageRequired):
+		return i18n.T_(c, "error.percentage_required")
+	case errors.Is(err, ErrPriceRequired):
+		return i18n.T_(c, "error.price_required")
+	case errors.Is(err, ErrSpecificPriceNotFound):
+		return i18n.T_(c, "error.price_reduction_not_found")
+
 	case errors.Is(err, ErrJSONBody):
 		return i18n.T_(c, "error.err_json_body")
 
@@ -277,8 +298,13 @@ func GetErrorStatus(err error) int {
 		errors.Is(err, ErrMaxAmtOfCartsReached),
 		errors.Is(err, ErrUserHasNoSuchCart),
 		errors.Is(err, ErrProductOrItsVariationDoesNotExist),
+		errors.Is(err, ErrAmountMustBePositive),
+		errors.Is(err, ErrAmountMustBeReasonable),
 		errors.Is(err, ErrEmptyCart),
 		errors.Is(err, ErrUserHasNoSuchOrder),
+		errors.Is(err, ErrInvalidReductionType),
+		errors.Is(err, ErrPercentageRequired),
+		errors.Is(err, ErrPriceRequired),
 		errors.Is(err, ErrAccessDenied),
 		errors.Is(err, ErrFolderDoesNotExist),
 		errors.Is(err, ErrFileDoesNotExist),
@@ -290,6 +316,8 @@ func GetErrorStatus(err error) int {
 		errors.Is(err, ErrInvalidCountryID),
 		errors.Is(err, ErrInvalidAddressJSON):
 		return fiber.StatusBadRequest
+	case errors.Is(err, ErrSpecificPriceNotFound):
+		return fiber.StatusNotFound
 	case errors.Is(err, ErrEmailExists):
 		return fiber.StatusConflict
 	case errors.Is(err, ErrAIResponseFail),

app/view/product.go

@@ -0,0 +1,100 @@
+package view
+
+import (
+	"encoding/json"
+	"time"
+)
+
+type ProductAttribute struct {
+	IDProductAttribute uint            `gorm:"column:id_product_attribute" json:"id_product_attribute"`
+	Reference          string          `gorm:"column:reference" json:"reference"`
+	BasePrice          float64         `gorm:"column:base_price" json:"base_price"`
+	PriceTaxExcl       float64         `gorm:"column:price_tax_excl" json:"price_tax_excl"`
+	PriceTaxIncl       float64         `gorm:"column:price_tax_incl" json:"price_tax_incl"`
+	Quantity           int64           `gorm:"column:quantity" json:"quantity"`
+	Attributes         json.RawMessage `gorm:"column:attributes" json:"attributes"`
+}
+
+type Price struct {
+	Base         float64 `json:"base"`
+	FinalTaxExcl float64 `json:"final_tax_excl"`
+	FinalTaxIncl float64 `json:"final_tax_incl"`
+	TaxRate      float64 `json:"tax_rate"`
+	Priority     int     `json:"priority"` // or string
+}
+
+type Variant struct {
+	ID        uint   `json:"id_product_attribute"`
+	Reference string `json:"reference"`
+
+	BasePrice float64 `json:"base_price"`
+	FinalExcl float64 `json:"final_tax_excl"`
+	FinalIncl float64 `json:"final_tax_incl"`
+
+	Stock int `json:"stock"`
+}
+type ProductFull struct {
+	Product  Product            `json:"product"`
+	Price    Price              `json:"price"`
+	Variants []ProductAttribute `json:"variants,omitempty"`
+}
+
+type Product struct {
+	ID                uint   `gorm:"column:id" json:"id"`
+	Reference         string `gorm:"column:reference" json:"reference"`
+	SupplierReference string `gorm:"column:supplier_reference" json:"supplier_reference,omitempty"`
+	EAN13             string `gorm:"column:ean13" json:"ean13,omitempty"`
+	UPC               string `gorm:"column:upc" json:"upc,omitempty"`
+	ISBN              string `gorm:"column:isbn" json:"isbn,omitempty"`
+
+	// Basic Price (from product table)
+	BasePrice      float64 `gorm:"column:base_price" json:"base_price"`
+	WholesalePrice float64 `gorm:"column:wholesale_price" json:"wholesale_price,omitempty"`
+	Unity          string  `gorm:"column:unity" json:"unity,omitempty"`
+	UnitPriceRatio float64 `gorm:"column:unit_price_ratio" json:"unit_price_ratio,omitempty"`
+
+	// Stock & Availability
+	Quantity           int    `gorm:"column:quantity" json:"quantity"`
+	MinimalQuantity    int    `gorm:"column:minimal_quantity" json:"minimal_quantity"`
+	AvailableForOrder  bool   `gorm:"column:available_for_order" json:"available_for_order"`
+	AvailableDate      string `gorm:"column:available_date" json:"available_date,omitempty"`
+	OutOfStockBehavior int    `gorm:"column:out_of_stock_behavior" json:"out_of_stock_behavior"`
+
+	// Flags
+	OnSale    bool   `gorm:"column:on_sale" json:"on_sale"`
+	ShowPrice bool   `gorm:"column:show_price" json:"show_price"`
+	Condition string `gorm:"column:condition" json:"condition"`
+	IsVirtual bool   `gorm:"column:is_virtual" json:"is_virtual"`
+
+	// Physical
+	Weight                 float64 `gorm:"column:weight" json:"weight"`
+	Width                  float64 `gorm:"column:width" json:"width"`
+	Height                 float64 `gorm:"column:height" json:"height"`
+	Depth                  float64 `gorm:"column:depth" json:"depth"`
+	AdditionalShippingCost float64 `gorm:"column:additional_shipping_cost" json:"additional_shipping_cost,omitempty"`
+
+	// Delivery
+	DeliveryDays int `gorm:"column:delivery_days" json:"delivery_days,omitempty"`
+
+	// Status
+	Active     bool   `gorm:"column:active" json:"active"`
+	Visibility string `gorm:"column:visibility" json:"visibility"`
+	Indexed    bool   `gorm:"column:indexed" json:"indexed"`
+
+	// Timestamps
+	DateAdd time.Time `gorm:"column:date_add" json:"date_add"`
+	DateUpd time.Time `gorm:"column:date_upd" json:"date_upd"`
+
+	// Language fields
+	Name             string `gorm:"column:name" json:"name"`
+	Description      string `gorm:"column:description" json:"description"`
+	DescriptionShort string `gorm:"column:description_short" json:"description_short"`
+
+	// Relations
+	Manufacturer string `gorm:"column:manufacturer" json:"manufacturer"`
+	Category     string `gorm:"column:category" json:"category"`
+
+	IsFavorite bool `gorm:"column:is_favorite" json:"is_favorite"`
+	IsOEM      bool `gorm:"column:is_oem" json:"is_oem"`
+	IsNew      bool `gorm:"column:is_new" json:"is_new"`
+}

bruno/api_v1/Change Locales.yml

@@ -1,7 +1,7 @@
 info:
   name: Change Locales
   type: http
-  seq: 3
+  seq: 5
 
 http:
   method: POST

bruno/api_v1/Delete Index - MeiliSearch.yml

@@ -1,7 +1,7 @@
 info:
   name: Delete Index - MeiliSearch
   type: http
-  seq: 5
+  seq: 7
 
 http:
   method: DELETE

bruno/api_v1/Search Index Settings.yml

@@ -1,7 +1,7 @@
 info:
   name: Search Index Settings
   type: http
-  seq: 4
+  seq: 6
 
 http:
   method: POST

bruno/api_v1/Search Items.yml

@@ -1,7 +1,7 @@
 info:
   name: Search Items
   type: http
-  seq: 2
+  seq: 4
 
 http:
   method: POST

bruno/api_v1/auth/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: auth
   type: folder
-  seq: 6
+  seq: 2
 
 request:
   auth: inherit

bruno/api_v1/currency/currency-rate.yml

@@ -11,7 +11,7 @@ http:
     data: |-
       {
         "b2b_id_currency" : 1,
-        "conversion_rate": 4.2
+        "conversion_rate": 3
       }
   auth: inherit
 

bruno/api_v1/currency/currency.yml

@@ -11,7 +11,7 @@ http:
 runtime:
   variables:
     - name: id
-      value: "1"
+      value: "2"
 
 settings:
   encodeUrl: true

bruno/api_v1/currency/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: currency
   type: folder
-  seq: 8
+  seq: 9
 
 request:
   auth: inherit

bruno/api_v1/customer/Customer (other).yml

@@ -5,10 +5,10 @@ info:
 
 http:
   method: GET
-  url: "{{bas_url}}/restricted/customer?id=1"
+  url: "{{bas_url}}/restricted/customer?id=2"
   params:
     - name: id
-      value: "1"
+      value: "2"
       type: query
   auth: inherit
 

bruno/api_v1/customer/Customer list.yml

@@ -5,10 +5,10 @@ info:
 
 http:
   method: GET
-  url: "{{bas_url}}/restricted/customer/list?search="
+  url: "{{bas_url}}/restricted/customer/list?search=marek"
   params:
     - name: search
-      value: ""
+      value: marek
       type: query
   auth: inherit
 

bruno/api_v1/customer/Set is_no_vat.yml

@@ -0,0 +1,22 @@
+info:
+  name: Set is_no_vat
+  type: http
+  seq: 4
+
+http:
+  method: PATCH
+  url: "{{bas_url}}/restricted/customer/no-vat"
+  body:
+    type: json
+    data: |-
+      {
+        "customer_id":1,
+        "is_no_vat": false
+      }
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/customer/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: customer
   type: folder
-  seq: 9
+  seq: 10
 
 request:
   auth: inherit

bruno/api_v1/product/Get Product.yml

@@ -5,7 +5,7 @@ info:
 
 http:
   method: GET
-  url: "{{bas_url}}/restricted/product/200/1/5"
+  url: "{{bas_url}}/restricted/product/51/1/7"
   auth: inherit
 
 settings:

bruno/api_v1/product/Product Variants List.yml

@@ -0,0 +1,22 @@
+info:
+  name: Product Variants List
+  type: http
+  seq: 3
+
+http:
+  method: GET
+  url: "{{bas_url}}/restricted/product/list-variants/{{product_id}}"
+  body:
+    type: json
+    data: ""
+
+runtime:
+  variables:
+    - name: product_id
+      value: "51"
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/product/Products List.yml

@@ -5,7 +5,7 @@ info:
 
 http:
   method: GET
-  url: "{{bas_url}}/restricted/product/list?p=1&elems=30&sort=product_id,asc&category_id_in=243&reference=~62"
+  url: "{{bas_url}}/restricted/product/list?p=1&elems=30&reference=~NC100&is_new_eq=0&is_favorite_eq=false&is_oem_eq=FALSE"
   params:
     - name: p
       value: "1"
@@ -16,11 +16,22 @@ http:
     - name: sort
       value: product_id,asc
       type: query
+      disabled: true
     - name: category_id_in
-      value: "243"
+      value: "23"
       type: query
+      disabled: true
     - name: reference
-      value: ~62
+      value: ~NC100
+      type: query
+    - name: is_new_eq
+      value: "0"
+      type: query
+    - name: is_favorite_eq
+      value: "false"
+      type: query
+    - name: is_oem_eq
+      value: "FALSE"
       type: query
   body:
     type: json

bruno/api_v1/product/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: product
   type: folder
-  seq: 7
+  seq: 8
 
 request:
   auth: inherit

bruno/api_v1/routes/Routes.yml

@@ -0,0 +1,15 @@
+info:
+  name: Routes
+  type: http
+  seq: 1
+
+http:
+  method: GET
+  url: ""
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/routes/folder.yml

@@ -1,7 +1,7 @@
 info:
-  name: list
+  name: routes
   type: folder
-  seq: 3
+  seq: 10
 
 request:
   auth: inherit

bruno/api_v1/specific_price/Activate.yml

@@ -0,0 +1,20 @@
+info:
+  name: Activate
+  type: http
+  seq: 5
+
+http:
+  method: PATCH
+  url: "{{bas_url}}/restricted/specific-price/{{id}}/activate"
+  auth: inherit
+
+runtime:
+  variables:
+    - name: id
+      value: "1"
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/specific_price/Create.yml

@@ -0,0 +1,27 @@
+info:
+  name: Create
+  type: http
+  seq: 3
+
+http:
+  method: POST
+  url: "{{bas_url}}/restricted/specific-price"
+  body:
+    type: json
+    data: |-
+      {
+        "name": "Summer Sale 3",
+        "scope": "shop",
+        "reduction_type": "amount",
+        "price": 69,
+        "from_quantity": 1,
+        "is_active": true,
+        "currency_id": 2
+      }
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/specific_price/Deactivate.yml

@@ -0,0 +1,20 @@
+info:
+  name: Deactivate
+  type: http
+  seq: 6
+
+http:
+  method: PATCH
+  url: "{{bas_url}}/restricted/specific-price/{{id}}/deactivate"
+  auth: inherit
+
+runtime:
+  variables:
+    - name: id
+      value: "1"
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/specific_price/Delete.yml

@@ -0,0 +1,20 @@
+info:
+  name: Delete
+  type: http
+  seq: 7
+
+http:
+  method: DELETE
+  url: "{{bas_url}}/restricted/price-reductions/{{id}}"
+  auth: inherit
+
+runtime:
+  variables:
+    - name: id
+      value: "1"
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/specific_price/Get.yml

@@ -0,0 +1,20 @@
+info:
+  name: Get
+  type: http
+  seq: 2
+
+http:
+  method: GET
+  url: "{{bas_url}}/restricted/specific-price/{{id}}"
+  auth: inherit
+
+runtime:
+  variables:
+    - name: id
+      value: "1"
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/specific_price/List.yml

@@ -0,0 +1,15 @@
+info:
+  name: List
+  type: http
+  seq: 1
+
+http:
+  method: GET
+  url: "{{bas_url}}/restricted/specific-price"
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/specific_price/Update.yml

@@ -0,0 +1,38 @@
+info:
+  name: Update
+  type: http
+  seq: 4
+
+http:
+  method: PUT
+  url: "{{bas_url}}/restricted/specific-price/{{id}}"
+  body:
+    type: json
+    data: |-
+      {
+        "name": "Summer Sale Updated",
+        "reduction_type": "amount",
+        "percentage_reduction": 50.0,
+        "price": 69,
+        "currency_id": 1,
+        "scope": "shop",
+        "is_active": true,
+        "from_quantity":1
+      //  "product_ids": [51,53],
+      //   "category_ids": [1],
+      //   "product_attribute_ids": [1114],
+      //   "country_ids": [1],
+      //   "customer_ids": [2,1]
+      }
+  auth: inherit
+
+runtime:
+  variables:
+    - name: id
+      value: "3"
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/api_v1/specific_price/folder.yml

@@ -0,0 +1,73 @@
+info:
+  name: specific_price
+  type: folder
+  seq: 3
+
+docs:
+  content: |
+    # Specific Price API
+
+    Endpoints for managing specific price rules (price reductions).
+
+    ## Scopes
+
+    Specific prices can be **global** or **scoped**:
+
+    - **Global**: If all scope arrays (`product_ids`, `category_ids`, `product_attribute_ids`, `country_ids`, `customer_ids`) are empty, the price reduction applies to everything.
+
+    - **Scoped**: If ANY scope array has values, the price reduction applies only when ANY condition matches (UNION logic).
+
+    ### Scope Fields
+
+    | Field | Type | Description |
+    |-------|------|-------------|
+    | `product_ids` | uint[] | Specific products |
+    | `category_ids` | uint[] | Products in categories |
+    | `product_attribute_ids` | uint[] | Product variants (e.g., size, color) |
+    | `country_ids` | uint[] | Customers in countries |
+    | `customer_ids` | uint[] | Specific customers |
+
+    ### Examples
+
+    **Global** (applies to all products):
+    ```json
+    {
+      "name": "Global Sale",
+      "reduction_type": "percentage",
+      "percentage_reduction": 10,
+      "from_quantity": 1
+    }
+    ```
+
+    **Scoped to specific products**:
+    ```json
+    {
+      "name": "Product Sale",
+      "reduction_type": "percentage",
+      "percentage_reduction": 20,
+      "product_ids": [1, 2, 3]
+    }
+    ```
+
+    **Scoped to category + country**:
+    ```json
+    {
+      "name": "Category Country Sale",
+      "reduction_type": "amount",
+      "price": 9.99,
+      "category_ids": [5],
+      "country_ids": [1]
+    }
+    ```
+
+    ## Reduction Types
+
+    - `percentage`: Requires `percentage_reduction` (e.g., 10.5 = 10.5% off)
+    - `amount`: Requires `price` (fixed price after reduction)
+
+    ## Validation
+
+    - `reduction_type` is required and must be "percentage" or "amount"
+    - If `reduction_type` is "percentage", then `percentage_reduction` is required
+    - If `reduction_type` is "amount", then `price` is required
+  type: text/markdown

bruno/b2b_daniel/addresses/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: addresses
   type: folder
-  seq: 10
+  seq: 9
 
 request:
   auth: inherit

bruno/b2b_daniel/auth/update-choice.yml

@@ -5,15 +5,14 @@ info:
 
 http:
   method: POST
-  url: http://localhost:3000/api/v1/public/auth/update-choice?lang_id=0&country_id=1
+  url: http://localhost:3000/api/v1/public/auth/update-choice?lang_id=1&country_id=1
   params:
     - name: lang_id
-      value: "0"
+      value: "1"
       type: query
     - name: country_id
       value: "1"
       type: query
-  auth: inherit
 
 settings:
   encodeUrl: true

bruno/b2b_daniel/carts/add-new-cart.yml

@@ -5,7 +5,11 @@ info:
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/carts/add-new-cart
+  url: http://localhost:3000/api/v1/restricted/carts/add-new-cart?name=carttt
+  params:
+    - name: name
+      value: carttt
+      type: query
   auth: inherit
 
 settings:

bruno/b2b_daniel/carts/add-product-to-cart (1).yml

@@ -5,7 +5,7 @@ info:
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&amount=1
+  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&amount=1&set_amount=false
   params:
     - name: cart_id
       value: "1"
@@ -16,6 +16,9 @@ http:
     - name: amount
       value: "1"
       type: query
+    - name: set_amount
+      value: "false"
+      type: query
   auth: inherit
 
 settings:

bruno/b2b_daniel/carts/add-product-to-cart.yml

@@ -5,7 +5,7 @@ info:
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&product_attribute_id=1115&amount=1
+  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&product_attribute_id=1115&amount=2&set_amount=true
   params:
     - name: cart_id
       value: "1"
@@ -17,7 +17,10 @@ http:
       value: "1115"
       type: query
     - name: amount
-      value: "1"
+      value: "2"
+      type: query
+    - name: set_amount
+      value: "true"
       type: query
   auth: inherit
 

bruno/b2b_daniel/list/list-products.yml

@@ -1,24 +0,0 @@
-info:
-  name: list-products
-  type: http
-  seq: 1
-
-http:
-  method: GET
-  url: http://localhost:3000/api/v1/restricted/list/list-products?p=1&elems=10&target_user_id=2
-  params:
-    - name: p
-      value: "1"
-      type: query
-    - name: elems
-      value: "10"
-      type: query
-    - name: target_user_id
-      value: "2"
-      type: query
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/b2b_daniel/list/list-users.yml

@@ -1,21 +0,0 @@
-info:
-  name: list-users
-  type: http
-  seq: 1
-
-http:
-  method: GET
-  url: http://localhost:3000/api/v1/restricted/list/list-users?p=1&elems=10
-  params:
-    - name: p
-      value: "1"
-      type: query
-    - name: elems
-      value: "10"
-      type: query
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/b2b_daniel/menu/get-breadcrumb.yml

@@ -5,10 +5,10 @@ info:
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/menu/get-breadcrumb?root_category_id=10&category_id=13
+  url: http://localhost:3000/api/v1/restricted/menu/get-breadcrumb?root_category_id=2&category_id=13
   params:
     - name: root_category_id
-      value: "10"
+      value: "2"
       type: query
     - name: category_id
       value: "13"

bruno/b2b_daniel/menu/get-category-tree.yml

@@ -5,10 +5,10 @@ info:
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/menu/get-category-tree?root_category_id=10
+  url: http://localhost:3000/api/v1/restricted/menu/get-category-tree?root_category_id=2
   params:
     - name: root_category_id
-      value: "10"
+      value: "2"
       type: query
   auth: inherit
 

bruno/b2b_daniel/orders/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: orders
   type: folder
-  seq: 11
+  seq: 10
 
 request:
   auth: inherit

bruno/b2b_daniel/product-translation/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: product-translation
   type: folder
-  seq: 2
+  seq: 3
 
 request:
   auth: inherit

bruno/b2b_daniel/storage-old/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: storage-old
   type: folder
-  seq: 1
+  seq: 2
 
 request:
   auth: inherit

bruno/b2b_daniel/storage-restricted/folder.yml

@@ -1,7 +1,7 @@
 info:
   name: storage-restricted
   type: folder
-  seq: 9
+  seq: 8
 
 request:
   auth: inherit

i18n/migrations/20260302163100_routes.sql

@@ -43,7 +43,6 @@ INSERT IGNORE INTO `b2b_top_menu` (`menu_id`, `label`, `parent_id`, `params`, `a
 (9, JSON_COMPACT('{"name":"carts","trans":{"pl":{"label":"Koszyki"},"en":{"label":"Carts"},"de":{"label":"Warenkörbe"}}}'),3,JSON_COMPACT('{"route": {"name": "home", "params":{"locale": ""}}}'),1,1);
 
 
-
 -- +goose Down
 
 DROP TABLE IF EXISTS b2b_routes;

i18n/migrations/20260302163122_create_tables.sql

@@ -112,7 +112,8 @@ CREATE TABLE IF NOT EXISTS b2b_customers (
   country_id                      INT NULL DEFAULT 2,
   created_at                      DATETIME(6) NULL,
   updated_at                      DATETIME(6) NULL,
-  deleted_at                      DATETIME(6) NULL
+  deleted_at                      DATETIME(6) NULL,
+  is_no_vat                     TINYINT(1) NOT NULL DEFAULT 0 
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE UNIQUE INDEX IF NOT EXISTS idx_customers_email
@@ -161,6 +162,16 @@ CREATE TABLE IF NOT EXISTS b2b_favorites (
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
 
 
+-- oems
+CREATE TABLE IF NOT EXISTS b2b_oems (
+  user_id BIGINT UNSIGNED NOT NULL,
+  product_id INT UNSIGNED NOT NULL,
+  PRIMARY KEY (user_id, product_id),
+  CONSTRAINT fk_oems_customer FOREIGN KEY (user_id) REFERENCES b2b_customers(id) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT fk_oems_product FOREIGN KEY (product_id) REFERENCES ps_product(id_product) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+
+
 -- refresh_tokens
 CREATE TABLE IF NOT EXISTS b2b_refresh_tokens (
   id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,
@@ -240,6 +251,11 @@ CREATE TABLE IF NOT EXISTS b2b_customer_orders (
   country_id BIGINT UNSIGNED NOT NULL,
   address_string TEXT NOT NULL,
   status VARCHAR(50) NOT NULL,
+  created_at DATETIME NOT NULL,
+  updated_at DATETIME NOT NULL,
+  base_price DECIMAL(10, 2) NOT NULL,
+  tax_incl DECIMAL(10, 2) NOT NULL,
+  tax_excl DECIMAL(10, 2) NOT NULL,
   CONSTRAINT fk_customer_orders_customers FOREIGN KEY (user_id) REFERENCES b2b_customers(id) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT fk_customer_orders_countries FOREIGN KEY (country_id) REFERENCES b2b_countries(id) ON DELETE NO ACTION ON UPDATE CASCADE
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
@@ -266,7 +282,6 @@ CREATE TABLE b2b_specific_price (
   created_at DATETIME NULL,
   updated_at DATETIME NULL,
   deleted_at DATETIME NULL,
-  scope ENUM('shop', 'category', 'product') NOT NULL,
   valid_from DATETIME NULL,
   valid_till DATETIME NULL,
   has_expiration_date BOOLEAN DEFAULT FALSE,
@@ -277,11 +292,9 @@ CREATE TABLE b2b_specific_price (
   from_quantity INT UNSIGNED DEFAULT 1,
   is_active BOOLEAN DEFAULT TRUE
 ) ENGINE = InnoDB;
-CREATE INDEX idx_b2b_scope ON b2b_specific_price(scope);
 CREATE INDEX idx_b2b_active_dates ON b2b_specific_price(is_active, valid_from, valid_till);
 CREATE INDEX idx_b2b_lookup 
 ON b2b_specific_price (
-  scope,
   is_active,
   from_quantity
 );
@@ -335,11 +348,29 @@ ON b2b_specific_price_category (id_category);
 CREATE INDEX idx_b2b_product_attribute_rel 
 ON b2b_specific_price_product_attribute (id_product_attribute);
 
-CREATE INDEX idx_bsp_customer 
-ON b2b_specific_price_customer (b2b_specific_price_id, b2b_id_customer);
+CREATE INDEX idx_bsp_customer_rel
+ON b2b_specific_price_customer (b2b_id_customer);
 
-CREATE INDEX idx_bsp_country 
-ON b2b_specific_price_country (b2b_specific_price_id, b2b_id_country);
+CREATE INDEX idx_bsp_country_rel
+ON b2b_specific_price_country (b2b_id_country);
+
+CREATE TABLE b2b_route_roles ( 
+  route_id INT NOT NULL,
+  role_id BIGINT UNSIGNED NOT NULL,
+  PRIMARY KEY (route_id, role_id),
+  INDEX idx_role_id (role_id),
+  INDEX idx_route_id (route_id),
+  CONSTRAINT FK_b2b_route_roles_route_id
+    FOREIGN KEY (route_id)
+    REFERENCES b2b_routes (id)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE,
+  CONSTRAINT FK_b2b_route_roles_role_id
+    FOREIGN KEY (role_id)
+    REFERENCES b2b_roles (id)
+    ON DELETE CASCADE
+    ON UPDATE CASCADE
+) ENGINE=InnoDB;
 
 DELIMITER //
 
@@ -433,16 +464,27 @@ DELIMITER ;
 
 -- +goose Down
 
-DROP TABLE IF EXISTS b2b_countries;
-DROP TABLE IF EXISTS b2b_language;
-DROP TABLE IF EXISTS b2b_components;
-DROP TABLE IF EXISTS b2b_scopes;
-DROP TABLE IF EXISTS b2b_translations;
-DROP TABLE IF EXISTS b2b_customers;
-DROP TABLE IF EXISTS b2b_refresh_tokens;
-DROP TABLE IF EXISTS b2b_currencies;
-DROP TABLE IF EXISTS b2b_currency_rates;
-DROP TABLE IF EXISTS b2b_specific_price;
-DROP TABLE IF EXISTS b2b_specific_price_product;
-DROP TABLE IF EXISTS b2b_specific_price_category;
+DROP TABLE IF EXISTS b2b_addresses;
+DROP TABLE IF EXISTS b2b_top_menu_roles;
+DROP TABLE IF EXISTS b2b_favorites;
+DROP TABLE IF EXISTS b2b_carts_products;
+DROP TABLE IF EXISTS b2b_customer_carts;
+DROP TABLE IF EXISTS b2b_specific_price_country;
+DROP TABLE IF EXISTS b2b_specific_price_customer;
 DROP TABLE IF EXISTS b2b_specific_price_product_attribute;
+DROP TABLE IF EXISTS b2b_route_roles;
+DROP TABLE IF EXISTS b2b_specific_price_category;
+DROP TABLE IF EXISTS b2b_specific_price_product;
+DROP TABLE IF EXISTS b2b_specific_price;
+DROP TABLE IF EXISTS b2b_role_permissions;
+DROP TABLE IF EXISTS b2b_permissions;
+DROP TABLE IF EXISTS b2b_roles;
+DROP TABLE IF EXISTS b2b_countries;
+DROP TABLE IF EXISTS b2b_currency_rates;
+DROP TABLE IF EXISTS b2b_currencies;
+DROP TABLE IF EXISTS b2b_refresh_tokens;
+DROP TABLE IF EXISTS b2b_customers;
+DROP TABLE IF EXISTS b2b_translations;
+DROP TABLE IF EXISTS b2b_scopes;
+DROP TABLE IF EXISTS b2b_components;
+DROP TABLE IF EXISTS b2b_language;

i18n/migrations/20260302163123_create_tables_data.sql

@@ -10,6 +10,7 @@ VALUES
 INSERT INTO `b2b_roles` (`name`, `id`) VALUES ('user','1');
 INSERT INTO `b2b_roles` (`name`, `id`) VALUES ('admin','2');
 INSERT INTO `b2b_roles` (`name`, `id`) VALUES ('super_admin','3');
+INSERT INTO `b2b_roles` (`name`, `id`) VALUES ('unlogged','4');
 
 
 -- insert sample admin user admin@ma-al.com/Maal12345678
@@ -34,13 +35,66 @@ INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('1', 'user.read.any');
 INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('2', 'user.write.any');
 INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('3', 'user.delete.any');
 INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('4', 'currency.write');
+INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('5', 'specific_price.manage');
+INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('6', 'webdav.create_token');
+INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('7', 'product_translation.save');
+INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('8', 'product_translation.translate');
+INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('9', 'search.create_index');
+INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('10', 'orders.view_all');
+INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('11', 'orders.modify_all');
+INSERT INTO `b2b_permissions` (`id`, `name`) VALUES ('12', 'teleport');
 
 INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '1');
 INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '2');
 INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '3');
 INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '4');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '5');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '6');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '7');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '8');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '9');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '10');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '11');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('2', '12');
 INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '1');
 INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '2');
 INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '3');
 INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '4');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '5');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '6');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '7');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '8');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '9');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '10');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '11');
+INSERT INTO `b2b_role_permissions` (`role_id`, `permission_id`) VALUES ('3', '12');
+
+INSERT INTO `b2b_route_roles` (`route_id`, `role_id`) VALUES
+(1, '1'),
+(1, '2'),
+(1, '3'),
+(2, '1'),
+(2, '2'),
+(2, '3'),
+(2, '4'),
+(3, '1'),
+(3, '2'),
+(3, '3'),
+(3, '4'),
+(4, '1'),
+(4, '2'),
+(4, '3'),
+(4, '4'),
+(5, '1'),
+(5, '2'),
+(5, '3'),
+(5, '4'),
+(6, '1'),
+(6, '2'),
+(6, '3'),
+(6, '4'),
+(7, '1'),
+(7, '2'),
+(7, '3'),
+(7, '4');
 -- +goose Down

i18n/migrations/20260319163200_procedures.sql

@@ -1,386 +1,425 @@
 -- +goose Up
-DELIMITER // 
-DROP PROCEDURE IF EXISTS get_full_product
-//
-CREATE PROCEDURE get_full_product(
-  IN p_id_product INT UNSIGNED,
-  IN p_id_shop INT UNSIGNED,
-  IN p_id_lang INT UNSIGNED,
-  IN p_id_customer INT UNSIGNED,
-  IN b2b_id_country INT UNSIGNED,
-  IN p_quantity INT UNSIGNED
-) 
-BEGIN 
-DECLARE v_tax_rate DECIMAL(10, 4) DEFAULT 0;
-DECLARE p_id_currency DECIMAL(10, 4) DEFAULT 0;
-SELECT
-  COALESCE(t.rate, 0.0000) INTO v_tax_rate
-FROM
-  ps_tax_rule tr
-  INNER JOIN ps_tax t ON t.id_tax = tr.id_tax
-  LEFT JOIN b2b_countries ON b2b_countries.id = b2b_id_country
-WHERE
-  tr.id_tax_rules_group = (
-    SELECT
-      ps.id_tax_rules_group
-    FROM
-      ps_product_shop ps
-    WHERE
-      ps.id_product = p_id_product
-      AND ps.id_shop = p_id_shop
-    LIMIT
-      1
-  )
-  AND tr.id_country = b2b_countries.ps_id_country
-ORDER BY
-  tr.id_state DESC,
-  tr.zipcode_from != '' DESC,
-  tr.id_tax_rule DESC
-LIMIT
-  1;
-  
-SELECT
-  b2b_currencies.ps_id_currency INTO p_id_currency
-FROM
-  b2b_currencies
- LEFT JOIN b2b_countries ON b2b_countries.b2b_id_currency = b2b_currencies.id
-WHERE
-    b2b_countries.id = b2b_id_country
-LIMIT 1;
- 
-/* FINAL JSON */
-SELECT
-  JSON_OBJECT(
-    /* ================= PRODUCT ================= */
-    'id_product',
-    p.id_product,
-    'reference',
-    p.reference,
-    'name',
-    pl.name,
-    'description',
-    pl.description,
-    'short_description',
-    pl.description_short,    
-    /* ================= PRICE ================= */
-'price',
-JSON_OBJECT(
-  'base',
-  COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate),
+DELIMITER //
 
-  'final_tax_excl',
-  (
-    CASE
-      WHEN bsp.id IS NOT NULL THEN
-        CASE
-          /* FIXED PRICE */
-          WHEN bsp.reduction_type = 'amount' THEN
-            (
-              CASE
-                WHEN bsp.b2b_id_currency IS NULL THEN bsp.price
-                ELSE bsp.price * br_bsp.conversion_rate
-              END
-            )
+DROP FUNCTION IF EXISTS fn_product_price //
+CREATE FUNCTION fn_product_price(
+  p_id_product INT UNSIGNED,
+  p_id_shop INT UNSIGNED,
+  p_id_customer INT UNSIGNED,
+  p_id_country INT UNSIGNED,
+  p_quantity INT UNSIGNED,
+  p_id_product_attribute INT UNSIGNED
+)
+RETURNS JSON
+DETERMINISTIC
+READS SQL DATA
+BEGIN
 
-          /* PERCENTAGE */
-          WHEN bsp.reduction_type = 'percentage' THEN
-            COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate)
-            * (1 - bsp.percentage_reduction / 100)
+  DECLARE v_tax_rate DECIMAL(10,4) DEFAULT 0;
+  DECLARE v_tax_group INT;
 
-          ELSE
-            COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate)
-        END
+  DECLARE v_base_raw DECIMAL(20,6);
+  DECLARE v_base DECIMAL(20,6);
+  DECLARE v_excl DECIMAL(20,6);
+  DECLARE v_incl DECIMAL(20,6);
 
-      ELSE
-        COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate)
-    END
-  ),
+  DECLARE v_reduction_type VARCHAR(20);
+  DECLARE v_percentage DECIMAL(10,4);
+  DECLARE v_fixed_price DECIMAL(20,6);
+  DECLARE v_specific_currency_id BIGINT;
 
-  'final_tax_incl',
-  (
-    (
-      CASE
-        WHEN bsp.id IS NOT NULL THEN
-          CASE
-            WHEN bsp.reduction_type = 'amount' THEN
-              (
-                CASE
-                  WHEN bsp.b2b_id_currency IS NULL THEN bsp.price
-                  ELSE bsp.price * br_bsp.conversion_rate
-                END
-              )
+  DECLARE v_has_specific INT DEFAULT 0;
 
-            WHEN bsp.reduction_type = 'percentage' THEN
-              COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate)
-              * (1 - bsp.percentage_reduction / 100)
+  DECLARE v_target_currency BIGINT;
+  DECLARE v_target_rate DECIMAL(13,6) DEFAULT 1;
+  DECLARE v_specific_rate DECIMAL(13,6) DEFAULT 1;
+
+  DECLARE v_is_no_vat TINYINT DEFAULT 0;
+
+  SET p_id_product_attribute = NULLIF(p_id_product_attribute, 0);
+
+  -- ================= CUSTOMER VAT =================
+  SELECT COALESCE(c.is_no_vat, 0)
+  INTO v_is_no_vat
+  FROM b2b_customers c
+  WHERE c.id = p_id_customer
+  LIMIT 1;
+
+  -- ================= TAX GROUP =================
+  SELECT ps.id_tax_rules_group
+  INTO v_tax_group
+  FROM ps_product_shop ps
+  WHERE ps.id_product = p_id_product
+    AND ps.id_shop = p_id_shop
+  LIMIT 1;
+
+  -- ================= TAX =================
+  SELECT COALESCE(t.rate, 0)
+  INTO v_tax_rate
+  FROM ps_tax_rule tr
+  JOIN ps_tax t ON t.id_tax = tr.id_tax
+  LEFT JOIN b2b_countries c ON c.id = p_id_country
+  WHERE tr.id_tax_rules_group = v_tax_group
+    AND tr.id_country = c.ps_id_country
+  LIMIT 1;
+
+  IF v_is_no_vat = 1 THEN
+    SET v_tax_rate = 0;
+  END IF;
+
+  -- ================= CURRENCY =================
+  SELECT c.b2b_id_currency, r.conversion_rate
+  INTO v_target_currency, v_target_rate
+  FROM b2b_countries c
+  LEFT JOIN b2b_currency_rates r
+    ON r.b2b_id_currency = c.b2b_id_currency
+  WHERE c.id = p_id_country
+  ORDER BY r.created_at DESC
+  LIMIT 1;
+
+  -- ================= BASE PRICE =================
+  SELECT
+    COALESCE(ps.price, p.price) + COALESCE(pas.price, 0)
+  INTO v_base_raw
+  FROM ps_product p
+  LEFT JOIN ps_product_shop ps
+    ON ps.id_product = p.id_product AND ps.id_shop = p_id_shop
+  LEFT JOIN ps_product_attribute_shop pas
+    ON pas.id_product_attribute = p_id_product_attribute
+    AND pas.id_shop = p_id_shop
+  WHERE p.id_product = p_id_product;
+
+  SET v_base = v_base_raw * v_target_rate;
+  SET v_excl = v_base;
+
+  -- ================= RULE SELECTION =================
+  SELECT
+    1,
+    bsp.reduction_type,
+    bsp.percentage_reduction,
+    bsp.price,
+    bsp.b2b_id_currency
+
+  INTO
+    v_has_specific,
+    v_reduction_type,
+    v_percentage,
+    v_fixed_price,
+    v_specific_currency_id
 
-            ELSE
-              COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate)
-          END
-        ELSE
-          COALESCE(ps.price * r.conversion_rate, p.price * r.conversion_rate)
-      END
-    ) * (1 + v_tax_rate / 100)
-  )
-),
-    /* ================= META ================= */
-    'active',
-    COALESCE(ps.active, p.active),
-    'visibility',
-    COALESCE(ps.visibility, p.visibility),
-    'manufacturer',
-    m.name,
-    'category',
-    cl.name,
-    /* ================= FAVORITE ================= */
-    'is_favorite',
-    EXISTS(
-      SELECT 1 FROM b2b_favorites f
-      WHERE f.user_id = p_id_customer AND f.product_id = p_id_product
-    ),
-    /* ================= IMAGE ================= */
-    'cover_image',
-    JSON_OBJECT(
-      'id',
-      i.id_image,
-      'legend',
-      il.legend
-    ),
-    /* ================= FEATURES ================= */
-    'features',
-    (
-      SELECT
-        JSON_ARRAYAGG(
-          JSON_OBJECT(
-            'name',
-            fl.name,
-            'value',
-            fvl.value
-          )
-        )
-      FROM
-        ps_feature_product fp
-        JOIN ps_feature_lang fl ON fl.id_feature = fp.id_feature
-        AND fl.id_lang = p_id_lang
-        JOIN ps_feature_value_lang fvl ON fvl.id_feature_value = fp.id_feature_value
-        AND fvl.id_lang = p_id_lang
-      WHERE
-        fp.id_product = p.id_product
-    ),
-    /* ================= COMBINATIONS ================= */
-    'combinations',
-    (
-      SELECT
-        JSON_ARRAYAGG(
-          JSON_OBJECT(
-            'id_product_attribute',
-            pa.id_product_attribute,
-            'reference',
-            pa.reference,
-            'price',
-            JSON_OBJECT(
-              'impact',
-              COALESCE(pas.price, pa.price),
-              'final_tax_excl',
-              (
-                COALESCE(ps.price, p.price) + COALESCE(pas.price, pa.price)
-              ),
-              'final_tax_incl',
-              (
-                (
-                  COALESCE(ps.price, p.price) + COALESCE(pas.price, pa.price)
-                ) * (1 + v_tax_rate / 100)
-              )
-            ),
-            'stock',
-            IFNULL(sa.quantity, 0),
-            'default_on',
-            pas.default_on,
-            /* ATTRIBUTES JSON */
-            'attributes',
-            (
-              SELECT
-                JSON_ARRAYAGG(
-                  JSON_OBJECT(
-                    'group',
-                    agl.name,
-                    'attribute',
-                    al.name
-                  )
-                )
-              FROM
-                ps_product_attribute_combination pac
-                JOIN ps_attribute a ON a.id_attribute = pac.id_attribute
-                JOIN ps_attribute_lang al ON al.id_attribute = a.id_attribute
-                AND al.id_lang = p_id_lang
-                JOIN ps_attribute_group_lang agl ON agl.id_attribute_group = a.id_attribute_group
-                AND agl.id_lang = p_id_lang
-              WHERE
-                pac.id_product_attribute = pa.id_product_attribute
-            ),
-            /* IMAGES */
-            'images',
-            (
-              SELECT
-                JSON_ARRAYAGG(img.id_image)
-              FROM
-                ps_product_attribute_image pai
-                JOIN ps_image img ON img.id_image = pai.id_image
-              WHERE
-                pai.id_product_attribute = pa.id_product_attribute
-            )
-          )
-        )
-      FROM
-        ps_product_attribute pa
-        JOIN ps_product_attribute_shop pas ON pas.id_product_attribute = pa.id_product_attribute
-        AND pas.id_shop = p_id_shop
-        LEFT JOIN ps_stock_available sa ON sa.id_product = pa.id_product
-        AND sa.id_product_attribute = pa.id_product_attribute
-        AND sa.id_shop = p_id_shop
-      WHERE
-        pa.id_product = p.id_product
-    )
-  ) AS product_json
-FROM
-  ps_product p
-  LEFT JOIN ps_product_shop ps ON ps.id_product = p.id_product
-  AND ps.id_shop = p_id_shop
-  LEFT JOIN ps_product_lang pl ON pl.id_product = p.id_product
-  AND pl.id_lang = p_id_lang
-  AND pl.id_shop = p_id_shop
-  LEFT JOIN ps_category_lang cl ON cl.id_category = COALESCE(ps.id_category_default, p.id_category_default)
-  AND cl.id_lang = p_id_lang
-  AND cl.id_shop = p_id_shop
-  LEFT JOIN ps_manufacturer m ON m.id_manufacturer = p.id_manufacturer
-  LEFT JOIN ps_image i ON i.id_product = p.id_product
-  AND i.cover = 1
-  LEFT JOIN ps_image_lang il ON il.id_image = i.id_image
-  AND il.id_lang = p_id_lang
-  /* SPECIFIC PRICE */
-LEFT JOIN (
-  SELECT bsp.*
   FROM b2b_specific_price bsp
 
-  /* RELATIONS */
-  LEFT JOIN b2b_specific_price_product bsp_p 
-    ON bsp_p.b2b_specific_price_id = bsp.id
+  LEFT JOIN b2b_specific_price_product spp
+    ON spp.b2b_specific_price_id = bsp.id
+    AND spp.id_product = p_id_product
 
-  LEFT JOIN b2b_specific_price_category bsp_c 
-    ON bsp_c.b2b_specific_price_id = bsp.id
+  LEFT JOIN b2b_specific_price_product_attribute spa
+    ON spa.b2b_specific_price_id = bsp.id
+    AND spa.id_product_attribute = p_id_product_attribute
 
-  WHERE bsp.is_active = TRUE
+  LEFT JOIN b2b_specific_price_customer spc
+    ON spc.b2b_specific_price_id = bsp.id
+    AND spc.b2b_id_customer = p_id_customer
 
-    /* SCOPE MATCH */
-    AND (
-      /* PRODUCT */
-      (bsp.scope = 'product' AND bsp_p.id_product = p_id_product)
+  LEFT JOIN b2b_specific_price_country spco
+    ON spco.b2b_specific_price_id = bsp.id
+    AND spco.b2b_id_country = p_id_country
 
-      /* CATEGORY */
-      OR (
-        bsp.scope = 'category'
-        AND bsp_c.id_category IN (
-          SELECT cp.id_category
-          FROM ps_category_product cp
-          WHERE cp.id_product = p_id_product
-        )
-      )
+  LEFT JOIN b2b_specific_price_category spcat
+    ON spcat.b2b_specific_price_id = bsp.id
 
-      /* SHOP (GLOBAL) */
-      OR (bsp.scope = 'shop')
-    )
+  LEFT JOIN ps_category_product cp
+    ON cp.id_category = spcat.id_category
+    AND cp.id_product = p_id_product
 
-   /* CUSTOMER MATCH */
-AND (
-  NOT EXISTS (
-    SELECT 1 FROM b2b_specific_price_customer c
-    WHERE c.b2b_specific_price_id = bsp.id
-  )
-  OR EXISTS (
-    SELECT 1 FROM b2b_specific_price_customer c
-    WHERE c.b2b_specific_price_id = bsp.id
-      AND c.b2b_id_customer = p_id_customer
-  )
-)
-
-/* COUNTRY MATCH */
-AND (
-  NOT EXISTS (
-    SELECT 1 FROM b2b_specific_price_country ctry
-    WHERE ctry.b2b_specific_price_id = bsp.id
-  )
-  OR EXISTS (
-    SELECT 1 FROM b2b_specific_price_country ctry
-    WHERE ctry.b2b_specific_price_id = bsp.id
-      AND ctry.b2b_id_country = b2b_id_country
-  )
-)
-
-    /* QUANTITY */
+  WHERE bsp.is_active = 1
     AND bsp.from_quantity <= p_quantity
 
-    /* DATE */
-    AND (
-      bsp.has_expiration_date = FALSE OR (
-        (bsp.valid_from IS NULL OR bsp.valid_from <= NOW())
-        AND (bsp.valid_till IS NULL OR bsp.valid_till >= NOW())
-      )
-    )
+    AND (spp.id_product IS NOT NULL OR NOT EXISTS (
+          SELECT 1 FROM b2b_specific_price_product x WHERE x.b2b_specific_price_id = bsp.id
+        ))
 
-    ORDER BY
-    /* 🔥 SCOPE PRIORITY */
-    bsp.scope = 'product' DESC,
-    bsp.scope = 'category' DESC,
-    bsp.scope = 'shop' DESC,
+    AND (spa.id_product_attribute IS NOT NULL OR NOT EXISTS (
+          SELECT 1 FROM b2b_specific_price_product_attribute x WHERE x.b2b_specific_price_id = bsp.id
+        ))
 
-    /* 🔥 CUSTOMER PRIORITY */
-    (
-      EXISTS (
-        SELECT 1 FROM b2b_specific_price_customer c
-        WHERE c.b2b_specific_price_id = bsp.id
-          AND c.b2b_id_customer = p_id_customer
-      )
-    ) DESC,
+    AND (spc.b2b_id_customer IS NOT NULL OR NOT EXISTS (
+          SELECT 1 FROM b2b_specific_price_customer x WHERE x.b2b_specific_price_id = bsp.id
+        ))
 
-    /* 🔥 COUNTRY PRIORITY */
-    (
-      EXISTS (
-        SELECT 1 FROM b2b_specific_price_country ctry
-        WHERE ctry.b2b_specific_price_id = bsp.id
-          AND ctry.b2b_id_country = b2b_id_country
-      )
-    ) DESC,
+    AND (spco.b2b_id_country IS NOT NULL OR NOT EXISTS (
+          SELECT 1 FROM b2b_specific_price_country x WHERE x.b2b_specific_price_id = bsp.id
+        ))
 
-    /* GLOBAL fallback (no restrictions) naturally goes last */
+    AND (cp.id_product IS NOT NULL OR NOT EXISTS (
+          SELECT 1 FROM b2b_specific_price_category x WHERE x.b2b_specific_price_id = bsp.id
+        ))
 
-    bsp.from_quantity DESC,
+  ORDER BY
+    (spc.b2b_id_customer IS NOT NULL) DESC,
+    (spa.id_product_attribute IS NOT NULL) DESC,
+    (spp.id_product IS NOT NULL) DESC,
+    (cp.id_product IS NOT NULL) DESC,
+    (spco.b2b_id_country IS NOT NULL) DESC,
     bsp.id DESC
 
-    LIMIT 1
-) bsp ON 1=1
-LEFT JOIN b2b_currency_rates br_bsp
-  ON br_bsp.b2b_id_currency = bsp.b2b_id_currency
-  AND br_bsp.created_at = (
-    SELECT MAX(created_at)
-    FROM b2b_currency_rates
-    WHERE b2b_id_currency = bsp.b2b_id_currency
-  )
-  LEFT JOIN b2b_countries ON b2b_countries.id = b2b_id_country
-  LEFT JOIN b2b_currencies ON b2b_currencies.id = p_id_currency
-  LEFT JOIN b2b_currency_rates r ON r.b2b_id_currency = b2b_currencies.id
-  AND r.created_at = (
-    SELECT
-      MAX(created_at)
-    FROM
-      b2b_currency_rates
-    WHERE
-      b2b_id_currency = b2b_currencies.id
-  )
-WHERE
-  p.id_product = p_id_product
-LIMIT
-  1;
+  LIMIT 1;
+
+  -- ================= APPLY =================
+  IF v_has_specific = 1 THEN
+
+    IF v_reduction_type = 'amount' THEN
+
+      IF v_specific_currency_id IS NOT NULL AND v_specific_currency_id != v_target_currency THEN
+
+        SELECT r.conversion_rate
+        INTO v_specific_rate
+        FROM b2b_currency_rates r
+        WHERE r.b2b_id_currency = v_specific_currency_id
+        ORDER BY r.created_at DESC
+        LIMIT 1;
+
+        SET v_excl = (v_fixed_price / v_specific_rate) * v_target_rate;
+
+      ELSE
+        SET v_excl = v_fixed_price;
+      END IF;
+
+    ELSEIF v_reduction_type = 'percentage' THEN
+      SET v_excl = v_base * (1 - v_percentage / 100);
+    END IF;
+
+  END IF;
+
+  SET v_incl = v_excl * (1 + v_tax_rate / 100);
+
+  RETURN JSON_OBJECT(
+    'base', v_base,
+    'final_tax_excl', v_excl,
+    'final_tax_incl', v_incl,
+    'tax_rate', v_tax_rate,
+    'rate', v_target_rate
+  );
+
 END //
 
 DELIMITER ;
+
+DELIMITER //
+
+DROP PROCEDURE IF EXISTS get_product_variants //
+CREATE PROCEDURE get_product_variants(
+  IN p_id_product INT,
+  IN p_id_shop INT,
+  IN p_id_lang INT,
+  IN p_id_customer INT,
+  IN p_id_country INT,
+  IN p_quantity INT
+)
+BEGIN
+
+SELECT
+  pa.id_product_attribute,
+  pa.reference,
+
+  -- PRICE (computed once per row via correlated subquery)
+  CAST(JSON_UNQUOTE(JSON_EXTRACT(
+    fn_product_price(
+      p_id_product,
+      p_id_shop,
+      p_id_customer,
+      p_id_country,
+      p_quantity,
+      pa.id_product_attribute
+    ),
+    '$.base'
+  )) AS DECIMAL(20,6)) AS base_price,
+
+  CAST(JSON_UNQUOTE(JSON_EXTRACT(
+    fn_product_price(
+      p_id_product,
+      p_id_shop,
+      p_id_customer,
+      p_id_country,
+      p_quantity,
+      pa.id_product_attribute
+    ),
+    '$.final_tax_excl'
+  )) AS DECIMAL(20,6)) AS price_tax_excl,
+
+  CAST(JSON_UNQUOTE(JSON_EXTRACT(
+    fn_product_price(
+      p_id_product,
+      p_id_shop,
+      p_id_customer,
+      p_id_country,
+      p_quantity,
+      pa.id_product_attribute
+    ),
+    '$.final_tax_incl'
+  )) AS DECIMAL(20,6)) AS price_tax_incl,
+
+  IFNULL(sa.quantity, 0) AS quantity,
+
+  (
+    SELECT JSON_ARRAYAGG(
+      JSON_OBJECT(
+        'group', agl.name,
+        'attribute', al.name
+      )
+    )
+    FROM ps_product_attribute_combination pac
+    JOIN ps_attribute a ON a.id_attribute = pac.id_attribute
+    JOIN ps_attribute_lang al
+      ON al.id_attribute = a.id_attribute AND al.id_lang = p_id_lang
+    JOIN ps_attribute_group_lang agl
+      ON agl.id_attribute_group = a.id_attribute_group AND agl.id_lang = p_id_lang
+    WHERE pac.id_product_attribute = pa.id_product_attribute
+  ) AS attributes
+
+FROM ps_product_attribute pa
+
+JOIN ps_product_attribute_shop pas
+  ON pas.id_product_attribute = pa.id_product_attribute
+ AND pas.id_shop = p_id_shop
+
+LEFT JOIN ps_stock_available sa
+  ON sa.id_product = pa.id_product
+ AND sa.id_product_attribute = pa.id_product_attribute
+ AND sa.id_shop = p_id_shop
+
+WHERE pa.id_product = p_id_product;
+
+END //
+
+DELIMITER ;
+
+DELIMITER //
+
+DROP PROCEDURE IF EXISTS get_product_price //
+CREATE PROCEDURE get_product_price(
+  IN p_id_product INT,
+  IN p_id_shop INT,
+  IN p_id_customer INT,
+  IN p_id_country INT,
+  IN p_quantity INT
+)
+BEGIN
+
+SELECT fn_product_price(
+  p_id_product,
+  p_id_shop,
+  p_id_customer,
+  p_id_country,
+  p_quantity,
+  NULL
+) AS price;
+
+END //
+
+DELIMITER ;
+
+DELIMITER //
+DROP PROCEDURE IF EXISTS get_product_base //
+CREATE PROCEDURE get_product_base(
+  IN p_id_product INT,
+  IN p_id_shop INT,
+  IN p_id_lang INT,
+  IN p_id_customer INT
+)
+BEGIN
+    SELECT
+        p.id_product AS id,                                 -- matches view.Product.ID
+        
+        p.reference,
+        p.supplier_reference,
+        p.ean13,
+        p.upc,
+        p.isbn,
+        
+        -- Price related (basic)
+        p.price AS base_price,
+        p.wholesale_price,
+        p.unity,
+        p.unit_price_ratio,
+        
+        -- Stock & Availability
+        p.quantity,
+        p.minimal_quantity,
+        p.available_for_order,
+        p.available_date,
+        p.out_of_stock AS out_of_stock_behavior,           -- 0=deny, 1=allow, 2=default
+        
+        -- Flags
+        COALESCE(ps.on_sale, 0) AS on_sale,
+        COALESCE(ps.show_price, 1) AS show_price,
+        p.condition,
+        p.is_virtual,
+        
+        -- Physical
+        p.weight,
+        p.width,
+        p.height,
+        p.depth,
+        p.additional_shipping_cost,
+        
+        -- Delivery
+        p.additional_delivery_times AS delivery_days,     -- you can adjust if needed
+        
+        -- Status
+        COALESCE(ps.active, p.active) AS active,
+        COALESCE(ps.visibility, p.visibility) AS visibility,
+        p.indexed,
+        
+        -- Other useful
+        p.date_add,
+        p.date_upd,
+        
+        -- Language data
+        pl.name,
+        pl.description,
+        pl.description_short,
+        
+        -- Relations
+        m.name AS manufacturer,
+        cl.name AS category,
+
+        p.is_oem,
+        EXISTS(
+          SELECT 1 FROM b2b_favorites f
+          WHERE f.user_id = p_id_customer AND f.product_id = p_id_product
+        ) AS is_favorite,
+        CASE
+          WHEN ps.date_add >= DATE_SUB(
+            NOW(),
+            INTERVAL COALESCE(CAST(ps_configuration.value AS SIGNED), 20) DAY
+          ) AND ps.active = 1
+          THEN 1
+          ELSE 0
+        END AS is_new
+
+
+
+    FROM ps_product p
+    LEFT JOIN ps_product_shop ps 
+        ON ps.id_product = p.id_product 
+       AND ps.id_shop = p_id_shop
+    LEFT JOIN ps_product_lang pl 
+        ON pl.id_product = p.id_product 
+       AND pl.id_lang = p_id_lang 
+       AND pl.id_shop = p_id_shop
+    LEFT JOIN ps_category_lang cl 
+        ON cl.id_category = COALESCE(ps.id_category_default, p.id_category_default)
+       AND cl.id_lang = p_id_lang 
+       AND cl.id_shop = p_id_shop
+    LEFT JOIN ps_manufacturer m 
+        ON m.id_manufacturer = p.id_manufacturer
+    LEFT JOIN ps_configuration
+        ON ps_configuration.name = 'PS_NB_DAYS_NEW_PRODUCT'
+
+    WHERE p.id_product = p_id_product
+    LIMIT 1;
+END //
+DELIMITER ;
+
 -- +goose Down

i18n/migrations/20260320113729_stuff.sql

@@ -1,9 +0,0 @@
--- +goose Up
--- +goose StatementBegin
-SELECT 'up SQL query';
--- +goose StatementEnd
-
--- +goose Down
--- +goose StatementBegin
-SELECT 'down SQL query';
--- +goose StatementEnd