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

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/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
 }
-
+</script>
-store.fetchAddresses()
-</script>

bo/src/components/customer/PageCarts.vue

@@ -1,78 +1,94 @@
 <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">
+      <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Shopping Cart') }}</h1>
-      <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Shopping Carts') }}</h1>
+      <div class="flex flex-col lg:flex-row gap-5 md:gap-10">
-      <div class="flex gap-3">
+        <div class="flex-1">
-        <UButton color="primary" @click="showCreateModal = true"
+          <div
-          class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light)">
+            class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
-          <UIcon name="mdi:plus" class="mr-1" />
+            <h2
-          {{ t('New Cart') }}
+              class="text-lg font-semibold text-black dark:text-white p-4 border-b border-(--border-light) dark:border-(--border-dark)">
-        </UButton>
+              {{ t('Selected Products') }}
-      </div>
+            </h2>
-    </div>
+            <div v-if="cartStore.items.length > 0">
-
+              <div v-for="item in cartStore.items" :key="item.id"
-    <div class="w-full">
+                class="grid grid-cols-5 items-center p-4 border-b border-(--border-light) dark:border-(--border-dark) w-[100%]">
-      <div
+                <div
-        class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
+                  class="bg-(--second-light) dark:bg-(--main-dark) rounded flex items-center justify-center overflow-hidden">
-        <h2
+                  <img v-if="item.image" :src="item.image" :alt="item.name" class="w-full h-full object-cover" />
-          class="text-lg font-semibold text-black dark:text-white p-4 border-b border-(--border-light) dark:border-(--border-dark)">
+                  <UIcon v-else name="mdi:package-variant" class="text-2xl text-gray-400" />
-          {{ t('Your Carts') }}
+                </div>
-        </h2>
+            </div>
-        <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)"
+            <div class="w-full">
-            class="p-4 cursor-pointer flex gap-2 items-center justify-between" :class="cartStore.activeCartId === cart.cart_id
+                <div
-              ? 'bg-blue-50 dark:bg-blue-900/20'
+                    class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
-              : 'hover:bg-gray-50 dark:hover:bg-gray-800 border-l-4 border-transparent'">
+                    <h2
-            <div class="flex-1 min-w-0">
+                        class="text-lg font-semibold text-black dark:text-white p-4 border-b border-(--border-light) dark:border-(--border-dark)">
-              <div class="flex items-center gap-2">
+                        {{ t('Your Carts') }}
-                <p class="text-red-600 font-medium truncate">{{ cart.cart_id }}</p>
+                    </h2>
-                <p class="text-black dark:text-white font-medium truncate cursor-pointer" @click="openCart(cart)">{{
+                    <div v-if="cartStore.carts?.length > 0"
-                  cart.name }}</p>
+                        class="divide-y divide-(--border-light) dark:divide-(--border-dark)">
-              </div>
+                        <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">
+            <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>
+              </label>
             </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>
+  </template>
-
-  <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 cartStore = useCartStore()
+const addressStore = useAddressStore()
+const { t } = useI18n()
 const router = useRouter()
 
 const cartStore = useCartStore()
@@ -82,26 +98,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/inner/CategoryMenu.vue

@@ -1,7 +1,7 @@
 <template>
   <UNavigationMenu orientation="vertical" type="single" :items="items" class="data-[orientation=vertical]:w-72" :ui="{
-    root: ''
+    root:''
-  }" />
+  }"/>
 </template>
 
 <script setup lang="ts">
@@ -39,10 +39,9 @@ function adaptMenu(menu: NavigationMenuItem[]) {
     if (item.children && item.children.length > 0) {
       item.open = path && path.includes(item.category_id) ? true : openAll.value
       adaptMenu(item.children);
-
       item.children.unshift({
         label: item.label, icon: 'i-lucide-book-open', popover: item.label, to: {
-          name: item.params.to, params: {
+          name: 'admin-products-category', params: {
             category_id: item.params.category_id,
             link_rewrite: item.params.link_rewrite
           }
@@ -50,7 +49,7 @@ function adaptMenu(menu: NavigationMenuItem[]) {
       })
     } else {
       item.to = {
-        name: item.params.to, params: {
+        name: 'admin-products-category', params: {
           category_id: item.params.category_id,
           link_rewrite: item.params.link_rewrite
         }

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/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,11 +1,19 @@
-import { useFetchJson } from '@/composable/useFetchJson'
 import { defineStore } from 'pinia'
-import { ref } from 'vue'
+import { ref, computed } from 'vue'
+
+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', () => {
@@ -13,46 +21,124 @@ export const useAddressStore = defineStore('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))
+
+  const paginatedAddresses = computed(() => {
+    const start = (currentPage.value - 1) * pageSize
+    return filteredAddresses.value.slice(start, start + pageSize)
+  })
+
+  function getAddressById(id: number) {
+    return addresses.value.find(addr => addr.id === id)
+  }
+
+  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 addAddress(formData: AddressFormData): Address {
-    const res = await useFetchJson<Record<string, string>>(
+    const newAddress: Address = {
-      `/api/v1/restricted/addresses/get-template?country_id=${countryId}`
+      id: generateId(),
-    )
+      ...normalize(formData)
-    return res.items ?? {}
+    }
+
+    addresses.value.unshift(newAddress)
+    resetPagination()
+
+    return newAddress
   }
 
-  async function createAddress(countryId: number, data: Record<string, string>) {
+  function updateAddress(id: number, formData: AddressFormData): boolean {
-    await useFetchJson(`/api/v1/restricted/addresses/add-new-address?country_id=${countryId}`, {
+    const index = addresses.value.findIndex(a => a.id === id)
-      method: 'POST',
+    if (index === -1) return false
-      body: JSON.stringify(data)
+
-    })
+    const existing = addresses.value[index]
-    await fetchAddresses()
+    if (!existing) return false
+
+    addresses.value[index] = {
+      id: existing.id,
+      ...normalize(formData)
+    }
+    return true
+  }
+  function deleteAddress(id: number): boolean {
+    const index = addresses.value.findIndex(a => a.id === id)
+    if (index === -1) return false
+
+    addresses.value.splice(index, 1)
+    resetPagination()
+
+    return true
   }
 
-  async function updateAddress(id: number, countryId: number, data: Record<string, string>) {
+  function setPage(page: number) {
-    await useFetchJson(`/api/v1/restricted/addresses/modify-address?country_id=${countryId}&address_id=${id}`, {
+    currentPage.value = page
-      method: 'POST',
-      body: JSON.stringify(data)
-    })
-    await fetchAddresses()
   }
 
-  return { addresses, loading, error, fetchAddresses, deleteAddress, getTemplate, createAddress, updateAddress }
+  function setSearchQuery(query: string) {
-})
+    searchQuery.value = query
+    currentPage.value = 1
+  }
+
+  function resetPagination() {
+    currentPage.value = 1
+  }
+
+  initMockData()
+
+  return {
+    addresses,
+    loading,
+    error,
+    currentPage,
+    pageSize,
+    totalItems,
+    totalPages,
+    searchQuery,
+    filteredAddresses,
+    paginatedAddresses,
+    getAddressById,
+    addAddress,
+    updateAddress,
+    deleteAddress,
+    setPage,
+    setSearchQuery,
+    resetPagination
+  }
+})

bo/src/stores/customer/cart.ts

@@ -1,7 +1,6 @@
 import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
 import { useFetchJson } from '@/composable/useFetchJson'
-import { useRoute } from 'vue-router'
 
 export interface Cart {
   id: number
@@ -23,18 +22,130 @@ export const useCartStore = defineStore('cart', () => {
   const activeCartId = ref<number | null>(null)
   const error = ref<string | null>(null)
 
-  async function fetchCarts() {
+  const addresses = ref<Address[]>([])
-    try {
+  const addressLoading = ref(false)
-      const res = await useFetchJson<ApiResponse>(
+  const addressError = ref<string | null>(null)
-        `/api/v1/restricted/carts/retrieve-carts-info`
+  const addressSearchQuery = ref('')
-      )
+  const addressCurrentPage = ref(1)
+  const addressPageSize = 20
+  const addressTotalCount = ref(0)
 
-      carts.value = res.items
+  function transformAddressResponse(address: any): Address {
-    } catch (e: any) {
+    const info = address.address_info || address.addressInfo || {}
-      error.value = e?.message ?? 'Error loading carts'
+
+    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()
+  }
+
+
+  function initMockData() {
+    items.value = [
+      { id: 1, productId: 101, name: 'Premium Widget Pro', product_number: 'NC209/7000', image: '/img/product-1.jpg', price: 129.99, quantity: 2 },
+      { id: 2, productId: 102, name: 'Ultra Gadget X', product_number: 'NC234/6453', image: '/img/product-2.jpg', price: 89.50, quantity: 1 },
+      { id: 3, productId: 103, name: 'Mega Tool Set', product_number: 'NC324/9030', image: '/img/product-3.jpg', price: 249.00, quantity: 3 }
+    ]
+  }
+
   async function addNewCart(name: string) {
     try {
       error.value = null
@@ -101,15 +212,37 @@ export const useCartStore = defineStore('cart', () => {
   })
 
   return {
-    carts,
+    items,
-    activeCartId,
+    selectedAddressId,
-    error,
+    selectedDeliveryMethodId,
-    errorMessage,
+    shippingCost,
-    activeCart,
+    vatRate,
-    setActiveCart,
+    deliveryMethods,
-    addProduct,
+    productsTotal,
-    fetchCarts,
+    vatAmount,
-    addNewCart,
+    orderTotal,
-    initCart,
+    itemCount,
+    deleteProduct,
+    updateQuantity,
+    removeItem,
+    clearCart,
+    setSelectedAddress,
+    setDeliveryMethod,
+    addresses,
+    addressLoading,
+    addressError,
+    addressSearchQuery,
+    addressCurrentPage,
+    addressPageSize,
+    paginatedAddresses,
+    totalAddressItems,
+    totalAddressPages,
+    fetchAddresses,
+    addAddress,
+    updateAddress,
+    deleteAddress,
+    setAddressPage,
+    setAddressSearchQuery,
+    getAddressTemplate
   }
 })

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