test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolved conflict

Browse Source
This commit is contained in:
Shariq Ansari 2025-07-05 14:38:21 +05:30 committed by GitHub
parent a78a110914
commit 8b04f3da3e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
frontend/src/pages/Contact.vue
View File

@ -348,26 +348,10 @@ function getParsedSections(_sections) {
} }
}, },
onDelete: async (option, isNew) => { onDelete: async (option, isNew) => {
<<<<<<< HEAD
contact.data.email_ids = contact.data.email_ids.filter(
(email) => email.name !== option.name
)
!isNew && (await deleteOption('Contact Email', option.name))
if (_contact.value.email_id === option.value) {
if (contact.data.email_ids.length === 0) {
_contact.value.email_id = ''
} else {
_contact.value.email_id = contact.data.email_ids.find(
(email) => email.is_primary
)?.email_id
}
}
=======
contact.doc.email_ids = contact.doc.email_ids.filter( contact.doc.email_ids = contact.doc.email_ids.filter(
(email) => email.name !== option.name, (email) => email.name !== option.name,
) )
!isNew && (await deleteOption('Contact Email', option.name)) !isNew && (await deleteOption('Contact Email', option.name))
>>>>>>> 42ea1ad1 (fix: useDocument in contact page)
}, },
} }
}) || [], }) || [],
@ -407,27 +391,10 @@ function getParsedSections(_sections) {
} }
}, },
onDelete: async (option, isNew) => { onDelete: async (option, isNew) => {
<<<<<<< HEAD
contact.data.phone_nos = contact.data.phone_nos.filter(
(phone) => phone.name !== option.name
)
!isNew && (await deleteOption('Contact Phone', option.name))
if (_contact.value.actual_mobile_no === option.value) {
if (contact.data.phone_nos.length === 0) {
_contact.value.actual_mobile_no = ''
} else {
_contact.value.actual_mobile_no =
contact.data.phone_nos.find(
(phone) => phone.is_primary_mobile_no
)?.phone
}
}
=======
contact.doc.phone_nos = contact.doc.phone_nos.filter( contact.doc.phone_nos = contact.doc.phone_nos.filter(
(phone) => phone.name !== option.name, (phone) => phone.name !== option.name,
) )
!isNew && (await deleteOption('Contact Phone', option.name)) !isNew && (await deleteOption('Contact Phone', option.name))
>>>>>>> 42ea1ad1 (fix: useDocument in contact page)
}, },
} }
}) || [], }) || [],