fix: cart and products

Reviewed-on: #72
Reviewed-by: Wiktor Dudzic <dudzic_wiktor@ma-al.com>

.air.toml

@@ -28,7 +28,7 @@ tmp_dir = "tmp"
   rerun = false
   rerun_delay = 500
   send_interrupt = false
-  stop_on_error = false
+  stop_on_error = true
 
 [color]
   app = ""

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{
+				return c.Next()
-					"error": "authorization token required",
-				})
 			}
 		} 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{
+				return c.Next()
-					"error": "invalid authorization header format",
-				})
 			}
 			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{
+			return c.Next()
-				"error": "invalid or expired token",
-			})
 		}
 
 		// Get user from database
 		user, err := authService.GetUserByID(claims.UserID)
 		if err != nil {
-			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
+			return c.Next()
-				"error": "user not found",
-			})
 		}
 
 		// Check if user is active
 		if !user.IsActive {
-			return c.Status(fiber.StatusForbidden).JSON(fiber.Map{
+			return c.Next()
-				"error": "user account is inactive",
-			})
 		}
 
 		// 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 {
+		if !userLocale.OriginalUser.HasPermission(perms.Teleport) {
-			return c.Status(fiber.StatusForbidden).JSON(fiber.Map{
+			return c.Next()
-				"error": "admin access required",
-			})
 		}
 
 		targetUserID, err := strconv.Atoi(targetUserIDAttribute)
@@ -115,22 +103,14 @@ func AuthMiddleware() fiber.Handler {
 	}
 }
 
-// RequireAdmin creates admin-only middleware
+func Authorize() fiber.Handler {
-func RequireAdmin() 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/perms/permissions.go

@@ -8,4 +8,11 @@ const (
 	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

@@ -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)
 

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)).
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+			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

@@ -124,13 +124,13 @@ func (h *AddressesHandler) RetrieveAddressesInfo(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
 	}
 
-	addresses_info, err := h.addressesService.RetrieveAddressesInfo(userID)
+	addresses, err := h.addressesService.RetrieveAddresses(userID)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
-	return c.JSON(response.Make(&addresses_info, 0, i18n.T_(c, response.Message_OK)))
+	return c.JSON(response.Make(addresses, 0, i18n.T_(c, response.Message_OK)))
 }
 
 func (h *AddressesHandler) DeleteAddress(c fiber.Ctx) error {

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

@@ -29,10 +29,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,7 +46,8 @@ 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 {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
@@ -53,6 +56,29 @@ 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 {
+		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 {
@@ -117,6 +143,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,7 +186,59 @@ 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 {
+		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 {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))

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

@@ -3,6 +3,7 @@ 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"
@@ -30,7 +31,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
 }
 
@@ -75,10 +77,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,12 +85,6 @@ 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 {
@@ -109,3 +101,28 @@ 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 {
+		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/orders.go

@@ -0,0 +1,171 @@
+package restricted
+
+import (
+	"strconv"
+
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"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/nullable"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/query/query_params"
+	"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 OrdersHandler struct {
+	ordersService *orderService.OrderService
+}
+
+func NewOrdersHandler() *OrdersHandler {
+	ordersService := orderService.New()
+	return &OrdersHandler{
+		ordersService: ordersService,
+	}
+}
+
+func OrdersHandlerRoutes(r fiber.Router) fiber.Router {
+	handler := NewOrdersHandler()
+
+	r.Get("/list", handler.ListOrders)
+	r.Post("/place-new-order", handler.PlaceNewOrder)
+	r.Post("/change-order-address", handler.ChangeOrderAddress)
+	r.Get("/change-order-status", handler.ChangeOrderStatus)
+
+	return r
+}
+
+// when a user (not admin) wants to list orders, we automatically append filter to only view his orders.
+// we base permissions and user based on target user only.
+func (h *OrdersHandler) ListOrders(c fiber.Ctx) error {
+	user, ok := localeExtractor.GetCustomer(c)
+	if !ok {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	paging, filters, err := query_params.ParseFilters[model.CustomerOrder](c, columnMappingListOrders)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	list, err := h.ordersService.Find(user, paging, filters)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&list.Items, int(list.Count), i18n.T_(c, response.Message_OK)))
+}
+
+var columnMappingListOrders map[string]string = map[string]string{
+	"order_id":   "b2b_customer_orders.order_id",
+	"user_id":    "b2b_customer_orders.user_id",
+	"name":       "b2b_customer_orders.name",
+	"country_id": "b2b_customer_orders.country_id",
+	"status":     "b2b_customer_orders.status",
+}
+
+func (h *OrdersHandler) PlaceNewOrder(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)))
+	}
+
+	country_id_attribute := c.Query("country_id")
+	country_id, err := strconv.Atoi(country_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	address_info := string(c.Body())
+	if address_info == "" {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	name := c.Query("name")
+
+	err = h.ordersService.PlaceNewOrder(userID, uint(cart_id), name, uint(country_id), address_info)
+	if err != nil {
+		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)))
+}
+
+// we base permissions and user based on target user only.
+func (h *OrdersHandler) ChangeOrderAddress(c fiber.Ctx) error {
+	user, ok := localeExtractor.GetCustomer(c)
+	if !ok {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	order_id_attribute := c.Query("order_id")
+	order_id, err := strconv.Atoi(order_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	country_id_attribute := c.Query("country_id")
+	country_id, err := strconv.Atoi(country_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	address_info := string(c.Body())
+	if address_info == "" {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	err = h.ordersService.ChangeOrderAddress(user, uint(order_id), uint(country_id), address_info)
+	if err != nil {
+		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)))
+}
+
+// we base permissions and user based on target user only.
+// TODO: well, permissions and all that.
+func (h *OrdersHandler) ChangeOrderStatus(c fiber.Ctx) error {
+	user, ok := localeExtractor.GetCustomer(c)
+	if !ok {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	order_id_attribute := c.Query("order_id")
+	order_id, err := strconv.Atoi(order_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	status := c.Query("status")
+
+	err = h.ordersService.ChangeOrderStatus(user, uint(order_id), status)
+	if err != nil {
+		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/product.go

@@ -103,14 +103,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",
+	"product_id":  "bp.product_id",
-	"name":          "pl.name",
+	"name":        "bp.name",
-	"reference":     "p.reference",
+	"reference":   "bp.reference",
-	"category_name": "cl.name",
+	"category_id": "bp.category_id",
-	"category_id":   "cp.id_category",
+	"quantity":    "bp.quantity",
-	"quantity":      "sa.quantity",
+	"is_favorite": "bp.is_favorite",
-	"is_favorite":   "ps.is_favorite",
+	"is_new":      "bp.is_new",
+	"is_oem":      "bp.is_oem",
 }
 
 func (h *ProductsHandler) AddToFavorites(c fiber.Ctx) error {

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

@@ -4,7 +4,8 @@ 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"
@@ -35,8 +36,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.Post("/save-product-description", middleware.Require(perms.ProductTranslationSave), handler.SaveProductDescription)
-	r.Get("/translate-product-description", handler.TranslateProductDescription)
+	r.Get("/translate-product-description", middleware.Require(perms.ProductTranslationTranslate), handler.TranslateProductDescription)
 
 	return r
 }
@@ -80,12 +81,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 {
@@ -123,12 +118,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 {

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

@@ -4,7 +4,8 @@ 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"
@@ -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,12 +45,6 @@ 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)

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

@@ -5,6 +5,7 @@ import (
 
 	"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"
@@ -30,13 +31,13 @@ func NewSpecificPriceHandler() *SpecificPriceHandler {
 func SpecificPriceHandlerRoutes(r fiber.Router) fiber.Router {
 	handler := NewSpecificPriceHandler()
 
-	r.Post("/", middleware.Require("specific_price.manage"), handler.Create)
+	r.Post("/", middleware.Require(perms.SpecificPriceManage), handler.Create)
-	r.Put("/:id", middleware.Require("specific_price.manage"), handler.Update)
+	r.Put("/:id", middleware.Require(perms.SpecificPriceManage), handler.Update)
-	r.Delete("/:id", middleware.Require("specific_price.manage"), handler.Delete)
+	r.Delete("/:id", middleware.Require(perms.SpecificPriceManage), handler.Delete)
-	r.Get("/", middleware.Require("specific_price.manage"), handler.List)
+	r.Get("/", middleware.Require(perms.SpecificPriceManage), handler.List)
-	r.Get("/:id", middleware.Require("specific_price.manage"), handler.GetByID)
+	r.Get("/:id", middleware.Require(perms.SpecificPriceManage), handler.GetByID)
-	r.Patch("/:id/activate", middleware.Require("specific_price.manage"), handler.Activate)
+	r.Patch("/:id/activate", middleware.Require(perms.SpecificPriceManage), handler.Activate)
-	r.Patch("/:id/deactivate", middleware.Require("specific_price.manage"), handler.Deactivate)
+	r.Patch("/:id/deactivate", middleware.Require(perms.SpecificPriceManage), handler.Deactivate)
 
 	return r
 }

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

@@ -4,7 +4,8 @@ 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"
@@ -34,7 +35,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
 }
@@ -84,12 +85,6 @@ 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 {
 		return c.Status(responseErrors.GetErrorStatus(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())
 
@@ -132,8 +133,13 @@ func (s *Server) Setup() error {
 	carts := s.restricted.Group("/carts")
 	restricted.CartsHandlerRoutes(carts)
 
+	// orders (restricted)
+	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)
@@ -161,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/address.go

@@ -3,7 +3,8 @@ package model
 type Address struct {
 	ID              uint             `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
 	CustomerID      uint             `gorm:"column:b2b_customer_id;not null;index" json:"customer_id"`
-	AddressInfo string `gorm:"column:address_info;not null" json:"address_info"`
+	AddressString   string           `gorm:"column:address_string;not null" json:"address_string"`
+	AddressUnparsed *AddressUnparsed `gorm:"-" json:"address_unparsed"`
 	CountryID       uint             `gorm:"column:b2b_country_id;not null" json:"country_id"`
 }
 
@@ -11,15 +12,7 @@ func (Address) TableName() string {
 	return "b2b_addresses"
 }
 
-type AddressUnparsed struct {
+type AddressUnparsed interface{}
-	ID          uint         `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
-	CustomerID  uint         `gorm:"column:b2b_customer_id;not null;index" json:"customer_id"`
-	AddressInfo AddressField `gorm:"column:address_info;not null" json:"address_info"`
-	CountryID   uint         `gorm:"column:b2b_country_id;not null" json:"country_id"`
-}
-
-type AddressField interface {
-}
 
 // Address template in Poland
 type AddressPL struct {

app/model/category.go

@@ -11,6 +11,7 @@ type ScannedCategory struct {
 	IsoCode     string `gorm:"column:iso_code"`
 
 	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/customer.go

@@ -35,6 +35,7 @@ type Customer struct {
 	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

@@ -0,0 +1,27 @@
+package model
+
+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"`
+	Name            string           `gorm:"column:name;not null" json:"name"`
+	CountryID       uint             `gorm:"column:country_id;not null" json:"country_id"`
+	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"`
+	Products        []OrderProduct   `gorm:"foreignKey:OrderID;references:OrderID" json:"products"`
+}
+
+func (CustomerOrder) TableName() string {
+	return "b2b_customer_orders"
+}
+
+type OrderProduct struct {
+	OrderID            uint  `gorm:"column:order_id;not null;index" json:"-"`
+	ProductID          uint  `gorm:"column:product_id;not null" json:"product_id"`
+	ProductAttributeID *uint `gorm:"column:product_attribute_id" json:"product_attribute_id,omitempty"`
+	Amount             uint  `gorm:"column:amount;not null" json:"amount"`
+}
+
+func (OrderProduct) TableName() string {
+	return "b2b_orders_products"
+}

app/model/product.go

@@ -12,6 +12,8 @@ type ProductInList struct {
 	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/repos/addressesRepo/addressesRepo.go

@@ -49,7 +49,7 @@ func (repo *AddressesRepo) UserAddressesAmt(user_id uint) (uint, error) {
 func (repo *AddressesRepo) AddNewAddress(user_id uint, address_info string, country_id uint) error {
 	address := model.Address{
 		CustomerID:    user_id,
-		AddressInfo: address_info,
+		AddressString: address_info,
 		CountryID:     country_id,
 	}
 
@@ -62,7 +62,7 @@ func (repo *AddressesRepo) UpdateAddress(user_id uint, address_id uint, address_
 	address := model.Address{
 		ID:            address_id,
 		CustomerID:    user_id,
-		AddressInfo: address_info,
+		AddressString: address_info,
 		CountryID:     country_id,
 	}
 

app/repos/cartsRepo/cartsRepo.go

@@ -1,20 +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)
-	UserHasCart(user_id uint, cart_id uint) (uint, 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) (uint, 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{}
@@ -36,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) {
+func (repo *CartsRepo) CreateNewCart(user_id uint, name string) (model.CustomerCart, error) {
-	var name string
-	name = constdata.DEFAULT_NEW_CART_NAME
-
 	cart := model.CustomerCart{
 		UserID: user_id,
 		Name:   &name,
@@ -49,7 +52,15 @@ func (repo *CartsRepo) CreateNewCart(user_id uint) (model.CustomerCart, error) {
 	return cart, err
 }
 
-func (repo *CartsRepo) UserHasCart(user_id uint, cart_id uint) (uint, error) {
+func (repo *CartsRepo) RemoveCart(user_id uint, cart_id uint) error {
+	return db.DB.
+		Table("b2b_customer_carts").
+		Where("cart_id = ? AND user_id = ?", cart_id, user_id).
+		Delete(nil).
+		Error
+}
+
+func (repo *CartsRepo) UserHasCart(user_id uint, cart_id uint) (bool, error) {
 	var amt uint
 
 	err := db.DB.
@@ -59,7 +70,7 @@ func (repo *CartsRepo) UserHasCart(user_id uint, cart_id uint) (uint, error) {
 		Scan(&amt).
 		Error
 
-	return amt, err
+	return amt >= 1, err
 }
 
 func (repo *CartsRepo) UpdateCartName(user_id uint, cart_id uint, new_name string) error {
@@ -96,7 +107,7 @@ func (repo *CartsRepo) RetrieveCart(user_id uint, cart_id uint) (*model.Customer
 	return &cart, err
 }
 
-func (repo *CartsRepo) CheckProductExists(product_id uint, product_attribute_id *uint) (uint, error) {
+func (repo *CartsRepo) CheckProductExists(product_id uint, product_attribute_id *uint) (bool, error) {
 	var amt uint
 
 	if product_attribute_id == nil {
@@ -106,7 +117,7 @@ func (repo *CartsRepo) CheckProductExists(product_id uint, product_attribute_id
 			Where("id_product = ?", product_id).
 			Scan(&amt).
 			Error
-		return amt, err
+		return amt >= 1, err
 
 	} else {
 		err := db.DB.
@@ -116,18 +127,65 @@ func (repo *CartsRepo) CheckProductExists(product_id uint, product_attribute_id
 			Where("ps.id_product = ? AND pas.id_product_attribute = ?", product_id, *product_attribute_id).
 			Scan(&amt).
 			Error
-		return amt, err
+		return amt >= 1, err
 	}
 }
 
-func (repo *CartsRepo) AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount uint) error {
+func (repo *CartsRepo) AddProduct(cart_id uint, product_id uint, product_attribute_id *uint, amount uint, set_amount bool) error {
-	product := model.CartProduct{
+	var product model.CartProduct
+
+	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,
 			}
-	err := db.DB.Create(&product).Error
 
+			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(
+func (repo *CustomerRepo) SetCustomerNoVatStatus(customerID uint, isNoVat bool) error {
-// 	customerId uint,
+	return db.DB.Model(&model.Customer{}).Where("id = ?", customerID).Update("is_no_vat", isNoVat).Error
-// 	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
-// }

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

@@ -0,0 +1,110 @@
+package ordersRepo
+
+import (
+	"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/query/filters"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
+)
+
+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
+	ChangeOrderAddress(order_id uint, country_id uint, address_info string) error
+	ChangeOrderStatus(order_id uint, status string) error
+}
+
+type OrdersRepo struct{}
+
+func New() UIOrdersRepo {
+	return &OrdersRepo{}
+}
+
+func (repo *OrdersRepo) UserHasOrder(user_id uint, order_id uint) (bool, error) {
+	var amt uint
+
+	err := db.DB.
+		Table("b2b_customer_orders").
+		Select("COUNT(*) AS amt").
+		Where("user_id = ? AND order_id = ?", user_id, order_id).
+		Scan(&amt).
+		Error
+
+	return amt >= 1, err
+}
+
+func (repo *OrdersRepo) Find(user_id uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.CustomerOrder], error) {
+	var list []model.CustomerOrder
+	var total int64
+
+	query := db.Get().
+		Model(&model.CustomerOrder{}).
+		Preload("Products").
+		Order("b2b_customer_orders.order_id DESC")
+
+	// 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.CustomerOrder]{}, err
+	}
+
+	err = query.
+		Limit(p.Limit()).
+		Offset(p.Offset()).
+		Find(&list).Error
+	if err != nil {
+		return &find.Found[model.CustomerOrder]{}, err
+	}
+
+	return &find.Found[model.CustomerOrder]{
+		Items: list,
+		Count: uint(total),
+	}, nil
+}
+
+func (repo *OrdersRepo) PlaceNewOrder(cart *model.CustomerCart, name string, country_id uint, address_info string) error {
+	order := model.CustomerOrder{
+		UserID:        cart.UserID,
+		Name:          name,
+		CountryID:     country_id,
+		AddressString: address_info,
+		Status:        constdata.NEW_ORDER_STATUS,
+		Products:      make([]model.OrderProduct, 0, len(cart.Products)),
+	}
+
+	for _, product := range cart.Products {
+		order.Products = append(order.Products, model.OrderProduct{
+			ProductID:          product.ProductID,
+			ProductAttributeID: product.ProductAttributeID,
+			Amount:             product.Amount,
+		})
+	}
+
+	return db.DB.Create(&order).Error
+}
+
+func (repo *OrdersRepo) ChangeOrderAddress(order_id uint, country_id uint, address_info string) error {
+	return db.DB.
+		Table("b2b_customer_orders").
+		Where("order_id = ?", order_id).
+		Updates(map[string]interface{}{
+			"country_id":     country_id,
+			"address_string": address_info,
+		}).
+		Error
+}
+
+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).
+		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

@@ -18,7 +18,7 @@ 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 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 uint) (view.Product, 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
@@ -33,11 +33,11 @@ func New() UIProductsRepo {
 	return &ProductsRepo{}
 }
 
-func (repo *ProductsRepo) GetBase(p_id_product, p_id_shop, p_id_lang uint) (view.Product, error) {
+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_product_base(?,?,?)`,
+	err := db.DB.Raw(`CALL get_product_base(?,?,?,?)`,
-		p_id_product, p_id_shop, p_id_lang).
+		p_id_product, p_id_shop, p_id_lang, p_id_customer).
 		Scan(&result).Error
 
 	return result, err
@@ -105,57 +105,107 @@ func (repo *ProductsRepo) GetVariants(p_id_product, p_id_shop, p_id_lang, p_id_c
 }
 
 func (repo *ProductsRepo) Find(langID uint, userID uint, p find.Paging, filt *filters.FiltersList) (*find.Found[model.ProductInList], error) {
-	query := db.Get().
+	query := db.DB.
-		Table(gormcol.Field.Tab(dbmodel.PsProductShopCols.Active)+" AS ps").
+		Table("base_products AS bp").
-		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 = ?", langID).
-		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 = ?", langID).
-		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").
 		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")
 
 	query = query.Scopes(filt.All()...)
 

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 {
+	err := db.
-		return nil, err
+		Get().
-	}
+		Model(model.Route{}).
-	return routes, nil
+		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/service/addressesService/addressesService.go

@@ -21,7 +21,7 @@ func New() *AddressesService {
 	}
 }
 
-func (s *AddressesService) GetTemplate(country_id uint) (model.AddressField, error) {
+func (s *AddressesService) GetTemplate(country_id uint) (model.AddressUnparsed, error) {
 	switch country_id {
 
 	case 1: // Poland
@@ -49,7 +49,7 @@ func (s *AddressesService) AddNewAddress(user_id uint, address_info string, coun
 		return responseErrors.ErrMaxAmtOfAddressesReached
 	}
 
-	_, err = s.validateAddressJson(address_info, country_id)
+	_, err = s.ValidateAddressJson(address_info, country_id)
 	if err != nil {
 		return err
 	}
@@ -66,7 +66,7 @@ func (s *AddressesService) ModifyAddress(user_id uint, address_id uint, address_
 		return responseErrors.ErrUserHasNoSuchAddress
 	}
 
-	_, err = s.validateAddressJson(address_info, country_id)
+	_, err = s.ValidateAddressJson(address_info, country_id)
 	if err != nil {
 		return err
 	}
@@ -74,30 +74,23 @@ func (s *AddressesService) ModifyAddress(user_id uint, address_id uint, address_
 	return s.repo.UpdateAddress(user_id, address_id, address_info, country_id)
 }
 
-func (s *AddressesService) RetrieveAddressesInfo(user_id uint) (*[]model.AddressUnparsed, error) {
+func (s *AddressesService) RetrieveAddresses(user_id uint) (*[]model.Address, error) {
-	parsed_addresses, err := s.repo.RetrieveAddresses(user_id)
+	addresses, err := s.repo.RetrieveAddresses(user_id)
 	if err != nil {
 		return nil, err
 	}
 
-	var unparsed_addresses []model.AddressUnparsed
+	for i := 0; i < len(*addresses); i++ {
-
+		address_unparsed, err := s.ValidateAddressJson((*addresses)[i].AddressString, (*addresses)[i].CountryID)
-	for i := 0; i < len(*parsed_addresses); i++ {
-		var next_address model.AddressUnparsed
-		next_address.ID = (*parsed_addresses)[i].ID
-		next_address.CustomerID = (*parsed_addresses)[i].CustomerID
-		next_address.CountryID = (*parsed_addresses)[i].CountryID
-
-		next_address.AddressInfo, err = s.validateAddressJson((*parsed_addresses)[i].AddressInfo, next_address.CountryID)
 		// log such errors
 		if err != nil {
 			fmt.Printf("err: %v\n", err)
 		}
 
-		unparsed_addresses = append(unparsed_addresses, next_address)
+		(*addresses)[i].AddressUnparsed = &address_unparsed
 	}
 
-	return &unparsed_addresses, nil
+	return addresses, nil
 }
 
 func (s *AddressesService) DeleteAddress(user_id uint, address_id uint) error {
@@ -112,7 +105,7 @@ func (s *AddressesService) DeleteAddress(user_id uint, address_id uint) error {
 }
 
 // validateAddressJson makes sure that the info string represents a valid json of address in given country
-func (s *AddressesService) validateAddressJson(info string, country_id uint) (model.AddressField, error) {
+func (s *AddressesService) ValidateAddressJson(info string, country_id uint) (model.AddressUnparsed, error) {
 	dec := json.NewDecoder(strings.NewReader(info))
 	dec.DisallowUnknownFields()
 

app/service/cartsService/cartsService.go

@@ -17,7 +17,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,18 +28,34 @@ 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)
 
 	return cart, nil
 }
 
-func (s *CartsService) UpdateCartName(user_id uint, cart_id uint, new_name string) error {
+func (s *CartsService) RemoveCart(user_id uint, cart_id uint) error {
-	amt, err := s.repo.UserHasCart(user_id, cart_id)
+	exists, err := s.repo.UserHasCart(user_id, cart_id)
 	if err != nil {
 		return err
 	}
-	if amt != 1 {
+	if !exists {
+		return responseErrors.ErrUserHasNoSuchCart
+	}
+
+	return s.repo.RemoveCart(user_id, cart_id)
+}
+
+func (s *CartsService) UpdateCartName(user_id uint, cart_id uint, new_name string) error {
+	exists, err := s.repo.UserHasCart(user_id, cart_id)
+	if err != nil {
+		return err
+	}
+	if !exists {
 		return responseErrors.ErrUserHasNoSuchCart
 	}
 
@@ -51,33 +67,45 @@ func (s *CartsService) RetrieveCartsInfo(user_id uint) ([]model.CustomerCart, er
 }
 
 func (s *CartsService) RetrieveCart(user_id uint, cart_id uint) (*model.CustomerCart, error) {
-	amt, err := s.repo.UserHasCart(user_id, cart_id)
+	exists, err := s.repo.UserHasCart(user_id, cart_id)
 	if err != nil {
 		return nil, err
 	}
-	if amt != 1 {
+	if !exists {
 		return nil, responseErrors.ErrUserHasNoSuchCart
 	}
 
 	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 {
-	amt, err := s.repo.UserHasCart(user_id, cart_id)
+	exists, err := s.repo.UserHasCart(user_id, cart_id)
 	if err != nil {
 		return err
 	}
-	if amt != 1 {
+	if !exists {
 		return responseErrors.ErrUserHasNoSuchCart
 	}
 
-	amt, err = s.repo.CheckProductExists(product_id, product_attribute_id)
+	exists, err = s.repo.CheckProductExists(product_id, product_attribute_id)
 	if err != nil {
 		return err
 	}
-	if amt != 1 {
+	if !exists {
 		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/emailService/email.go

@@ -117,6 +117,18 @@ func (s *EmailService) SendNewUserAdminNotification(userEmail, userName, baseURL
 	return s.SendEmail(s.config.AdminEmail, subject, body)
 }
 
+// SendNewOrderPlacedNotification sends an email to admin when new order is placed
+func (s *EmailService) SendNewOrderPlacedNotification(userID uint) error {
+	if s.config.AdminEmail == "" {
+		return nil // No admin email configured
+	}
+
+	subject := "New Order Created"
+	body := s.newOrderPlacedTemplate(userID)
+
+	return s.SendEmail(s.config.AdminEmail, subject, body)
+}
+
 // verificationEmailTemplate returns the HTML template for email verification
 func (s *EmailService) verificationEmailTemplate(name, verificationURL string, langID uint) string {
 	buf := bytes.Buffer{}
@@ -137,3 +149,10 @@ func (s *EmailService) newUserAdminNotificationTemplate(userEmail, userName, bas
 	emails.EmailAdminNotificationWrapper(view.EmailLayout[view.EmailAdminNotificationData]{LangID: constdata.ADMIN_NOTIFICATION_LANGUAGE, Data: view.EmailAdminNotificationData{UserEmail: userEmail, UserName: userName, BaseURL: baseURL}}).Render(context.Background(), &buf)
 	return buf.String()
 }
+
+// newUserAdminNotificationTemplate returns the HTML template for admin notification
+func (s *EmailService) newOrderPlacedTemplate(userID uint) string {
+	buf := bytes.Buffer{}
+	// emails.EmailNewOrderPlacedWrapper(view.EmailLayout[view.EmailNewOrderPlacedData]{LangID: constdata.ADMIN_NOTIFICATION_LANGUAGE, Data: view.EmailNewOrderPlacedData{UserID: userID}}).Render(context.Background(), &buf)
+	return buf.String()
+}

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,7 +20,7 @@ type MeiliIndexSettings struct {
 }
 
 type MeiliService struct {
-	productDescriptionRepo productDescriptionRepo.UIProductDescriptionRepo
+	searchRepo  searchrepo.UISearchRepo
 	meiliClient meilisearch.ServiceManager
 }
 
@@ -33,7 +33,7 @@ func New() *MeiliService {
 
 	return &MeiliService{
 		meiliClient: client,
-		productDescriptionRepo: productDescriptionRepo.New(),
+		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
+	categoryRepo categoryrepo.UICategoryRepo
 	routesRepo   routesRepo.UIRoutesRepo
 }
 
 func New() *MenuService {
 	return &MenuService{
-		categoriesRepo: categoriesRepo.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) {
+func (s *MenuService) GetRoutes(id_lang, roleId uint) ([]model.Route, error) {
-	return s.routesRepo.GetRoutes(id_lang)
+	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

@@ -0,0 +1,145 @@
+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/service/addressesService"
+	"git.ma-al.com/goc_daniel/b2b/app/service/emailService"
+	"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"
+)
+
+type OrderService struct {
+	ordersRepo       ordersRepo.UIOrdersRepo
+	cartsRepo        cartsRepo.UICartsRepo
+	addressesService *addressesService.AddressesService
+	emailService     *emailService.EmailService
+}
+
+func New() *OrderService {
+	return &OrderService{
+		ordersRepo:       ordersRepo.New(),
+		cartsRepo:        cartsRepo.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.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))
+	}
+
+	list, err := s.ordersRepo.Find(user.ID, p, filt)
+	if err != nil {
+		return nil, err
+	}
+
+	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)
+		}
+
+		list.Items[i].AddressUnparsed = &address_unparsed
+	}
+
+	return list, nil
+}
+
+func (s *OrderService) PlaceNewOrder(user_id uint, cart_id uint, name string, country_id uint, address_info string) error {
+	_, err := s.addressesService.ValidateAddressJson(address_info, country_id)
+	if err != nil {
+		return err
+	}
+
+	exists, err := s.cartsRepo.UserHasCart(user_id, cart_id)
+	if err != nil {
+		return err
+	}
+	if !exists {
+		return responseErrors.ErrUserHasNoSuchCart
+	}
+
+	cart, err := s.cartsRepo.RetrieveCart(user_id, cart_id)
+	if err != nil {
+		return err
+	}
+	if len(cart.Products) == 0 {
+		return responseErrors.ErrEmptyCart
+	}
+
+	if name == "" && cart.Name != nil {
+		name = *cart.Name
+	}
+
+	// all checks passed
+	err = s.ordersRepo.PlaceNewOrder(cart, name, country_id, address_info)
+	if err != nil {
+		return err
+	}
+	// from this point onward we do not cancel this order.
+
+	// 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
+	}
+
+	// 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
+		}
+	}(user_id)
+
+	return nil
+}
+
+func (s *OrderService) ChangeOrderAddress(user *model.Customer, order_id uint, country_id uint, address_info string) error {
+	_, err := s.addressesService.ValidateAddressJson(address_info, country_id)
+	if err != nil {
+		return err
+	}
+
+	if !user.HasPermission(perms.OrdersModifyAll) {
+		exists, err := s.ordersRepo.UserHasOrder(user.ID, order_id)
+		if err != nil {
+			return err
+		}
+
+		if !exists {
+			return responseErrors.ErrUserHasNoSuchOrder
+		}
+	}
+
+	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.OrdersModifyAll) {
+		exists, err := s.ordersRepo.UserHasOrder(user.ID, order_id)
+		if err != nil {
+			return err
+		}
+
+		if !exists {
+			return responseErrors.ErrUserHasNoSuchOrder
+		}
+	}
+
+	return s.ordersRepo.ChangeOrderStatus(order_id, status)
+}

app/service/productService/productService.go

@@ -27,7 +27,7 @@ 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)
+	product, err := s.productsRepo.GetBase(p_id_product, constdata.SHOP_ID, p_id_lang, p_id_customer)
 	if err != nil {
 		return nil, err
 	}

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 {
+func transliterateSlug(s string) string {
-	var b strings.Builder
+	var cleared string
-	b.Grow(len(s))
 
-	for _, r := range s {
+	err := db.DB.Raw("SELECT slugify_eu(?)", s).Scan(&cleared).Error
-		if repl, ok := constdata.TRANSLITERATION_TABLE[r]; ok {
+	if err != nil {
-			b.WriteString(repl)
+		// log error
-		} else {
+		_ = err
-			b.WriteRune(r)
+		return s
-		}
 	}
 
-	return b.String()
+	return cleared
 }
 
 func removeDiacritics(s string) string {

app/templ/emails/emailNewOrderPlacedNotification.templ

@@ -0,0 +1,26 @@
+package emails
+
+import (
+	"git.ma-al.com/goc_daniel/b2b/app/templ/layout"
+	"git.ma-al.com/goc_daniel/b2b/app/view"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+)
+
+templ EmailNewOrderPlacedWrapper(data view.EmailLayout[view.EmailNewOrderPlacedData]) {
+	@layout.Base( i18n.T___(data.LangID, "email.email_new_order_placed_notification_title")) {
+        <div class="container">
+            <div class="email-wrapper">
+                <div class="email-header">
+                    <h1>New Order Placed</h1>
+                </div>
+                <div class="email-body">
+                    <p>Hello Administrator,</p>
+                    <p>User with id { data.Data.UserID } has placed a new order. </p>
+                </div>
+                <div class="email-footer">
+                    <p>&copy; 2024 Gitea Manager. All rights reserved.</p>
+                </div>
+            </div>
+        </div>
+    }
+}

app/utils/const_data/consts.go

@@ -9,14 +9,22 @@ 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
 
 const USER_LOCALE = "user"
 
+// ORDERS
+const NEW_ORDER_STATUS = "PENDING"
+
 // WEBDAV
 const NBYTES_IN_WEBDAV_TOKEN = 32
 const WEBDAV_HREF_ROOT = "http://localhost:3000/api/v1/webdav/storage"
@@ -27,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
+const UNLOGGED_USER_ROLE_ID = 4
-var TRANSLITERATION_TABLE = map[rune]string{
-	// German
-	'ä': "ae",
-	'ö': "oe",
-	'ü': "ue",
-	'ß': "ss",
-
-	// Polish
-	'ą': "a",
-	'ć': "c",
-	'ę': "e",
-	'ł': "l",
-	'ń': "n",
-	'ó': "o",
-	'ś': "s",
-	'ż': "z",
-	'ź': "z",
-}

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/responseErrors/responseErrors.go

@@ -65,12 +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")
@@ -200,6 +207,15 @@ 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")
+	case errors.Is(err, ErrUserHasNoSuchOrder):
+		return i18n.T_(c, "error.err_user_has_no_such_order")
 
 	case errors.Is(err, ErrAccessDenied):
 		return i18n.T_(c, "error.err_access_denied")
@@ -282,6 +298,10 @@ 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),

app/view/emails.go

@@ -18,3 +18,7 @@ type EmailAdminNotificationData struct {
 type EmailPasswordResetData struct {
 	ResetURL string
 }
+
+type EmailNewOrderPlacedData struct {
+	UserID uint
+}

app/view/product.go

@@ -95,4 +95,6 @@ type Product struct {
 	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"`
 }

bo/components.d.ts

@@ -11,7 +11,6 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    ButtonGoToProfile: typeof import('./src/components/customer-management/ButtonGoToProfile.vue')['default']
     CartDetails: typeof import('./src/components/customer/CartDetails.vue')['default']
     CategoryMenu: typeof import('./src/components/inner/CategoryMenu.vue')['default']
     copy: typeof import('./src/components/admin/ProductDetailView copy.vue')['default']
@@ -23,12 +22,16 @@ declare module 'vue' {
     FavoriteProducts: typeof import('./src/components/admin/FavoriteProducts.vue')['default']
     LangSwitch: typeof import('./src/components/inner/LangSwitch.vue')['default']
     PageAddresses: typeof import('./src/components/customer/PageAddresses.vue')['default']
+    PageCart: typeof import('./src/components/customer/PageCart.vue')['default']
     PageCarts: typeof import('./src/components/customer/PageCarts.vue')['default']
+    PageCArts: typeof import('./src/components/customer/PageCArts.vue')['default']
+    PageCreateCart: typeof import('./src/components/customer/PageCreateCart.vue')['default']
     PageOrders: typeof import('./src/components/customer/PageOrders.vue')['default']
     PageProduct: typeof import('./src/components/customer/PageProduct.vue')['default']
     PageProducts: typeof import('./src/components/admin/PageProducts.vue')['default']
     PageProfileDetails: typeof import('./src/components/customer/PageProfileDetails.vue')['default']
     PageProfileDetailsAddInfo: typeof import('./src/components/customer/PageProfileDetailsAddInfo.vue')['default']
+    PageSearchProducts: typeof import('./src/components/customer/PageSearchProducts.vue')['default']
     PageStatistic: typeof import('./src/components/customer/PageStatistic.vue')['default']
     Pl_PrivacyPolicyView: typeof import('./src/components/terms/pl_PrivacyPolicyView.vue')['default']
     Pl_TermsAndConditionsView: typeof import('./src/components/terms/pl_TermsAndConditionsView.vue')['default']
@@ -45,6 +48,7 @@ declare module 'vue' {
     TopBar: typeof import('./src/components/TopBar.vue')['default']
     TopBarLogin: typeof import('./src/components/TopBarLogin.vue')['default']
     UAlert: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Alert.vue')['default']
+    UApp: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/App.vue')['default']
     UAvatar: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Avatar.vue')['default']
     UButton: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Button.vue')['default']
     UCard: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Card.vue')['default']
@@ -69,6 +73,7 @@ declare module 'vue' {
     UTable: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Table.vue')['default']
     UTabs: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Tabs.vue')['default']
     UTextarea: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Textarea.vue')['default']
+    UTooltip: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Tooltip.vue')['default']
     UTree: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Tree.vue')['default']
   }
 }

bo/src/App.vue

@@ -1,17 +1,25 @@
 <script setup lang="ts">
+import { computed } from 'vue'
 import { TooltipProvider } from 'reka-ui'
-import { RouterView } from 'vue-router'
+import { RouterView, useRoute } from 'vue-router'
+import DefaultLayout from '@/layouts/default.vue'
+import EmptyLayout from '@/layouts/empty.vue'
+import ManagementLayout from '@/layouts/management.vue'
 import { useAuthStore } from './stores/customer/auth'
 
 const authStore = useAuthStore()
+const route = useRoute()
+const layout = computed(() => (route.meta.layout as string) || 'default')
 </script>
 
 <template>
   <Suspense>
     <TooltipProvider>
-      <RouterView />
+      <component :is="layout === 'empty' ? EmptyLayout : layout === 'management' ? ManagementLayout : DefaultLayout">
+        <RouterView v-slot="{ Component }">
+          <component :is="Component" />
+        </RouterView>
+      </component>
     </TooltipProvider>
   </Suspense>
 </template>
-
-

bo/src/components/admin/FavoriteProducts.vue

@@ -1,12 +1,9 @@
 <template>
-    <component :is="Default || 'div'">
             <div>
 
         </div>
-    </component>
     </template>
 
 <script setup lang="ts">
-import Default from '@/layouts/default.vue';
 
 </script>

bo/src/components/admin/PageProducts.vue

@@ -1,5 +1,4 @@
 <template>
-    <component :is="Default || 'div'">
             <div class="flex flex-col md:flex-row gap-10">
             <CategoryMenu />
             <div class="w-full flex flex-col items-center gap-4">
@@ -9,13 +8,11 @@
                 <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
             </div>
         </div>
-    </component>
     </template>
 
 <script setup lang="ts">
 import { ref, watch, h, resolveComponent, computed } from 'vue'
 import { useFetchJson } from '@/composable/useFetchJson'
-import Default from '@/layouts/default.vue'
 import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
 import CategoryMenu from '../inner/CategoryMenu.vue'

bo/src/components/admin/ProductDetailView copy.vue

@@ -1,5 +1,4 @@
 <template>
-  <component :is="Default || 'div'">
       <div class="flex items-center gap-2 mb-4">
       <UIcon name="line-md:arrow-left" class="text-(--text-sky-light) dark:text-(--text-sky-dark)" />
       <p class="cursor-pointer text-(--text-sky-light) dark:text-(--text-sky-dark)" @click="backFromProduct()">
@@ -190,12 +189,10 @@
         </UTabs>
       </div>
     </div>
-  </component>
   </template>
 
 <script setup lang="ts">
 import { useEditable } from '@/composable/useConteditable';
-import Default from '@/layouts/default.vue';
 import { langs } from '@/router/langs';
 import { useProductStore } from '@/stores/product';
 import { useSettingsStore } from '@/stores/admin/settings';

bo/src/components/admin/ProductDetailView.vue

@@ -1,5 +1,4 @@
 <template>
-  <component :is="Default || 'div'">
       <div class="flex items-center gap-2 mb-4">
       <UIcon name="line-md:arrow-left" class="text-(--text-sky-light) dark:text-(--text-sky-dark)" />
       <p class="cursor-pointer text-(--text-sky-light) dark:text-(--text-sky-dark)" @click="backFromProduct()">
@@ -154,11 +153,9 @@
       </div>
       <div class=""></div>
     </div>
-  </component>
   </template>
 
 <script setup lang="ts">
-import Default from '@/layouts/default.vue';
 import { langs } from '@/router/langs';
 import { useProductStore } from '@/stores/admin/product';
 import { useSettingsStore } from '@/stores/admin/settings';

bo/src/components/admin/UsersList.vue

@@ -1,17 +1,15 @@
 <template>
-    <component :is="Default || 'div'">
     <div class="flex flex-col md:flex-row gap-10">
         <div class="w-full flex flex-col items-center gap-4">
-                <UTable :data="usersList" :columns="columns" class="flex-1 w-full"
+            <UTable :data="usersList" :columns="columns" class="flex-1 w-full" :ui="{
-                    :ui="{ root: 'max-w-100wv overflow-auto!' }" />
+                root: 'max-w-100wv overflow-auto!'
+            }" />
             <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
         </div>
     </div>
-    </component>
 </template>
 
 <script setup lang="ts">
-import Default from '@/layouts/default.vue'
 import { ref, computed, watch, resolveComponent, h } from 'vue'
 import { useFetchJson } from '@/composable/useFetchJson'
 import { useRoute, useRouter } from 'vue-router'

bo/src/components/admin/UsersSearch.vue

@@ -1,11 +1,12 @@
 <template>
-    <component :is="Default">
     <div class="pt-70! flex flex-col items-center justify-center bg-gray-50 dark:bg-(--main-dark)">
         <h1 class="text-6xl font-bold text-black dark:text-white mb-14">Search Users</h1>
 
-            <div class="w-full max-w-4xl">
+        <div class="w-full flex flex-col items-center gap-4">
             <UInput icon="i-lucide-search" type="text" placeholder="Type user name or ID..." v-model="searchQuery"
-                    class="w-full!" :ui="{ base: 'py-4! rounded-full!' }" />
+                class="flex-1 w-full" :ui="{
+                    root: 'max-w-100wv overflow-auto!'
+                }" />
         </div>
 
         <p v-if="loading">Loading...</p>
@@ -18,12 +19,10 @@
             No users found with that name or ID
         </p>
     </div>
-    </component>
 </template>
 
 <script setup lang="ts">
 import { ref, computed, watch, resolveComponent, h } from 'vue'
-import Default from '@/layouts/default.vue';
 import type { TableColumn } from '@nuxt/ui';
 import { useRoute, useRouter } from 'vue-router';
 import { useFetchJson } from '@/composable/useFetchJson';

bo/src/components/customer-management/Profile.vue

@@ -1,11 +1,7 @@
 <template>
-    <component :is="Management || 'div'">
     <div>customer-management</div>
-    </component>
 </template>
 
 
 <script setup lang="ts">
-import Management from '@/layouts/management.vue';
-
 </script>

bo/src/components/customer/CartDetails.vue

@@ -1,5 +1,4 @@
 <template>
-    <component :is="Default || 'div'">
       <div class="">
     <h2
       class="font-semibold text-black dark:text-white pb-6 text-2xl">
@@ -48,7 +47,6 @@
       </UButton>
     </div>
   </div>
-  </component>
   </template>
 
 <script setup lang="ts">
@@ -56,7 +54,6 @@ import { useCartStore } from '@/stores/customer/cart'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
-import Default from '@/layouts/default.vue'
 const cartStore = useCartStore()
 const { t } = useI18n()
 const router = useRouter()

bo/src/components/customer/PageAddresses.vue

@@ -1,5 +1,4 @@
 <template>
-    <component :is="Default || 'div'">
             <div class="">
             <div class="flex flex-col gap-5 mb-6">
                 <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Addresses') }}</h1>
@@ -10,20 +9,32 @@
                         <UIcon name="ic:baseline-search"
                             class="text-[20px] text-(--text-sky-light) dark:text-(--text-sky-dark) relative left-40" />
                     </div>
-                <UButton color="primary" @click="openCreateModal"
+                    <UButton color="info" @click="openCreateModal">
-                    class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light)">
                         <UIcon name="mdi:add-bold" />
                         {{ t('Add Address') }}
                     </UButton>
                 </div>
             </div>
-        <div v-if="paginatedAddresses.length" class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6">
+            <div v-if="cartStore.addressLoading" class="text-center py-8 text-gray-500 dark:text-gray-400">
-            <div v-for="address in paginatedAddresses" :key="address.id"
+                {{ t('Loading addresses...') }}
+            </div>
+            <div v-else-if="cartStore.addressError" class="text-center py-8 text-red-500 dark:text-red-400">
+                {{ cartStore.addressError }}
+            </div>
+            <div v-else-if="cartStore.paginatedAddresses.length"
+                class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6">
+                <div v-for="address in cartStore.paginatedAddresses" :key="address.id"
                     class="border border-(--border-light) dark:border-(--border-dark) rounded-md p-4 bg-(--second-light) dark:bg-(--main-dark) hover:shadow-md transition-shadow flex justify-between">
-                <div class="flex flex-col gap-2 items-strat justify-end">
+                    <div class="flex flex-col gap-2 items-start justify-end">
-                    <p class="text-black dark:text-white">{{ address.street }}</p>
+                        <p class="text-black dark:text-white font-semibold">{{ address.address_info.recipient }}</p>
-                    <p class="text-black dark:text-white">{{ address.zipCode }}, {{ address.city }}</p>
+                        <p class="text-black dark:text-white">{{ address.address_info.street }} {{
-                    <p class="text-black dark:text-white">{{ address.country }}</p>
+                            address.address_info.building_no }}{{ address.address_info.apartment_no ? '/' +
+                                address.address_info.apartment_no : '' }}</p>
+                        <p class="text-black dark:text-white">{{ address.address_info.postal_code }}, {{
+                            address.address_info.city }}</p>
+                        <p class="text-black dark:text-white">{{ address.address_info.voivodeship }}</p>
+                        <p v-if="address.address_info.address_line2" class="text-black dark:text-white">{{
+                            address.address_info.address_line2 }}</p>
                     </div>
                     <div class="flex flex-col items-end justify-between gap-2">
                         <button @click="confirmDelete(address.id)"
@@ -47,33 +58,24 @@
                 <template #content>
                     <div class="p-6 flex flex-col gap-6">
                         <p class="text-[20px] text-black dark:text-white ">Address</p>
-                    <UForm @submit.prevent="saveAddress" class="space-y-4" :validate="validate">
+                        <UForm @submit="saveAddress" class="space-y-4" :validate="validate" :state="formData">
-                        <div>
+                            <template v-for="field in formFieldKeys" :key="field">
-                            <label class="block text-sm font-medium text-black dark:text-white mb-1">Street *</label>
+                                <UFormField :label="fieldLabel(field)" :name="field"
-                            <UInput v-model="formData.street" placeholder="Enter street" name="street" class="w-full" />
+                                    :required="field !== 'address_line2'">
-                        </div>
+                                    <UInput v-model="formData[field]" :placeholder="fieldLabel(field)" class="w-full" />
-                        <div>
+                                </UFormField>
-                            <label class="block text-sm font-medium text-black dark:text-white mb-1">Zip Code *</label>
+                            </template>
-                            <UInput v-model="formData.zipCode" placeholder="Enter zip code" name="zipCode"
+
-                                class="w-full" />
+                            <div class="flex justify-end gap-2">
-                        </div>
+                                <UButton variant="outline" color="neutral" @click="closeModal">
-                        <div>
+                                    {{ t('Cancel') }}
-                            <label class="block text-sm font-medium text-black dark:text-white mb-1">City *</label>
+                                </UButton>
-                            <UInput v-model="formData.city" placeholder="Enter city" name="city" class="w-full" />
+
-                        </div>
+                                <UButton type="submit" color="info" class="cursor-pointer">
-                        <div>
+                                    {{ t('Save') }}
-                            <label class="block text-sm font-medium text-black dark:text-white mb-1">Country *</label>
+                                </UButton>
-                            <UInput v-model="formData.country" placeholder="Enter country" name="country"
-                                class="w-full" />
                             </div>
                         </UForm>
-                    <div class="flex justify-end gap-2">
-                        <UButton variant="outline" color="neutral" @click="closeModal"
-                            class="text-black dark:text-white">{{ t('Cancel') }}</UButton>
-                        <UButton variant="outline" color="neutral" @click="saveAddress"
-                            class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light)">
-                            {{ t('Save') }}</UButton>
-                    </div>
                     </div>
                 </template>
             </UModal>
@@ -99,82 +101,146 @@
                 </template>
             </UModal>
         </div>
-    </component>
     </template>
 
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+import { ref, reactive, computed, watch, onMounted } from 'vue'
-import { useAddressStore } from '@/stores/customer/address'
+import { useCartStore } from '@/stores/customer/cart'
 import { useI18n } from 'vue-i18n'
-import Default from '@/layouts/default.vue'
+import { currentCountry } from '@/router/langs'
-const addressStore = useAddressStore()
+
+type AddressFormState = Record<string, string>
+
+const cartStore = useCartStore()
 const { t } = useI18n()
-const searchQuery = ref('')
+const searchQuery = ref(cartStore.addressSearchQuery)
 const showModal = ref(false)
 const isEditing = ref(false)
 const editingAddressId = ref<number | null>(null)
-const formData = ref({ street: '', zipCode: '', city: '', country: '' })
+const addressTemplate = ref<AddressFormState | null>(null)
+const formData = reactive<AddressFormState>({})
 
 const showDeleteConfirm = ref(false)
 const addressToDelete = ref<number | null>(null)
 
-const page = ref(addressStore.currentPage)
+const page = computed<number>({
-const paginatedAddresses = computed(() => addressStore.paginatedAddresses)
+    get: () => cartStore.addressCurrentPage,
-const totalItems = computed(() => addressStore.totalItems)
+    set: (value: number) => cartStore.setAddressPage(value)
-const pageSize = addressStore.pageSize
-
-watch(page, (newPage) => addressStore.setPage(newPage))
-watch(searchQuery, (val) => {
-    addressStore.setSearchQuery(val)
 })
-function openCreateModal() {
+const totalItems = computed(() => cartStore.totalAddressItems)
+const pageSize = cartStore.addressPageSize
+const formFieldKeys = computed(() => (addressTemplate.value ? Object.keys(addressTemplate.value) : []))
+
+watch(searchQuery, (val) => {
+    cartStore.setAddressSearchQuery(val)
+})
+
+onMounted(() => {
+    cartStore.fetchAddresses()
+})
+
+function clearFormData() {
+    Object.keys(formData).forEach((key) => delete formData[key])
+}
+
+function fieldLabel(key: string) {
+    const labels: Record<string, string> = {
+        postal_code: 'Zip Code',
+        post_town: 'City',
+        city: 'City',
+        county: 'County',
+        region: 'Region',
+        voivodeship: 'Region / Voivodeship',
+        street: 'Street',
+        thoroughfare: 'Street',
+        building_no: 'Building No',
+        building_name: 'Building Name',
+        house_number: 'House Number',
+        orientation_number: 'Orientation Number',
+        apartment_no: 'Apartment No',
+        sub_building: 'Sub Building',
+        address_line2: 'Address Line 2',
+        recipient: 'Recipient'
+    }
+
+    return t(labels[key] ?? key.replace(/_/g, ' ').replace(/\b\w/g, (chr) => chr.toUpperCase()))
+}
+
+async function openCreateModal() {
     resetForm()
     isEditing.value = false
+
+    const template = await cartStore.getAddressTemplate(Number(currentCountry.value?.id) | 2).catch(() => null)
+    if (template) {
+        addressTemplate.value = template
+        clearFormData()
+        Object.assign(formData, template)
+    }
+
     showModal.value = true
 }
-function openEditModal(address: any) {
+
-    formData.value = {
+async function openEditModal(address: any) {
-        street: address.street,
+    currentCountry.value = address.country_id || 1
-        zipCode: address.zipCode,
+    const template = await cartStore.getAddressTemplate(address.country_id | 2).catch(() => null)
-        city: address.city,
+
-        country: address.country
+    if (template) {
+        addressTemplate.value = template
+        clearFormData()
+        Object.assign(formData, template)
     }
+
+    if (address.address_info) {
+        formFieldKeys.value.forEach((key) => {
+            formData[key] = address.address_info[key] ?? ''
+        })
+    }
+
     isEditing.value = true
     editingAddressId.value = address.id
     showModal.value = true
 }
+
 function resetForm() {
-    formData.value = { street: '', zipCode: '', city: '', country: '' }
+    clearFormData()
     editingAddressId.value = null
 }
+
 function closeModal() {
     showModal.value = false
     resetForm()
 }
+
 function validate() {
-    const errors = []
+    const errors: Array<{ name: string; message: string }> = []
-    if (!formData.value.street) errors.push({ name: 'street', message: 'Street required' })
+    const optionalFields = new Set(['address_line2'])
-    if (!formData.value.zipCode) errors.push({ name: 'zipCode', message: 'Zip Code required' })
+
-    if (!formData.value.city) errors.push({ name: 'city', message: 'City required' })
+    formFieldKeys.value.forEach((key) => {
-    if (!formData.value.country) errors.push({ name: 'country', message: 'Country required' })
+        if (!optionalFields.has(key) && !formData[key]?.trim()) {
-    return errors.length ? errors : null
+            errors.push({ name: key, message: `${fieldLabel(key)} required` })
         }
-function saveAddress() {
+    })
-    if (validate()) return
+
+    return errors
+}
+
+async function saveAddress() {
     if (isEditing.value && editingAddressId.value) {
-        addressStore.updateAddress(editingAddressId.value, formData.value)
+        await cartStore.updateAddress(editingAddressId.value, currentCountry.value?.id || 2, formData)
     } else {
-        addressStore.addAddress(formData.value)
+        await cartStore.addAddress(currentCountry.value?.id || 2, formData)
     }
     closeModal()
 }
+
 function confirmDelete(id: number) {
     addressToDelete.value = id
     showDeleteConfirm.value = true
 }
-function deleteAddress() {
+
+async function deleteAddress() {
     if (addressToDelete.value) {
-        addressStore.deleteAddress(addressToDelete.value)
+        await cartStore.deleteAddress(addressToDelete.value)
     }
     showDeleteConfirm.value = false
     addressToDelete.value = null

bo/src/components/customer/PageCart.vue

@@ -0,0 +1,14 @@
+<template>
+    <div class="flex flex-col gap-5 md:gap-10">
+      <h1 class="text-2xl font-bold text-black dark:text-white">
+        Shopping Cart
+      </h1>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { useCartStore } from '@/stores/customer/cart';
+
+const cartStore =useCartStore()
+
+</script>

bo/src/components/customer/PageCarts.vue

@@ -1,204 +1,108 @@
 <template>
-  <component :is="Default || 'div'">
     <div class="flex flex-col gap-5 md:gap-10">
-      <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Shopping Cart') }}</h1>
+        <div class="flex flex-col md:flex-row justify-between items-center gap-4">
-      <div class="flex flex-col lg:flex-row gap-5 md:gap-10">
+            <div class="flex items-start gap-2">
-        <div class="flex-1">
+                <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Shopping Carts') }}</h1>
+                <UTooltip :delay-duration="0" text="You can create up to 10 carts.">
+                    <UIcon name="icon-park-outline:attention" class="text-[15px] text-blue-500" />
+                </UTooltip>
+            </div>
+            <div class="flex items-start gap-1">
+                <UButton color="info" @click="showCreateModal = true" :disabled="cartStore.carts?.length >= 10"
+                    class="">
+                    <UIcon name="mdi:plus" class="mr-1" />
+                    {{ t('New Cart') }}
+                </UButton>
+            </div>
+        </div>
+
+        <div class="w-full">
             <div
                 class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
                 <h2
                     class="text-lg font-semibold text-black dark:text-white p-4 border-b border-(--border-light) dark:border-(--border-dark)">
-              {{ t('Selected Products') }}
+                    {{ t('Your Carts') }}
                 </h2>
-            <div v-if="cartStore.items.length > 0">
+                <div v-if="cartStore.carts?.length > 0"
-              <div v-for="item in cartStore.items" :key="item.id"
+                    class="divide-y divide-(--border-light) dark:divide-(--border-dark)">
-                class="grid grid-cols-5 items-center p-4 border-b border-(--border-light) dark:border-(--border-dark) w-[100%]">
+                    <div v-for="cart in cartStore.carts" :key="cart.cart_id"
-                <div
+                        @click="cartStore.setActiveCart(cart.cart_id)"
-                  class="bg-(--second-light) dark:bg-(--main-dark) rounded flex items-center justify-center overflow-hidden">
+                        class="p-4 cursor-pointer flex gap-2 items-center justify-between" :class="cartStore.activeCartId === cart.cart_id
-                  <img v-if="item.image" :src="item.image" :alt="item.name" class="w-full h-full object-cover" />
+                            ? 'bg-blue-50 dark:bg-blue-900/20'
-                  <UIcon v-else name="mdi:package-variant" class="text-2xl text-gray-400" />
+                            : 'hover:bg-gray-50 dark:hover:bg-gray-800 border-l-4 border-transparent'">
+                        <div class="flex-1 min-w-0">
+                            <div class="flex items-center gap-2">
+                                <p class="text-black dark:text-white font-medium truncate cursor-pointer"
+                                    @click="openCart(cart)">{{ cart.name }}</p>
+                            </div>
+                        </div>
+                        <input type="checkbox" :checked="cartStore.activeCartId === cart.cart_id"
+                            @change="toggleCart(cart.cart_id)" />
+                    </div>
+                </div>
+                <div v-else class="p-8 text-center flex items-center justify-center">
+                    <UIcon name="mdi:cart-outline" class="text-4xl text-gray-300 dark:text-gray-600 mb-2" />
+                    <p class="text-gray-500 dark:text-gray-400">{{ t('No carts yet') }}</p>
+                </div>
+            </div>
+        </div>
     </div>
-                <p class="text-black dark:text-white text-sm font-medium">{{ item.name }}</p>
-                <p class="text-black dark:text-white">${{ item.price.toFixed(2) }}</p>
-                <p class="text-black dark:text-white font-medium">${{ (item.price * item.quantity).toFixed(2)
-                  }}</p>
 
-                <div class="flex items-center justify-end gap-10">
+    <UModal v-model:open="showCreateModal">
-                  <UInputNumber v-model="item.quantity" :min="1"
+        <template #body>
-                    @update:model-value="(val: number) => cartStore.updateQuantity(item.id, val)" />
+            <div class="flex flex-col gap-5">
-                  <div class="flex justify-center">
+                <h3 class="text-xl font-bold text-black dark:text-white text-center">{{ t('Create New Cart') }}</h3>
-                    <button @click="removeItem(item.id)"
+                <div class="flex flex-col gap-4">
-                      class="p-2 text-red-500 bg-red-100 dark:bg-(--main-dark)  rounded transition-colors"
+                    <UInput v-model="newCartName" :placeholder="t('Cart name')"
-                      :title="t('Remove')">
-                      <UIcon name="material-symbols:delete" class="text-[20px]" />
-                    </button>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div v-else class="p-8 text-center">
-              <UIcon name="mdi:cart-outline" class="text-6xl text-gray-300 dark:text-gray-600 mb-4" />
-              <p class="text-gray-500 dark:text-gray-400">{{ t('Your cart is empty') }}</p>
-              <RouterLink :to="{
-                name: 'customer-product', params: {
-                  product_id: '51'
-                }
-              }" class="inline-block mt-4 text-(--text-sky-light) dark:text-(--text-sky-dark) hover:underline">
-                {{ t('Continue Shopping') }}
-              </RouterLink>
-            </div>
-          </div>
-        </div>
-        <div class="lg:w-80">
-          <div
-            class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-6 sticky top-24">
-            <h2 class="text-lg font-semibold text-black dark:text-white mb-4">{{ t('Order Summary') }}</h2>
-            <div class="space-y-3 border-b border-(--border-light) dark:border-(--border-dark) pb-4 mb-4">
-              <div class="flex justify-between">
-                <span class="text-gray-600 dark:text-gray-400">{{ t('Products total') }}</span>
-                <span class="text-black dark:text-white">${{ cartStore.productsTotal.toFixed(2) }}</span>
-              </div>
-              <div class="flex justify-between">
-                <span class="text-gray-600 dark:text-gray-400">{{ t('Shipping') }}</span>
-                <span class="text-black dark:text-white">
-                  {{ cartStore.shippingCost > 0 ? `$${cartStore.shippingCost.toFixed(2)}` : t('Free') }}
-                </span>
-              </div>
-              <div class="flex justify-between">
-                <span class="text-gray-600 dark:text-gray-400">{{ t('VAT') }} ({{ (cartStore.vatRate * 100).toFixed(0)
-                  }}%)</span>
-                <span class="text-black dark:text-white">${{ cartStore.vatAmount.toFixed(2) }}</span>
-              </div>
-            </div>
-            <div class="flex justify-between mb-6">
-              <span class="text-black dark:text-white font-semibold text-lg">{{ t('Total') }}</span>
-              <span class="text-(--text-sky-light) dark:text-(--text-sky-dark) font-bold text-lg">${{
-                cartStore.orderTotal.toFixed(2) }}</span>
-            </div>
-            <div class="flex flex-col gap-3">
-              <UButton block color="primary" @click="placeOrder" :disabled="!canPlaceOrder"
-                class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light) disabled:opacity-50 disabled:cursor-not-allowed">
-                {{ t('Place Order') }}
-              </UButton>
-              <UButton block variant="outline" color="neutral" @click="cancelOrder"
-                class="text-black dark:text-white border-(--border-light) dark:border-(--border-dark) hover:bg-gray-100 dark:hover:bg-gray-700">
-                {{ t('Cancel') }}
-              </UButton>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="grid grid-cols-1 md:grid-cols-2 gap-5 md:gap-10">
-        <div class="flex-1">
-          <div
-            class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-6">
-            <h2 class="text-lg font-semibold text-black dark:text-white mb-4">{{ t('Select Delivery Address') }}</h2>
-            <div class="mb-4">
-              <UInput v-model="addressSearchQuery" type="text" :placeholder="t('Search address')"
                         class="w-full bg-white dark:bg-gray-800 text-black dark:text-white" />
                 </div>
-            <div v-if="addressStore.filteredAddresses.length > 0" class="space-y-3">
+                <div class="flex justify-end gap-2">
-              <label v-for="address in addressStore.filteredAddresses" :key="address.id"
+                    <UButton variant="outline" color="neutral" @click="showCreateModal = false">
-                class="flex items-start gap-3 p-4 border rounded-lg cursor-pointer transition-colors" :class="cartStore.selectedAddressId === address.id
+                        {{ t('Cancel') }}
-                  ? 'border-(--accent-blue-light) dark:border-(--accent-blue-dark) bg-blue-50 dark:bg-blue-900/20'
+                    </UButton>
-                  : 'border-(--border-light) dark:border-(--border-dark) hover:border-gray-400'">
+                    <UButton color="info" @click="createCart" :disabled="!newCartName.trim()"
-                <input type="radio" :value="address.id" v-model="selectedAddress"
+                        class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white">
-                  class="mt-1 w-4 h-4 text-(--text-sky-light) dark:text-(--text-sky-dark)" />
+                        {{ t('Create') }}
-                <div class="flex-1">
+                    </UButton>
-                  <p class="text-black dark:text-white font-medium">{{ address.street }}</p>
-                  <p class="text-gray-600 dark:text-gray-400 text-sm">{{ address.zipCode }}, {{ address.city }}</p>
-                  <p class="text-gray-600 dark:text-gray-400 text-sm">{{ address.country }}</p>
-                </div>
-              </label>
-            </div>
-            <div v-else class="text-center py-6">
-              <UIcon name="mdi:map-marker-outline" class="text-4xl text-gray-400 mb-2" />
-              <p class="text-gray-500 dark:text-gray-400">{{ t('No addresses found') }}</p>
-              <RouterLink :to="{ name: 'addresses' }"
-                class="inline-block mt-2 text-(--text-sky-light) dark:text-(--text-sky-dark) hover:underline">
-                {{ t('Add Address') }}
-              </RouterLink>
                 </div>
             </div>
-        </div>
+        </template>
-        <div class="flex-1">
+    </UModal>
-          <div
-            class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-6">
-            <h2 class="text-lg font-semibold text-black dark:text-white mb-4">{{ t('Delivery Method') }}</h2>
-            <div class="space-y-3">
-              <label v-for="method in cartStore.deliveryMethods" :key="method.id"
-                class="flex items-center gap-3 p-4 border rounded-lg cursor-pointer transition-colors" :class="cartStore.selectedDeliveryMethodId === method.id
-                  ? 'border-(--accent-blue-light) dark:border-(--accent-blue-dark) bg-blue-50 dark:bg-blue-900/20'
-                  : 'border-(--border-light) dark:border-(--border-dark) hover:border-gray-400'">
-                <input type="radio" :value="method.id" v-model="selectedDeliveryMethod"
-                  class="w-4 h-4 text-(--text-sky-light) dark:text-(--text-sky-dark)" />
-                <div class="flex-1">
-                  <div class="flex justify-between items-center">
-                    <span class="text-black dark:text-white font-medium">{{ method.name }}</span>
-                    <span class="text-(--text-sky-light) dark:text-(--text-sky-dark) font-medium">
-                      {{ method.price > 0 ? `$${method.price.toFixed(2)}` : t('Free') }}
-                    </span>
-                  </div>
-                  <p class="text-gray-500 dark:text-gray-400 text-sm">{{ method.description }}</p>
-                </div>
-              </label>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </component>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+import { ref, onMounted } from 'vue'
 import { useCartStore } from '@/stores/customer/cart'
-import { useAddressStore } from '@/stores/customer/address'
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
-import Default from '@/layouts/default.vue'
+
-const cartStore = useCartStore()
-const addressStore = useAddressStore()
-const { t } = useI18n()
 const router = useRouter()
 
-const selectedAddress = ref<number | null>(cartStore.selectedAddressId)
+const cartStore = useCartStore()
-const selectedDeliveryMethod = ref<number | null>(cartStore.selectedDeliveryMethodId)
+const { t } = useI18n()
-const addressSearchQuery = ref('')
 
-watch(addressSearchQuery, (val) => {
+const showCreateModal = ref(false)
-  addressStore.setSearchQuery(val)
+const newCartName = ref('')
-})
 
-watch(selectedAddress, (newValue) => {
+async function createCart() {
-  cartStore.setSelectedAddress(newValue)
+    await cartStore.addNewCart(newCartName.value)
-})
+    newCartName.value = ''
-
+    showCreateModal.value = false
-watch(selectedDeliveryMethod, (newValue) => {
-  if (newValue) {
-    cartStore.setDeliveryMethod(newValue)
-  }
-})
-
-const canPlaceOrder = computed(() => {
-  return cartStore.items.length > 0 &&
-    cartStore.selectedAddressId !== null &&
-    cartStore.selectedDeliveryMethodId !== null
-})
-function removeItem(itemId: number) {
-  cartStore.removeItem(itemId)
 }
 
-function placeOrder() {
+onMounted(() => {
-  if (canPlaceOrder.value) {
+    cartStore.fetchCarts()
-    console.log('Placing order...')
+})
-    alert(t('Order placed successfully!'))
+
-    cartStore.clearCart()
+function openCart(cart) {
-    router.push({ name: 'home' })
+    router.push({ name: 'customer-cart', params: { id: cart.cart_id } });
-  }
 }
 
-function cancelOrder() {
+function toggleCart(cartId: number) {
-  router.back()
+    if (cartStore.activeCartId === cartId) {
+        cartStore.setActiveCart(null)
+    } else {
+        cartStore.setActiveCart(cartId)
+    }
 }
 </script>

bo/src/components/customer/PageOrders.vue

@@ -1,9 +1,6 @@
 <template>
-    <component :is="Default || 'div'">
             Orders page
-    </component>
     </template>
 
 <script lang="ts" setup>
-import Default from '@/layouts/default.vue'
 </script>

bo/src/components/customer/PageProduct.vue

@@ -1,5 +1,4 @@
 <template>
-    <component :is="Default || 'div'">
             <div class="">
             <div class="flex md:flex-row flex-col justify-between gap-8 my-6">
                 <div class="flex-1">
@@ -79,14 +78,12 @@
             <hr class="border-t border-(--border-light) dark:border-(--border-dark) mb-8" />
             <ProductVariants />
         </div>
-    </component>
     </template>
 
 <script setup lang="ts">
 import { ref, computed } from 'vue'
 import ProductCustomization from './components/ProductCustomization.vue'
 import ProductVariants from './components/ProductVariants.vue'
-import Default from '@/layouts/default.vue'
 import { useFetchJson } from '@/composable/useFetchJson'
 import { useRoute } from 'vue-router'
 interface Color {
@@ -172,21 +169,21 @@ if (productData.colors.length > 0) {
 
 const route = useRoute()
 
-async function toggleFavorite() {
+// async function toggleFavorite() {
-    const url = `/api/v1/restricted/product/favorite/${route.params.product_id}`
+//     const url = `/api/v1/restricted/product/favorite/${route.params.product_id}`
 
-    try {
+//     try {
-        if (!productData.is_favorite) {
+//         if (!productData.is_favorite) {
-            await useFetchJson(url, { method: 'POST' })
+//             await useFetchJson(url, { method: 'POST' })
-        } else {
+//         } else {
-            await useFetchJson(url, { method: 'DELETE' })
+//             await useFetchJson(url, { method: 'DELETE' })
-        }
+//         }
 
-        productData.is_favorite = !productData.is_favorite
+//         productData.is_favorite = !productData.is_favorite
-    } catch (e: unknown) {
+//     } catch (e: unknown) {
-        console.error(e)
+//         console.error(e)
-    }
+//     }
-}
+// }
 </script>
 
 <style scoped>

bo/src/components/customer/PageProducts.vue

@@ -1,20 +1,11 @@
 <template>
     <suspense>
-        <component :is="Default || 'div'">
         <div class="">
-                <!-- <UNavigationMenu orientation="vertical" :items="listing" class="data-[orientation=vertical]:w-48">
-                    <template #item="{ item, active }">
-                        <div class="flex items-center gap-2 px-3 py-2">
-                            <UIcon name="i-heroicons-book-open" />
-                            <span>{{ item.name }}</span>
-                        </div>
-                    </template>
-</UNavigationMenu> -->
             <h1 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">Products</h1>
-                <div v-if="customerProductStore.loading" class="text-center py-8">
+            <!-- <div v-if="customerProductStore.loading" class="text-center py-8">
                 <span class="text-gray-600 dark:text-gray-400">Loading products...</span>
-                </div>
+            </div> -->
-                <div v-else-if="customerProductStore.error" class="mb-4 p-3 bg-red-100 text-red-700 rounded">
+            <div v-if="customerProductStore.error" class="mb-4 p-3 bg-red-100 text-red-700 rounded">
                 {{ customerProductStore.error }}
             </div>
             <div v-else class="overflow-x-auto">
@@ -22,8 +13,7 @@
                     <CategoryMenu />
                     <UTable :data="customerProductStore.productsList" :columns="columns" class="flex-1">
                         <template #expanded="{ row }">
-                                <UTable :data="customerProductStore.productsList.slice(0, 3)" :columns="columnsChild"
+                            <UTable :data="customerProductStore.productsList.slice(0, 3)" :columns="columnsChild" :ui="{
-                                    :ui="{
                                 thead: 'hidden'
                             }" />
                         </template>
@@ -39,99 +29,32 @@
                 </div>
             </div>
         </div>
-        </component>
     </suspense>
 </template>
 
 <script setup lang="ts">
-import { ref, watch, h, resolveComponent, computed } from 'vue'
+import { ref, watch, h, resolveComponent } from 'vue'
-import Default from '@/layouts/default.vue'
+import { useRouter } from 'vue-router'
-import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
 import CategoryMenu from '../inner/CategoryMenu.vue'
 import { useCustomerProductStore } from '@/stores/customer/customer-product'
 import type { Product } from '@/stores/customer/customer-product'
-
+import { useCartStore } from '@/stores/customer/cart'
+import { useToast } from '@nuxt/ui/runtime/composables/useToast.js'
+import { useTableState } from '@/composable/useTableState'
+import { debounce } from '@/composable/useDebouncedSearch'
 
 const customerProductStore = useCustomerProductStore()
-const router = useRouter()
+const { page, sortField, filters } = useTableState()
-const route = useRoute()
 
-const page = computed({
-    get: () => Number(route.query.page) || 1,
-    set: (val: number) => {
-        router.push({
-            query: {
-                ...route.query,
-                page: val
-            }
-        })
-    }
-})
-const sortField = computed({
-    get: () => [
-        route.query.sort as string | undefined,
-        route.query.direction as 'asc' | 'desc' | undefined
-    ],
 
-    set: ([sort]: [string, 'asc' | 'desc']) => {
-        const currentSort = route.query.sort as string | undefined
-        const currentDirection = route.query.direction as 'asc' | 'desc' | undefined
 
-        let query = { ...route.query }
+function getIcon(name: string) {
-
+    if (sortField.value[0] === name) {
-        if (currentSort === sort) {
+        if (sortField.value[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
-            if (currentDirection === 'asc') {
+        if (sortField.value[1] === 'desc') return 'i-lucide-arrow-down-wide-narrow'
-                query.direction = 'desc'
-            } else if (currentDirection === 'desc') {
-                delete query.sort
-                delete query.direction
-            } else {
-                query.direction = 'asc'
-                query.sort = sort
-            }
-        } else {
-            query.sort = sort
-            query.direction = 'asc'
-        }
-
-        router.push({ query })
-    }
-})
-
-const filters = computed<Record<string, string>>({
-    get: () => {
-        const q = { ...route.query }
-        delete q.page
-        delete q.sort
-        delete q.direction
-        return q as Record<string, string>
-    },
-    set: (val) => {
-        const baseQuery = { ...route.query }
-
-        Object.keys(baseQuery).forEach(key => {
-            if (!['page', 'sort', 'direction'].includes(key)) {
-                delete baseQuery[key]
-            }
-        })
-
-        router.push({
-            query: {
-                ...baseQuery,
-                ...val,
-                page: 1
-            }
-        })
-    }
-})
-
-function debounce(fn: Function, delay = 400) {
-    let t: any
-    return (...args: any[]) => {
-        clearTimeout(t)
-        t = setTimeout(() => fn(...args), delay)
     }
+    return 'i-lucide-arrow-up-down'
 }
 
 const updateFilter = debounce((columnId: string, val: string) => {
@@ -143,29 +66,11 @@ const updateFilter = debounce((columnId: string, val: string) => {
     filters.value = newFilters
 }, 400)
 
-
-
-function goToProduct(productId: number) {
-    router.push({
-        name: 'customer-product-details',
-        params: { product_id: productId }
-    })
-}
-
-
 const selectedCount = ref({
-    product_id: null,
+    product_id: null as number | null,
     count: 0
 })
 
-function getIcon(name: string) {
-    if (sortField.value[0] === name) {
-        if (sortField.value[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
-        if (sortField.value[1] === 'desc') return 'i-lucide-arrow-down-wide-narrow'
-    }
-    return 'i-lucide-arrow-up-down'
-}
-
 const UInputNumber = resolveComponent('UInputNumber')
 const UInput = resolveComponent('UInput')
 const UButton = resolveComponent('UButton')
@@ -216,7 +121,6 @@ const columns: TableColumn<Product>[] = [
                 })
             ])
         },
-        // header: '#',
         cell: ({ row }) => `#${row.getValue('product_id') as number}`
     },
     {
@@ -310,10 +214,9 @@ const columns: TableColumn<Product>[] = [
         cell: ({ row }) => {
             return h(UButton, {
                 onClick: () => {
-                    console.log('Clicked', row.original)
+                    addToCart(row.original.product_id)
                 },
                 color: selectedCount.value.product_id !== row.original.product_id ? 'info' : 'primary',
-                disabled: selectedCount.value.product_id !== row.original.product_id,
                 variant: 'solid'
             }, 'Add to cart')
         },
@@ -349,7 +252,7 @@ const columns: TableColumn<Product>[] = [
     }
 ]
 
-const columnsChild: TableColumn<Payment>[] = [
+const columnsChild: TableColumn<Product>[] = [
     {
         accessorKey: 'product_id',
         header: '',
@@ -405,7 +308,7 @@ const columnsChild: TableColumn<Payment>[] = [
         cell: ({ row }) => {
             return h(UButton, {
                 onClick: () => {
-                    console.log('Clicked', row.original)
+                    addToCart(row.original.product_id)
                 },
                 color: selectedCount.value.product_id !== row.original.product_id ? 'info' : 'primary',
                 disabled: selectedCount.value.product_id !== row.original.product_id,
@@ -426,14 +329,67 @@ const columnsChild: TableColumn<Payment>[] = [
                 variant: 'soft'
             }, () => 'Show product')
         },
+    },
+    {
+        accessorKey: 'counta',
+        header: '',
+        cell: ({ row }) => {
+            return h(UIcon, {
+                onClick: () => customerProductStore.toggleFavorite(row.original),
+                class: [
+                    'cursor-pointer text-[20px] transition-transform duration-200 hover:scale-125',
+                    row.original.is_favorite ? 'text-red-500' : 'text-blue-500'
+                ],
+                name: 'material-symbols:favorite',
+                variant: 'soft',
+            })
+        }
     }
 ]
 
+const router = useRouter()
+
+function goToProduct(productId: number) {
+    router.push({
+        name: 'customer-product-details',
+        params: { product_id: productId }
+    })
+}
+
+const cartStore = useCartStore()
+const toast = useToast()
+async function addToCart(product_id: number) {
+    if (!cartStore.activeCartId) {
+        toast.add({
+            title: "No cart selected",
+            description: "Please select a cart before adding products",
+            icon: "i-heroicons-exclamation-triangle",
+            duration: 5000
+        })
+        return
+    }
+
+    const count = selectedCount.value.count || 1
+    await cartStore.addProduct(product_id, count)
+
+    toast.add({
+        title: "Product added to cart",
+        description: `Quantity: ${count}`,
+        icon: "i-heroicons-check-circle",
+        duration: 5000
+    })
+}
+
 watch(
-    () => route.query,
+    [filters, sortField, page],
     () => {
-        customerProductStore.fetchProductList()
+        customerProductStore.fetchProductList({
+            ...filters.value,
+            sort: sortField.value[0],
+            direction: sortField.value[1],
+            page: page.value
+        })
     },
-    { immediate: true }
+    { immediate: true, deep: true }
 )
 </script>

bo/src/components/customer/PageProfileDetails.vue

@@ -1,5 +1,4 @@
 <template>
-    <component :is="Default || 'div'">
             <div class="">
             <div class="flex flex-col gap-5 mb-6">
                 <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Customer Data') }}</h1>
@@ -97,7 +96,6 @@
                 </div>
             </div>
         </div>
-    </component>
     </template>
 
 <script setup lang="ts">
@@ -106,7 +104,6 @@ import { useRouter } from 'vue-router'
 import { useCustomerStore } from '@/stores/customer'
 import { useAddressStore } from '@/stores/customer/address'
 import { useI18n } from 'vue-i18n'
-import Default from '@/layouts/default.vue'
 const router = useRouter()
 const customerStore = useCustomerStore()
 const addressStore = useAddressStore()

bo/src/components/customer/PageProfileDetailsAddInfo.vue

@@ -1,5 +1,4 @@
 <template>
-    <component :is="Default || 'div'">
             <div class="">
             <div class="max-w-2xl mx-auto">
                 <div class="flex flex-col gap-5 mb-6">
@@ -109,7 +108,6 @@
                 </div>
             </div>
         </div>
-    </component>
     </template>
 
 <script setup lang="ts">
@@ -119,7 +117,6 @@ import { useCustomerStore } from '@/stores/customer'
 import { useAddressStore } from '@/stores/customer/address'
 import { useI18n } from 'vue-i18n'
 import { useCartStore } from '@/stores/customer/cart'
-import Default from '@/layouts/default.vue'
 const router = useRouter()
 const customerStore = useCustomerStore()
 const addressStore = useAddressStore()

bo/src/components/customer/PageSearchProducts.vue

@@ -0,0 +1,368 @@
+<template>
+    <div class="pt-70! flex flex-col items-center justify-center bg-gray-50 dark:bg-(--main-dark)">
+        <h1 class="text-6xl font-bold text-black dark:text-white mb-14">
+            Search Products
+        </h1>
+
+        <div class="w-full max-w-4xl flex flex-col gap-2">
+            <div class="flex items-center gap-2 mt-3 text-gray-600 dark:text-gray-300">
+                <UCheckbox v-model="searchByReference" />
+                <span>Search by reference (ID)</span>
+            </div>
+            <UInput icon="i-lucide-search" type="text" placeholder="Type product name or ID..."
+                v-model="searchQuery" class="w-full!" :ui="{ base: 'py-4! rounded-full!' }" />
+        </div>
+
+        <div v-if="loading" class="mt-6">
+            Loading...
+        </div>
+
+        <p v-else-if="error" class="mt-6 text-red-500">
+            {{ error }}
+        </p>
+
+        <div v-else-if="products.length" class="flex items-center w-full">
+            <UTable :data="products" :columns="columns" class="mt-7" :ui="{ root: 'w-full!' }" />
+        </div>
+
+        <p v-else-if="searchQuery" class="mt-6">
+            No products found
+        </p>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { h, resolveComponent } from 'vue'
+import type { TableColumn } from '@nuxt/ui'
+import type { Product } from '@/types/product'
+import { useProductSearchApi } from '@/composable/useProductSearchApi'
+import { useTableState } from '@/composable/useTableState'
+import { debounce } from '@/composable/useDebouncedSearch'
+
+const {
+    searchQuery,
+    products,
+    loading,
+    error,
+    searchByReference,
+    selectedCount,
+    fetchProducts,
+    addToCart,
+    goToProduct
+} = useProductSearchApi()
+
+const { sortField, filters } = useTableState()
+
+const debouncedFetch = debounce(fetchProducts, 400)
+
+watch([searchQuery, searchByReference], () => {
+    debouncedFetch()
+})
+
+const UInputNumber = resolveComponent('UInputNumber')
+const UInput = resolveComponent('UInput')
+const UButton = resolveComponent('UButton')
+const UIcon = resolveComponent('UIcon')
+
+function getIcon(name: string) {
+    if (sortField.value[0] === name) {
+        if (sortField.value[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
+        if (sortField.value[1] === 'desc') return 'i-lucide-arrow-down-wide-narrow'
+    }
+    return 'i-lucide-arrow-up-down'
+}
+
+const updateFilter = debounce((columnId: string, val: string) => {
+    const newFilters = { ...filters.value }
+
+    if (val) newFilters[columnId] = val
+    else delete newFilters[columnId]
+
+    filters.value = newFilters
+}, 400)
+
+const columns: TableColumn<Product>[] = [
+    {
+        id: 'expand',
+        cell: ({ row }) =>
+            h(UButton, {
+                color: 'neutral',
+                variant: 'ghost',
+                icon: 'i-lucide-chevron-down',
+                square: true,
+                'aria-label': 'Expand',
+                ui: {
+                    leadingIcon: [
+                        'transition-transform',
+                        row.getIsExpanded() ? 'duration-200 rotate-180' : ''
+                    ]
+                },
+                onClick: () => row.toggleExpanded()
+            })
+    },
+    {
+        accessorKey: 'product_id',
+        header: ({ column }) => {
+            return h('div', { class: 'flex flex-col gap-1' }, [
+                h('div', {
+                    class: 'flex items-center gap-2 cursor-pointer',
+                    onClick: () => {
+                        sortField.value = ['product_id', 'asc']
+                    }
+                }, [
+                    h('span', 'ID'),
+                    h(UIcon, {
+                        name: getIcon('product_id')
+                    })
+                ]),
+
+                h(UInput, {
+                    placeholder: 'Search...',
+                    modelValue: filters.value[column.id] ?? '',
+                    'onUpdate:modelValue': (val: string) => {
+                        updateFilter(column.id, val)
+                    },
+                    size: 'xs'
+                })
+            ])
+        },
+        cell: ({ row }) => `#${row.getValue('product_id') as number}`
+    },
+    {
+        accessorKey: 'image_link',
+        header: 'Image',
+        cell: ({ row }) => {
+            return h('img', {
+                src: row.getValue('image_link') as string,
+                style: 'width:40px;height:40px;object-fit:cover;'
+            })
+        }
+    },
+    {
+        accessorKey: 'name',
+        header: ({ column }) => {
+            return h('div', { class: 'flex flex-col gap-1' }, [
+                h('div', {
+                    class: 'flex items-center gap-2 cursor-pointer',
+                    onClick: () => {
+                        sortField.value = ['name', 'asc']
+                    }
+                }, [
+                    h('span', 'Name'),
+                    h(UIcon, {
+                        name: getIcon('name')
+                    })
+                ]),
+
+                h(UInput, {
+                    placeholder: 'Search...',
+                    modelValue: filters.value[column.id] ?? '',
+                    'onUpdate:modelValue': (val: string) => {
+                        updateFilter(column.id, val)
+                    },
+                    size: 'xs'
+                })
+            ])
+        },
+        cell: ({ row }) => row.getValue('name') as string,
+        filterFn: (row, columnId, value) => {
+            const name = row.getValue(columnId) as string
+            return name.toLowerCase().includes(value.toLowerCase())
+        }
+    },
+    {
+        accessorKey: 'quantity',
+        header: ({ column }) => {
+            return h('div', { class: 'flex flex-col gap-1' }, [
+                h('div', {
+                    class: 'flex items-center gap-2 cursor-pointer',
+                    onClick: () => {
+                        sortField.value = ['quantity', 'asc']
+                    }
+                }, [
+                    h('span', 'In stock'),
+                    h(UIcon, {
+                        name: getIcon('quantity')
+                    })
+                ]),
+            ])
+        },
+        cell: ({ row }) => row.getValue('quantity') as number
+    },
+    {
+        accessorKey: 'count',
+        header: 'Count',
+        cell: ({ row }) => {
+            return h(UInputNumber, {
+                modelValue: selectedCount.value.product_id === row.original.product_id ? selectedCount.value.count : 0,
+                'onUpdate:modelValue': (val: number) => {
+                    if (val)
+                        selectedCount.value = {
+                            product_id: row.original.product_id,
+                            count: val
+                        }
+                    else {
+                        selectedCount.value = {
+                            product_id: null,
+                            count: 0
+                        }
+                    }
+                },
+                min: 0,
+                max: row.original.quantity
+            })
+        }
+    },
+    {
+        accessorKey: 'count',
+        header: '',
+        cell: ({ row }) => {
+            return h(UButton, {
+                onClick: () => {
+                    addToCart(row.original.product_id)
+                },
+                color: selectedCount.value.product_id !== row.original.product_id ? 'info' : 'primary',
+                variant: 'solid'
+            }, 'Add to cart')
+        },
+    },
+    {
+        accessorKey: 'count',
+        header: '',
+        cell: ({ row }) => {
+            return h(UButton, {
+                onClick: () => {
+                    goToProduct(row.original.product_id)
+                },
+                class: 'cursor-pointer',
+                color: 'info',
+                variant: 'soft'
+            }, () => 'Show product')
+        },
+    },
+    {
+        accessorKey: 'counta',
+        header: '',
+        cell: ({ row }) => {
+            return h(UIcon, {
+                onClick: () => toggleFavorite(row.original),
+                class: [
+                    'cursor-pointer text-[20px] transition-transform duration-200 hover:scale-125',
+                    row.original.is_favorite ? 'text-red-500' : 'text-blue-500'
+                ],
+                name: 'material-symbols:favorite',
+                variant: 'soft',
+            })
+        }
+    }
+]
+
+const columnsChild: TableColumn<Product>[] = [
+    {
+        accessorKey: 'product_id',
+        header: '',
+        cell: ({ row }) => `#${row.getValue('product_id') as number}`
+    },
+    {
+        accessorKey: 'image_link',
+        header: '',
+        cell: ({ row }) => {
+            return h('img', {
+                src: row.getValue('image_link') as string,
+                style: 'width:40px;height:40px;object-fit:cover;'
+            })
+        }
+    },
+    {
+        accessorKey: 'name',
+        header: '',
+        cell: ({ row }) => row.getValue('name') as string
+    },
+    {
+        accessorKey: 'quantity',
+        header: '',
+        cell: ({ row }) => row.getValue('quantity') as number
+    },
+    {
+        accessorKey: 'count',
+        header: '',
+        cell: ({ row }) => {
+            return h(UInputNumber, {
+                modelValue: selectedCount.value.product_id === row.original.product_id ? selectedCount.value.count : 0,
+                'onUpdate:modelValue': (val: number) => {
+                    if (val)
+                        selectedCount.value = {
+                            product_id: row.original.product_id,
+                            count: val
+                        }
+                    else {
+                        selectedCount.value = {
+                            product_id: null,
+                            count: 0
+                        }
+                    }
+                },
+                min: 0,
+                max: row.original.quantity
+            })
+        }
+    },
+    {
+        accessorKey: 'count',
+        header: '',
+        cell: ({ row }) => {
+            return h(UButton, {
+                onClick: () => {
+                    addToCart(row.original.product_id)
+                },
+                color: selectedCount.value.product_id !== row.original.product_id ? 'info' : 'primary',
+                disabled: selectedCount.value.product_id !== row.original.product_id,
+                variant: 'solid'
+            }, 'Add to cart')
+        },
+    },
+    {
+        accessorKey: 'count',
+        header: '',
+        cell: ({ row }) => {
+            return h(UButton, {
+                onClick: () => {
+                    goToProduct(row.original.product_id)
+                },
+                class: 'cursor-pointer',
+                color: 'info',
+                variant: 'soft'
+            }, () => 'Show product')
+        },
+    },
+    {
+        accessorKey: 'counta',
+        header: '',
+        cell: ({ row }) => {
+            return h(UIcon, {
+                onClick: () => toggleFavorite(row.original),
+                class: [
+                    'cursor-pointer text-[20px] transition-transform duration-200 hover:scale-125',
+                    row.original.is_favorite ? 'text-red-500' : 'text-blue-500'
+                ],
+                name: 'material-symbols:favorite',
+                variant: 'soft',
+            })
+        }
+    }
+]
+
+import { useCustomerProductStore } from '@/stores/customer/customer-product'
+const customerProductStore = useCustomerProductStore()
+
+function toggleFavorite(product: Product) {
+    customerProductStore.toggleFavorite(product)
+}
+</script>
+
+<style scoped>
+input::placeholder {
+    color: #9ca3af;
+}
+</style>

bo/src/components/customer/PageStatistic.vue

@@ -1,9 +1,6 @@
 <template>
-    <component :is="Default || 'div'">
             Statistic page
-    </component>
     </template>
 
 <script lang="ts" setup>
-import Default from '@/layouts/default.vue'
 </script>

bo/src/components/customer/StorageFileBrowser.vue

@@ -1,5 +1,4 @@
 <template>
-    <component :is="Default || 'div'">
             <div class="p-4">
             <div v-if="loading" class="flex justify-center py-8">
                 <ULoader />
@@ -25,13 +24,11 @@
                 </template>
             </UTree>
         </div>
-    </component>
     </template>
 
 <script setup lang="ts">
 import { ref, computed } from 'vue'
 import { useFetchJson } from '@/composable/useFetchJson'
-import Default from '@/layouts/default.vue'
 
 interface FileItemRaw {
     Name: string

bo/src/components/inner/CategoryMenu.vue

@@ -39,9 +39,10 @@ function adaptMenu(menu: NavigationMenuItem[]) {
     if (item.children && item.children.length > 0) {
       item.open = path && path.includes(item.category_id) ? true : openAll.value
       adaptMenu(item.children);
+
       item.children.unshift({
         label: item.label, icon: 'i-lucide-book-open', popover: item.label, to: {
-          name: 'admin-products-category', params: {
+          name: item.params.to, params: {
             category_id: item.params.category_id,
             link_rewrite: item.params.link_rewrite
           }
@@ -49,7 +50,7 @@ function adaptMenu(menu: NavigationMenuItem[]) {
       })
     } else {
       item.to = {
-        name: 'admin-products-category', params: {
+        name: item.params.to, params: {
           category_id: item.params.category_id,
           link_rewrite: item.params.link_rewrite
         }

bo/src/composable/useDebouncedSearch.ts

@@ -0,0 +1,32 @@
+import { ref, watch } from 'vue'
+
+export function useDebouncedSearch<T>(fetchFn: () => Promise<void>, delay = 400) {
+    const loading = ref(false)
+
+    function debounce<T extends (...args: any[]) => any>(fn: T, delay: number) {
+        let t: ReturnType<typeof setTimeout> | null = null
+        return (...args: Parameters<T>) => {
+            if (t) clearTimeout(t)
+            t = setTimeout(() => fn(...args), delay)
+        }
+    }
+
+    const debouncedFetch = debounce(fetchFn, delay)
+
+    watch(() => { }, () => {
+        loading.value = false
+    }, { immediate: true })
+
+    return {
+        loading,
+        debouncedFetch
+    }
+}
+
+export function debounce<T extends (...args: any[]) => any>(fn: T, delay: number): (...args: Parameters<T>) => void {
+    let t: ReturnType<typeof setTimeout> | null = null
+    return (...args: Parameters<T>) => {
+        if (t) clearTimeout(t)
+        t = setTimeout(() => fn(...args), delay)
+    }
+}

bo/src/composable/useProductSearchApi.ts

@@ -0,0 +1,109 @@
+import { ref } from 'vue'
+import { useRouter } from 'vue-router'
+import { useCartStore } from '@/stores/customer/cart'
+import { useCustomerProductStore } from '@/stores/customer/customer-product'
+import { useToast } from '@nuxt/ui/runtime/composables/useToast.js'
+import { useFetchJson } from '@/composable/useFetchJson'
+
+export interface SearchProductParams {
+    query: string
+    searchByReference?: boolean
+}
+
+export function useProductSearchApi() {
+    const router = useRouter()
+    const cartStore = useCartStore()
+    const customerProductStore = useCustomerProductStore()
+    const toast = useToast()
+
+    const searchQuery = ref('')
+    const products = ref<any[]>([])
+    const loading = ref(false)
+    const error = ref<string | null>(null)
+    const searchByReference = ref(false)
+
+    const selectedCount = ref({
+        product_id: null as number | null,
+        count: 0
+    })
+
+    async function fetchProducts() {
+        if (!searchQuery.value.trim()) {
+            products.value = []
+            return
+        }
+
+        loading.value = true
+        error.value = null
+
+        try {
+            let query = ''
+
+            if (searchByReference.value) {
+                query = `reference_eq=${searchQuery.value.trim()}`
+            } else {
+                query = `name=~${searchQuery.value.trim()}`
+            }
+
+            const result = await useFetchJson(
+                `/api/v1/restricted/product/list?elems=30&${query}`
+            )
+
+            products.value = result.items || []
+        } catch (e) {
+            error.value = 'Failed to load products'
+        } finally {
+            loading.value = false
+        }
+    }
+
+    async function addToCart(product_id: number) {
+        if (!cartStore.activeCartId) {
+            toast.add({
+                title: "No cart selected",
+                description: "Please select a cart before adding products",
+                icon: "i-heroicons-exclamation-triangle",
+                duration: 5000
+            })
+            return
+        }
+
+        const count = selectedCount.value.count || 1
+        await cartStore.addProduct(product_id, count)
+
+        toast.add({
+            title: "Product added to cart",
+            description: `Quantity: ${count}`,
+            icon: "i-heroicons-check-circle",
+            duration: 5000
+        })
+    }
+
+    function goToProduct(productId: number) {
+        router.push({
+            name: 'customer-product-details',
+            params: { product_id: productId }
+        })
+    }
+
+    function getSortIcon(field: string, sortValue: [string | undefined, string | undefined]): string {
+        if (sortValue[0] === field) {
+            if (sortValue[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
+            if (sortValue[1] === 'desc') return 'i-lucide-arrow-down-wide-narrow'
+        }
+        return 'i-lucide-arrow-up-down'
+    }
+
+    return {
+        searchQuery,
+        products,
+        loading,
+        error,
+        searchByReference,
+        selectedCount,
+        fetchProducts,
+        addToCart,
+        goToProduct,
+        getSortIcon
+    }
+}

bo/src/composable/useTableState.ts

@@ -0,0 +1,82 @@
+import { computed } from 'vue'
+import { useRoute, useRouter } from 'vue-router'
+
+export function useTableState() {
+    const route = useRoute()
+    const router = useRouter()
+
+    const page = computed({
+        get: () => Number(route.query.page) || 1,
+        set: (val: number) => {
+            router.push({
+                query: {
+                    ...route.query,
+                    page: val
+                }
+            })
+        }
+    })
+
+    const sortField = computed({
+        get: () => [
+            route.query.sort as string | undefined,
+            route.query.direction as 'asc' | 'desc' | undefined
+        ],
+        set: ([sort]: [string, 'asc' | 'desc']) => {
+            const currentSort = route.query.sort as string | undefined
+            const currentDirection = route.query.direction as 'asc' | 'desc' | undefined
+
+            let query = { ...route.query }
+
+            if (currentSort === sort) {
+                if (currentDirection === 'asc') {
+                    query.direction = 'desc'
+                } else if (currentDirection === 'desc') {
+                    delete query.sort
+                    delete query.direction
+                } else {
+                    query.direction = 'asc'
+                    query.sort = sort
+                }
+            } else {
+                query.sort = sort
+                query.direction = 'asc'
+            }
+
+            router.push({ query })
+        }
+    })
+
+    const filters = computed<Record<string, string>>({
+        get: () => {
+            const q = { ...route.query }
+            delete q.page
+            delete q.sort
+            delete q.direction
+            return q as Record<string, string>
+        },
+        set: (val) => {
+            const baseQuery = { ...route.query }
+
+            Object.keys(baseQuery).forEach(key => {
+                if (!['page', 'sort', 'direction'].includes(key)) {
+                    delete baseQuery[key]
+                }
+            })
+
+            router.push({
+                query: {
+                    ...baseQuery,
+                    ...val,
+                    page: 1
+                }
+            })
+        }
+    })
+
+    return {
+        page,
+        sortField,
+        filters
+    }
+}

bo/src/layouts/default.vue

@@ -34,11 +34,34 @@
 
     <div class="flex-1 flex flex-col">
       <div class="flex h-(--ui-header-height) shrink-0 items-center justify-between px-4 border-b border-default">
+        <div class="flex items-center gap-5">
           <div class="flex items-center gap-2">
             <UButton icon="i-lucide-panel-left" color="neutral" variant="ghost" aria-label="Toggle sidebar"
               @click="open = !open" />
             <span class="text-[20px] font-medium">{{ pageTitle }}</span>
           </div>
+          <div>
+            <div v-if="cartStore.activeCart"
+              class="flex items-center gap-2 p-1 rounded-md bg-gray-100 dark:bg-gray-800">
+              <UIcon name="i-lucide-shopping-cart" />
+
+              <div class="flex gap-2">
+                <p class="text-sm font-medium">
+                  {{ cartStore.activeCart.name }}-
+                  <span class="text-xs text-gray-400">
+                    ID: {{ cartStore.activeCart.cart_id }}
+                  </span>
+                </p>
+
+              </div>
+            </div>
+
+            <span v-else class="text-sm text-red-400 flex gap-1 items-center">
+              <UIcon name="i-lucide-shopping-cart" />
+              No cart selected
+            </span>
+          </div>
+        </div>
 
         <div class="hidden md:flex items-center gap-12">
           <div class="flex items-center gap-2">
@@ -172,6 +195,7 @@ import LangSwitch from '@/components/inner/LangSwitch.vue'
 import ThemeSwitch from '@/components/inner/ThemeSwitch.vue'
 import type { LabelTrans, TopMenuItem } from '@/types'
 import { useUserStore } from '@/stores/user'
+import { useCartStore } from '@/stores/customer/cart'
 
 
 const router = useRouter()
@@ -297,5 +321,11 @@ const userItems = computed<DropdownMenuItem[][]>(() => [
   ]
 ])
 
+const cartStore = useCartStore()
+
+onMounted(() => {
+  cartStore.initCart()
+})
+
 defineShortcuts(extractShortcuts(teamsItems.value))
 </script>

bo/src/layouts/management.vue

@@ -180,7 +180,6 @@ const router = useRouter()
 const menu = ref<TopMenuItem[] | null>(null)
 
 const Id = Number(route.params.user_id)
-
 async function cmGetTopMenu() {
     try {
         const { items } = await useFetchJson<TopMenuItem[]>(`/api/v1/restricted/menu/get-top-menu?target_user_id=${Id}`)
@@ -191,7 +190,6 @@ async function cmGetTopMenu() {
     }
 }
 
-console.log(route)
 watch(
     () => route.params.user_id,
     () => {

bo/src/router/index.ts

@@ -13,13 +13,30 @@ await getSettings()
 
 const routes = await getRoutes()
 let newRoutes = []
+
+function getLayoutFromComponent(path: string) {
+  const emptyLayouts = [
+    'LoginView.vue',
+    'RegisterView.vue',
+    'PasswordRecoveryView.vue',
+    'VerifyEmailView.vue',
+    'ResetPasswordForm.vue'
+  ]
+  return emptyLayouts.some((name) => path.includes(name)) ? 'empty' : 'default'
+}
+
 for (let r of routes) {
   const component = () => import(/* @vite-ignore */ `..${r.component}`)
+  const parsedMeta = r.meta ? JSON.parse(r.meta) : {}
+  const layout = parsedMeta.layout ?? getLayoutFromComponent(r.component)
   newRoutes.push({
     path: r.path,
     component,
     name: r.name,
-    meta: r.meta ? JSON.parse(r.meta) : {},
+    meta: {
+      ...parsedMeta,
+      layout,
+    },
   })
 }
 
@@ -73,15 +90,21 @@ async function setRoutes() {
     }
 
     const importedComponent = (await importer()).default
+    const parsedMeta = item.meta ? JSON.parse(item.meta) : {}
+    const layout = parsedMeta.layout ?? getLayoutFromComponent(item.component)
 
     router.addRoute('locale', {
       path: item.path,
       component: importedComponent,
       name: item.name,
-      meta: item.meta ? JSON.parse(item.meta) : {}
+      meta: {
+        ...parsedMeta,
+        layout,
+      }
     })
   }
   
+  console.log(router);
   // await router.replace(router.currentRoute.value.fullPath)
 }
 

bo/src/stores/customer/address.ts

@@ -1,5 +1,7 @@
+import { useFetchJson } from '@/composable/useFetchJson'
 import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
+import type { AddressTemplate } from './cart'
 
 export interface AddressFormData {
   street: string
@@ -17,7 +19,6 @@ export interface Address {
 }
 
 export const useAddressStore = defineStore('address', () => {
-  const addresses = ref<Address[]>([])
   const loading = ref(false)
   const error = ref<string | null>(null)
 
@@ -50,11 +51,6 @@ export const useAddressStore = defineStore('address', () => {
   const totalItems = computed(() => filteredAddresses.value.length)
   const totalPages = computed(() => Math.ceil(totalItems.value / pageSize))
 
-  const paginatedAddresses = computed(() => {
-    const start = (currentPage.value - 1) * pageSize
-    return filteredAddresses.value.slice(start, start + pageSize)
-  })
-
   function getAddressById(id: number) {
     return addresses.value.find(addr => addr.id === id)
   }
@@ -72,41 +68,6 @@ export const useAddressStore = defineStore('address', () => {
     return Math.max(0, ...addresses.value.map(a => a.id)) + 1
   }
 
-  function addAddress(formData: AddressFormData): Address {
-    const newAddress: Address = {
-      id: generateId(),
-      ...normalize(formData)
-    }
-
-    addresses.value.unshift(newAddress)
-    resetPagination()
-
-    return newAddress
-  }
-
-  function updateAddress(id: number, formData: AddressFormData): boolean {
-    const index = addresses.value.findIndex(a => a.id === id)
-    if (index === -1) return false
-
-    const existing = addresses.value[index]
-    if (!existing) return false
-
-    addresses.value[index] = {
-      id: existing.id,
-      ...normalize(formData)
-    }
-    return true
-  }
-  function deleteAddress(id: number): boolean {
-    const index = addresses.value.findIndex(a => a.id === id)
-    if (index === -1) return false
-
-    addresses.value.splice(index, 1)
-    resetPagination()
-
-    return true
-  }
-
   function setPage(page: number) {
     currentPage.value = page
   }
@@ -122,6 +83,121 @@ export const useAddressStore = defineStore('address', () => {
 
   initMockData()
 
+  const addresses = ref<Address[]>([])
+  const addressLoading = ref(false)
+  const addressError = ref<string | null>(null)
+  const addressSearchQuery = ref('')
+  const addressCurrentPage = ref(1)
+  const addressPageSize = 20
+  const addressTotalCount = ref(0)
+
+  function transformAddressResponse(address: any): Address {
+    const info = address.address_info || address.addressInfo || {}
+
+    return {
+      id: address.id ?? 0,
+      country_id: address.country_id ?? address.countryId ?? 1,
+      customer_id: address.customer_id ?? address.customerId ?? 0,
+      address_info: info as Record<string, string>
+    }
+  }
+
+  async function fetchAddresses() {
+    addressLoading.value = true
+    addressError.value = null
+
+    try {
+      const queryParam = addressSearchQuery.value ? `&query=${encodeURIComponent(addressSearchQuery.value)}` : ''
+      const response = await useFetchJson<Address[]>(`/api/v1/restricted/addresses/retrieve-addresses?page=${addressCurrentPage.value}&elems=${addressPageSize}${queryParam}`)
+      addresses.value = response.items || []
+      addressTotalCount.value = response.count ?? addresses.value.length
+    } catch (error: unknown) {
+      addressError.value = error instanceof Error ? error.message : 'Failed to load addresses'
+    } finally {
+      addressLoading.value = false
+    }
+  }
+
+  async function addAddress(countryId: number, formData: AddressTemplate): Promise<Address | null> {
+    addressLoading.value = true
+    addressError.value = null
+
+    try {
+      const response = await useFetchJson<any>(`/api/v1/restricted/addresses/add-new-address?country_id=${countryId}`, {
+        method: 'POST',
+        body: JSON.stringify(formData)
+      })
+
+      await fetchAddresses()
+      return transformAddressResponse(response.items ?? response)
+    } catch (error: unknown) {
+      addressError.value = error instanceof Error ? error.message : 'Failed to create address'
+      return null
+    } finally {
+      addressLoading.value = false
+    }
+  }
+
+  async function getAddressTemplate(countryId: number): Promise<AddressTemplate> {
+    const response = await useFetchJson<any>(`/api/v1/restricted/addresses/get-template?country_id=${countryId}`)
+    return response.items ?? {}
+  }
+
+  async function updateAddress(id: number, countryId: number, formData: AddressTemplate): Promise<boolean> {
+    addressLoading.value = true
+    addressError.value = null
+
+    try {
+      await useFetchJson<any>(`/api/v1/restricted/addresses/modify-address?country_id=${countryId}&address_id=${id}`, {
+        method: 'POST',
+        body: JSON.stringify(formData)
+      })
+
+      await fetchAddresses()
+      return true
+    } catch (error: unknown) {
+      addressError.value = error instanceof Error ? error.message : 'Failed to update address'
+      return false
+    } finally {
+      addressLoading.value = false
+    }
+  }
+
+  async function deleteAddress(id: number): Promise<boolean> {
+    addressLoading.value = true
+    addressError.value = null
+
+    try {
+      await useFetchJson<any>(`/api/v1/restricted/addresses/delete-address?address_id=${id}`, {
+        method: 'DELETE'
+      })
+
+      await fetchAddresses()
+      return true
+    } catch (error: unknown) {
+      addressError.value = error instanceof Error ? error.message : 'Failed to delete address'
+      return false
+    } finally {
+      addressLoading.value = false
+    }
+  }
+
+  const totalAddressItems = computed(() => addressTotalCount.value || addresses.value.length)
+  const totalAddressPages = computed(() => Math.ceil(totalAddressItems.value / addressPageSize))
+
+  const paginatedAddresses = computed(() => addresses.value)
+
+  function setAddressPage(page: number) {
+    addressCurrentPage.value = page
+    return fetchAddresses()
+  }
+
+  function setAddressSearchQuery(query: string) {
+    addressSearchQuery.value = query
+    addressCurrentPage.value = 1
+    return fetchAddresses()
+  }
+
   return {
     addresses, 
     loading,
@@ -139,6 +215,17 @@ export const useAddressStore = defineStore('address', () => {
     deleteAddress,
     setPage,
     setSearchQuery,
-    resetPagination
+    resetPagination,
+    addressLoading,
+    addressError,
+    addressSearchQuery,
+    addressCurrentPage,
+    addressPageSize,
+    totalAddressItems,
+    totalAddressPages,
+    fetchAddresses,
+    setAddressPage,
+    setAddressSearchQuery,
+    getAddressTemplate
   }
 })

bo/src/stores/customer/cart.ts

@@ -1,129 +1,121 @@
 import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
+import { computed, ref } from 'vue'
+import { useFetchJson } from '@/composable/useFetchJson'
+import type { ApiResponse } from '@/types'
+import { useRoute } from 'vue-router'
 
-export interface CartItem {
+export interface Cart {
-  id: number
-  productId: number
-  name: string
-  image: string
-  price: number
-  quantity: number
-  product_number: string
-}
-
-export interface DeliveryMethod {
   id: number
   name: string
-  price: number
+  items: any[]
-  description: string
 }
 
+export interface Address {
+  id: number
+  country_id: number
+  customer_id: number
+  address_info: Record<string, string>
+}
+
+export type AddressTemplate = Record<string, string>
+
 export const useCartStore = defineStore('cart', () => {
-  const items = ref<CartItem[]>([])
+  const carts = ref<Cart[]>([])
-  const selectedAddressId = ref<number | null>(null)
+  const activeCartId = ref<number | null>(null)
-  const selectedDeliveryMethodId = ref<number | null>(null)
+  const error = ref<string | null>(null)
-  const shippingCost = ref(0)
-  const vatRate = ref(0.23) // 23% VAT
-  const currentPage = ref(1)
-  const deliveryMethods = ref<DeliveryMethod[]>([
-    { id: 1, name: 'Standard Delivery', price: 0, description: '5-7 business days' },
-    { id: 2, name: 'Express Delivery', price: 15, description: '2-3 business days' },
-    { id: 3, name: 'Priority Delivery', price: 30, description: 'Next business day' }
-  ])
 
-  function initMockData() {
+  async function fetchCarts() {
-    items.value = [
+    try {
-      { id: 1, productId: 101, name: 'Premium Widget Pro', product_number: 'NC209/7000', image: '/img/product-1.jpg', price: 129.99, quantity: 2 },
+      const res = await useFetchJson<ApiResponse>(
-      { id: 2, productId: 102, name: 'Ultra Gadget X', product_number: 'NC234/6453', image: '/img/product-2.jpg', price: 89.50, quantity: 1 },
+        `/api/v1/restricted/carts/retrieve-carts-info`
-      { id: 3, productId: 103, name: 'Mega Tool Set', product_number: 'NC324/9030', image: '/img/product-3.jpg', price: 249.00, quantity: 3 }
+      )
-    ]
+
+      carts.value = res.items
+    } catch (e: any) {
+      error.value = e?.message ?? 'Error loading carts'
+    }
   }
 
-  const productsTotal = computed(() => {
+async function addNewCart(name: string) {
-    return items.value.reduce((sum, item) => sum + (item.price * item.quantity), 0)
+  if (!name.trim()) {
-  })
+    error.value = 'Cart name is required'
+    return
+  }
 
-  const vatAmount = computed(() => {
+  try {
-    return productsTotal.value * vatRate.value
+    error.value = null
-  })
 
-  const orderTotal = computed(() => {
+    const url = `/api/v1/restricted/carts/add-new-cart?name=${name}`
-    return productsTotal.value + shippingCost.value + vatAmount.value
+    const response = await useFetchJson<ApiResponse>(url)
-  })
 
-  const itemCount = computed(() => {
+    const newCart: Cart = {
-    return items.value.reduce((sum, item) => sum + item.quantity, 0)
+      id: response.items.cart_id,
-  })
+      name: response.items.name,
+      items: []
+    }
 
-  function updateQuantity(itemId: number, quantity: number) {
+    carts.value.push(newCart)
-    const item = items.value.find(i => i.id === itemId)
+    activeCartId.value = newCart.id
-    if (item) {
+
-      if (quantity <= 0) {
+    return newCart
-        removeItem(itemId)
+  } catch (e: any) {
+    error.value = e?.message ?? 'Error creating cart'
+  }
+}
+
+  const route = useRoute()
+  const amount = ref<number>(1);
+  const errorMessage = ref('');
+
+  async function addProduct(product_id: number, count: number) {
+    if (!activeCartId.value) {
+      errorMessage.value = 'No active cart selected'
+      return
+    }
+
+    try {
+      const res = await useFetchJson<ApiResponse>(
+        `/api/v1/restricted/carts/add-product-to-cart?cart_id=${activeCartId.value}&product_id=${product_id}&amount=${count}&set_amount=false`
+      )
+
+      console.log('fsdfsdfdsfdsfs', res)
+    } catch (e: any) {
+      errorMessage.value = e?.message ?? 'Error adding product'
+    }
+  }
+
+  function setActiveCart(id: number | null) {
+    activeCartId.value = id
+
+    if (id) {
+      localStorage.setItem('activeCartId', String(id))
     } else {
-        item.quantity = quantity
+      localStorage.removeItem('activeCartId')
-      }
-    }
-  }
-
-  function deleteProduct(id: number): boolean {
-    const index = items.value.findIndex(a => a.id === id)
-    if (index === -1) return false
-
-    items.value.splice(index, 1)
-    resetProductPagination()
-
-    return true
-  }
-
-  function resetProductPagination() {
-    currentPage.value = 1
-  }
-
-  function removeItem(itemId: number) {
-    const index = items.value.findIndex(i => i.id === itemId)
-    if (index !== -1) {
-      items.value.splice(index, 1)
     }
   }
 
-  function clearCart() {
+  function initCart() {
-    items.value = []
+    const saved = localStorage.getItem('activeCartId')
-    selectedAddressId.value = null
-    selectedDeliveryMethodId.value = null
-    shippingCost.value = 0
-  }
 
-  function setSelectedAddress(addressId: number | null) {
+    if (saved) {
-    selectedAddressId.value = addressId
+      activeCartId.value = Number(saved)
-  }
-
-  function setDeliveryMethod(methodId: number) {
-    selectedDeliveryMethodId.value = methodId
-    const method = deliveryMethods.value.find(m => m.id === methodId)
-    if (method) {
-      shippingCost.value = method.price
     }
   }
 
-  initMockData()
+  const activeCart = computed(() => {
+    return carts.value.find(c => c.cart_id === activeCartId.value)
+  })
 
   return {
-    items,
+    carts,
-    selectedAddressId,
+    activeCartId,
-    selectedDeliveryMethodId,
+    error,
-    shippingCost,
+    errorMessage,
-    vatRate,
+    activeCart,
-    deliveryMethods,
+    setActiveCart,
-    productsTotal,
+    addProduct,
-    vatAmount,
+    fetchCarts,
-    orderTotal,
+    addNewCart,
-    itemCount,
+    initCart,
-    deleteProduct,
-    updateQuantity,
-    removeItem,
-    clearCart,
-    setSelectedAddress,
-    setDeliveryMethod
   }
 })

bo/src/stores/customer/customer-product.ts

@@ -11,6 +11,7 @@ export interface Product {
     productDetails?: string
     product_id: number
     is_favorite?: boolean
+    quantity: number
 }
 
 export interface ProductResponse {
@@ -32,29 +33,30 @@ export const useCustomerProductStore = defineStore('customer-product', () => {
     const total = ref(0)
     const perPage = ref(15)
 
-    async function fetchProductList() {
+    async function fetchProductList(paramsObj: Record<string, any>) {
         loading.value = true
         error.value = null
 
         const params = new URLSearchParams()
 
-        Object.entries(route.query).forEach(([key, value]) => {
+        Object.entries(paramsObj).forEach(([key, value]) => {
             if (value) params.append(key, String(value))
         })
 
         const url = `/api/v1/restricted/product/list?${params}`
 
-
         try {
             const response = await useFetchJson<ApiResponse>(url)
             productsList.value = response.items || []
             total.value = response.count || 0
-        } catch (e: unknown) {
-            error.value = e instanceof Error ? e.message : 'Failed to load products'
         } finally {
             loading.value = false
         }
     }
+    function updateFavoriteState(product_id: number, value: boolean) {
+        const p = productsList.value.find(p => p.product_id === product_id)
+        if (p) p.is_favorite = value
+    }
 
     async function toggleFavorite(product: Product) {
         const productId = product.product_id
@@ -64,11 +66,19 @@ export const useCustomerProductStore = defineStore('customer-product', () => {
 
         try {
             if (!isFavorite) {
-                await useFetchJson(url, { method: 'POST' })
+                await useFetchJson(url, {
+                    method: 'POST',
+                    body: JSON.stringify({
+                        id: productId
+                    }),
+                })
             } else {
-                await useFetchJson(url, { method: 'DELETE' })
+                await useFetchJson(url, {
+                    method: 'DELETE',
+                })
             }
-            product.is_favorite = !isFavorite
+
+            product.is_favorite = !product.is_favorite
         } catch (e: unknown) {
             error.value = e instanceof Error ? e.message : 'Failed to update favorite'
         }
@@ -77,6 +87,7 @@ export const useCustomerProductStore = defineStore('customer-product', () => {
     return {
         fetchProductList,
         toggleFavorite,
+        updateFavoriteState,
         productsList,
         total,
         loading,

bo/src/views/CategoryView.vue

@@ -1,42 +0,0 @@
-<template>
-    <component :is="Default || 'div'">
-        <div class="container mt-24">
-            <div class="row">
-                <!-- <div class="col-12">
-                    <h2 class="text-2xl">Category ID: {{ $route.params.category_id }}</h2>
-                    <div v-for="(p, i) in products" :key="i">
-                        <p>
-                            <span class="border-b-1 bg-red-100 px-4">{{ p.name }}</span>
-                            <span class="border-b-1 bg-red-100 px-4">{{ p.price }}</span>
-                        </p>
-                    </div>
-                </div> -->
-            </div>
-        </div>
-    </component>
-</template>
-
-
-<script setup lang="ts">
-// import { useRoute } from 'vue-router';
-import Default from '@/layouts/default.vue';
-import { useCategoryStore } from '@/stores/admin/category';
-import { ref, watch } from 'vue';
-import { useRoute } from 'vue-router';
-// const route = useRoute()
-// console.log(route);
-
-const categoryStore = useCategoryStore()
-const route = useRoute()
-
-const products = ref([])
-
-watch(() => route.params, async (n) => {
-    categoryStore.setCategoryID(parseInt(n.category_id as string))
-    const res = await categoryStore.getCategoryProducts()
-    // products.value = res
-
-}, { immediate: true })
-
-
-</script>

bo/src/views/HomeView.vue

@@ -1,9 +1,6 @@
 <template>
-        <component :is="Default || 'div'">
                     home View
-        </component>
         </template>
 <script setup lang="ts">
-import Default from '@/layouts/default.vue';
 
 </script>

bo/src/views/RepoChartView.vue

@@ -15,7 +15,6 @@ import { useAuthStore } from '@/stores/customer/auth'
 import { i18n } from '@/plugins/02_i18n'
 import type { TableColumn } from '@nuxt/ui'
 import { useI18n } from 'vue-i18n'
-import Default from '@/layouts/default.vue'
 
 ChartJS.register(Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale)
 
@@ -182,7 +181,6 @@ const columns = computed<TableColumn<IssueTimeSummary>[]>(() => [
 </script>
 
 <template>
-      <component :is="Default || 'div'">
           <div class="">
         <div class="p-6 bg-(--main-light) dark:bg-(--black) font-sans">
             <h1 class="text-2xl font-bold mb-6 text-black dark:text-white">{{ $t('repo_chart.repository_work_chart') }}
@@ -256,5 +254,4 @@ const columns = computed<TableColumn<IssueTimeSummary>[]>(() => [
             </div>
         </div>
     </div>
-    </component>
     </template>

bo/src/views/StorageView.vue

@@ -7,6 +7,5 @@
 </template>
 
 <script setup lang="ts">
-import Default from '@/layouts/default.vue'
 import StorageFileBrowser from '@/components/customer/StorageFileBrowser.vue'
 </script>

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/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&reference=~NC100"
+  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,13 +16,23 @@ 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: ~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
     data: ""

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/b2b_daniel/addresses/folder.yml

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

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

@@ -1,11 +1,11 @@
 info:
   name: add-product-to-cart (1)
   type: http
-  seq: 1
+  seq: 2
 
 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

@@ -1,11 +1,11 @@
 info:
   name: add-product-to-cart
   type: http
-  seq: 14
+  seq: 6
 
 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=1&set_amount=true
   params:
     - name: cart_id
       value: "1"
@@ -19,6 +19,9 @@ http:
     - name: amount
       value: "1"
       type: query
+    - name: set_amount
+      value: "true"
+      type: query
   auth: inherit
 
 settings:

bruno/b2b_daniel/carts/change-cart-name.yml

@@ -1,7 +1,7 @@
 info:
   name: change-cart-name
   type: http
-  seq: 1
+  seq: 3
 
 http:
   method: GET

bruno/b2b_daniel/carts/retrieve-cart.yml

@@ -1,14 +1,14 @@
 info:
   name: retrieve-cart
   type: http
-  seq: 1
+  seq: 4
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/carts/retrieve-cart?cart_id=3
+  url: http://localhost:3000/api/v1/restricted/carts/retrieve-cart?cart_id=1
   params:
     - name: cart_id
-      value: "3"
+      value: "1"
       type: query
   auth: inherit
 

bruno/b2b_daniel/carts/retrieve-carts-info.yml

@@ -1,7 +1,7 @@
 info:
   name: retrieve-carts-info
   type: http
-  seq: 1
+  seq: 5
 
 http:
   method: GET

bruno/b2b_daniel/environments/dev.yml

@@ -0,0 +1 @@
+name: dev

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/change-order-address.yml

@@ -0,0 +1,33 @@
+info:
+  name: change-order-address
+  type: http
+  seq: 3
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/orders/change-order-address?order_id=1&country_id=1
+  params:
+    - name: order_id
+      value: "1"
+      type: query
+    - name: country_id
+      value: "1"
+      type: query
+  body:
+    type: json
+    data: |-
+      {
+        "postal_code": "31-154",
+        "city": "Kraków",
+        "voivodeship": "śląskie",
+        "street": "Długa",
+        "building_no": "5",
+        "recipient": "Adam Adamowicz"
+      }
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b_daniel/orders/change-order-status.yml

@@ -0,0 +1,22 @@
+info:
+  name: change-order-status
+  type: http
+  seq: 4
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/orders/change-order-status?order_id=1&status=PAID
+  params:
+    - name: order_id
+      value: "1"
+      type: query
+    - name: status
+      value: PAID
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5