fix: addresses

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

@@ -46,8 +46,7 @@ func (h *CartsHandler) AddNewCart(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
 	}
 
-	name := c.Query("name")
+	new_cart, err := h.cartsService.CreateNewCart(userID)
-	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)))

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

@@ -32,7 +32,6 @@ 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
 }
 
@@ -101,28 +100,3 @@ 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,7 +112,6 @@ 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,7 +35,6 @@ 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,8 +12,7 @@ type ProductInList struct {
 	PriceTaxExcl   float64 `gorm:"column:price_tax_excl" json:"price_tax_excl"`
 	PriceTaxIncl   float64 `gorm:"column:price_tax_incl" json:"price_tax_incl"`
 	IsFavorite     bool    `gorm:"column:is_favorite" json:"is_favorite"`
-	IsNew          bool    `gorm:"column:is_new" json:"is_new"`
+	IsNew          uint    `gorm:"column:is_new" json:"is_new"`
-	IsOEM          bool    `gorm:"column:is_oem" json:"is_oem"`
 }
 
 type ProductFilters struct {

app/repos/cartsRepo/cartsRepo.go

@@ -12,7 +12,7 @@ import (
 
 type UICartsRepo interface {
 	CartsAmount(user_id uint) (uint, error)
-	CreateNewCart(user_id uint, name string) (model.CustomerCart, error)
+	CreateNewCart(user_id uint) (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
@@ -42,7 +42,10 @@ func (repo *CartsRepo) CartsAmount(user_id uint) (uint, error) {
 	return amt, err
 }
 
-func (repo *CartsRepo) CreateNewCart(user_id uint, name string) (model.CustomerCart, error) {
+func (repo *CartsRepo) CreateNewCart(user_id uint) (model.CustomerCart, error) {
+	var name string
+	name = constdata.DEFAULT_NEW_CART_NAME
+
 	cart := model.CustomerCart{
 		UserID: user_id,
 		Name:   &name,

app/repos/customerRepo/customerRepo.go

@@ -17,7 +17,6 @@ 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{}
@@ -115,7 +114,3 @@ 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/productsRepo/productsRepo.go

@@ -122,19 +122,6 @@ 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{
@@ -163,7 +150,6 @@ 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
@@ -180,9 +166,7 @@ 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"),
 					},
 				},
@@ -198,8 +182,7 @@ 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, name string) (model.CustomerCart, error) {
+func (s *CartsService) CreateNewCart(user_id uint) (model.CustomerCart, error) {
 	var cart model.CustomerCart
 
 	customers_carts_amount, err := s.repo.CartsAmount(user_id)
@@ -28,12 +28,8 @@ func (s *CartsService) CreateNewCart(user_id uint, name string) (model.CustomerC
 		return cart, responseErrors.ErrMaxAmtOfCartsReached
 	}
 
-	if name == "" {
-		name = constdata.DEFAULT_NEW_CART_NAME
-	}
-
 	// create new cart for customer
-	cart, err = s.repo.CreateNewCart(user_id, name)
+	cart, err = s.repo.CreateNewCart(user_id)
 
 	return cart, nil
 }

app/service/customerService/customerService.go

@@ -24,7 +24,3 @@ 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/menuService/menuService.go

@@ -231,54 +231,21 @@ 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_eq=" + strconv.Itoa(int((*all_categories)[i].CategoryID))
+		(*all_categories)[i].Filter = "category_id_in=" + strconv.Itoa(int((*all_categories)[i].CategoryID))
 	}
 
-	// the new products category
+	var additional model.ScannedCategory
-	var new_products_category model.ScannedCategory
+	additional.CategoryID = 10001
-	new_products_category.CategoryID = constdata.ADDITIONAL_CATEGORIES_INDEX + 1
+	additional.Name = "New Products"
-	new_products_category.Name = "New Products"
+	additional.Active = 1
-	new_products_category.Active = 1
+	additional.Position = 10
-	new_products_category.Position = 10
+	additional.ParentID = 2
-	new_products_category.ParentID = 2
+	additional.IsRoot = 0
-	new_products_category.IsRoot = 0
+	additional.LinkRewrite = i18n.T___(id_lang, "category.new_products")
-	new_products_category.LinkRewrite = i18n.T___(id_lang, "category.new_products")
+	additional.IsoCode = iso_code
-	new_products_category.IsoCode = iso_code
 
-	new_products_category.Visited = false
+	additional.Visited = false
-	new_products_category.Filter = "is_new_eq=true"
+	additional.Filter = "is_new_in=true"
 
-	*all_categories = append(*all_categories, new_products_category)
+	*all_categories = append(*all_categories, additional)
-
-	// 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,7 +9,6 @@ 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}

app/view/product.go

@@ -95,6 +95,4 @@ 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

@@ -73,7 +73,6 @@ declare module 'vue' {
     UTable: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Table.vue')['default']
     UTabs: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Tabs.vue')['default']
     UTextarea: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Textarea.vue')['default']
-    UTooltip: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Tooltip.vue')['default']
     UTree: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Tree.vue')['default']
   }
 }

bo/src/components/admin/UsersList.vue

@@ -1,13 +1,12 @@
 <template>
-    <div class="flex flex-col md:flex-row gap-10">
+            <div class="flex flex-col md:flex-row gap-10">
-        <div class="w-full flex flex-col items-center gap-4">
+            <div class="w-full flex flex-col items-center gap-4">
-            <UTable :data="usersList" :columns="columns" class="flex-1 w-full" :ui="{
+                <UTable :data="usersList" :columns="columns" class="flex-1 w-full"
-                root: 'max-w-100wv overflow-auto!'
+                    :ui="{ root: 'max-w-100wv overflow-auto!' }" />
-            }" />
+                <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
-            <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
+            </div>
         </div>
-    </div>
+    </template>
-</template>
 
 <script setup lang="ts">
 import { ref, computed, watch, resolveComponent, h } from 'vue'
@@ -196,7 +195,7 @@ const columns: TableColumn<Customer>[] = [
                 variant: 'soft',
                 onClick: () => {
                     router.push({
-                        name: 'customer-management-profile',
+                        name: 'customer-management-profile', 
                         params: { user_id: userId }
                     })
                 }

bo/src/components/admin/UsersSearch.vue

@@ -1,25 +1,23 @@
 <template>
-    <div class="pt-70! flex flex-col items-center justify-center bg-gray-50 dark:bg-(--main-dark)">
+            <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>
+            <h1 class="text-6xl font-bold text-black dark:text-white mb-14">Search Users</h1>
 
-        <div class="w-full flex flex-col items-center gap-4">
+            <div class="w-full max-w-4xl">
-            <UInput icon="i-lucide-search" type="text" placeholder="Type user name or ID..." v-model="searchQuery"
+                <UInput icon="i-lucide-search" type="text" placeholder="Type user name or ID..." v-model="searchQuery"
-                class="flex-1 w-full" :ui="{
+                    class="w-full!" :ui="{ base: 'py-4! rounded-full!' }" />
-                    root: 'max-w-100wv overflow-auto!'
+            </div>
-                }" />
+
+            <p v-if="loading">Loading...</p>
+            <p v-else-if="error" class="text-red-600">{{ error }}</p>
+            <div v-else-if="clients.length" class="w-full max-w-4xl mt-7">
+                <UTable :columns="columns" :data="clients" :ui="{ root: 'w-full!' }" />
+            </div>
+
+            <p v-else-if="searchQuery.length" class="pt-4 text-gray-700">
+                No users found with that name or ID
+            </p>
         </div>
-
+    </template>
-        <p v-if="loading">Loading...</p>
-        <p v-else-if="error" class="text-red-600">{{ error }}</p>
-        <div v-else-if="clients.length" class="w-full max-w-4xl mt-7">
-            <UTable :columns="columns" :data="clients" :ui="{ root: 'w-full!' }" />
-        </div>
-
-        <p v-else-if="searchQuery.length" class="pt-4 text-gray-700">
-            No users found with that name or ID
-        </p>
-    </div>
-</template>
 
 <script setup lang="ts">
 import { ref, computed, watch, resolveComponent, h } from 'vue'

bo/src/components/customer/PageAddresses.vue

@@ -1,248 +1,239 @@
 <template>
-            <div class="">
+    <div class="flex flex-col gap-5">
-            <div class="flex flex-col gap-5 mb-6">
+        <div class="flex justify-between items-center">
-                <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Addresses') }}</h1>
+            <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">
+                <UIcon name="mdi:add-bold" />
-                        <UInput v-model="searchQuery" type="text" :placeholder="t('Search address')"
+                {{ t('Add Address') }}
-                            class="bg-white dark:bg-gray-800 text-black dark:text-white absolute" />
+            </UButton>
-                        <UIcon name="ic:baseline-search"
+        </div>
-                            class="text-[20px] text-(--text-sky-light) dark:text-(--text-sky-dark) relative left-40" />
+
-                    </div>
+        <div v-if="store.loading" class="text-center py-8 text-gray-500 dark:text-gray-400">
-                    <UButton color="info" @click="openCreateModal">
+            {{ t('Loading...') }}
-                        <UIcon name="mdi:add-bold" />
+        </div>
-                        {{ t('Add Address') }}
+        <div v-else-if="store.error" class="text-center py-8 text-red-500">
+            {{ store.error }}
+        </div>
+        <div v-else-if="store.addresses.length" class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6">
+            <div v-for="addr in store.addresses" :key="addr.id"
+                class="border border-(--border-light) dark:border-(--border-dark) rounded-md p-4 bg-(--second-light) dark:bg-(--main-dark) flex justify-between">
+                <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]" />
+                    </UButton>
+                    <UButton size="sm" color="neutral" variant="outline" @click="openModal(addr)">
+                        {{ t('edit') }}
+                        <UIcon name="ic:sharp-edit" class="text-[14px]" />
                     </UButton>
                 </div>
             </div>
-            <div v-if="cartStore.addressLoading" class="text-center py-8 text-gray-500 dark:text-gray-400">
-                {{ t('Loading addresses...') }}
-            </div>
-            <div v-else-if="cartStore.addressError" class="text-center py-8 text-red-500 dark:text-red-400">
-                {{ cartStore.addressError }}
-            </div>
-            <div v-else-if="cartStore.paginatedAddresses.length"
-                class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6">
-                <div v-for="address in cartStore.paginatedAddresses" :key="address.id"
-                    class="border border-(--border-light) dark:border-(--border-dark) rounded-md p-4 bg-(--second-light) dark:bg-(--main-dark) hover:shadow-md transition-shadow flex justify-between">
-                    <div class="flex flex-col gap-2 items-start justify-end">
-                        <p class="text-black dark:text-white font-semibold">{{ address.address_info.recipient }}</p>
-                        <p class="text-black dark:text-white">{{ address.address_info.street }} {{
-                            address.address_info.building_no }}{{ address.address_info.apartment_no ? '/' +
-                                address.address_info.apartment_no : '' }}</p>
-                        <p class="text-black dark:text-white">{{ address.address_info.postal_code }}, {{
-                            address.address_info.city }}</p>
-                        <p class="text-black dark:text-white">{{ address.address_info.voivodeship }}</p>
-                        <p v-if="address.address_info.address_line2" class="text-black dark:text-white">{{
-                            address.address_info.address_line2 }}</p>
-                    </div>
-                    <div class="flex flex-col items-end justify-between gap-2">
-                        <button @click="confirmDelete(address.id)"
-                            class="p-2 text-red-500 bg-red-100 dark:bg-(--main-dark)  rounded transition-colors"
-                            :title="t('Remove')">
-                            <UIcon name="material-symbols:delete" class="text-[18px]" />
-                        </button>
-                        <UButton size="sm" color="neutral" variant="outline" @click="openEditModal(address)"
-                            class="text-(--text-sky-light) dark:text-(--text-sky-dark) text-[13px]">
-                            {{ t('edit') }}
-                            <UIcon name="ic:sharp-edit" class="text-[15px]" />
-                        </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 class="mt-6 flex justify-center">
-                <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>
-                    <div class="p-6 flex flex-col gap-6">
-                        <p class="text-[20px] text-black dark:text-white ">Address</p>
-                        <UForm @submit="saveAddress" class="space-y-4" :validate="validate" :state="formData">
-                            <template v-for="field in formFieldKeys" :key="field">
-                                <UFormField :label="fieldLabel(field)" :name="field"
-                                    :required="field !== 'address_line2'">
-                                    <UInput v-model="formData[field]" :placeholder="fieldLabel(field)" class="w-full" />
-                                </UFormField>
-                            </template>
-
-                            <div class="flex justify-end gap-2">
-                                <UButton variant="outline" color="neutral" @click="closeModal">
-                                    {{ t('Cancel') }}
-                                </UButton>
-
-                                <UButton type="submit" color="info" class="cursor-pointer">
-                                    {{ t('Save') }}
-                                </UButton>
-                            </div>
-                        </UForm>
-                    </div>
-                </template>
-            </UModal>
-            <UModal v-model:open="showDeleteConfirm" :overlay="true" class="max-w-md mx-auto">
-                <template #content>
-                    <div class="p-6 flex flex-col gap-3">
-                        <div class="flex flex-col gap-2 justify-center items-center">
-                            <p class="flex items-end gap-2 dark:text-white text-black">
-                                <UIcon name='f7:exclamationmark-triangle' class="text-[35px] text-red-700" />
-                                Confirm Delete
-                            </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">
-                            <UButton variant="outline" color="neutral" @click="showDeleteConfirm = false"
-                                class="dark:text-white text-black">{{ t('Cancel') }}
-                            </UButton>
-                            <UButton variant="outline" color="neutral" @click="deleteAddress" class="text-red-700">
-                                {{ t('Delete') }}</UButton>
-                        </div>
-                    </div>
-                </template>
-            </UModal>
         </div>
-    </template>
+        <div v-else class="text-center py-8 text-gray-500 dark:text-gray-400">
+            {{ t('No addresses found') }}
+        </div>
+
+        <UModal v-model:open="showModal">
+            <template #header>
+                <h3 class="text-lg font-semibold text-black dark:text-white">
+                    {{ editingId ? t('Edit Address') : t('Add Address') }}
+                </h3>
+            </template>
+            <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>
+                        </template>
+                        <template #item-leading="{ item }">
+                            <span class="text-lg mr-1">{{ item.flag }} {{ item.name }}</span>
+                        </template>
+                    </USelectMenu>
+
+                    <div v-if="templateLoading" class="text-center py-4 text-gray-500 dark:text-gray-400">
+                        {{ t('Loading...') }}
+                    </div>
+                    <p v-else-if="!selectedCountry" class="text-center text-sm text-gray-400 dark:text-gray-500">
+                        {{ t('Select a country to continue') }}
+                    </p>
+                    <UForm v-else :validate="validate" :state="formData" @submit="save" class="space-y-4">
+                        <UFormField v-for="field in templateKeys" :key="field" :label="fieldLabel(field)" :name="field"
+                            :required="!optionalFields.has(field)">
+                            <UInput v-model="formData[field]" :placeholder="fieldLabel(field)" 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>
+            </template>
+        </UModal>
+
+        <UModal v-model:open="showDeleteConfirm">
+            <template #body>
+                <div class="flex flex-col items-center gap-3 py-2">
+                    <UIcon name="f7:exclamationmark-triangle" class="text-[40px] text-red-600" />
+                    <p class="font-semibold text-black dark:text-white">{{ t('Confirm Delete') }}</p>
+                    <p class="text-sm text-gray-600 dark:text-gray-300">
+                        {{ t('Are you sure you want to delete this address?') }}
+                    </p>
+                </div>
+            </template>
+            <template #footer>
+                <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>
+                </div>
+            </template>
+        </UModal>
+    </div>
+</template>
 
 <script setup lang="ts">
-import { ref, reactive, computed, watch, onMounted } from 'vue'
+import { ref, reactive, computed } from 'vue'
-import { useCartStore } from '@/stores/customer/cart'
 import { useI18n } from 'vue-i18n'
-import { currentCountry } from '@/router/langs'
+import { countries } from '@/router/langs'
+import { useAddressStore } from '@/stores/customer/address'
+import type { Country } from '@/types'
+import type { Address } from '@/stores/customer/address'
 
-type AddressFormState = Record<string, string>
-
-const cartStore = useCartStore()
 const { t } = useI18n()
-const searchQuery = ref(cartStore.addressSearchQuery)
+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 addressTemplate = ref<AddressFormState | null>(null)
+const templateLoading = ref(false)
-const formData = reactive<AddressFormState>({})
+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 = computed<number>({
+const fieldLabels: Record<string, string> = {
-    get: () => cartStore.addressCurrentPage,
+    recipient: 'Recipient',
-    set: (value: number) => cartStore.setAddressPage(value)
+    street: 'Street',
-})
+    thoroughfare: 'Street',
-const totalItems = computed(() => cartStore.totalAddressItems)
+    building_no: 'Building No',
-const pageSize = cartStore.addressPageSize
+    building_name: 'Building Name',
-const formFieldKeys = computed(() => (addressTemplate.value ? Object.keys(addressTemplate.value) : []))
+    house_number: 'House Number',
-
+    orientation_number: 'Orientation Number',
-watch(searchQuery, (val) => {
+    apartment_no: 'Apartment No',
-    cartStore.setAddressSearchQuery(val)
+    sub_building: 'Sub Building',
-})
+    postal_code: 'Zip Code',
-
+    post_town: 'City',
-onMounted(() => {
+    city: 'City',
-    cartStore.fetchAddresses()
+    county: 'County',
-})
+    region: 'Region',
-
+    voivodeship: 'Region / Voivodeship',
-function clearFormData() {
+    address_line2: 'Address Line 2'
-    Object.keys(formData).forEach((key) => delete formData[key])
 }
 
 function fieldLabel(key: string) {
-    const labels: Record<string, string> = {
+    return t(fieldLabels[key] ?? key.replace(/_/g, ' ').replace(/\b\w/g, (c) => c.toUpperCase()))
-        postal_code: 'Zip Code',
-        post_town: 'City',
-        city: 'City',
-        county: 'County',
-        region: 'Region',
-        voivodeship: 'Region / Voivodeship',
-        street: 'Street',
-        thoroughfare: 'Street',
-        building_no: 'Building No',
-        building_name: 'Building Name',
-        house_number: 'House Number',
-        orientation_number: 'Orientation Number',
-        apartment_no: 'Apartment No',
-        sub_building: 'Sub Building',
-        address_line2: 'Address Line 2',
-        recipient: 'Recipient'
-    }
-
-    return t(labels[key] ?? key.replace(/_/g, ' ').replace(/\b\w/g, (chr) => chr.toUpperCase()))
-}
-
-async function openCreateModal() {
-    resetForm()
-    isEditing.value = false
-
-    const template = await cartStore.getAddressTemplate(Number(currentCountry.value?.id) | 2).catch(() => null)
-    if (template) {
-        addressTemplate.value = template
-        clearFormData()
-        Object.assign(formData, template)
-    }
-
-    showModal.value = true
-}
-
-async function openEditModal(address: any) {
-    currentCountry.value = address.country_id || 1
-    const template = await cartStore.getAddressTemplate(address.country_id | 2).catch(() => null)
-
-    if (template) {
-        addressTemplate.value = template
-        clearFormData()
-        Object.assign(formData, template)
-    }
-
-    if (address.address_info) {
-        formFieldKeys.value.forEach((key) => {
-            formData[key] = address.address_info[key] ?? ''
-        })
-    }
-
-    isEditing.value = true
-    editingAddressId.value = address.id
-    showModal.value = true
-}
-
-function resetForm() {
-    clearFormData()
-    editingAddressId.value = null
-}
-
-function closeModal() {
-    showModal.value = false
-    resetForm()
 }
 
 function validate() {
-    const errors: Array<{ name: string; message: string }> = []
+    return templateKeys.value
-    const optionalFields = new Set(['address_line2'])
+        .filter((key) => !optionalFields.has(key) && !formData[key]?.trim())
-
+        .map((key) => ({ name: key, message: t(`${fieldLabel(key)} is required`) }))
-    formFieldKeys.value.forEach((key) => {
-        if (!optionalFields.has(key) && !formData[key]?.trim()) {
-            errors.push({ name: key, message: `${fieldLabel(key)} required` })
-        }
-    })
-
-    return errors
 }
 
-async function saveAddress() {
+function applyTemplate(tpl: Record<string, string>, existing?: Record<string, string>) {
-    if (isEditing.value && editingAddressId.value) {
+    Object.keys(formData).forEach((k) => delete formData[k])
-        await cartStore.updateAddress(editingAddressId.value, currentCountry.value?.id || 2, formData)
+    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 {
-        await cartStore.addAddress(currentCountry.value?.id || 2, formData)
+        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
 }
 
 async function deleteAddress() {
-    if (addressToDelete.value) {
+    if (deleteId.value) await store.deleteAddress(deleteId.value)
-        await cartStore.deleteAddress(addressToDelete.value)
-    }
     showDeleteConfirm.value = false
-    addressToDelete.value = null
+    deleteId.value = null
 }
-</script>
+
+store.fetchAddresses()
+</script>

bo/src/components/customer/PageCart.vue

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

bo/src/components/customer/PageCarts.vue

@@ -1,79 +1,76 @@
 <template>
-    <div class="flex flex-col gap-5 md:gap-10">
+  <div class="flex flex-col gap-5 md:gap-10">
-        <div class="flex flex-col md:flex-row justify-between items-center gap-4">
+    <div class="flex flex-col md:flex-row justify-between items-center gap-4">
-            <div class="flex items-start gap-2">
+      <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Shopping Carts') }}</h1>
-                <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Shopping Carts') }}</h1>
+      <div class="flex gap-3">
-                <UTooltip :delay-duration="0" text="You can create up to 10 carts.">
+        <UButton color="primary" @click="showCreateModal = true"
-                    <UIcon name="icon-park-outline:attention" class="text-[15px] text-blue-500" />
+          class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light)">
-                </UTooltip>
+          <UIcon name="mdi:plus" class="mr-1" />
-            </div>
+          {{ t('New Cart') }}
-            <div class="flex items-start gap-1">
+        </UButton>
-                <UButton color="info" @click="showCreateModal = true" :disabled="cartStore.carts?.length >= 10"
+      </div>
-                    class="">
-                    <UIcon name="mdi:plus" class="mr-1" />
-                    {{ t('New Cart') }}
-                </UButton>
-            </div>
-        </div>
-
-        <div class="w-full">
-            <div
-                class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
-                <h2
-                    class="text-lg font-semibold text-black dark:text-white p-4 border-b border-(--border-light) dark:border-(--border-dark)">
-                    {{ t('Your Carts') }}
-                </h2>
-                <div v-if="cartStore.carts?.length > 0"
-                    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)"
-                        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-black dark:text-white font-medium truncate cursor-pointer"
-                                    @click="openCart(cart)">{{ cart.name }}</p>
-                            </div>
-                        </div>
-                        <input type="checkbox" :checked="cartStore.activeCartId === cart.cart_id"
-                            @change="toggleCart(cart.cart_id)" />
-                    </div>
-                </div>
-                <div v-else class="p-8 text-center flex items-center justify-center">
-                    <UIcon name="mdi:cart-outline" class="text-4xl text-gray-300 dark:text-gray-600 mb-2" />
-                    <p class="text-gray-500 dark:text-gray-400">{{ t('No carts yet') }}</p>
-                </div>
-            </div>
-        </div>
     </div>
 
-    <UModal v-model:open="showCreateModal">
+    <div class="w-full">
-        <template #body>
+      <div
-            <div class="flex flex-col gap-5">
+        class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
-                <h3 class="text-xl font-bold text-black dark:text-white text-center">{{ t('Create New Cart') }}</h3>
+        <h2
-                <div class="flex flex-col gap-4">
+          class="text-lg font-semibold text-black dark:text-white p-4 border-b border-(--border-light) dark:border-(--border-dark)">
-                    <UInput v-model="newCartName" :placeholder="t('Cart name')"
+          {{ t('Your Carts') }}
-                        class="w-full bg-white dark:bg-gray-800 text-black dark:text-white" />
+        </h2>
-                </div>
+        <div v-if="cartStore.carts?.length > 0" class="divide-y divide-(--border-light) dark:divide-(--border-dark)">
-                <div class="flex justify-end gap-2">
+          <div v-for="cart in cartStore.carts" :key="cart.cart_id" @click="cartStore.setActiveCart(cart.cart_id)"
-                    <UButton variant="outline" color="neutral" @click="showCreateModal = false">
+            class="p-4 cursor-pointer flex gap-2 items-center justify-between" :class="cartStore.activeCartId === cart.cart_id
-                        {{ t('Cancel') }}
+              ? 'bg-blue-50 dark:bg-blue-900/20'
-                    </UButton>
+              : 'hover:bg-gray-50 dark:hover:bg-gray-800 border-l-4 border-transparent'">
-                    <UButton color="info" @click="createCart" :disabled="!newCartName.trim()"
+            <div class="flex-1 min-w-0">
-                        class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white">
+              <div class="flex items-center gap-2">
-                        {{ t('Create') }}
+                <p class="text-red-600 font-medium truncate">{{ cart.cart_id }}</p>
-                    </UButton>
+                <p class="text-black dark:text-white font-medium truncate cursor-pointer" @click="openCart(cart)">{{
-                </div>
+                  cart.name }}</p>
+              </div>
             </div>
-        </template>
+            <input type="checkbox" :checked="cartStore.activeCartId === cart.cart_id"
-    </UModal>
+              @change="toggleCart(cart.cart_id)" />
+          </div>
+        </div>
+        <div v-else class="p-8 text-center">
+          <UIcon name="mdi:cart-outline" class="text-4xl text-gray-300 dark:text-gray-600 mb-2" />
+          <p class="text-gray-500 dark:text-gray-400">{{ t('No carts yet') }}</p>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <UModal v-model:open="showCreateModal">
+    <template #header>
+      <h3 class="text-lg font-semibold text-black dark:text-white">{{ t('Create New Cart') }}</h3>
+    </template>
+    <template #body>
+      <div class="flex flex-col gap-4">
+        <UInput v-model="newCartName" :placeholder="t('Cart name')"
+          class="w-full bg-white dark:bg-gray-800 text-black dark:text-white" />
+      </div>
+    </template>
+    <template #footer>
+      <div class="flex justify-end gap-2">
+        <UButton variant="outline" color="neutral" @click="showCreateModal = false">
+          {{ t('Cancel') }}
+        </UButton>
+        <UButton color="primary" @click="createCart" :disabled="!newCartName.trim()"
+          class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white">
+          {{ t('Create') }}
+        </UButton>
+      </div>
+    </template>
+  </UModal>
 </template>
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
 import { useCartStore } from '@/stores/customer/cart'
 import { useI18n } from 'vue-i18n'
+import Default from '@/layouts/default.vue'
 import { useRouter } from 'vue-router'
 
 const router = useRouter()
@@ -85,24 +82,26 @@ const showCreateModal = ref(false)
 const newCartName = ref('')
 
 async function createCart() {
-    await cartStore.addNewCart(newCartName.value)
+  await cartStore.addNewCart(newCartName.value)
-    newCartName.value = ''
+  newCartName.value = ''
-    showCreateModal.value = false
+  showCreateModal.value = false
 }
 
+
 onMounted(() => {
-    cartStore.fetchCarts()
+  cartStore.fetchCarts()
 })
 
+
 function openCart(cart) {
-    router.push({ name: 'customer-cart', params: { id: cart.cart_id } });
+  router.push({ name: 'customer-cart', params: { id: cart.cart_id } });
 }
 
 function toggleCart(cartId: number) {
-    if (cartStore.activeCartId === cartId) {
+  if (cartStore.activeCartId === cartId) {
-        cartStore.setActiveCart(null)
+    cartStore.setActiveCart(null)
-    } else {
+  } else {
-        cartStore.setActiveCart(cartId)
+    cartStore.setActiveCart(cartId)
-    }
+  }
 }
 </script>

bo/src/components/customer/PageProducts.vue

@@ -1,60 +1,136 @@
 <template>
     <suspense>
-        <div class="">
+                    <div class="">
-            <h1 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">Products</h1>
+                <!-- <UNavigationMenu orientation="vertical" :items="listing" class="data-[orientation=vertical]:w-48">
-            <!-- <div v-if="customerProductStore.loading" class="text-center py-8">
+                    <template #item="{ item, active }">
-                <span class="text-gray-600 dark:text-gray-400">Loading products...</span>
+                        <div class="flex items-center gap-2 px-3 py-2">
-            </div> -->
+                            <UIcon name="i-heroicons-book-open" />
-            <div v-if="customerProductStore.error" class="mb-4 p-3 bg-red-100 text-red-700 rounded">
+                            <span>{{ item.name }}</span>
-                {{ customerProductStore.error }}
+                        </div>
-            </div>
+                    </template>
-            <div v-else class="overflow-x-auto">
+</UNavigationMenu> -->
-                <div class="flex gap-2">
+                <h1 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">Products</h1>
-                    <CategoryMenu />
+                <div v-if="customerProductStore.loading" class="text-center py-8">
-                    <UTable :data="customerProductStore.productsList" :columns="columns" class="flex-1">
+                    <span class="text-gray-600 dark:text-gray-400">Loading products...</span>
-                        <template #expanded="{ row }">
-                            <UTable :data="customerProductStore.productsList.slice(0, 3)" :columns="columnsChild" :ui="{
-                                thead: 'hidden'
-                            }" />
-                        </template>
-                    </UTable>
                 </div>
-                <div class="flex justify-center items-center py-8">
+                <div v-else-if="customerProductStore.error" class="mb-4 p-3 bg-red-100 text-red-700 rounded">
-                    <UPagination v-model:page="page" :total="customerProductStore.total"
+                    {{ customerProductStore.error }}
-                        :page-size="customerProductStore.perPage" />
                 </div>
-                <div v-if="customerProductStore.productsList.length === 0"
+                <div v-else class="overflow-x-auto">
-                    class="text-center py-8 text-gray-500 dark:text-gray-400">
+                    <div class="flex gap-2">
-                    No products found
+                        <CategoryMenu />
+                        <UTable :data="customerProductStore.productsList" :columns="columns" class="flex-1">
+                            <template #expanded="{ row }">
+                                <UTable :data="customerProductStore.productsList.slice(0, 3)" :columns="columnsChild"
+                                    :ui="{
+                                        thead: 'hidden'
+                                    }" />
+                            </template>
+                        </UTable>
+                    </div>
+                    <div class="flex justify-center items-center py-8">
+                        <UPagination v-model:page="page" :total="customerProductStore.total"
+                            :page-size="customerProductStore.perPage" />
+                    </div>
+                    <div v-if="customerProductStore.productsList.length === 0"
+                        class="text-center py-8 text-gray-500 dark:text-gray-400">
+                        No products found
+                    </div>
                 </div>
             </div>
-        </div>
+            </suspense>
-    </suspense>
 </template>
 
 <script setup lang="ts">
-import { ref, watch, h, resolveComponent } from 'vue'
+import { ref, watch, h, resolveComponent, computed } from 'vue'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
 import CategoryMenu from '../inner/CategoryMenu.vue'
 import { useCustomerProductStore } from '@/stores/customer/customer-product'
 import type { Product } from '@/stores/customer/customer-product'
 import { useCartStore } from '@/stores/customer/cart'
 import { useToast } from '@nuxt/ui/runtime/composables/useToast.js'
-import { useTableState } from '@/composable/useTableState'
+
-import { debounce } from '@/composable/useDebouncedSearch'
 
 const customerProductStore = useCustomerProductStore()
-const { page, sortField, filters } = useTableState()
+const router = useRouter()
+const route = useRoute()
 
-
+const page = computed({
-
+    get: () => Number(route.query.page) || 1,
-function getIcon(name: string) {
+    set: (val: number) => {
-    if (sortField.value[0] === name) {
+        router.push({
-        if (sortField.value[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
+            query: {
-        if (sortField.value[1] === 'desc') return 'i-lucide-arrow-down-wide-narrow'
+                ...route.query,
+                page: val
+            }
+        })
+    }
+})
+const sortField = computed({
+    get: () => [
+        route.query.sort as string | undefined,
+        route.query.direction as 'asc' | 'desc' | undefined
+    ],
+
+    set: ([sort]: [string, 'asc' | 'desc']) => {
+        const currentSort = route.query.sort as string | undefined
+        const currentDirection = route.query.direction as 'asc' | 'desc' | undefined
+
+        let query = { ...route.query }
+
+        if (currentSort === sort) {
+            if (currentDirection === 'asc') {
+                query.direction = 'desc'
+            } else if (currentDirection === 'desc') {
+                delete query.sort
+                delete query.direction
+            } else {
+                query.direction = 'asc'
+                query.sort = sort
+            }
+        } else {
+            query.sort = sort
+            query.direction = 'asc'
+        }
+
+        router.push({ query })
+    }
+})
+
+const filters = computed<Record<string, string>>({
+    get: () => {
+        const q = { ...route.query }
+        delete q.page
+        delete q.sort
+        delete q.direction
+        return q as Record<string, string>
+    },
+    set: (val) => {
+        const baseQuery = { ...route.query }
+
+        Object.keys(baseQuery).forEach(key => {
+            if (!['page', 'sort', 'direction'].includes(key)) {
+                delete baseQuery[key]
+            }
+        })
+
+        router.push({
+            query: {
+                ...baseQuery,
+                ...val,
+                page: 1
+            }
+        })
+    }
+})
+
+function debounce(fn: Function, delay = 400) {
+    let t: any
+    return (...args: any[]) => {
+        clearTimeout(t)
+        t = setTimeout(() => fn(...args), delay)
     }
-    return 'i-lucide-arrow-up-down'
 }
 
 const updateFilter = debounce((columnId: string, val: string) => {
@@ -66,11 +142,29 @@ const updateFilter = debounce((columnId: string, val: string) => {
     filters.value = newFilters
 }, 400)
 
+
+
+function goToProduct(productId: number) {
+    router.push({
+        name: 'customer-product-details',
+        params: { product_id: productId }
+    })
+}
+
+
 const selectedCount = ref({
-    product_id: null as number | null,
+    product_id: null,
     count: 0
 })
 
+function getIcon(name: string) {
+    if (sortField.value[0] === name) {
+        if (sortField.value[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
+        if (sortField.value[1] === 'desc') return 'i-lucide-arrow-down-wide-narrow'
+    }
+    return 'i-lucide-arrow-up-down'
+}
+
 const UInputNumber = resolveComponent('UInputNumber')
 const UInput = resolveComponent('UInput')
 const UButton = resolveComponent('UButton')
@@ -121,6 +215,7 @@ const columns: TableColumn<Product>[] = [
                 })
             ])
         },
+        // header: '#',
         cell: ({ row }) => `#${row.getValue('product_id') as number}`
     },
     {
@@ -347,15 +442,6 @@ const columnsChild: TableColumn<Product>[] = [
     }
 ]
 
-const router = useRouter()
-
-function goToProduct(productId: number) {
-    router.push({
-        name: 'customer-product-details',
-        params: { product_id: productId }
-    })
-}
-
 const cartStore = useCartStore()
 const toast = useToast()
 async function addToCart(product_id: number) {
@@ -379,17 +465,11 @@ async function addToCart(product_id: number) {
         duration: 5000
     })
 }
-
 watch(
-    [filters, sortField, page],
+    () => route.query,
     () => {
-        customerProductStore.fetchProductList({
+        customerProductStore.fetchProductList()
-            ...filters.value,
-            sort: sortField.value[0],
-            direction: sortField.value[1],
-            page: page.value
-        })
     },
-    { immediate: true, deep: true }
+    { immediate: true }
 )
 </script>

bo/src/components/customer/PageSearchProducts.vue

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

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/composable/useDebouncedSearch.ts

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

bo/src/composable/useProductSearchApi.ts

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

bo/src/composable/useTableState.ts

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

bo/src/layouts/default.vue

@@ -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/router/index.ts

@@ -103,8 +103,6 @@ async function setRoutes() {
       }
     })
   }
-  
-  console.log(router);
   // 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,231 +1,58 @@
 import { useFetchJson } from '@/composable/useFetchJson'
 import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
+import { ref } from 'vue'
-import type { AddressTemplate } from './cart'
-
-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', () => {
+  const addresses = ref<Address[]>([])
   const loading = ref(false)
   const error = ref<string | null>(null)
 
-  const currentPage = ref(1)
-  const pageSize = 20
-
-  const searchQuery = ref('')
-
-  function initMockData() {
-    addresses.value = [
-      { id: 1, street: 'Main Street 123', zipCode: '10-001', city: 'New York', country: 'United States' },
-      { id: 2, street: 'Oak Avenue 123', zipCode: '90-001', city: 'Los Angeles', country: 'United States' },
-      { id: 3, street: 'Pine Road 123', zipCode: '60-601', city: 'Chicago', country: 'United States' }
-    ]
-  }
-
-  const filteredAddresses = computed(() => {
-    if (!searchQuery.value) return addresses.value
-
-    const query = searchQuery.value.toLowerCase()
-
-    return addresses.value.filter(addr =>
-      addr.street.toLowerCase().includes(query) ||
-      addr.city.toLowerCase().includes(query) ||
-      addr.country.toLowerCase().includes(query) ||
-      addr.zipCode.toLowerCase().includes(query)
-    )
-  })
-
-  const totalItems = computed(() => filteredAddresses.value.length)
-  const totalPages = computed(() => Math.ceil(totalItems.value / pageSize))
-
-  function getAddressById(id: number) {
-    return addresses.value.find(addr => addr.id === id)
-  }
-
-  function normalize(data: AddressFormData): AddressFormData {
-    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 setPage(page: number) {
-    currentPage.value = page
-  }
-
-  function setSearchQuery(query: string) {
-    searchQuery.value = query
-    currentPage.value = 1
-  }
-
-  function resetPagination() {
-    currentPage.value = 1
-  }
-
-  initMockData()
-
-  const addresses = ref<Address[]>([])
-  const addressLoading = ref(false)
-  const addressError = ref<string | null>(null)
-  const addressSearchQuery = ref('')
-  const addressCurrentPage = ref(1)
-  const addressPageSize = 20
-  const addressTotalCount = ref(0)
-
-  function transformAddressResponse(address: any): Address {
-    const info = address.address_info || address.addressInfo || {}
-
-    return {
-      id: address.id ?? 0,
-      country_id: address.country_id ?? address.countryId ?? 1,
-      customer_id: address.customer_id ?? address.customerId ?? 0,
-      address_info: info as Record<string, string>
-    }
-  }
-
   async function fetchAddresses() {
-    addressLoading.value = true
+    loading.value = true
-    addressError.value = null
+    error.value = null
-
     try {
-      const queryParam = addressSearchQuery.value ? `&query=${encodeURIComponent(addressSearchQuery.value)}` : ''
+      const res = await useFetchJson<Address[]>('/api/v1/restricted/addresses/retrieve-addresses')
-      const response = await useFetchJson<Address[]>(`/api/v1/restricted/addresses/retrieve-addresses?page=${addressCurrentPage.value}&elems=${addressPageSize}${queryParam}`)
+      addresses.value = res.items ?? []
-      addresses.value = response.items || []
+    } catch (e: unknown) {
-      addressTotalCount.value = response.count ?? addresses.value.length
+      error.value = e instanceof Error ? e.message : 'Failed to load addresses'
-    } catch (error: unknown) {
-      addressError.value = error instanceof Error ? error.message : 'Failed to load addresses'
     } finally {
-      addressLoading.value = false
+      loading.value = false
     }
   }
 
-  async function addAddress(countryId: number, formData: AddressTemplate): Promise<Address | null> {
+  async function deleteAddress(id: number) {
-    addressLoading.value = true
+    await useFetchJson(`/api/v1/restricted/addresses/delete-address?address_id=${id}`, { method: 'DELETE' })
-    addressError.value = null
+    addresses.value = addresses.value.filter((a) => a.id !== id)
-
-    try {
-      const response = await useFetchJson<any>(`/api/v1/restricted/addresses/add-new-address?country_id=${countryId}`, {
-        method: 'POST',
-        body: JSON.stringify(formData)
-      })
-
-      await fetchAddresses()
-      return transformAddressResponse(response.items ?? response)
-    } catch (error: unknown) {
-      addressError.value = error instanceof Error ? error.message : 'Failed to create address'
-      return null
-    } finally {
-      addressLoading.value = false
-    }
   }
 
-  async function getAddressTemplate(countryId: number): Promise<AddressTemplate> {
+  async function getTemplate(countryId: number): Promise<Record<string, string>> {
-    const response = await useFetchJson<any>(`/api/v1/restricted/addresses/get-template?country_id=${countryId}`)
+    const res = await useFetchJson<Record<string, string>>(
-    return response.items ?? {}
+      `/api/v1/restricted/addresses/get-template?country_id=${countryId}`
+    )
+    return res.items ?? {}
   }
 
-  async function updateAddress(id: number, countryId: number, formData: AddressTemplate): Promise<boolean> {
+  async function createAddress(countryId: number, data: Record<string, string>) {
-    addressLoading.value = true
+    await useFetchJson(`/api/v1/restricted/addresses/add-new-address?country_id=${countryId}`, {
-    addressError.value = null
+      method: 'POST',
-
+      body: JSON.stringify(data)
-    try {
+    })
-      await useFetchJson<any>(`/api/v1/restricted/addresses/modify-address?country_id=${countryId}&address_id=${id}`, {
+    await fetchAddresses()
-        method: 'POST',
-        body: JSON.stringify(formData)
-      })
-
-      await fetchAddresses()
-      return true
-    } catch (error: unknown) {
-      addressError.value = error instanceof Error ? error.message : 'Failed to update address'
-      return false
-    } finally {
-      addressLoading.value = false
-    }
   }
 
-  async function deleteAddress(id: number): Promise<boolean> {
+  async function updateAddress(id: number, countryId: number, data: Record<string, string>) {
-    addressLoading.value = true
+    await useFetchJson(`/api/v1/restricted/addresses/modify-address?country_id=${countryId}&address_id=${id}`, {
-    addressError.value = null
+      method: 'POST',
-
+      body: JSON.stringify(data)
-    try {
+    })
-      await useFetchJson<any>(`/api/v1/restricted/addresses/delete-address?address_id=${id}`, {
+    await fetchAddresses()
-        method: 'DELETE'
-      })
-
-      await fetchAddresses()
-      return true
-    } catch (error: unknown) {
-      addressError.value = error instanceof Error ? error.message : 'Failed to delete address'
-      return false
-    } finally {
-      addressLoading.value = false
-    }
   }
 
-  const totalAddressItems = computed(() => addressTotalCount.value || addresses.value.length)
+  return { addresses, loading, error, fetchAddresses, deleteAddress, getTemplate, createAddress, updateAddress }
-  const totalAddressPages = computed(() => Math.ceil(totalAddressItems.value / addressPageSize))
+})
-
-  const paginatedAddresses = computed(() => addresses.value)
-
-  function setAddressPage(page: number) {
-    addressCurrentPage.value = page
-    return fetchAddresses()
-  }
-
-  function setAddressSearchQuery(query: string) {
-    addressSearchQuery.value = query
-    addressCurrentPage.value = 1
-    return fetchAddresses()
-  }
-
-  return {
-    addresses, 
-    loading,
-    error,
-    currentPage,
-    pageSize,
-    totalItems,
-    totalPages,
-    searchQuery,
-    filteredAddresses,
-    paginatedAddresses,
-    getAddressById,
-    addAddress,
-    updateAddress,
-    deleteAddress,
-    setPage,
-    setSearchQuery,
-    resetPagination,
-    addressLoading,
-    addressError,
-    addressSearchQuery,
-    addressCurrentPage,
-    addressPageSize,
-    totalAddressItems,
-    totalAddressPages,
-    fetchAddresses,
-    setAddressPage,
-    setAddressSearchQuery,
-    getAddressTemplate
-  }
-})

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 {
@@ -36,32 +35,27 @@ export const useCartStore = defineStore('cart', () => {
     }
   }
 
-async function addNewCart(name: string) {
+  async function addNewCart(name: string) {
-  if (!name.trim()) {
+    try {
-    error.value = 'Cart name is required'
+      error.value = null
-    return
-  }
 
-  try {
+      const url = `/api/v1/restricted/carts/add-new-cart`
-    error.value = null
+      const response = await useFetchJson<ApiResponse>(url)
 
-    const url = `/api/v1/restricted/carts/add-new-cart?name=${name}`
+      const newCart: Cart = {
-    const response = await useFetchJson<ApiResponse>(url)
+        id: response.items.cart_id,
+        name: response.items.name,
+        items: []
+      }
 
-    const newCart: Cart = {
+      carts.value.push(newCart)
-      id: response.items.cart_id,
+      activeCartId.value = newCart.id
-      name: response.items.name,
+
-      items: []
+      return newCart
+    } catch (e: any) {
+      error.value = e?.message ?? 'Error creating cart'
     }
-
-    carts.value.push(newCart)
-    activeCartId.value = newCart.id
-
-    return newCart
-  } catch (e: any) {
-    error.value = e?.message ?? 'Error creating cart'
   }
-}
 
   const route = useRoute()
   const amount = ref<number>(1);
@@ -75,7 +69,7 @@ async function addNewCart(name: string) {
 
     try {
       const res = await useFetchJson<ApiResponse>(
-        `/api/v1/restricted/carts/add-product-to-cart?cart_id=${activeCartId.value}&product_id=${product_id}&amount=${count}&set_amount=false`
+        `/api/v1/restricted/carts/add-product-to-cart?cart_id=${activeCartId.value}&product_id=${product_id}&amount=${count}`
       )
 
       console.log('fsdfsdfdsfdsfs', res)

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

@@ -33,26 +33,30 @@ export const useCustomerProductStore = defineStore('customer-product', () => {
     const total = ref(0)
     const perPage = ref(15)
 
-    async function fetchProductList(paramsObj: Record<string, any>) {
+    async function fetchProductList() {
         loading.value = true
         error.value = null
 
         const params = new URLSearchParams()
 
-        Object.entries(paramsObj).forEach(([key, value]) => {
+        Object.entries(route.query).forEach(([key, value]) => {
             if (value) params.append(key, String(value))
         })
 
         const url = `/api/v1/restricted/product/list?${params}`
 
+
         try {
             const response = await useFetchJson<ApiResponse>(url)
             productsList.value = response.items || []
             total.value = response.count || 0
+        } catch (e: unknown) {
+            error.value = e instanceof Error ? e.message : 'Failed to load products'
         } finally {
             loading.value = false
         }
     }
+
     function updateFavoriteState(product_id: number, value: boolean) {
         const p = productsList.value.find(p => p.product_id === product_id)
         if (p) p.is_favorite = value

bruno/api_v1/customer/Set is_no_vat.yml

@@ -1,22 +0,0 @@
-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&is_new_eq=0&is_favorite_eq=false&is_oem_eq=FALSE"
+  url: "{{bas_url}}/restricted/product/list?p=1&elems=30&reference=~NC100"
   params:
     - name: p
       value: "1"
@@ -27,12 +27,11 @@ http:
     - name: is_new_eq
       value: "0"
       type: query
+      disabled: true
     - name: is_favorite_eq
       value: "false"
       type: query
-    - name: is_oem_eq
+      disabled: true
-      value: "FALSE"
-      type: query
   body:
     type: json
     data: ""

bruno/b2b_daniel/addresses/folder.yml

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

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

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

bruno/b2b_daniel/list/folder.yml

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

bruno/b2b_daniel/list/list-products.yml

@@ -0,0 +1,24 @@
+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

@@ -0,0 +1,21 @@
+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: 10
+  seq: 11
 
 request:
   auth: inherit

bruno/b2b_daniel/product-translation/folder.yml

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

bruno/b2b_daniel/storage-old/folder.yml

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

bruno/b2b_daniel/storage-restricted/folder.yml

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

i18n/migrations/20260302163100_routes.sql

@@ -70,8 +70,7 @@ INSERT IGNORE INTO `b2b_routes` (`id`, `name`, `path`, `component`, `meta`, `act
 }', 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),
+(22, 'customer-page-carts', 'carts', '/components/customer/PageCarts.vue', '{ "guest":true, "name": "Carts" }', 1);
-(24, 'customer-search-products', 'search-products', '/components/customer/PageSearchProducts.vue', '{ "guest":true, "name": "Carts" }', 1);
 
 CREATE TABLE IF NOT EXISTS b2b_top_menu (
   menu_id INT AUTO_INCREMENT NOT NULL,
@@ -287,28 +286,6 @@ INSERT IGNORE INTO `b2b_top_menu` (`menu_id`, `label`, `parent_id`, `params`, `a
       "locale": ""
     }
   }
-}', 1, 1),
-(17, '{
-  "name": "customer-search-products",
-  "trans": {
-    "pl": {
-      "label": "Search-Products"
-    },
-    "en": {
-      "label": "Search-Products"
-    },
-    "de": {
-      "label": "Search-Products"
-    }
-  },
-  "icon": "proicons:cart1"
-}', 1, '{
-  "route": {
-    "name": "customer-search-products",
-    "params": {
-      "locale": ""
-    }
-  }
 }', 1, 1);
 
 

i18n/migrations/20260302163122_create_tables.sql

@@ -112,8 +112,7 @@ 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
@@ -162,16 +161,6 @@ 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

@@ -114,6 +114,5 @@ INSERT INTO `b2b_route_roles` (`route_id`, `role_id`) VALUES
 (19, '1'),
 (20, '1'),
 (21, '1'),
-(22, '1'),
+(22, '1');
-(24, '1');
 -- +goose Down

i18n/migrations/20260319163200_procedures.sql

@@ -16,7 +16,6 @@ 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);
@@ -30,54 +29,45 @@ 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 = v_tax_group
+  WHERE tr.id_tax_rules_group = (
-    AND tr.id_country = c.ps_id_country
+    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;
 
-  IF v_is_no_vat = 1 THEN
+  -- ================= TARGET CURRENCY =================
-    SET v_tax_rate = 0;
+  SELECT c.b2b_id_currency
-  END IF;
+  INTO v_target_currency
-
-  -- ================= 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 =================
+  -- ================= BASE PRICE (RAW) =================
   SELECT
     COALESCE(ps.price, p.price) + COALESCE(pas.price, 0)
   INTO v_base_raw
@@ -89,8 +79,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
@@ -109,67 +99,71 @@ 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
 
-    AND (spp.id_product IS NOT NULL OR NOT EXISTS (
+    -- intersection rules (unchanged)
-          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 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 (spa.id_product_attribute IS NOT NULL OR NOT EXISTS (
+    AND (
-          SELECT 1 FROM b2b_specific_price_product_attribute x WHERE x.b2b_specific_price_id = bsp.id
+      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 (spc.b2b_id_customer IS NOT NULL OR NOT EXISTS (
+    AND (
-          SELECT 1 FROM b2b_specific_price_customer x WHERE x.b2b_specific_price_id = bsp.id
+      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 (spco.b2b_id_country IS NOT NULL OR NOT EXISTS (
+    AND (
-          SELECT 1 FROM b2b_specific_price_country x WHERE x.b2b_specific_price_id = bsp.id
+      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 (cp.id_product IS NOT NULL OR NOT EXISTS (
+    AND (
-          SELECT 1 FROM b2b_specific_price_category x WHERE x.b2b_specific_price_id = bsp.id
+      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)
+    )
 
   ORDER BY
-    (spc.b2b_id_customer IS NOT NULL) DESC,
+    -- customer wins
-    (spa.id_product_attribute 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,
-    (spp.id_product IS NOT NULL) DESC,
+
-    (cp.id_product IS NOT NULL) DESC,
+    -- attribute
-    (spco.b2b_id_country 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,
+
+    -- 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
@@ -179,6 +173,7 @@ 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
@@ -384,19 +379,10 @@ 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
 
 
 
@@ -414,8 +400,6 @@ 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;