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