expand orders

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

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

@@ -66,6 +66,11 @@ var columnMappingListOrders map[string]string = map[string]string{
 	"name":       "b2b_customer_orders.name",
 	"country_id": "b2b_customer_orders.country_id",
 	"status":     "b2b_customer_orders.status",
+	"base_price": "b2b_customer_orders.base_price",
+	"tax_incl":   "b2b_customer_orders.tax_incl",
+	"tax_excl":   "b2b_customer_orders.tax_excl",
+	"created_at": "b2b_customer_orders.created_at",
+	"updated_at": "b2b_customer_orders.updated_at",
 }
 
 func (h *OrdersHandler) PlaceNewOrder(c fiber.Ctx) error {

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

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

app/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/ordersRepo/ordersRepo.go

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

app/service/authService/auth.go

@@ -99,6 +99,7 @@ func (s *AuthService) Login(req *model.LoginRequest) (*model.AuthResponse, strin
 		user.LangID = *req.LangID
 	}
 
+	user.Country = nil
 	s.db.Save(&user)
 
 	// Generate access token (JWT)
@@ -210,6 +211,7 @@ func (s *AuthService) CompleteRegistration(req *model.CompleteRegistrationReques
 	user.EmailVerificationToken = ""
 	user.EmailVerificationExpires = nil
 
+	user.Country = nil
 	if err := s.db.Save(&user).Error; err != nil {
 		return nil, "", fmt.Errorf("failed to update user: %w", err)
 	}
@@ -278,6 +280,7 @@ func (s *AuthService) RequestPasswordReset(emailAddr string) error {
 	user.PasswordResetToken = token
 	user.PasswordResetExpires = &expiresAt
 	user.LastPasswordResetRequest = &now
+	user.Country = nil
 	if err := s.db.Save(&user).Error; err != nil {
 		return fmt.Errorf("failed to save reset token: %w", err)
 	}
@@ -328,6 +331,7 @@ func (s *AuthService) ResetPassword(token, newPassword string) error {
 	user.PasswordResetToken = ""
 	user.PasswordResetExpires = nil
 
+	user.Country = nil
 	if err := s.db.Save(&user).Error; err != nil {
 		return fmt.Errorf("failed to update password: %w", err)
 	}
@@ -539,6 +543,7 @@ func (s *AuthService) UpdateJWTToken(user *model.Customer) (string, error) {
 	}
 
 	// Save the updated user
+	user.Country = nil
 	if err := s.db.Save(user).Error; err != nil {
 		return "", fmt.Errorf("database error: %w", err)
 	}

app/service/authService/google_oauth.go

@@ -83,6 +83,7 @@ func (s *AuthService) HandleGoogleCallback(code string) (*model.AuthResponse, st
 	// Update last login
 	now := time.Now()
 	user.LastLoginAt = &now
+	user.Country = nil
 	s.db.Save(user)
 
 	// Generate access token (JWT)

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

@@ -8,8 +8,10 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/repos/cartsRepo"
 	"git.ma-al.com/goc_daniel/b2b/app/repos/ordersRepo"
+	"git.ma-al.com/goc_daniel/b2b/app/repos/productsRepo"
 	"git.ma-al.com/goc_daniel/b2b/app/service/addressesService"
 	"git.ma-al.com/goc_daniel/b2b/app/service/emailService"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -18,6 +20,7 @@ import (
 type OrderService struct {
 	ordersRepo       ordersRepo.UIOrdersRepo
 	cartsRepo        cartsRepo.UICartsRepo
+	productsRepo     productsRepo.UIProductsRepo
 	addressesService *addressesService.AddressesService
 	emailService     *emailService.EmailService
 }
@@ -26,6 +29,7 @@ func New() *OrderService {
 	return &OrderService{
 		ordersRepo:       ordersRepo.New(),
 		cartsRepo:        cartsRepo.New(),
+		productsRepo:     productsRepo.New(),
 		addressesService: addressesService.New(),
 		emailService:     emailService.NewEmailService(),
 	}
@@ -82,8 +86,10 @@ func (s *OrderService) PlaceNewOrder(user_id uint, cart_id uint, name string, co
 		name = *cart.Name
 	}
 
+	base_price, tax_incl, tax_excl, err := s.getOrderTotalPrice(user_id, cart_id, country_id)
+
 	// all checks passed
-	err = s.ordersRepo.PlaceNewOrder(cart, name, country_id, address_info)
+	err = s.ordersRepo.PlaceNewOrder(cart, name, country_id, address_info, base_price, tax_incl, tax_excl)
 	if err != nil {
 		return err
 	}
@@ -143,3 +149,27 @@ func (s *OrderService) ChangeOrderStatus(user *model.Customer, order_id uint, st
 
 	return s.ordersRepo.ChangeOrderStatus(order_id, status)
 }
+
+func (s *OrderService) getOrderTotalPrice(user_id uint, cart_id uint, country_id uint) (float64, float64, float64, error) {
+	cart, err := s.cartsRepo.RetrieveCart(user_id, cart_id)
+	if err != nil {
+		return 0.0, 0.0, 0.0, err
+	}
+
+	base_price := 0.0
+	tax_incl := 0.0
+	tax_excl := 0.0
+
+	for _, product := range cart.Products {
+		prices, err := s.productsRepo.GetPrice(product.ProductID, product.ProductAttributeID, constdata.SHOP_ID, user_id, country_id, product.Amount)
+		if err != nil {
+			return 0.0, 0.0, 0.0, err
+		}
+
+		base_price += prices.Base
+		tax_incl += prices.FinalTaxIncl
+		tax_excl += prices.FinalTaxExcl
+	}
+
+	return base_price, tax_incl, tax_excl, nil
+}

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/b2b_daniel/auth/update-choice.yml

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

bruno/b2b_daniel/carts/add-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&set_amount=true
+  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&product_attribute_id=1115&amount=2&set_amount=true
   params:
     - name: cart_id
       value: "1"
@@ -17,7 +17,7 @@ http:
       value: "1115"
       type: query
     - name: amount
-      value: "1"
+      value: "2"
       type: query
     - name: set_amount
       value: "true"

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
@@ -250,6 +251,11 @@ CREATE TABLE IF NOT EXISTS b2b_customer_orders (
   country_id BIGINT UNSIGNED NOT NULL,
   address_string TEXT NOT NULL,
   status VARCHAR(50) NOT NULL,
+  created_at DATETIME NOT NULL,
+  updated_at DATETIME NOT NULL,
+  base_price DECIMAL(10, 2) NOT NULL,
+  tax_incl DECIMAL(10, 2) NOT NULL,
+  tax_excl DECIMAL(10, 2) NOT NULL,
   CONSTRAINT fk_customer_orders_customers FOREIGN KEY (user_id) REFERENCES b2b_customers(id) ON DELETE NO ACTION ON UPDATE CASCADE,
   CONSTRAINT fk_customer_orders_countries FOREIGN KEY (country_id) REFERENCES b2b_countries(id) ON DELETE NO ACTION ON UPDATE CASCADE
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;

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 = (
-    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
+  WHERE tr.id_tax_rules_group = v_tax_group
+    AND tr.id_country = c.ps_id_country
   LIMIT 1;
 
-  -- ================= TARGET CURRENCY =================
-  SELECT c.b2b_id_currency
-  INTO v_target_currency
+  IF v_is_no_vat = 1 THEN
+    SET v_tax_rate = 0;
+  END IF;
+
+  -- ================= CURRENCY =================
+  SELECT c.b2b_id_currency, r.conversion_rate
+  INTO v_target_currency, v_target_rate
   FROM b2b_countries c
+  LEFT JOIN b2b_currency_rates r
+    ON r.b2b_id_currency = c.b2b_id_currency
   WHERE c.id = p_id_country
-  LIMIT 1;
-
-  -- latest target rate
-  SELECT r.conversion_rate
-  INTO v_target_rate
-  FROM b2b_currency_rates r
-  WHERE r.b2b_id_currency = v_target_currency
   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 (
-      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 (spp.id_product IS NOT NULL OR NOT EXISTS (
+          SELECT 1 FROM b2b_specific_price_product x WHERE x.b2b_specific_price_id = bsp.id
+        ))
 
-    AND (
-      NOT EXISTS (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 (spa.id_product_attribute IS NOT NULL OR NOT EXISTS (
+          SELECT 1 FROM b2b_specific_price_product_attribute x WHERE x.b2b_specific_price_id = bsp.id
+        ))
 
-    AND (
-      NOT EXISTS (SELECT 1 FROM b2b_specific_price_category 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 (spc.b2b_id_customer IS NOT NULL OR NOT EXISTS (
+          SELECT 1 FROM b2b_specific_price_customer x WHERE x.b2b_specific_price_id = bsp.id
+        ))
 
-    AND (
-      NOT EXISTS (SELECT 1 FROM b2b_specific_price_customer 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 (spco.b2b_id_country IS NOT NULL OR NOT EXISTS (
+          SELECT 1 FROM b2b_specific_price_country x WHERE x.b2b_specific_price_id = bsp.id
+        ))
 
-    AND (
-      NOT EXISTS (SELECT 1 FROM b2b_specific_price_country 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)
-    )
+    AND (cp.id_product IS NOT NULL OR NOT EXISTS (
+          SELECT 1 FROM b2b_specific_price_category x WHERE x.b2b_specific_price_id = bsp.id
+        ))
 
   ORDER BY
-    -- customer wins
-    (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,
-
-    -- attribute
-    (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,
-
-    -- 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,
-
+    (spc.b2b_id_customer IS NOT NULL) DESC,
+    (spa.id_product_attribute IS NOT NULL) DESC,
+    (spp.id_product IS NOT NULL) DESC,
+    (cp.id_product IS NOT NULL) DESC,
+    (spco.b2b_id_country IS NOT NULL) DESC,
     bsp.id DESC
 
   LIMIT 1;
 
   -- ================= 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