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-09-05 15:53:57 +05:30 committed by GitHub
parent 068f303448
commit 0d9264e5e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 0 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -322,38 +322,6 @@ const parsedSections = computed(() => {
...field,
read_only: false,
fieldtype: 'Dropdown',
<<<<<<< HEAD
options:
contact.doc?.email_ids?.map((email) => {
return {
name: email.name,
value: email.email_id,
selected: email.email_id === contact.doc.email_id,
placeholder: 'john@doe.com',
onClick: () => {
setAsPrimary('email', email.email_id)
},
onSave: (option, isNew) => {
if (isNew) {
createNew('email', option.value)
} else {
editOption(
'Contact Email',
option.name,
'email_id',
option.value
)
}
},
onDelete: async (option, isNew) => {
contact.doc.email_ids = contact.doc.email_ids.filter(
(email) => email.name !== option.name,
)
!isNew && (await deleteOption('Contact Email', option.name))
},
}
}) || [],
=======
options: (contact.doc?.email_ids || []).map((email) => ({
name: email.name,
value: email.email_id,
@ -376,7 +344,6 @@ const parsedSections = computed(() => {
if (!isNew) await deleteOption('Contact Email', option.name)
},
})),
>>>>>>> 50708ebe (fix: if contact email is updated it is updating previously opened contact)
create: () => {
// Add a temporary new option locally (mirrors original behavior)
contact.doc.email_ids = [
@ -396,37 +363,6 @@ const parsedSections = computed(() => {
...field,
read_only: false,
fieldtype: 'Dropdown',
<<<<<<< HEAD
options:
contact.doc?.phone_nos?.map((phone) => {
return {
name: phone.name,
value: phone.phone,
selected: phone.phone === contact.doc.mobile_no,
onClick: () => {
setAsPrimary('mobile_no', phone.phone)
},
onSave: (option, isNew) => {
if (isNew) {
createNew('phone', option.value)
} else {
editOption(
'Contact Phone',
option.name,
'phone',
option.value
)
}
},
onDelete: async (option, isNew) => {
contact.doc.phone_nos = contact.doc.phone_nos.filter(
(phone) => phone.name !== option.name,
)
!isNew && (await deleteOption('Contact Phone', option.name))
},
}
}) || [],
=======
options: (contact.doc?.phone_nos || []).map((phone) => ({
name: phone.name,
value: phone.phone,
@ -448,7 +384,6 @@ const parsedSections = computed(() => {
if (!isNew) await deleteOption('Contact Phone', option.name)
},
})),
>>>>>>> 50708ebe (fix: if contact email is updated it is updating previously opened contact)
create: () => {
contact.doc.phone_nos = [
...(contact.doc.phone_nos || []),