fix: cart and products

bo/components.d.ts

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

bo/src/components/admin/UsersList.vue

@@ -1,12 +1,13 @@
 <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"
+            <UTable :data="usersList" :columns="columns" class="flex-1 w-full" :ui="{
-                    :ui="{ root: 'max-w-100wv overflow-auto!' }" />
+                root: 'max-w-100wv overflow-auto!'
-                <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
+            }" />
-            </div>
+            <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
         </div>
-    </template>
+    </div>
+</template>
 
 <script setup lang="ts">
 import { ref, computed, watch, resolveComponent, h } from 'vue'

bo/src/components/admin/UsersSearch.vue

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

bo/src/components/customer/PageCart.vue

@@ -1,15 +1,12 @@
 <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,76 +1,79 @@
 <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">
-      <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Shopping Carts') }}</h1>
+            <div class="flex items-start gap-2">
-      <div class="flex gap-3">
+                <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Shopping Carts') }}</h1>
-        <UButton color="primary" @click="showCreateModal = true"
+                <UTooltip :delay-duration="0" text="You can create up to 10 carts.">
-          class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light)">
+                    <UIcon name="icon-park-outline:attention" class="text-[15px] text-blue-500" />
-          <UIcon name="mdi:plus" class="mr-1" />
+                </UTooltip>
-          {{ t('New Cart') }}
+            </div>
-        </UButton>
+            <div class="flex items-start gap-1">
-      </div>
+                <UButton color="info" @click="showCreateModal = true" :disabled="cartStore.carts?.length >= 10"
-    </div>
+                    class="">
-
+                    <UIcon name="mdi:plus" class="mr-1" />
-    <div class="w-full">
+                    {{ t('New Cart') }}
-      <div
+                </UButton>
-        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-red-600 font-medium truncate">{{ cart.cart_id }}</p>
-                <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">
-          <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 #header>
+            <div
-      <h3 class="text-lg font-semibold text-black dark:text-white">{{ t('Create New Cart') }}</h3>
+                class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
-    </template>
+                <h2
-    <template #body>
+                    class="text-lg font-semibold text-black dark:text-white p-4 border-b border-(--border-light) dark:border-(--border-dark)">
-      <div class="flex flex-col gap-4">
+                    {{ t('Your Carts') }}
-        <UInput v-model="newCartName" :placeholder="t('Cart name')"
+                </h2>
-          class="w-full bg-white dark:bg-gray-800 text-black dark:text-white" />
+                <div v-if="cartStore.carts?.length > 0"
-      </div>
+                    class="divide-y divide-(--border-light) dark:divide-(--border-dark)">
-    </template>
+                    <div v-for="cart in cartStore.carts" :key="cart.cart_id"
-    <template #footer>
+                        @click="cartStore.setActiveCart(cart.cart_id)"
-      <div class="flex justify-end gap-2">
+                        class="p-4 cursor-pointer flex gap-2 items-center justify-between" :class="cartStore.activeCartId === cart.cart_id
-        <UButton variant="outline" color="neutral" @click="showCreateModal = false">
+                            ? 'bg-blue-50 dark:bg-blue-900/20'
-          {{ t('Cancel') }}
+                            : 'hover:bg-gray-50 dark:hover:bg-gray-800 border-l-4 border-transparent'">
-        </UButton>
+                        <div class="flex-1 min-w-0">
-        <UButton color="primary" @click="createCart" :disabled="!newCartName.trim()"
+                            <div class="flex items-center gap-2">
-          class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white">
+                                <p class="text-black dark:text-white font-medium truncate cursor-pointer"
-          {{ t('Create') }}
+                                    @click="openCart(cart)">{{ cart.name }}</p>
-        </UButton>
+                            </div>
-      </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 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">
+        <template #body>
+            <div class="flex flex-col gap-5">
+                <h3 class="text-xl font-bold text-black dark:text-white text-center">{{ t('Create New Cart') }}</h3>
+                <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>
+                <div class="flex justify-end gap-2">
+                    <UButton variant="outline" color="neutral" @click="showCreateModal = false">
+                        {{ t('Cancel') }}
+                    </UButton>
+                    <UButton color="info" @click="createCart" :disabled="!newCartName.trim()"
+                        class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white">
+                        {{ t('Create') }}
+                    </UButton>
+                </div>
+            </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()
@@ -82,26 +85,24 @@ 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,136 +1,60 @@
 <template>
     <suspense>
-                    <div class="">
+        <div class="">
-                <!-- <UNavigationMenu orientation="vertical" :items="listing" class="data-[orientation=vertical]:w-48">
+            <h1 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">Products</h1>
-                    <template #item="{ item, active }">
+            <!-- <div v-if="customerProductStore.loading" class="text-center py-8">
-                        <div class="flex items-center gap-2 px-3 py-2">
+                <span class="text-gray-600 dark:text-gray-400">Loading products...</span>
-                            <UIcon name="i-heroicons-book-open" />
+            </div> -->
-                            <span>{{ item.name }}</span>
+            <div v-if="customerProductStore.error" class="mb-4 p-3 bg-red-100 text-red-700 rounded">
-                        </div>
+                {{ customerProductStore.error }}
-                    </template>
+            </div>
-</UNavigationMenu> -->
+            <div v-else class="overflow-x-auto">
-                <h1 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">Products</h1>
+                <div class="flex gap-2">
-                <div v-if="customerProductStore.loading" class="text-center py-8">
+                    <CategoryMenu />
-                    <span class="text-gray-600 dark:text-gray-400">Loading products...</span>
+                    <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 v-else-if="customerProductStore.error" class="mb-4 p-3 bg-red-100 text-red-700 rounded">
+                <div class="flex justify-center items-center py-8">
-                    {{ customerProductStore.error }}
+                    <UPagination v-model:page="page" :total="customerProductStore.total"
+                        :page-size="customerProductStore.perPage" />
                 </div>
-                <div v-else class="overflow-x-auto">
+                <div v-if="customerProductStore.productsList.length === 0"
-                    <div class="flex gap-2">
+                    class="text-center py-8 text-gray-500 dark:text-gray-400">
-                        <CategoryMenu />
+                    No products found
-                        <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>
-            </suspense>
+        </div>
+    </suspense>
 </template>
 
 <script setup lang="ts">
-import { ref, watch, h, resolveComponent, computed } from 'vue'
+import { ref, watch, h, resolveComponent } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
 import CategoryMenu from '../inner/CategoryMenu.vue'
 import { useCustomerProductStore } from '@/stores/customer/customer-product'
 import type { Product } from '@/stores/customer/customer-product'
 import { useCartStore } from '@/stores/customer/cart'
 import { useToast } from '@nuxt/ui/runtime/composables/useToast.js'
-
+import { useTableState } from '@/composable/useTableState'
+import { debounce } from '@/composable/useDebouncedSearch'
 
 const customerProductStore = useCustomerProductStore()
-const router = useRouter()
+const { page, sortField, filters } = useTableState()
-const route = useRoute()
 
-const page = computed({
+
-    get: () => Number(route.query.page) || 1,
+
-    set: (val: number) => {
+function getIcon(name: string) {
-        router.push({
+    if (sortField.value[0] === name) {
-            query: {
+        if (sortField.value[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
-                ...route.query,
+        if (sortField.value[1] === 'desc') return 'i-lucide-arrow-down-wide-narrow'
-                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) => {
@@ -142,29 +66,11 @@ const updateFilter = debounce((columnId: string, val: string) => {
     filters.value = newFilters
 }, 400)
 
-
-
-function goToProduct(productId: number) {
-    router.push({
-        name: 'customer-product-details',
-        params: { product_id: productId }
-    })
-}
-
-
 const selectedCount = ref({
-    product_id: null,
+    product_id: null as number | null,
     count: 0
 })
 
-function getIcon(name: string) {
-    if (sortField.value[0] === name) {
-        if (sortField.value[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
-        if (sortField.value[1] === 'desc') return 'i-lucide-arrow-down-wide-narrow'
-    }
-    return 'i-lucide-arrow-up-down'
-}
-
 const UInputNumber = resolveComponent('UInputNumber')
 const UInput = resolveComponent('UInput')
 const UButton = resolveComponent('UButton')
@@ -215,7 +121,6 @@ const columns: TableColumn<Product>[] = [
                 })
             ])
         },
-        // header: '#',
         cell: ({ row }) => `#${row.getValue('product_id') as number}`
     },
     {
@@ -442,6 +347,15 @@ 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) {
@@ -465,11 +379,17 @@ async function addToCart(product_id: number) {
         duration: 5000
     })
 }
+
 watch(
-    () => route.query,
+    [filters, sortField, page],
     () => {
-        customerProductStore.fetchProductList()
+        customerProductStore.fetchProductList({
+            ...filters.value,
+            sort: sortField.value[0],
+            direction: sortField.value[1],
+            page: page.value
+        })
     },
-    { immediate: true }
+    { immediate: true, deep: true }
 )
 </script>

bo/src/components/customer/PageSearchProducts.vue

@@ -1,176 +1,364 @@
 <template>
-    <component :is="Default">
+    <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">
-            <h1 class="text-6xl font-bold text-black dark:text-white mb-14">Search Products</h1>
+            Search Products
+        </h1>
 
-            <div class="w-full max-w-4xl">
+        <div class="w-full max-w-4xl flex flex-col gap-2">
-                <UInput icon="i-lucide-search" type="text" placeholder="Type product name or ID..."
+            <div class="flex items-center gap-2 mt-3 text-gray-600 dark:text-gray-300">
-                    v-model="searchQuery" class="w-full!" :ui="{ base: 'py-4! rounded-full!' }" />
+                <UCheckbox v-model="searchByReference" />
+                <span>Search by reference (ID)</span>
             </div>
-            <div v-if="products.length" class="mt-6">
+            <UInput icon="i-lucide-search" type="text" placeholder="Type product name or ID..."
-                    <UTable :data="products" :columns="columns" class="flex-1 w-full" :ui="{
+                v-model="searchQuery" class="w-full!" :ui="{ base: 'py-4! rounded-full!' }" />
-                        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 { useFetchJson } from '@/composable/useFetchJson';
+import { ref, watch } from 'vue'
-import Default from '@/layouts/default.vue';
+import { h, resolveComponent } from 'vue'
-import { watch } from 'vue';
+import type { TableColumn } from '@nuxt/ui'
-import { ref } from 'vue';
+import type { Product } from '@/types/product'
+import { useProductSearchApi } from '@/composable/useProductSearchApi'
+import { useTableState } from '@/composable/useTableState'
+import { debounce } from '@/composable/useDebouncedSearch'
 
-const searchQuery = ref('')
+const {
-const products = ref([])
+    searchQuery,
-const loading = ref(false)
+    products,
-const error = ref<string | null>(null)
+    loading,
+    error,
+    searchByReference,
+    selectedCount,
+    fetchProducts,
+    addToCart,
+    goToProduct
+} = useProductSearchApi()
 
-async function fetchProducts() {
+const { sortField, filters } = useTableState()
-    loading.value = true
-    error.value = null
 
-    try {
+const debouncedFetch = debounce(fetchProducts, 400)
-        const query = searchQuery.value
-            ? `name=~${searchQuery.value}`
-            : ''
 
-        const result = await useFetchJson(
+watch([searchQuery, searchByReference], () => {
-            `/api/v1/restricted/list-products/get-listing?${query}`
+    debouncedFetch()
-        )
-
-        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')
 
-import errorImg from '@/assets/error.svg'
+function getIcon(name: string) {
-import type { TableColumn } from '@nuxt/ui';
+    if (sortField.value[0] === name) {
-import type { Product } from '@/types/product';
+        if (sortField.value[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
-// const columns: TableColumn<Product>[] = [
+        if (sortField.value[1] === 'desc') return 'i-lucide-arrow-down-wide-narrow'
-//     {
+    }
-//         accessorKey: 'product_id',
+    return 'i-lucide-arrow-up-down'
-//         header: ({ column }) => {
+}
-//             return h('div', { class: 'flex flex-col gap-1' }, [
-//                 h('div', {
-//                     class: 'flex items-center gap-2 cursor-pointer',
-//                     onClick: () => {
-//                         sortField.value = ['product_id', 'asc']
-//                     }
-//                 }, [
-//                     h('span', 'ID'),
-//                     h(UIcon, {
-//                         name: getIcon('product_id')
-//                     })
-//                 ]),
 
-//                 h(UInput, {
+const updateFilter = debounce((columnId: string, val: string) => {
-//                     placeholder: 'Search...',
+    const newFilters = { ...filters.value }
-//                     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')
-//                     })
-//                 ]),
 
-//                 h(UInput, {
+    if (val) newFilters[columnId] = val
-//                     placeholder: 'Search...',
+    else delete newFilters[columnId]
-//                     modelValue: filters.value[column.id] ?? '',
+
-//                     'onUpdate:modelValue': (val: string) => {
+    filters.value = newFilters
-//                         updateFilter(column.id, val)
+}, 400)
-//                     },
+
-//                     size: 'xs'
+const columns: TableColumn<Product>[] = [
-//                 })
+    {
-//             ])
+        id: 'expand',
-//         },
+        cell: ({ row }) =>
-//         cell: ({ row }) => row.getValue('name') as string,
+            h(UButton, {
-//         filterFn: (row, columnId, value) => {
+                color: 'neutral',
-//             const name = row.getValue(columnId) as string
+                variant: 'ghost',
-//             return name.toLowerCase().includes(value.toLowerCase())
+                icon: 'i-lucide-chevron-down',
-//         }
+                square: true,
-//     },
+                'aria-label': 'Expand',
-//     {
+                ui: {
-//         accessorKey: 'quantity',
+                    leadingIcon: [
-//         header: ({ }) => {
+                        'transition-transform',
-//             return h('div', { class: 'flex flex-col gap-1' }, [
+                        row.getIsExpanded() ? 'duration-200 rotate-180' : ''
-//                 h('div', {
+                    ]
-//                     class: 'flex items-center gap-2 cursor-pointer',
+                },
-//                     onClick: () => {
+                onClick: () => row.toggleExpanded()
-//                         sortField.value = ['quantity', 'asc']
+            })
-//                     }
+    },
-//                 }, [
+    {
-//                     h('span', 'In stock'),
+        accessorKey: 'product_id',
-//                     h(UIcon, {
+        header: ({ column }) => {
-//                         name: getIcon('quantity')
+            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']
-//         cell: ({ row }) => row.getValue('quantity') as number
+                    }
-//     },
+                }, [
-//     {
+                    h('span', 'ID'),
-//         accessorKey: 'count',
+                    h(UIcon, {
-//         header: '',
+                        name: getIcon('product_id')
-//         cell: ({ row }) => {
+                    })
-//             return h(UButton, {
+                ]),
-//                 onClick: () => {
+
-//                     goToProduct(row.original.product_id, row.original.link_rewrite)
+                h(UInput, {
-//                 },
+                    placeholder: 'Search...',
-//                 class: 'cursor-pointer',
+                    modelValue: filters.value[column.id] ?? '',
-//                 color: 'info',
+                    'onUpdate:modelValue': (val: string) => {
-//                 variant: 'soft'
+                        updateFilter(column.id, val)
-//             }, () => '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,6 +54,7 @@ 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

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

bo/src/composable/useProductSearchApi.ts

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

bo/src/composable/useTableState.ts

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

bo/src/layouts/default.vue

@@ -205,7 +205,8 @@ 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,6 +103,8 @@ async function setRoutes() {
       }
     })
   }
+  
+  console.log(router);
   // await router.replace(router.currentRoute.value.fullPath)
 }
 

bo/src/router/langs.ts

@@ -12,7 +12,10 @@ 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')
@@ -30,6 +33,8 @@ 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')
@@ -38,10 +43,13 @@ export async function initCountryCurrency() {
     let idfromcookie = null
     const cc = cookie.getCookie('country_id')
     if (cc) {
-      idfromcookie = countries.find((x) => x.id == parseInt(cc))
+      idfromcookie = langs.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)
   }
@@ -52,6 +60,7 @@ 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,58 +1,231 @@
 import { useFetchJson } from '@/composable/useFetchJson'
 import { defineStore } from 'pinia'
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
+import type { AddressTemplate } from './cart'
+
+export interface AddressFormData {
+  street: string
+  zipCode: string
+  city: string
+  country: string
+}
 
 export interface Address {
   id: number
-  country_id: number
+  street: string
-  address_unparsed: Record<string, string>
+  zipCode: string
+  city: string
+  country: string
 }
 
 export const useAddressStore = defineStore('address', () => {
-  const addresses = ref<Address[]>([])
   const loading = ref(false)
   const error = ref<string | null>(null)
 
-  async function fetchAddresses() {
+  const currentPage = ref(1)
-    loading.value = true
+  const pageSize = 20
-    error.value = null
+
-    try {
+  const searchQuery = ref('')
-      const res = await useFetchJson<Address[]>('/api/v1/restricted/addresses/retrieve-addresses')
+
-      addresses.value = res.items ?? []
+  function initMockData() {
-    } catch (e: unknown) {
+    addresses.value = [
-      error.value = e instanceof Error ? e.message : 'Failed to load addresses'
+      { id: 1, street: 'Main Street 123', zipCode: '10-001', city: 'New York', country: 'United States' },
-    } finally {
+      { id: 2, street: 'Oak Avenue 123', zipCode: '90-001', city: 'Los Angeles', country: 'United States' },
-      loading.value = false
+      { 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()
     }
   }
 
-  async function deleteAddress(id: number) {
+  function generateId(): number {
-    await useFetchJson(`/api/v1/restricted/addresses/delete-address?address_id=${id}`, { method: 'DELETE' })
+    return Math.max(0, ...addresses.value.map(a => a.id)) + 1
-    addresses.value = addresses.value.filter((a) => a.id !== id)
   }
 
-  async function getTemplate(countryId: number): Promise<Record<string, string>> {
+  function setPage(page: number) {
-    const res = await useFetchJson<Record<string, string>>(
+    currentPage.value = page
-      `/api/v1/restricted/addresses/get-template?country_id=${countryId}`
-    )
-    return res.items ?? {}
   }
 
-  async function createAddress(countryId: number, data: Record<string, string>) {
+  function setSearchQuery(query: string) {
-    await useFetchJson(`/api/v1/restricted/addresses/add-new-address?country_id=${countryId}`, {
+    searchQuery.value = query
-      method: 'POST',
+    currentPage.value = 1
-      body: JSON.stringify(data)
-    })
-    await fetchAddresses()
   }
 
-  async function updateAddress(id: number, countryId: number, data: Record<string, string>) {
+  function resetPagination() {
-    await useFetchJson(`/api/v1/restricted/addresses/modify-address?country_id=${countryId}&address_id=${id}`, {
+    currentPage.value = 1
-      method: 'POST',
-      body: JSON.stringify(data)
-    })
-    await fetchAddresses()
   }
 
-  return { addresses, loading, error, fetchAddresses, deleteAddress, getTemplate, createAddress, updateAddress }
+  initMockData()
+
+  const addresses = ref<Address[]>([])
+  const addressLoading = ref(false)
+  const addressError = ref<string | null>(null)
+  const addressSearchQuery = ref('')
+  const addressCurrentPage = ref(1)
+  const addressPageSize = 20
+  const addressTotalCount = ref(0)
+
+  function transformAddressResponse(address: any): Address {
+    const info = address.address_info || address.addressInfo || {}
+
+    return {
+      id: address.id ?? 0,
+      country_id: address.country_id ?? address.countryId ?? 1,
+      customer_id: address.customer_id ?? address.customerId ?? 0,
+      address_info: info as Record<string, string>
+    }
+  }
+
+  async function fetchAddresses() {
+    addressLoading.value = true
+    addressError.value = null
+
+    try {
+      const queryParam = addressSearchQuery.value ? `&query=${encodeURIComponent(addressSearchQuery.value)}` : ''
+      const response = await useFetchJson<Address[]>(`/api/v1/restricted/addresses/retrieve-addresses?page=${addressCurrentPage.value}&elems=${addressPageSize}${queryParam}`)
+      addresses.value = response.items || []
+      addressTotalCount.value = response.count ?? addresses.value.length
+    } catch (error: unknown) {
+      addressError.value = error instanceof Error ? error.message : 'Failed to load addresses'
+    } finally {
+      addressLoading.value = false
+    }
+  }
+
+  async function addAddress(countryId: number, formData: AddressTemplate): Promise<Address | null> {
+    addressLoading.value = true
+    addressError.value = null
+
+    try {
+      const response = await useFetchJson<any>(`/api/v1/restricted/addresses/add-new-address?country_id=${countryId}`, {
+        method: 'POST',
+        body: JSON.stringify(formData)
+      })
+
+      await fetchAddresses()
+      return transformAddressResponse(response.items ?? response)
+    } catch (error: unknown) {
+      addressError.value = error instanceof Error ? error.message : 'Failed to create address'
+      return null
+    } finally {
+      addressLoading.value = false
+    }
+  }
+
+  async function getAddressTemplate(countryId: number): Promise<AddressTemplate> {
+    const response = await useFetchJson<any>(`/api/v1/restricted/addresses/get-template?country_id=${countryId}`)
+    return response.items ?? {}
+  }
+
+  async function updateAddress(id: number, countryId: number, formData: AddressTemplate): Promise<boolean> {
+    addressLoading.value = true
+    addressError.value = null
+
+    try {
+      await useFetchJson<any>(`/api/v1/restricted/addresses/modify-address?country_id=${countryId}&address_id=${id}`, {
+        method: 'POST',
+        body: JSON.stringify(formData)
+      })
+
+      await fetchAddresses()
+      return true
+    } catch (error: unknown) {
+      addressError.value = error instanceof Error ? error.message : 'Failed to update address'
+      return false
+    } finally {
+      addressLoading.value = false
+    }
+  }
+
+  async function deleteAddress(id: number): Promise<boolean> {
+    addressLoading.value = true
+    addressError.value = null
+
+    try {
+      await useFetchJson<any>(`/api/v1/restricted/addresses/delete-address?address_id=${id}`, {
+        method: 'DELETE'
+      })
+
+      await fetchAddresses()
+      return true
+    } catch (error: unknown) {
+      addressError.value = error instanceof Error ? error.message : 'Failed to delete address'
+      return false
+    } finally {
+      addressLoading.value = false
+    }
+  }
+
+  const totalAddressItems = computed(() => addressTotalCount.value || addresses.value.length)
+  const totalAddressPages = computed(() => Math.ceil(totalAddressItems.value / addressPageSize))
+
+  const paginatedAddresses = computed(() => addresses.value)
+
+  function setAddressPage(page: number) {
+    addressCurrentPage.value = page
+    return fetchAddresses()
+  }
+
+  function setAddressSearchQuery(query: string) {
+    addressSearchQuery.value = query
+    addressCurrentPage.value = 1
+    return fetchAddresses()
+  }
+
+  return {
+    addresses, 
+    loading,
+    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,6 +1,7 @@
 import { defineStore } from 'pinia'
-import { ref, computed } from 'vue'
+import { computed, ref } from 'vue'
 import { useFetchJson } from '@/composable/useFetchJson'
+import type { ApiResponse } from '@/types'
 import { useRoute } from 'vue-router'
 
 export interface Cart {
@@ -35,28 +36,33 @@ export const useCartStore = defineStore('cart', () => {
     }
   }
 
-  async function addNewCart(name: string) {
+async function addNewCart(name: string) {
-    try {
+  if (!name.trim()) {
-      error.value = null
+    error.value = 'Cart name is required'
-
+    return
-      const url = `/api/v1/restricted/carts/add-new-cart`
-      const response = await useFetchJson<ApiResponse>(url)
-
-      const newCart: Cart = {
-        id: response.items.cart_id,
-        name: response.items.name,
-        items: []
-      }
-
-      carts.value.push(newCart)
-      activeCartId.value = newCart.id
-
-      return newCart
-    } catch (e: any) {
-      error.value = e?.message ?? 'Error creating cart'
-    }
   }
 
+  try {
+    error.value = null
+
+    const url = `/api/v1/restricted/carts/add-new-cart?name=${name}`
+    const response = await useFetchJson<ApiResponse>(url)
+
+    const newCart: Cart = {
+      id: response.items.cart_id,
+      name: response.items.name,
+      items: []
+    }
+
+    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);
   const errorMessage = ref('');
@@ -69,7 +75,7 @@ export const useCartStore = defineStore('cart', () => {
 
     try {
       const res = await useFetchJson<ApiResponse>(
-        `/api/v1/restricted/carts/add-product-to-cart?cart_id=${activeCartId.value}&product_id=${product_id}&amount=${count}`
+        `/api/v1/restricted/carts/add-product-to-cart?cart_id=${activeCartId.value}&product_id=${product_id}&amount=${count}&set_amount=false`
       )
 
       console.log('fsdfsdfdsfdsfs', res)

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

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

i18n/migrations/20260302163100_routes.sql

@@ -70,7 +70,8 @@ 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,
@@ -286,6 +287,28 @@ 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/20260302163123_create_tables_data.sql

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