merge

frontend/components/cart/delivery/AddressModal.vue

@@ -134,15 +134,14 @@ const handleSubmit = async () => {
 };
 
 watch(
-    () => addressData.value.for_me,
+    () => [addressData.value.for_me, isShow.value],
-    (newValue) => {
+    ([newValue, newValue2]) => {
         if (!isEditing.value) {
-            addressData.value.phone = newValue == "بله" ? account.value!.phone : "";
+            addressData.value.phone = newValue == "بله" && newValue2 ? account.value?.phone ?? "" : "";
         }
     },
     {
         immediate: true,
-        deep: true,
     }
 );
 </script>
@@ -178,7 +177,7 @@ watch(
                 <div class="grid w-full grid-cols-1 gap-6 md:grid-cols-2 lg:grid-cols-3">
                     <DataField
                         id="name"
-                        label="نام پیش فرض"
+                        label="نام پیش فرض آدرس"
                     >
                         <Input
                             id="name"

frontend/components/products/FilterProducts.vue

@@ -252,7 +252,7 @@ watch(
                         mode="out-in"
                     >
                         <span class="flex-center gap-3">
-                            ثبت فیلتر جدید
+                            ثبت فیلتر
                             <Icon
                                 name="ci:plus"
                                 size="20"

frontend/pages/cart/delivery.vue

@@ -96,7 +96,7 @@ const deliveryData = ref<DeliveryData>({
                     <AddressItem
                         v-for="(address, index) in addresses"
                         :key="index"
-                        :isSelected="address.id === cart?.address.id"
+                        :isSelected="address.id === cart?.address?.id"
                         :address="address"
                     />
                 </div>

frontend/pages/cart/index.vue

@@ -81,7 +81,7 @@ const hasCartItem = computed(() => !!cart.value && cart.value.items.length! > 0)
                     icon="bi:cart"
                 >
                     <template #actions>
-                        <NuxtLink :to="{ name: 'products' }">
+                        <NuxtLink :to="{ name: 'products-slug' }">
                             <Button
                                 class="rounded-full"
                                 size="md"

frontend/types/global.d.ts

@@ -158,7 +158,7 @@ declare global {
     };
 
     type Address = {
-        id: number | undefined;
+        id: number;
         province: string | undefined;
         city: string | undefined;
         postal_code: string | undefined;