test/jcrm
1
0
Fork 0
forked from test/crm
Code Pull Requests Activity

fix: use document.doc instead of lead.data/deal.data

Browse Source 
(cherry picked from commit 0144bc109a83f80e4349508001d1cb752707043c)

# Conflicts:
#	frontend/src/pages/Deal.vue
#	frontend/src/pages/Lead.vue
This commit is contained in:
Shariq Ansari 2025-07-30 12:56:27 +05:30 committed by Mergify
parent 0e177818cc
commit 971265d000
3 changed files with 186 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

168
frontend/src/pages/Deal.vue
View File

@ -1,5 +1,5 @@
<template>
<LayoutHeader v-if="deal.data">
<LayoutHeader>
<template #left-header>
<Breadcrumbs :items="breadcrumbs">
<template #prefix="{ item }">
@ -7,38 +7,30 @@
</template>
</Breadcrumbs>
</template>
<template #right-header>
<template v-if="!errorTitle" #right-header>
<CustomActions
v-if="deal.data._customActions?.length"
:actions="deal.data._customActions"
v-if="document._actions?.length"
:actions="document._actions"
/>
<CustomActions
v-if="document.actions?.length"
:actions="document.actions"
/>
<AssignTo
v-model="assignees.data"
:data="document.doc"
doctype="CRM Deal"
/>
<AssignTo v-model="assignees.data" :data="doc" doctype="CRM Deal" />
<Dropdown
v-if="document.doc"
v-if="doc"
:options="
statusOptions(
'deal',
document.statuses?.length
? document.statuses
: deal.data._customStatuses,
document.statuses?.length ? document.statuses : document._statuses,
triggerStatusChange,
)
"
>
<template #default="{ open }">
<Button :label="document.doc.status">
<Button v-if="doc.status" :label="doc.status">
<template #prefix>
<IndicatorIcon
:class="getDealStatus(document.doc.status).color"
/>
<IndicatorIcon :class="getDealStatus(doc.status).color" />
</template>
<template #suffix>
<FeatherIcon
@ -69,9 +61,9 @@
<Resizer side="right" class="flex flex-col justify-between border-l">
<div
class="flex h-10.5 cursor-copy items-center border-b px-5 py-2.5 text-lg font-medium text-ink-gray-9"
@click="copyToClipboard(deal.data.name)"
@click="copyToClipboard(doc.name)"
>
{{ __(deal.data.name) }}
{{ __(doc.name) }}
</div>
<div class="flex items-center justify-start gap-5 border-b p-5">
<Tooltip :text="__('Organization logo')">
@ -102,9 +94,7 @@
<div>
<Button
@click="
deal.data.email
? openEmailBox()
: toast.error(__('No email set'))
doc.email ? openEmailBox() : toast.error(__('No email set'))
"
>
<template #icon><Email2Icon /></template>
@ -115,8 +105,8 @@
<div>
<Button
@click="
deal.data.website
? openWebsite(deal.data.website)
doc.website
? openWebsite(doc.website)
: toast.error(__('No website set'))
"
>
@ -131,12 +121,25 @@
</Button>
</div>
</Tooltip>
<<<<<<< HEAD
=======
<Tooltip :text="__('Delete')">
<div>
<Button
@click="deleteDealWithModal(doc.name)"
variant="subtle"
icon="trash-2"
theme="red"
/>
</div>
</Tooltip>
>>>>>>> 0144bc10 (fix: use document.doc instead of lead.data/deal.data)
</div>
</div>
</div>
<SLASection
v-if="deal.data.sla_status"
v-model="deal.data"
v-if="doc.sla_status"
v-model="doc"
@updateField="updateField"
/>
<div
@ -147,7 +150,7 @@
:sections="sections.data"
:addContact="addContact"
doctype="CRM Deal"
:docname="deal.data.name"
:docname="doc.name"
@reload="sections.reload"
@beforeFieldChange="beforeStatusChange"
@afterFieldChange="reloadAssignees"
@ -162,7 +165,7 @@
(value, close) => {
_contact = {
first_name: value,
company_name: deal.data.organization,
company_name: doc.organization,
}
showContactModal = true
close()
@ -298,7 +301,7 @@
:data="_organization"
:options="{
redirect: false,
afterInsert: (doc) => updateField('organization', doc.name),
afterInsert: (_doc) => updateField('organization', _doc.name),
}"
/>
<ContactModal
@ -307,14 +310,14 @@
:contact="_contact"
:options="{
redirect: false,
afterInsert: (doc) => addContact(doc.name),
afterInsert: (_doc) => addContact(_doc.name),
}"
/>
<FilesUploader
v-if="deal.data?.name"
v-if="doc?.name"
v-model="showFilesUploader"
doctype="CRM Deal"
:docname="deal.data.name"
:docname="doc.name"
@after="
() => {
activities?.all_activities?.reload()
@ -326,7 +329,7 @@
v-if="showDeleteLinkedDocModal"
v-model="showDeleteLinkedDocModal"
:doctype="'CRM Deal'"
:docname="props.dealId"
:docname="dealId"
name="Deals"
/>
<LostReasonModal
@ -386,7 +389,15 @@ import {
toast,
} from 'frappe-ui'
import { useOnboarding } from 'frappe-ui/frappe'
import { ref, computed, h, onMounted, onBeforeUnmount, nextTick } from 'vue'
import {
ref,
computed,
h,
onMounted,
onBeforeUnmount,
nextTick,
watch,
} from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { useActiveTabManager } from '@/composables/useActiveTabManager'
@ -411,45 +422,60 @@ const props = defineProps({
const errorTitle = ref('')
const errorMessage = ref('')
const { triggerOnChange, assignees, document, scripts, error } = useDocument(
'CRM Deal',
props.dealId,
)
const doc = computed(() => document.doc || {})
watch(error, (err) => {
if (err) {
errorTitle.value = __(
err.exc_type == 'DoesNotExistError'
? 'Document not found'
: 'Error occurred',
)
errorMessage.value = __(err.messages?.[0] || 'An error occurred')
} else {
errorTitle.value = ''
errorMessage.value = ''
}
})
watch(
() => document.doc,
async (_doc) => {
if (scripts.data?.length) {
let s = await setupCustomizations(scripts.data, {
doc: _doc,
$dialog,
$socket,
router,
toast,
updateField,
createToast: toast.create,
deleteDoc: deleteDeal,
call,
})
document._actions = s.actions || []
document._statuses = s.statuses || []
}
},
{ once: true },
)
const deal = createResource({
url: 'crm.fcrm.doctype.crm_deal.api.get_deal',
params: { name: props.dealId },
cache: ['deal', props.dealId],
onSuccess: (data) => {
errorTitle.value = ''
errorMessage.value = ''
if (data.organization) {
organization.update({
params: { doctype: 'CRM Organization', name: data.organization },
})
organization.fetch()
}
setupCustomizations(deal, {
doc: data,
$dialog,
$socket,
router,
toast,
updateField,
createToast: toast.create,
deleteDoc: deleteDeal,
resource: {
deal,
dealContacts,
sections,
},
call,
})
},
onError: (err) => {
if (err.messages?.[0]) {
errorTitle.value = __('Not permitted')
errorMessage.value = __(err.messages?.[0])
} else {
router.push({ name: 'Deals' })
}
},
})
@ -510,7 +536,7 @@ function updateDeal(fieldname, value, callback) {
}
function validateRequired(fieldname, value) {
let meta = deal.data.fields_meta || {}
let meta = deal.data?.fields_meta || {}
if (meta[fieldname]?.reqd && !value) {
toast.error(__('{0} is a required field', [meta[fieldname].label]))
return true
@ -538,14 +564,14 @@ const breadcrumbs = computed(() => {
items.push({
label: title.value,
route: { name: 'Deal', params: { dealId: deal.data.name } },
route: { name: 'Deal', params: { dealId: props.dealId } },
})
return items
})
const title = computed(() => {
let t = doctypeMeta['CRM Deal']?.title_field || 'name'
return deal.data?.[t] || props.dealId
return doc.value?.[t] || props.dealId
})
usePageMeta(() => {
@ -736,7 +762,7 @@ function updateField(name, value, callback) {
}
updateDeal(name, value, () => {
deal.data[name] = value
doc.value[name] = value
callback?.()
})
}
@ -759,11 +785,6 @@ function openEmailBox() {
nextTick(() => (activities.value.emailBox.show = true))
}
const { assignees, document, triggerOnChange } = useDocument(
'CRM Deal',
props.dealId,
)
async function triggerStatusChange(value) {
await triggerOnChange('status', value)
setLostReason()
@ -785,7 +806,10 @@ function setLostReason() {
}
function beforeStatusChange(data) {
if (data?.hasOwnProperty('status') && getDealStatus(data.status).type == 'Lost') {
if (
data?.hasOwnProperty('status') &&
getDealStatus(data.status).type == 'Lost'
) {
setLostReason()
} else {
document.save.submit(null, {

151
frontend/src/pages/Lead.vue
View File

@ -1,5 +1,5 @@
<template>
<LayoutHeader v-if="lead.data">
<LayoutHeader>
<template #left-header>
<Breadcrumbs :items="breadcrumbs">
<template #prefix="{ item }">
@ -7,38 +7,30 @@
</template>
</Breadcrumbs>
</template>
<template #right-header>
<template v-if="!errorTitle" #right-header>
<CustomActions
v-if="lead.data._customActions?.length"
:actions="lead.data._customActions"
v-if="document._actions?.length"
:actions="document._actions"
/>
<CustomActions
v-if="document.actions?.length"
:actions="document.actions"
/>
<AssignTo
v-model="assignees.data"
:data="document.doc"
doctype="CRM Lead"
/>
<AssignTo v-model="assignees.data" :data="doc" doctype="CRM Lead" />
<Dropdown
v-if="document.doc"
v-if="doc"
:options="
statusOptions(
'lead',
document.statuses?.length
? document.statuses
: lead.data._customStatuses,
document.statuses?.length ? document.statuses : document._statuses,
triggerStatusChange,
)
"
>
<template #default="{ open }">
<Button :label="document.doc.status">
<Button v-if="doc.status" :label="doc.status">
<template #prefix>
<IndicatorIcon
:class="getLeadStatus(document.doc.status).color"
/>
<IndicatorIcon :class="getLeadStatus(doc.status).color" />
</template>
<template #suffix>
<FeatherIcon
@ -56,7 +48,7 @@
/>
</template>
</LayoutHeader>
<div v-if="lead?.data" class="flex h-full overflow-hidden">
<div v-if="lead.data" class="flex h-full overflow-hidden">
<Tabs as="div" v-model="tabIndex" :tabs="tabs">
<template #tab-panel>
<Activities
@ -74,9 +66,9 @@
<Resizer class="flex flex-col justify-between border-l" side="right">
<div
class="flex h-10.5 cursor-copy items-center border-b px-5 py-2.5 text-lg font-medium text-ink-gray-9"
@click="copyToClipboard(lead.data.name)"
@click="copyToClipboard(doc.name)"
>
{{ __(lead.data.name) }}
{{ __(doc.name) }}
</div>
<FileUploader
@success="(file) => updateField('image', file.file_url)"
@ -89,17 +81,17 @@
size="3xl"
class="size-12"
:label="title"
:image="lead.data.image"
:image="doc.image"
/>
<component
:is="lead.data.image ? Dropdown : 'div'"
:is="doc.image ? Dropdown : 'div'"
v-bind="
lead.data.image
doc.image
? {
options: [
{
icon: 'upload',
label: lead.data.image
label: doc.image
? __('Change image')
: __('Upload image'),
onClick: openFileSelector,
@ -127,7 +119,7 @@
</component>
</div>
<div class="flex flex-col gap-2.5 truncate">
<Tooltip :text="lead.data.lead_name || __('Set first name')">
<Tooltip :text="doc.lead_name || __('Set first name')">
<div class="truncate text-2xl font-medium text-ink-gray-9">
{{ title }}
</div>
@ -138,8 +130,8 @@
<Button
@click="
() =>
lead.data.mobile_no
? makeCall(lead.data.mobile_no)
doc.mobile_no
? makeCall(doc.mobile_no)
: toast.error(__('No phone number set'))
"
>
@ -153,7 +145,7 @@
<div>
<Button
@click="
lead.data.email
doc.email
? openEmailBox()
: toast.error(__('No email set'))
"
@ -168,8 +160,8 @@
<div>
<Button
@click="
lead.data.website
? openWebsite(lead.data.website)
doc.website
? openWebsite(doc.website)
: toast.error(__('No website set'))
"
>
@ -188,6 +180,19 @@
</Button>
</div>
</Tooltip>
<<<<<<< HEAD
=======
<Tooltip :text="__('Delete')">
<div>
<Button
@click="deleteLeadWithModal(doc.name)"
variant="subtle"
theme="red"
icon="trash-2"
/>
</div>
</Tooltip>
>>>>>>> 0144bc10 (fix: use document.doc instead of lead.data/deal.data)
</div>
<ErrorMessage :message="__(error)" />
</div>
@ -195,8 +200,8 @@
</template>
</FileUploader>
<SLASection
v-if="lead.data.sla_status"
v-model="lead.data"
v-if="doc.sla_status"
v-model="doc"
@updateField="updateField"
/>
<div
@ -206,7 +211,7 @@
<SidePanelLayout
:sections="sections.data"
doctype="CRM Lead"
:docname="lead.data.name"
:docname="doc.name"
@reload="sections.reload"
@afterFieldChange="reloadAssignees"
/>
@ -221,13 +226,13 @@
<ConvertToDealModal
v-if="showConvertToDealModal"
v-model="showConvertToDealModal"
:lead="lead.data"
:lead="doc"
/>
<FilesUploader
v-if="lead.data?.name"
v-if="doc?.name"
v-model="showFilesUploader"
doctype="CRM Lead"
:docname="lead.data.name"
:docname="doc.name"
@after="
() => {
activities?.all_activities?.reload()
@ -239,7 +244,7 @@
v-if="showDeleteLinkedDocModal"
v-model="showDeleteLinkedDocModal"
:doctype="'CRM Lead'"
:docname="props.leadId"
:docname="leadId"
name="Leads"
/>
</template>
@ -317,44 +322,58 @@ const errorMessage = ref('')
const showDeleteLinkedDocModal = ref(false)
const showConvertToDealModal = ref(false)
const { triggerOnChange, assignees, document } = useDocument(
const { triggerOnChange, assignees, document, scripts, error } = useDocument(
'CRM Lead',
props.leadId,
)
const doc = computed(() => document.doc || {})
async function triggerStatusChange(value) {
await triggerOnChange('status', value)
document.save.submit()
}
watch(error, (err) => {
if (err) {
errorTitle.value = __(
err.exc_type == 'DoesNotExistError'
? 'Document not found'
: 'Error occurred',
)
errorMessage.value = __(err.messages?.[0] || 'An error occurred')
} else {
errorTitle.value = ''
errorMessage.value = ''
}
})
watch(
() => document.doc,
async (_doc) => {
if (scripts.data?.length) {
let s = await setupCustomizations(scripts.data, {
doc: _doc,
$dialog,
$socket,
router,
toast,
updateField,
createToast: toast.create,
deleteDoc: deleteLead,
call,
})
document._actions = s.actions || []
document._statuses = s.statuses || []
}
},
{ once: true },
)
const lead = createResource({
url: 'crm.fcrm.doctype.crm_lead.api.get_lead',
params: { name: props.leadId },
cache: ['lead', props.leadId],
onSuccess: (data) => {
errorTitle.value = ''
errorMessage.value = ''
setupCustomizations(lead, {
doc: data,
$dialog,
$socket,
router,
toast,
updateField,
createToast: toast.create,
deleteDoc: deleteLead,
resource: { lead, sections },
call,
})
},
onError: (err) => {
if (err.messages?.[0]) {
errorTitle.value = __('Not permitted')
errorMessage.value = __(err.messages?.[0])
} else {
router.push({ name: 'Leads' })
}
},
})
onMounted(() => {
@ -392,7 +411,7 @@ function updateLead(fieldname, value, callback) {
}
function validateRequired(fieldname, value) {
let meta = lead.data.fields_meta || {}
let meta = lead.data?.fields_meta || {}
if (meta[fieldname]?.reqd && !value) {
toast.error(__('{0} is a required field', [meta[fieldname].label]))
return true
@ -420,14 +439,14 @@ const breadcrumbs = computed(() => {
items.push({
label: title.value,
route: { name: 'Lead', params: { leadId: lead.data.name } },
route: { name: 'Lead', params: { leadId: props.leadId } },
})
return items
})
const title = computed(() => {
let t = doctypeMeta['CRM Lead']?.title_field || 'name'
return lead.data?.[t] || props.leadId
return doc?.[t] || props.leadId
})
usePageMeta(() => {
@ -511,7 +530,7 @@ const sections = createResource({
function updateField(name, value, callback) {
updateLead(name, value, () => {
lead.data[name] = value
doc[name] = value
callback?.()
})
}

17
frontend/src/utils/index.js
View File

@ -278,25 +278,18 @@ async function getFormScript(script, obj) {
return formScript || {}
}
export async function setupCustomizations(doc, obj) {
if (!doc.data?._form_script) return []
export async function setupCustomizations(scripts, obj) {
if (!scripts) return []
let statuses = []
let actions = []
if (Array.isArray(doc.data._form_script)) {
for (let script of doc.data._form_script) {
let _script = await getFormScript(script, obj)
if (Array.isArray(scripts)) {
for (let s of scripts) {
let _script = await getFormScript(s.script, obj)
actions = actions.concat(_script?.actions || [])
statuses = statuses.concat(_script?.statuses || [])
}
} else {
let _script = await getFormScript(doc.data._form_script, obj)
actions = _script?.actions || []
statuses = _script?.statuses || []
}
doc.data._customStatuses = statuses
doc.data._customActions = actions
return { statuses, actions }
}