Merge remote-tracking branch 'origin/main' into front-styles

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/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

@@ -32,6 +32,7 @@ func CustomerHandlerRoutes(r fiber.Router) fiber.Router {
 
 	r.Get("", handler.customerData)
 	r.Get("/list", middleware.Require(perms.UserReadAny), handler.listCustomers)
+	r.Patch("/no-vat", middleware.Require(perms.UserWriteAny), handler.setCustomerNoVatStatus)
 	return r
 }
 
@@ -100,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/product.go

@@ -112,6 +112,7 @@ var columnMappingListProducts map[string]string = map[string]string{
 	"quantity":    "bp.quantity",
 	"is_favorite": "bp.is_favorite",
 	"is_new":      "bp.is_new",
+	"is_oem":      "bp.is_oem",
 }
 
 func (h *ProductsHandler) AddToFavorites(c fiber.Ctx) error {

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

@@ -12,7 +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          uint    `gorm:"column:is_new" json:"is_new"`
+	IsNew          bool    `gorm:"column:is_new" json:"is_new"`
+	IsOEM          bool    `gorm:"column:is_oem" json:"is_oem"`
 }
 
 type ProductFilters struct {

app/repos/cartsRepo/cartsRepo.go

@@ -1,21 +1,26 @@
 package cartsRepo
 
 import (
+	"errors"
+
 	"git.ma-al.com/goc_daniel/b2b/app/db"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
+	"gorm.io/gorm"
 )
 
 type UICartsRepo interface {
 	CartsAmount(user_id uint) (uint, error)
-	CreateNewCart(user_id uint) (model.CustomerCart, error)
+	CreateNewCart(user_id uint, name string) (model.CustomerCart, error)
 	RemoveCart(user_id uint, cart_id uint) error
 	UserHasCart(user_id uint, cart_id uint) (bool, error)
 	UpdateCartName(user_id uint, cart_id uint, new_name string) error
 	RetrieveCartsInfo(user_id uint) ([]model.CustomerCart, error)
 	RetrieveCart(user_id uint, cart_id uint) (*model.CustomerCart, error)
 	CheckProductExists(product_id uint, product_attribute_id *uint) (bool, error)
-	AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount uint) error
+	AddProduct(cart_id uint, product_id uint, product_attribute_id *uint, amount uint, set_amount bool) error
+	RemoveProduct(cart_id uint, product_id uint, product_attribute_id *uint) error
 }
 
 type CartsRepo struct{}
@@ -37,10 +42,7 @@ func (repo *CartsRepo) CartsAmount(user_id uint) (uint, error) {
 	return amt, err
 }
 
-func (repo *CartsRepo) CreateNewCart(user_id uint) (model.CustomerCart, error) {
+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,
@@ -129,14 +131,61 @@ func (repo *CartsRepo) CheckProductExists(product_id uint, product_attribute_id
 	}
 }
 
-func (repo *CartsRepo) AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount uint) error {
+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/customerRepo/customerRepo.go

@@ -17,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{}
@@ -114,3 +115,7 @@ func (repo *CustomerRepo) Save(customer *model.Customer) error {
 func (repo *CustomerRepo) Create(customer *model.Customer) error {
 	return db.DB.Create(customer).Error
 }
+
+func (repo *CustomerRepo) SetCustomerNoVatStatus(customerID uint, isNoVat bool) error {
+	return db.DB.Model(&model.Customer{}).Where("id = ?", customerID).Update("is_no_vat", isNoVat).Error
+}

app/repos/localeSelectorRepo/localeSelectorRepo.go

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

app/repos/productsRepo/productsRepo.go

@@ -122,6 +122,19 @@ func (repo *ProductsRepo) Find(langID uint, userID uint, p find.Paging, filt *fi
 							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{
@@ -150,6 +163,7 @@ func (repo *ProductsRepo) Find(langID uint, userID uint, p find.Paging, filt *fi
 								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
@@ -166,7 +180,9 @@ func (repo *ProductsRepo) Find(langID uint, userID uint, p find.Paging, filt *fi
 							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"),
 					},
 				},
@@ -182,7 +198,8 @@ func (repo *ProductsRepo) Find(langID uint, userID uint, p find.Paging, filt *fi
 			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_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").

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,8 +28,12 @@ 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
 }
@@ -74,7 +78,7 @@ func (s *CartsService) RetrieveCart(user_id uint, cart_id uint) (*model.Customer
 	return s.repo.RetrieveCart(user_id, cart_id)
 }
 
-func (s *CartsService) AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount uint) error {
+func (s *CartsService) AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount int, set_amount bool) error {
 	exists, err := s.repo.UserHasCart(user_id, cart_id)
 	if err != nil {
 		return err
@@ -91,5 +95,17 @@ func (s *CartsService) AddProduct(user_id uint, cart_id uint, product_id uint, p
 		return responseErrors.ErrProductOrItsVariationDoesNotExist
 	}
 
-	return s.repo.AddProduct(user_id, cart_id, product_id, product_attribute_id, amount)
+	return s.repo.AddProduct(cart_id, product_id, product_attribute_id, uint(amount), set_amount)
+}
+
+func (s *CartsService) RemoveProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint) error {
+	exists, err := s.repo.UserHasCart(user_id, cart_id)
+	if err != nil {
+		return err
+	}
+	if !exists {
+		return responseErrors.ErrUserHasNoSuchCart
+	}
+
+	return s.repo.RemoveProduct(cart_id, product_id, product_attribute_id)
 }

app/service/customerService/customerService.go

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

app/service/emailService/email.go

@@ -153,6 +153,6 @@ func (s *EmailService) newUserAdminNotificationTemplate(userEmail, userName, bas
 // 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)
+	// 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/menuService/menuService.go

@@ -231,21 +231,54 @@ func (s *MenuService) GetTopMenu(languageId uint, roleId uint) ([]*model.B2BTopM
 
 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_in=" + strconv.Itoa(int((*all_categories)[i].CategoryID))
+		(*all_categories)[i].Filter = "category_id_eq=" + strconv.Itoa(int((*all_categories)[i].CategoryID))
 	}
 
-	var additional model.ScannedCategory
+	// the new products category
-	additional.CategoryID = 10001
+	var new_products_category model.ScannedCategory
-	additional.Name = "New Products"
+	new_products_category.CategoryID = constdata.ADDITIONAL_CATEGORIES_INDEX + 1
-	additional.Active = 1
+	new_products_category.Name = "New Products"
-	additional.Position = 10
+	new_products_category.Active = 1
-	additional.ParentID = 2
+	new_products_category.Position = 10
-	additional.IsRoot = 0
+	new_products_category.ParentID = 2
-	additional.LinkRewrite = i18n.T___(id_lang, "category.new_products")
+	new_products_category.IsRoot = 0
-	additional.IsoCode = iso_code
+	new_products_category.LinkRewrite = i18n.T___(id_lang, "category.new_products")
+	new_products_category.IsoCode = iso_code
 
-	additional.Visited = false
+	new_products_category.Visited = false
-	additional.Filter = "is_new_in=true"
+	new_products_category.Filter = "is_new_eq=true"
 
-	*all_categories = append(*all_categories, additional)
+	*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/utils/const_data/consts.go

@@ -9,12 +9,14 @@ 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
 

app/utils/responseErrors/responseErrors.go

@@ -65,6 +65,8 @@ 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")
@@ -205,6 +207,10 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 		return i18n.T_(c, "error.err_user_has_no_such_cart")
 	case errors.Is(err, ErrProductOrItsVariationDoesNotExist):
 		return i18n.T_(c, "error.err_product_or_its_variation_does_not_exist")
+	case errors.Is(err, ErrAmountMustBePositive):
+		return i18n.T_(c, "error.err_amount_must_be_positive")
+	case errors.Is(err, ErrAmountMustBeReasonable):
+		return i18n.T_(c, "error.err_amount_must_be_reasonable")
 
 	case errors.Is(err, ErrEmptyCart):
 		return i18n.T_(c, "error.err_cart_is_empty")
@@ -292,6 +298,8 @@ 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),

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']

bo/src/App.vue

@@ -1,18 +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>
-  <UApp>
   <Suspense>
     <TooltipProvider>
-        <RouterView />
+      <component :is="layout === 'empty' ? EmptyLayout : layout === 'management' ? ManagementLayout : DefaultLayout">
-        <UNotifications />
+        <RouterView v-slot="{ Component }">
+          <component :is="Component" />
+        </RouterView>
+      </component>
     </TooltipProvider>
   </Suspense>
-  </UApp>
 </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,5 +1,4 @@
 <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"
@@ -7,11 +6,9 @@
                 <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,5 +1,4 @@
 <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>
 
@@ -18,12 +17,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,182 +1,239 @@
 <template>
-    <component :is="Default || 'div'">
+    <div class="flex flex-col gap-5">
-    <div class="">
+        <div class="flex justify-between items-center">
-        <div class="flex flex-col gap-5 mb-6">
             <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Addresses') }}</h1>
-            <div class="flex md:flex-row flex-col justify-between items-start md:items-center gap-5 md:gap-0">
+            <UButton color="info" @click="openModal()">
-                <div class="flex gap-2 items-center">
-                    <UInput v-model="searchQuery" type="text" :placeholder="t('Search address')"
-                        class="bg-white dark:bg-gray-800 text-black dark:text-white absolute" />
-                    <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"
-                    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 v-if="store.loading" class="text-center py-8 text-gray-500 dark:text-gray-400">
+            {{ t('Loading...') }}
         </div>
-        <div v-if="paginatedAddresses.length" class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6">
+        <div v-else-if="store.error" class="text-center py-8 text-red-500">
-            <div v-for="address in paginatedAddresses" :key="address.id"
+            {{ store.error }}
-                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">
-                    <p class="text-black dark:text-white">{{ address.street }}</p>
-                    <p class="text-black dark:text-white">{{ address.zipCode }}, {{ address.city }}</p>
-                    <p class="text-black dark:text-white">{{ address.country }}</p>
         </div>
-                <div class="flex flex-col items-end justify-between gap-2">
+        <div v-else-if="store.addresses.length" class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6">
-                    <button @click="confirmDelete(address.id)"
+            <div v-for="addr in store.addresses" :key="addr.id"
-                    class="p-2 text-red-500 bg-red-100 dark:bg-(--main-dark)  rounded transition-colors"
+                class="border border-(--border-light) dark:border-(--border-dark) rounded-md p-4 bg-(--second-light) dark:bg-(--main-dark) flex justify-between">
-                    :title="t('Remove')">
+                <div class="flex flex-col gap-1">
+                    <p class="font-semibold text-black dark:text-white">{{ addr.address_unparsed.recipient }}</p>
+                    <p class="text-sm text-black dark:text-white">
+                        {{ addr.address_unparsed.street }} {{ addr.address_unparsed.building_no
+                        }}{{ addr.address_unparsed.apartment_no ? '/' + addr.address_unparsed.apartment_no : '' }}
+                    </p>
+                    <p class="text-sm text-black dark:text-white">
+                        {{ addr.address_unparsed.postal_code }}, {{ addr.address_unparsed.city }}
+                    </p>
+                </div>
+                <div class="flex flex-col items-end justify-between">
+                    <UButton size="xs" color="error" variant="ghost" :title="t('Delete')"
+                        @click="confirmDelete(addr.id)">
                         <UIcon name="material-symbols:delete" class="text-[18px]" />
-                </button>
+                    </UButton>
-                <UButton size="sm" color="neutral" variant="outline" @click="openEditModal(address)"
+                    <UButton size="sm" color="neutral" variant="outline" @click="openModal(addr)">
-                    class="text-(--text-sky-light) dark:text-(--text-sky-dark) text-[13px]">
                         {{ t('edit') }}
-                    <UIcon name="ic:sharp-edit" class="text-[15px]" />
+                        <UIcon name="ic:sharp-edit" class="text-[14px]" />
                     </UButton>
                 </div>
             </div>
         </div>
-        <div v-else class="text-center py-8 text-gray-500 dark:text-gray-400">{{ t('No addresses found') }}</div>
+        <div v-else class="text-center py-8 text-gray-500 dark:text-gray-400">
-        <div class="mt-6 flex justify-center">
+            {{ t('No addresses found') }}
-            <UPagination v-model:page="page" :total="totalItems" :page-size="pageSize" />
         </div>
-        <UModal v-model:open="showModal" :overlay="true" class="max-w-md mx-auto">
+
-            <template #content>
+        <UModal v-model:open="showModal">
-                <div class="p-6 flex flex-col gap-6">
+            <template #header>
-                    <p class="text-[20px] text-black dark:text-white ">Address</p>
+                <h3 class="text-lg font-semibold text-black dark:text-white">
-                    <UForm @submit.prevent="saveAddress" class="space-y-4" :validate="validate">
+                    {{ editingId ? t('Edit Address') : t('Add Address') }}
-                        <div>
+                </h3>
-                            <label class="block text-sm font-medium text-black dark:text-white mb-1">Street *</label>
+            </template>
-                            <UInput v-model="formData.street" placeholder="Enter street" name="street" class="w-full" />
+            <template #body>
+                <div class="flex flex-col gap-5">
+                    <USelectMenu v-model="selectedCountry" :items="countries" class="w-full"
+                        @update:model-value="onCountryChange" :searchInput="false">
+                        <template #default>
+                            <div class="flex flex-col items-start leading-tight">
+                                <span class="text-xs text-gray-400">{{ t('Country') }}</span>
+                                <span v-if="selectedCountry" class="font-medium text-black dark:text-white">
+                                    {{ selectedCountry.name }}
+                                </span>
+                                <span v-else class="text-gray-400">{{ t('Select country') }}</span>
                             </div>
-                        <div>
+                        </template>
-                            <label class="block text-sm font-medium text-black dark:text-white mb-1">Zip Code *</label>
+                        <template #item-leading="{ item }">
-                            <UInput v-model="formData.zipCode" placeholder="Enter zip code" name="zipCode"
+                            <span class="text-lg mr-1">{{ item.flag }} {{ item.name }}</span>
-                                class="w-full" />
+                        </template>
+                    </USelectMenu>
+
+                    <div v-if="templateLoading" class="text-center py-4 text-gray-500 dark:text-gray-400">
+                        {{ t('Loading...') }}
                     </div>
-                        <div>
+                    <p v-else-if="!selectedCountry" class="text-center text-sm text-gray-400 dark:text-gray-500">
-                            <label class="block text-sm font-medium text-black dark:text-white mb-1">City *</label>
+                        {{ t('Select a country to continue') }}
-                            <UInput v-model="formData.city" placeholder="Enter city" name="city" class="w-full" />
+                    </p>
-                        </div>
+                    <UForm v-else :validate="validate" :state="formData" @submit="save" class="space-y-4">
-                        <div>
+                        <UFormField v-for="field in templateKeys" :key="field" :label="fieldLabel(field)" :name="field"
-                            <label class="block text-sm font-medium text-black dark:text-white mb-1">Country *</label>
+                            :required="!optionalFields.has(field)">
-                            <UInput v-model="formData.country" placeholder="Enter country" name="country"
+                            <UInput v-model="formData[field]" :placeholder="fieldLabel(field)" class="w-full" />
-                                class="w-full" />
+                        </UFormField>
+
+                        <div class="flex justify-end gap-2 pt-2">
+                            <UButton variant="outline" color="neutral" @click="showModal = false">
+                                {{ t('Cancel') }}
+                            </UButton>
+                            <UButton type="submit" color="info">
+                                {{ t('Save') }}
+                            </UButton>
                         </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>
-        <UModal v-model:open="showDeleteConfirm" :overlay="true" class="max-w-md mx-auto">
+
-            <template #content>
+        <UModal v-model:open="showDeleteConfirm">
-                <div class="p-6 flex flex-col gap-3">
+            <template #body>
-                    <div class="flex flex-col gap-2 justify-center items-center">
+                <div class="flex flex-col items-center gap-3 py-2">
-                        <p class="flex items-end gap-2 dark:text-white text-black">
+                    <UIcon name="f7:exclamationmark-triangle" class="text-[40px] text-red-600" />
-                            <UIcon name='f7:exclamationmark-triangle' class="text-[35px] text-red-700" />
+                    <p class="font-semibold text-black dark:text-white">{{ t('Confirm Delete') }}</p>
-                            Confirm Delete
+                    <p class="text-sm text-gray-600 dark:text-gray-300">
+                        {{ t('Are you sure you want to delete this address?') }}
                     </p>
-                        <p class="text-gray-700 dark:text-gray-300">
-                            {{ t('Are you sure you want to delete this address?') }}</p>
                 </div>
-                    <div class="flex justify-center gap-5">
+            </template>
-                        <UButton variant="outline" color="neutral" @click="showDeleteConfirm = false"
+            <template #footer>
-                            class="dark:text-white text-black">{{ t('Cancel') }}
+                <div class="flex justify-center gap-4">
+                    <UButton variant="outline" color="neutral" @click="showDeleteConfirm = false">
+                        {{ t('Cancel') }}
+                    </UButton>
+                    <UButton variant="outline" color="error" @click="deleteAddress">
+                        {{ t('Delete') }}
                     </UButton>
-                        <UButton variant="outline" color="neutral" @click="deleteAddress" class="text-red-700">
-                            {{ t('Delete') }}</UButton>
-                    </div>
                 </div>
             </template>
         </UModal>
     </div>
-    </component>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+import { ref, reactive, computed } from 'vue'
-import { useAddressStore } from '@/stores/customer/address'
 import { useI18n } from 'vue-i18n'
-import Default from '@/layouts/default.vue'
+import { countries } from '@/router/langs'
-const addressStore = useAddressStore()
+import { useAddressStore } from '@/stores/customer/address'
+import type { Country } from '@/types'
+import type { Address } from '@/stores/customer/address'
+
 const { t } = useI18n()
-const searchQuery = ref('')
+const store = useAddressStore()
+
+// --- Modal state ---
 const showModal = ref(false)
-const isEditing = ref(false)
+const editingId = ref<number | null>(null)
-const editingAddressId = ref<number | null>(null)
+const selectedCountry = ref<Country | null>(null)
-const formData = ref({ street: '', zipCode: '', city: '', country: '' })
+const templateLoading = ref(false)
+const template = ref<Record<string, string>>({})
+const formData = reactive<Record<string, string>>({})
 
+const templateKeys = computed(() => Object.keys(template.value))
+const optionalFields = new Set(['address_line2'])
+
+// --- Delete state ---
 const showDeleteConfirm = ref(false)
-const addressToDelete = ref<number | null>(null)
+const deleteId = ref<number | null>(null)
 
-const page = ref(addressStore.currentPage)
+const fieldLabels: Record<string, string> = {
-const paginatedAddresses = computed(() => addressStore.paginatedAddresses)
+    recipient: 'Recipient',
-const totalItems = computed(() => addressStore.totalItems)
+    street: 'Street',
-const pageSize = addressStore.pageSize
+    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',
+    postal_code: 'Zip Code',
+    post_town: 'City',
+    city: 'City',
+    county: 'County',
+    region: 'Region',
+    voivodeship: 'Region / Voivodeship',
+    address_line2: 'Address Line 2'
+}
 
-watch(page, (newPage) => addressStore.setPage(newPage))
+function fieldLabel(key: string) {
-watch(searchQuery, (val) => {
+    return t(fieldLabels[key] ?? key.replace(/_/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase()))
-    addressStore.setSearchQuery(val)
-})
-function openCreateModal() {
-    resetForm()
-    isEditing.value = false
-    showModal.value = true
-}
-function openEditModal(address: any) {
-    formData.value = {
-        street: address.street,
-        zipCode: address.zipCode,
-        city: address.city,
-        country: address.country
-    }
-    isEditing.value = true
-    editingAddressId.value = address.id
-    showModal.value = true
-}
-function resetForm() {
-    formData.value = { street: '', zipCode: '', city: '', country: '' }
-    editingAddressId.value = null
-}
-function closeModal() {
-    showModal.value = false
-    resetForm()
 }
+
 function validate() {
-    const errors = []
+    return templateKeys.value
-    if (!formData.value.street) errors.push({ name: 'street', message: 'Street required' })
+        .filter((key) => !optionalFields.has(key) && !formData[key]?.trim())
-    if (!formData.value.zipCode) errors.push({ name: 'zipCode', message: 'Zip Code required' })
+        .map((key) => ({ name: key, message: t(`${fieldLabel(key)} is required`) }))
-    if (!formData.value.city) errors.push({ name: 'city', message: 'City required' })
-    if (!formData.value.country) errors.push({ name: 'country', message: 'Country required' })
-    return errors.length ? errors : null
 }
-function saveAddress() {
+
-    if (validate()) return
+function applyTemplate(tpl: Record<string, string>, existing?: Record<string, string>) {
-    if (isEditing.value && editingAddressId.value) {
+    Object.keys(formData).forEach((k) => delete formData[k])
-        addressStore.updateAddress(editingAddressId.value, formData.value)
+    Object.keys(tpl).forEach((k) => {
+        formData[k] = existing?.[k] ?? ''
+    })
+}
+
+function openModal(addr?: Address) {
+    template.value = {}
+    Object.keys(formData).forEach((k) => delete formData[k])
+
+    if (addr) {
+        editingId.value = addr.id
+        selectedCountry.value = countries.find((c) => c.id === addr.country_id) ?? null
+        loadTemplate(addr.country_id, addr.address_unparsed)
     } else {
-        addressStore.addAddress(formData.value)
+        editingId.value = null
+        selectedCountry.value = null
     }
-    closeModal()
+
+    showModal.value = true
 }
+
+async function onCountryChange(country: Country | null) {
+    if (!country) {
+        template.value = {}
+        Object.keys(formData).forEach((k) => delete formData[k])
+        return
+    }
+    await loadTemplate(country.id)
+}
+
+async function loadTemplate(countryId: number, existing?: Record<string, string>) {
+    templateLoading.value = true
+    try {
+        const tpl = await store.getTemplate(countryId)
+        template.value = tpl
+        applyTemplate(tpl, existing)
+    } finally {
+        templateLoading.value = false
+    }
+}
+
+async function save() {
+    if (!selectedCountry.value) return
+    if (editingId.value) {
+        await store.updateAddress(editingId.value, selectedCountry.value.id, { ...formData })
+    } else {
+        await store.createAddress(selectedCountry.value.id, { ...formData })
+    }
+    showModal.value = false
+}
+
 function confirmDelete(id: number) {
-    addressToDelete.value = id
+    deleteId.value = id
     showDeleteConfirm.value = true
 }
-function deleteAddress() {
+
-    if (addressToDelete.value) {
+async function deleteAddress() {
-        addressStore.deleteAddress(addressToDelete.value)
+    if (deleteId.value) await store.deleteAddress(deleteId.value)
-    }
     showDeleteConfirm.value = false
-    addressToDelete.value = null
+    deleteId.value = null
 }
+
+store.fetchAddresses()
 </script>

bo/src/components/customer/PageCarts.vue

@@ -1,5 +1,4 @@
 <template>
-    <component :is="Default || 'div'">
   <div class="flex flex-col gap-5 md:gap-10">
     <div class="flex flex-col md:flex-row justify-between items-center gap-4">
       <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Shopping Carts') }}</h1>
@@ -19,18 +18,15 @@
           class="text-lg font-semibold text-black dark:text-white p-4 border-b border-(--border-light) dark:border-(--border-dark)">
           {{ t('Your Carts') }}
         </h2>
-                    <div v-if="cartStore.carts?.length > 0"
+        <div v-if="cartStore.carts?.length > 0" class="divide-y divide-(--border-light) dark:divide-(--border-dark)">
-                        class="divide-y divide-(--border-light) dark:divide-(--border-dark)">
+          <div v-for="cart in cartStore.carts" :key="cart.cart_id" @click="cartStore.setActiveCart(cart.cart_id)"
-                        <div v-for="cart in cartStore.carts" :key="cart.cart_id"
-                            @click="cartStore.setActiveCart(cart.cart_id)"
             class="p-4 cursor-pointer flex gap-2 items-center justify-between" :class="cartStore.activeCartId === cart.cart_id
               ? 'bg-blue-50 dark:bg-blue-900/20'
               : '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-red-600 font-medium truncate">{{ cart.cart_id }}</p>
-                                    <p class="text-black dark:text-white font-medium truncate cursor-pointer"
+                <p class="text-black dark:text-white font-medium truncate cursor-pointer" @click="openCart(cart)">{{
-                                        @click="openCart(cart)">{{
                   cart.name }}</p>
               </div>
             </div>
@@ -68,7 +64,6 @@
       </div>
     </template>
   </UModal>
-    </component>
 </template>
 
 <script setup lang="ts">

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,13 @@
             <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 {
     id: string

bo/src/components/customer/PageProducts.vue

@@ -1,7 +1,14 @@
 <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">
                     <span class="text-gray-600 dark:text-gray-400">Loading products...</span>
@@ -31,13 +38,11 @@
                     </div>
                 </div>
             </div>
-        </component>
             </suspense>
 </template>
 
 <script setup lang="ts">
 import { ref, watch, h, resolveComponent, computed } from 'vue'
-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/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/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/components/inner/LangSwitch.vue

@@ -54,7 +54,6 @@ const locale = computed({
     const pathParts = currentPath.split('/').filter(Boolean)
 
     cookie.setCookie('lang_id', `${langs.find((x) => x.iso_code == value)?.id}`, { days: 60, secure: true, sameSite: 'Lax' })
-
     if (pathParts.length > 0) {
       const isLocale = langs.some((l) => l.lang_code === pathParts[0])
       if (isLocale) {

bo/src/layouts/default.vue

@@ -205,8 +205,7 @@ const menu = ref<TopMenuItem[] | null>(null)
 async function getTopMenu() {
   try {
     const { items } = await useFetchJson<TopMenuItem[]>('/api/v1/restricted/menu/get-top-menu')
-
+    menu.value = items[0]?.children || []
-    menu.value = items
   } catch (err) {
     console.log(err)
   }

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,19 @@ 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,
+      }
     })
   }
-
   // await router.replace(router.currentRoute.value.fullPath)
 }
 

bo/src/router/langs.ts

@@ -12,10 +12,7 @@ export const currentCountry = ref<Country>()
 const defLang = ref<Language>()
 const defCountry = ref<Country>()
 const cookie = useCookie()
-// Get available language codes for route matching
-// export const availableLocales = computed(() => langs.map((l) => l.lang_code))
 
-// Initialize languages from API
 export async function initLangs() {
   try {
     const { items } = await useFetchJson<Language[]>('/api/v1/langs')
@@ -33,8 +30,6 @@ export async function initLangs() {
   }
 }
 
-// Initialize country/currency from API
-
 export async function initCountryCurrency() {
   try {
     const { items } = await useFetchJson<Country[]>('/api/v1/restricted/langs-and-countries/get-countries')
@@ -43,13 +38,10 @@ export async function initCountryCurrency() {
     let idfromcookie = null
     const cc = cookie.getCookie('country_id')
     if (cc) {
-      idfromcookie = langs.find((x) => x.id == parseInt(cc))
+      idfromcookie = countries.find((x) => x.id == parseInt(cc))
     }
     defCountry.value = items.find((x) => x.id === defLang.value?.id)
     currentCountry.value = idfromcookie ?? defCountry.value
-    console.log(defCountry.value);
-    console.log(currentCountry.value);
-
   } catch (error) {
     console.error('Failed to fetch languages:', error)
   }
@@ -60,7 +52,6 @@ export async function switchLocalization() {
     await useFetchJson('/api/v1/public/auth/update-choice', {
       method: 'POST'
     })
-
   } catch (error) {
     console.log(error)
   }

bo/src/stores/customer/address.ts

@@ -1,19 +1,11 @@
+import { useFetchJson } from '@/composable/useFetchJson'
 import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
-
-export interface AddressFormData {
-  street: string
-  zipCode: string
-  city: string
-  country: string
-}
 
 export interface Address {
   id: number
-  street: string
+  country_id: number
-  zipCode: string
+  address_unparsed: Record<string, string>
-  city: string
-  country: string
 }
 
 export const useAddressStore = defineStore('address', () => {
@@ -21,124 +13,46 @@ export const useAddressStore = defineStore('address', () => {
   const loading = ref(false)
   const error = ref<string | null>(null)
 
-  const currentPage = ref(1)
+  async function fetchAddresses() {
-  const pageSize = 20
+    loading.value = true
-
+    error.value = null
-  const searchQuery = ref('')
+    try {
-
+      const res = await useFetchJson<Address[]>('/api/v1/restricted/addresses/retrieve-addresses')
-  function initMockData() {
+      addresses.value = res.items ?? []
-    addresses.value = [
+    } catch (e: unknown) {
-      { id: 1, street: 'Main Street 123', zipCode: '10-001', city: 'New York', country: 'United States' },
+      error.value = e instanceof Error ? e.message : 'Failed to load addresses'
-      { id: 2, street: 'Oak Avenue 123', zipCode: '90-001', city: 'Los Angeles', country: 'United States' },
+    } finally {
-      { id: 3, street: 'Pine Road 123', zipCode: '60-601', city: 'Chicago', country: 'United States' }
+      loading.value = false
-    ]
+    }
   }
 
-  const filteredAddresses = computed(() => {
+  async function deleteAddress(id: number) {
-    if (!searchQuery.value) return addresses.value
+    await useFetchJson(`/api/v1/restricted/addresses/delete-address?address_id=${id}`, { method: 'DELETE' })
+    addresses.value = addresses.value.filter((a) => a.id !== id)
+  }
 
-    const query = searchQuery.value.toLowerCase()
+  async function getTemplate(countryId: number): Promise<Record<string, string>> {
-
+    const res = await useFetchJson<Record<string, string>>(
-    return addresses.value.filter(addr =>
+      `/api/v1/restricted/addresses/get-template?country_id=${countryId}`
-      addr.street.toLowerCase().includes(query) ||
-      addr.city.toLowerCase().includes(query) ||
-      addr.country.toLowerCase().includes(query) ||
-      addr.zipCode.toLowerCase().includes(query)
     )
+    return res.items ?? {}
+  }
+
+  async function createAddress(countryId: number, data: Record<string, string>) {
+    await useFetchJson(`/api/v1/restricted/addresses/add-new-address?country_id=${countryId}`, {
+      method: 'POST',
+      body: JSON.stringify(data)
     })
+    await fetchAddresses()
+  }
 
-  const totalItems = computed(() => filteredAddresses.value.length)
+  async function updateAddress(id: number, countryId: number, data: Record<string, string>) {
-  const totalPages = computed(() => Math.ceil(totalItems.value / pageSize))
+    await useFetchJson(`/api/v1/restricted/addresses/modify-address?country_id=${countryId}&address_id=${id}`, {
-
+      method: 'POST',
-  const paginatedAddresses = computed(() => {
+      body: JSON.stringify(data)
-    const start = (currentPage.value - 1) * pageSize
-    return filteredAddresses.value.slice(start, start + pageSize)
     })
-
+    await fetchAddresses()
-  function getAddressById(id: number) {
-    return addresses.value.find(addr => addr.id === id)
   }
 
-  function normalize(data: AddressFormData): AddressFormData {
+  return { addresses, loading, error, fetchAddresses, deleteAddress, getTemplate, createAddress, updateAddress }
-    return {
-      street: data.street.trim(),
-      zipCode: data.zipCode.trim(),
-      city: data.city.trim(),
-      country: data.country.trim()
-    }
-  }
-
-  function generateId(): number {
-    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
-  }
-
-  function setSearchQuery(query: string) {
-    searchQuery.value = query
-    currentPage.value = 1
-  }
-
-  function resetPagination() {
-    currentPage.value = 1
-  }
-
-  initMockData()
-
-  return {
-    addresses,
-    loading,
-    error,
-    currentPage,
-    pageSize,
-    totalItems,
-    totalPages,
-    searchQuery,
-    filteredAddresses,
-    paginatedAddresses,
-    getAddressById,
-    addAddress,
-    updateAddress,
-    deleteAddress,
-    setPage,
-    setSearchQuery,
-    resetPagination
-  }
 })

bo/src/stores/customer/cart.ts

@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia'
-import { computed, ref } from 'vue'
+import { ref, computed } from 'vue'
 import { useFetchJson } from '@/composable/useFetchJson'
-import type { ApiResponse } from '@/types'
 import { useRoute } from 'vue-router'
 
 export interface Cart {
@@ -10,6 +9,15 @@ export interface Cart {
   items: any[]
 }
 
+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 carts = ref<Cart[]>([])
   const activeCartId = ref<number | null>(null)

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&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"
@@ -27,11 +27,12 @@ http:
     - name: is_new_eq
       value: "0"
       type: query
-      disabled: true
     - name: is_favorite_eq
       value: "false"
       type: query
-      disabled: true
+    - name: is_oem_eq
+      value: "FALSE"
+      type: query
   body:
     type: json
     data: ""

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

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

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

@@ -5,7 +5,7 @@ info:
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&product_attribute_id=1115&amount=1
+  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&product_attribute_id=1115&amount=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/environments/dev.yml

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

bruno/b2b_daniel/list/folder.yml

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

bruno/b2b_daniel/list/list-products.yml

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

bruno/b2b_daniel/list/list-users.yml

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

bruno/b2b_daniel/orders/folder.yml

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

bruno/b2b_daniel/product-translation/folder.yml

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

bruno/b2b_daniel/storage-old/folder.yml

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

bruno/b2b_daniel/storage-restricted/folder.yml

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

i18n/migrations/20260302163100_routes.sql

@@ -10,17 +10,6 @@ CREATE TABLE IF NOT EXISTS b2b_routes (
 
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
--- INSERT IGNORE INTO b2b_routes
---   (name, path, component, meta, active)
--- VALUES
---   ('root', '', '', '{"trans": "route.root"}', 0),
---   ('home', '', '/views/HomeView.vue', '{"trans": "route.home"}', 1),
---   ('login', 'login', '/views/LoginView.vue', '{"guest":true}', 1),
---   ('register', 'register', '/views/RegisterView.vue', '{"guest":true}', 1),
---   ('password-recovery', 'password-recovery', '/views/PasswordRecoveryView.vue', '{"guest":true}', 1),
---   ('reset-password', 'reset-password', '/views/ResetPasswordView.vue', '{"guest":true}', 1),
---   ('verify-email', 'verify-email', '/views/VerifyEmailView.vue', '{"guest":true}', 1);
-
 INSERT IGNORE INTO `b2b_routes` (`id`, `name`, `path`, `component`, `meta`, `active`) VALUES 
 (1, 'root', '', '', '{"trans": "route.root"}', 0),
 (2, 'home', '', '/views/HomeView.vue', '{"trans": "route.home"}', 1),
@@ -29,16 +18,59 @@ INSERT IGNORE INTO `b2b_routes` (`id`, `name`, `path`, `component`, `meta`, `act
 (5, 'password-recovery', 'password-recovery', '/views/PasswordRecoveryView.vue', '{"guest":true}', 1),
 (6, 'reset-password', 'reset-password', '/views/ResetPasswordForm.vue', '{"guest":true}', 1),
 (7, 'verify-email', 'verify-email', '/views/VerifyEmailView.vue', '{"guest":true}', 1),
-(8, 'category', 'category/:category_id-:link_rewrite', '/views/CategoryView.vue', '{"guest":true}', 1),
 (9, 'admin-products-category', 'products/:category_id-:link_rewrite', '/components/admin/PageProducts.vue', '{
-  "guest": true
+"guest":true,
+"name": "Products Category"
 }', 1),
-(10, 'customer-addresses', 'addresses', '/components/customer/PageAddresses.vue', '{"guest":true}', 1),
+(10, 'customer-addresses', 'addresses', '/components/customer/PageAddresses.vue', '{
-(11, 'customer-carts', 'carts', '/components/customer/PageCarts.vue', '{"guest":true}', 1),
+"guest":true,
-(12, 'customer-orders', 'orders', '/components/customer/PageOrders.vue', '{"guest":true}', 1),
+"name": "Addresses"
-(13, 'customer-statistic', 'statistic', '/components/customer/PageStatistic.vue', '{"guest":true}', 1),
+}', 1),
-(14, 'customer-product-details', 'products/:product_id/:link_rewrite', '/components/admin/ProductDetailView.vue', '{"guest":true}', 1),
+(11, 'customer-cart', 'cart/:id', '/components/customer/PageCart.vue', '{
-(15, 'admin-products', 'products', '/components/admin/PageProducts.vue', '{"guest":true}', 1);
+"guest":true,
+"name": "Cart"
+}', 1),
+(12, 'customer-orders', 'orders', '/components/customer/PageOrders.vue', '{
+"guest":true,
+"name": "Order"
+}', 1),
+(13, 'customer-statistic', 'statistic', '/components/customer/PageStatistic.vue', '{
+"guest":true,
+"name": "Statistic"
+}
+', 1),
+(14, 'admin-product-details', 'products/:product_id', '/components/admin/ProductDetailView.vue', '{
+"guest":true,
+"name": "Products"
+}
+', 1),
+(15, 'admin-products', 'products', '/components/admin/PageProducts.vue', '{
+"guest":true,
+"name": "Products"
+}
+', 1),
+(16, 'admin-users-list', 'users-list', '/components/admin/UsersList.vue', '{
+"guest":true,
+"name": "Client List"
+}
+', 1),
+(17, 'customer-management-profile', ':user_id/profile', '/components/customer-management/Profile.vue', '{
+"guest":true,
+"name": "Profile"
+}
+', 1),
+(18, 'admin-users-search', 'users-search', '/components/admin/UsersSearch.vue', '{
+"guest":true,
+"name": "Search Clients"
+}
+', 1),
+(19, 'customer-storage-file', 'file-storage', '/components/customer/StorageFileBrowser.vue', '{
+"guest":true,
+"name": "File Storage"
+}', 1),
+(20, 'customer-products', 'products', '/components/customer/PageProducts.vue', '{ "guest":true, "name": "Products" }', 1),
+(21, 'customer-product-details', 'products/:product_id', '/components/customer/PageProduct.vue', '{ "guest":true, "name": "Products" }', 1),
+(22, 'customer-page-carts', 'carts', '/components/customer/PageCarts.vue', '{ "guest":true, "name": "Carts" }', 1);
 
 CREATE TABLE IF NOT EXISTS b2b_top_menu (
   menu_id INT AUTO_INCREMENT NOT NULL,
@@ -71,21 +103,6 @@ INSERT IGNORE INTO `b2b_top_menu` (`menu_id`, `label`, `parent_id`, `params`, `a
   },
   "icon" : "quill:list"
 }', 1, '{"route":{"name":"admin-products","params":{"locale":""}}}', 1, 1),
-(3, '{
-  "name": "customer-carts",
-  "trans": {
-    "pl": {
-      "label": "Carts"
-    },
-    "en": {
-      "label": "Carts"
-    },
-    "de": {
-      "label": "Carts"
-    }
-  },
-  "icon" : "proicons:cart"
-}', 1, '{"route":{"name":"customer-carts","params":{"locale":""}}}', 1, 1),
 (4, '{
   "name": "customer-addresses",
   "trans": {
@@ -138,7 +155,138 @@ INSERT IGNORE INTO `b2b_top_menu` (`menu_id`, `label`, `parent_id`, `params`, `a
     }
   }
 }', 1, 1),
-(9, '{"name":"carts","trans":{"pl":{"label":"Koszyki"},"en":{"label":"Carts"},"de":{"label":"Warenkörbe"}}}', 3, '{"route":{"name":"home","params":{"locale":""}}}', 1, 1);
+(10, '{
+  "name": "customer-storage-file",
+  "trans": {
+    "pl": {
+      "label": "File Storage"
+    },
+    "en": {
+      "label": "File Storage"
+    },
+    "de": {
+      "label": "File Storage"
+    }
+  },
+  "icon": "carbon:volume-file-storage"
+}', 1, '{
+  "route": {
+    "name": "customer-storage-file",
+    "params": {
+      "locale": ""
+    }
+  }
+}', 1, 1),
+(12, '{
+  "name": "admin-users-list",
+  "trans": {
+    "pl": {
+      "label": "Client List"
+    },
+    "en": {
+      "label": "Client List"
+    },
+    "de": {
+      "label": "Client List"
+    }
+  },
+  "icon": "tdesign:user-list"
+}', 1, '{
+  "route": {
+    "name": "admin-users-list",
+    "params": {
+      "locale": ""
+    }
+  }
+}', 1, 1),
+(13, '{
+  "name": "admin-users-search",
+  "trans": {
+    "pl": {
+      "label": "Search Clients"
+    },
+    "en": {
+      "label": "Search Clients"
+    },
+    "de": {
+      "label": "Search Clients"
+    }
+  },
+  "icon": "material-symbols:search"
+}', 1, '{
+  "route": {
+    "name": "admin-users-search",
+    "params": {
+      "locale": ""
+    }
+  }
+}', 1, 1),
+(14, '{
+  "name": "customer-management-profile",
+  "trans": {
+    "pl": {
+      "label": "Profile"
+    },
+    "en": {
+      "label": "Profile"
+    },
+    "de": {
+      "label": "Profile"
+    }
+  },
+  "icon": "akar-icons:statistic-up"
+}', 1, '{
+  "route": {
+    "name": "customer-management-profile",
+    "params": {
+      "locale": ""
+    }
+  }
+}', 1, 1),
+(15, '{
+  "name": "customer-products",
+  "trans": {
+    "pl": {
+      "label": "Products"
+    },
+    "en": {
+      "label": "Products"
+    },
+    "de": {
+      "label": "Products"
+    }
+  },
+  "icon": "akar-icons:statistic-up"
+}', 1, '{
+  "route": {
+    "name": "customer-products",
+    "params": {
+      "locale": ""
+    }
+  }
+}', 1, 1),
+(16, '{
+  "name": "customer-page-carts",
+  "trans": {
+    "pl": {
+      "label": "Carts"
+    },
+    "en": {
+      "label": "Carts"
+    },
+    "de": {
+      "label": "Carts"
+    }
+  },
+  "icon": "proicons:cart1"
+}', 1, '{
+  "route": {
+    "name": "customer-page-carts",
+    "params": {
+      "locale": ""
+    }
+  }
+}', 1, 1);
 
 
 -- +goose Down

i18n/migrations/20260302163122_create_tables.sql

@@ -112,7 +112,8 @@ CREATE TABLE IF NOT EXISTS b2b_customers (
   country_id                      INT NULL DEFAULT 2,
   created_at                      DATETIME(6) NULL,
   updated_at                      DATETIME(6) NULL,
-  deleted_at                      DATETIME(6) NULL
+  deleted_at                      DATETIME(6) NULL,
+  is_no_vat                     TINYINT(1) NULL DEFAULT 0 
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
 CREATE UNIQUE INDEX IF NOT EXISTS idx_customers_email
@@ -161,6 +162,16 @@ CREATE TABLE IF NOT EXISTS b2b_favorites (
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
 
 
+-- oems
+CREATE TABLE IF NOT EXISTS b2b_oems (
+  user_id BIGINT UNSIGNED NOT NULL,
+  product_id INT UNSIGNED NOT NULL,
+  PRIMARY KEY (user_id, product_id),
+  CONSTRAINT fk_oems_customer FOREIGN KEY (user_id) REFERENCES b2b_customers(id) ON DELETE CASCADE ON UPDATE CASCADE,
+  CONSTRAINT fk_oems_product FOREIGN KEY (product_id) REFERENCES ps_product(id_product) ON DELETE CASCADE ON UPDATE CASCADE
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+
+
 -- refresh_tokens
 CREATE TABLE IF NOT EXISTS b2b_refresh_tokens (
   id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY,

i18n/migrations/20260302163123_create_tables_data.sql

@@ -75,6 +75,7 @@ INSERT INTO `b2b_route_roles` (`route_id`, `role_id`) VALUES
 (2, '1'),
 (2, '2'),
 (2, '3'),
+(2, '4'),
 (3, '1'),
 (3, '2'),
 (3, '3'),
@@ -94,5 +95,24 @@ INSERT INTO `b2b_route_roles` (`route_id`, `role_id`) VALUES
 (7, '1'),
 (7, '2'),
 (7, '3'),
-(7, '4');
+(7, '4'),
+(9, '2'),
+(9, '3'),
+(10, '1'),
+(11, '1'),
+(12, '1'),
+(13, '1'),
+(14, '2'),
+(14, '3'),
+(15, '2'),
+(15, '3'),
+(16, '2'),
+(16, '3'),
+(17, '1'),
+(18, '2'),
+(18, '3'),
+(19, '1'),
+(20, '1'),
+(21, '1'),
+(22, '1');
 -- +goose Down

i18n/migrations/20260319163200_procedures.sql

@@ -16,6 +16,7 @@ READS SQL DATA
 BEGIN
 
   DECLARE v_tax_rate DECIMAL(10,4) DEFAULT 0;
+  DECLARE v_tax_group INT;
 
   DECLARE v_base_raw DECIMAL(20,6);
   DECLARE v_base DECIMAL(20,6);
@@ -29,45 +30,54 @@ BEGIN
 
   DECLARE v_has_specific INT DEFAULT 0;
 
-  -- currency
   DECLARE v_target_currency BIGINT;
   DECLARE v_target_rate DECIMAL(13,6) DEFAULT 1;
   DECLARE v_specific_rate DECIMAL(13,6) DEFAULT 1;
 
+  DECLARE v_is_no_vat TINYINT DEFAULT 0;
+
   SET p_id_product_attribute = NULLIF(p_id_product_attribute, 0);
 
+  -- ================= CUSTOMER VAT =================
+  SELECT COALESCE(c.is_no_vat, 0)
+  INTO v_is_no_vat
+  FROM b2b_customers c
+  WHERE c.id = p_id_customer
+  LIMIT 1;
+
+  -- ================= TAX GROUP =================
+  SELECT ps.id_tax_rules_group
+  INTO v_tax_group
+  FROM ps_product_shop ps
+  WHERE ps.id_product = p_id_product
+    AND ps.id_shop = p_id_shop
+  LIMIT 1;
+
   -- ================= TAX =================
   SELECT COALESCE(t.rate, 0)
   INTO v_tax_rate
   FROM ps_tax_rule tr
   JOIN ps_tax t ON t.id_tax = tr.id_tax
   LEFT JOIN b2b_countries c ON c.id = p_id_country
-  WHERE tr.id_tax_rules_group = (
+  WHERE tr.id_tax_rules_group = v_tax_group
-    SELECT ps.id_tax_rules_group
-    FROM ps_product_shop ps
-    WHERE ps.id_product = p_id_product
-      AND ps.id_shop = p_id_shop
-    LIMIT 1
-  )
     AND tr.id_country = c.ps_id_country
   LIMIT 1;
 
-  -- ================= TARGET CURRENCY =================
+  IF v_is_no_vat = 1 THEN
-  SELECT c.b2b_id_currency
+    SET v_tax_rate = 0;
-  INTO v_target_currency
+  END IF;
-  FROM b2b_countries c
-  WHERE c.id = p_id_country
-  LIMIT 1;
 
-  -- latest target rate
+  -- ================= CURRENCY =================
-  SELECT r.conversion_rate
+  SELECT c.b2b_id_currency, r.conversion_rate
-  INTO v_target_rate
+  INTO v_target_currency, v_target_rate
-  FROM b2b_currency_rates r
+  FROM b2b_countries c
-  WHERE r.b2b_id_currency = v_target_currency
+  LEFT JOIN b2b_currency_rates r
+    ON r.b2b_id_currency = c.b2b_id_currency
+  WHERE c.id = p_id_country
   ORDER BY r.created_at DESC
   LIMIT 1;
 
-  -- ================= BASE PRICE (RAW) =================
+  -- ================= BASE PRICE =================
   SELECT
     COALESCE(ps.price, p.price) + COALESCE(pas.price, 0)
   INTO v_base_raw
@@ -79,8 +89,8 @@ BEGIN
     AND pas.id_shop = p_id_shop
   WHERE p.id_product = p_id_product;
 
-  -- convert base to target currency
   SET v_base = v_base_raw * v_target_rate;
+  SET v_excl = v_base;
 
   -- ================= RULE SELECTION =================
   SELECT
@@ -99,71 +109,67 @@ BEGIN
 
   FROM b2b_specific_price bsp
 
+  LEFT JOIN b2b_specific_price_product spp
+    ON spp.b2b_specific_price_id = bsp.id
+    AND spp.id_product = p_id_product
+
+  LEFT JOIN b2b_specific_price_product_attribute spa
+    ON spa.b2b_specific_price_id = bsp.id
+    AND spa.id_product_attribute = p_id_product_attribute
+
+  LEFT JOIN b2b_specific_price_customer spc
+    ON spc.b2b_specific_price_id = bsp.id
+    AND spc.b2b_id_customer = p_id_customer
+
+  LEFT JOIN b2b_specific_price_country spco
+    ON spco.b2b_specific_price_id = bsp.id
+    AND spco.b2b_id_country = p_id_country
+
+  LEFT JOIN b2b_specific_price_category spcat
+    ON spcat.b2b_specific_price_id = bsp.id
+
+  LEFT JOIN ps_category_product cp
+    ON cp.id_category = spcat.id_category
+    AND cp.id_product = p_id_product
+
   WHERE bsp.is_active = 1
     AND bsp.from_quantity <= p_quantity
 
-    -- intersection rules (unchanged)
+    AND (spp.id_product IS NOT NULL OR NOT EXISTS (
-    AND (
+          SELECT 1 FROM b2b_specific_price_product x WHERE x.b2b_specific_price_id = bsp.id
-      NOT EXISTS (SELECT 1 FROM b2b_specific_price_product x WHERE x.b2b_specific_price_id = bsp.id)
+        ))
-      OR EXISTS (SELECT 1 FROM b2b_specific_price_product x WHERE x.b2b_specific_price_id = bsp.id AND x.id_product = p_id_product)
-    )
 
-    AND (
+    AND (spa.id_product_attribute IS NOT NULL OR NOT EXISTS (
-      NOT EXISTS (SELECT 1 FROM b2b_specific_price_product_attribute x WHERE x.b2b_specific_price_id = bsp.id)
+          SELECT 1 FROM b2b_specific_price_product_attribute x WHERE x.b2b_specific_price_id = bsp.id
-      OR EXISTS (SELECT 1 FROM b2b_specific_price_product_attribute x WHERE x.b2b_specific_price_id = bsp.id AND x.id_product_attribute = p_id_product_attribute)
+        ))
-    )
 
-    AND (
+    AND (spc.b2b_id_customer IS NOT NULL OR NOT EXISTS (
-      NOT EXISTS (SELECT 1 FROM b2b_specific_price_category x WHERE x.b2b_specific_price_id = bsp.id)
+          SELECT 1 FROM b2b_specific_price_customer x WHERE x.b2b_specific_price_id = bsp.id
-      OR EXISTS (
+        ))
-        SELECT 1 FROM b2b_specific_price_category x
-        JOIN ps_category_product cp ON cp.id_category = x.id_category
-        WHERE x.b2b_specific_price_id = bsp.id AND cp.id_product = p_id_product
-      )
-    )
 
-    AND (
+    AND (spco.b2b_id_country IS NOT NULL OR NOT EXISTS (
-      NOT EXISTS (SELECT 1 FROM b2b_specific_price_customer x WHERE x.b2b_specific_price_id = bsp.id)
+          SELECT 1 FROM b2b_specific_price_country x WHERE x.b2b_specific_price_id = bsp.id
-      OR EXISTS (SELECT 1 FROM b2b_specific_price_customer x WHERE x.b2b_specific_price_id = bsp.id AND x.b2b_id_customer = p_id_customer)
+        ))
-    )
 
-    AND (
+    AND (cp.id_product IS NOT NULL OR NOT EXISTS (
-      NOT EXISTS (SELECT 1 FROM b2b_specific_price_country x WHERE x.b2b_specific_price_id = bsp.id)
+          SELECT 1 FROM b2b_specific_price_category x WHERE x.b2b_specific_price_id = bsp.id
-      OR EXISTS (SELECT 1 FROM b2b_specific_price_country x WHERE x.b2b_specific_price_id = bsp.id AND x.b2b_id_country = p_id_country)
+        ))
-    )
 
   ORDER BY
-    -- customer wins
+    (spc.b2b_id_customer IS NOT NULL) DESC,
-    (EXISTS (SELECT 1 FROM b2b_specific_price_customer x WHERE x.b2b_specific_price_id = bsp.id AND x.b2b_id_customer = p_id_customer)) DESC,
+    (spa.id_product_attribute IS NOT NULL) DESC,
-
+    (spp.id_product IS NOT NULL) DESC,
-    -- attribute
+    (cp.id_product IS NOT NULL) DESC,
-    (EXISTS (SELECT 1 FROM b2b_specific_price_product_attribute x WHERE x.b2b_specific_price_id = bsp.id AND x.id_product_attribute = p_id_product_attribute)) DESC,
+    (spco.b2b_id_country IS NOT NULL) DESC,
-
-    -- product
-    (EXISTS (SELECT 1 FROM b2b_specific_price_product x WHERE x.b2b_specific_price_id = bsp.id AND x.id_product = p_id_product)) DESC,
-
-    -- category
-    (EXISTS (
-      SELECT 1 FROM b2b_specific_price_category x
-      JOIN ps_category_product cp ON cp.id_category = x.id_category
-      WHERE x.b2b_specific_price_id = bsp.id AND cp.id_product = p_id_product
-    )) DESC,
-
-    -- country
-    (EXISTS (SELECT 1 FROM b2b_specific_price_country x WHERE x.b2b_specific_price_id = bsp.id AND x.b2b_id_country = p_id_country)) DESC,
-
     bsp.id DESC
 
   LIMIT 1;
 
   -- ================= APPLY =================
-  SET v_excl = v_base;
-
   IF v_has_specific = 1 THEN
 
     IF v_reduction_type = 'amount' THEN
 
-      -- convert specific price currency if needed
       IF v_specific_currency_id IS NOT NULL AND v_specific_currency_id != v_target_currency THEN
 
         SELECT r.conversion_rate
@@ -173,7 +179,6 @@ BEGIN
         ORDER BY r.created_at DESC
         LIMIT 1;
 
-        -- normalize → then convert to target
         SET v_excl = (v_fixed_price / v_specific_rate) * v_target_rate;
 
       ELSE
@@ -379,10 +384,19 @@ BEGIN
         m.name AS manufacturer,
         cl.name AS category,
 
+        p.is_oem,
         EXISTS(
           SELECT 1 FROM b2b_favorites f
           WHERE f.user_id = p_id_customer AND f.product_id = p_id_product
-        ) AS is_favorite
+        ) AS is_favorite,
+        CASE
+          WHEN ps.date_add >= DATE_SUB(
+            NOW(),
+            INTERVAL COALESCE(CAST(ps_configuration.value AS SIGNED), 20) DAY
+          ) AND ps.active = 1
+          THEN 1
+          ELSE 0
+        END AS is_new
 
 
 
@@ -400,6 +414,8 @@ BEGIN
        AND cl.id_shop = p_id_shop
     LEFT JOIN ps_manufacturer m 
         ON m.id_manufacturer = p.id_manufacturer
+    LEFT JOIN ps_configuration
+        ON ps_configuration.name = PS_NB_DAYS_NEW_PRODUCT
 
     WHERE p.id_product = p_id_product
     LIMIT 1;