From 0cc1d5da8f7af481ec6d70622a664a44daf852c6 Mon Sep 17 00:00:00 2001 From: Ocheretovich Date: Thu, 29 May 2025 13:03:21 +0300 Subject: [PATCH 01/30] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21503df7..84a2ef82 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ **Simplify Sales, Amplify Relationships** -![GitHub release (latest by date)](https://img.shields.io/github/v/release/frappe/crm) +[![GitHub release (latest by date)](https://img.shields.io/github/v/release/frappe/crm)](https://github.com/frappe/crm/releases)
From c9b9dbb092d36280bc27f58d8df627b2a017afd7 Mon Sep 17 00:00:00 2001 From: Ocheretovich Date: Thu, 29 May 2025 13:06:52 +0300 Subject: [PATCH 02/30] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 21503df7..81652411 100644 --- a/README.md +++ b/README.md @@ -181,6 +181,7 @@ You need Docker, docker-compose and git setup on your machine. Refer [Docker doc - [Discuss Forum](https://discuss.frappe.io/c/frappe-crm) - [Documentation](https://docs.frappe.io/crm) - [YouTube](https://www.youtube.com/channel/UCn3bV5kx77HsVwtnlCeEi_A) +- [X/Twitter](https://x.com/frappetech)

From 165509f5a08b7e38ed84c73ce4896b95a6eb4caf Mon Sep 17 00:00:00 2001 From: frappe-pr-bot Date: Sun, 1 Jun 2025 09:36:30 +0000 Subject: [PATCH 03/30] chore: update POT file --- crm/locale/main.pot | 134 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 107 insertions(+), 27 deletions(-) diff --git a/crm/locale/main.pot b/crm/locale/main.pot index a18de683..ce353280 100644 --- a/crm/locale/main.pot +++ b/crm/locale/main.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Frappe CRM VERSION\n" "Report-Msgid-Bugs-To: shariq@frappe.io\n" -"POT-Creation-Date: 2025-05-25 09:35+0000\n" -"PO-Revision-Date: 2025-05-25 09:35+0000\n" +"POT-Creation-Date: 2025-06-01 09:36+0000\n" +"PO-Revision-Date: 2025-06-01 09:36+0000\n" "Last-Translator: shariq@frappe.io\n" "Language-Team: shariq@frappe.io\n" "MIME-Version: 1.0\n" @@ -25,6 +25,26 @@ msgstr "" msgid "01/04/2024 11:30 PM" msgstr "" +#: frontend/src/utils/index.js:122 +msgid "1 hour ago" +msgstr "" + +#: frontend/src/utils/index.js:118 +msgid "1 minute ago" +msgstr "" + +#: frontend/src/utils/index.js:136 +msgid "1 month ago" +msgstr "" + +#: frontend/src/utils/index.js:132 +msgid "1 week ago" +msgstr "" + +#: frontend/src/utils/index.js:140 +msgid "1 year ago" +msgstr "" + #. Option for the 'No. of Employees' (Select) field in DocType 'CRM Deal' #. Option for the 'No. of Employees' (Select) field in DocType 'CRM Lead' #. Option for the 'No. of Employees' (Select) field in DocType 'CRM @@ -176,7 +196,7 @@ msgstr "" msgid "Actions" msgstr "" -#: frontend/src/pages/Deal.vue:527 frontend/src/pages/Lead.vue:519 +#: frontend/src/pages/Deal.vue:527 frontend/src/pages/Lead.vue:520 #: frontend/src/pages/MobileDeal.vue:428 frontend/src/pages/MobileLead.vue:331 msgid "Activity" msgstr "" @@ -421,7 +441,7 @@ msgstr "" msgid "Attach a file" msgstr "" -#: frontend/src/pages/Deal.vue:562 frontend/src/pages/Lead.vue:554 +#: frontend/src/pages/Deal.vue:562 frontend/src/pages/Lead.vue:555 #: frontend/src/pages/MobileDeal.vue:464 frontend/src/pages/MobileLead.vue:367 msgid "Attachments" msgstr "" @@ -685,7 +705,7 @@ msgstr "" msgid "Calling..." msgstr "" -#: frontend/src/pages/Deal.vue:547 frontend/src/pages/Lead.vue:539 +#: frontend/src/pages/Deal.vue:547 frontend/src/pages/Lead.vue:540 #: frontend/src/pages/MobileDeal.vue:448 frontend/src/pages/MobileLead.vue:351 msgid "Calls" msgstr "" @@ -829,7 +849,7 @@ msgstr "" msgid "Comment" msgstr "" -#: frontend/src/pages/Deal.vue:537 frontend/src/pages/Lead.vue:529 +#: frontend/src/pages/Deal.vue:537 frontend/src/pages/Lead.vue:530 #: frontend/src/pages/MobileDeal.vue:438 frontend/src/pages/MobileLead.vue:341 msgid "Comments" msgstr "" @@ -975,7 +995,7 @@ msgstr "" msgid "Converted successfully" msgstr "" -#: frontend/src/utils/index.js:218 +#: frontend/src/utils/index.js:295 msgid "Copied to clipboard" msgstr "" @@ -1104,7 +1124,7 @@ msgstr "" #: frontend/src/components/Activities/DataFields.vue:6 #: frontend/src/components/Layouts/AppSidebar.vue:569 -#: frontend/src/pages/Deal.vue:542 frontend/src/pages/Lead.vue:534 +#: frontend/src/pages/Deal.vue:542 frontend/src/pages/Lead.vue:535 #: frontend/src/pages/MobileDeal.vue:443 frontend/src/pages/MobileLead.vue:346 msgid "Data" msgstr "" @@ -1567,7 +1587,7 @@ msgstr "" msgid "Email template" msgstr "" -#: frontend/src/pages/Deal.vue:532 frontend/src/pages/Lead.vue:524 +#: frontend/src/pages/Deal.vue:532 frontend/src/pages/Lead.vue:525 #: frontend/src/pages/MobileDeal.vue:433 frontend/src/pages/MobileLead.vue:336 msgid "Emails" msgstr "" @@ -1636,7 +1656,7 @@ msgstr "" msgid "Equals" msgstr "" -#: frontend/src/pages/Lead.vue:642 +#: frontend/src/pages/Lead.vue:651 msgid "Error converting to deal: {0}" msgstr "" @@ -1652,7 +1672,7 @@ msgstr "" msgid "Error updating document" msgstr "" -#: frontend/src/pages/Lead.vue:464 +#: frontend/src/pages/Lead.vue:465 msgid "Error updating lead" msgstr "" @@ -1759,7 +1779,7 @@ msgstr "" msgid "Failed to create email account, Invalid credentials" msgstr "" -#: frontend/src/data/script.js:97 +#: frontend/src/data/script.js:105 msgid "Failed to load form controller: {0}" msgstr "" @@ -2357,13 +2377,13 @@ msgstr "" msgid "Lead Statuses" msgstr "" -#: frontend/src/pages/Lead.vue:460 frontend/src/pages/MobileLead.vue:266 +#: frontend/src/pages/Lead.vue:461 frontend/src/pages/MobileLead.vue:266 msgid "Lead updated successfully" msgstr "" #. Label of a shortcut in the Frappe CRM Workspace #: crm/fcrm/workspace/frappe_crm/frappe_crm.json -#: frontend/src/pages/Lead.vue:479 frontend/src/pages/MobileLead.vue:285 +#: frontend/src/pages/Lead.vue:480 frontend/src/pages/MobileLead.vue:285 msgid "Leads" msgstr "" @@ -2876,7 +2896,7 @@ msgid "Not allowed to set primary contact for Deal" msgstr "" #: frontend/src/pages/Contact.vue:256 frontend/src/pages/Deal.vue:417 -#: frontend/src/pages/Lead.vue:427 frontend/src/pages/Organization.vue:245 +#: frontend/src/pages/Lead.vue:428 frontend/src/pages/Organization.vue:245 msgid "Not permitted" msgstr "" @@ -2886,7 +2906,7 @@ msgstr "" msgid "Note" msgstr "" -#: frontend/src/pages/Deal.vue:557 frontend/src/pages/Lead.vue:549 +#: frontend/src/pages/Deal.vue:557 frontend/src/pages/Lead.vue:550 #: frontend/src/pages/MobileDeal.vue:459 frontend/src/pages/MobileLead.vue:362 msgid "Notes" msgstr "" @@ -2934,7 +2954,7 @@ msgstr "" msgid "Old Parent" msgstr "" -#: frontend/src/pages/Contact.vue:304 frontend/src/pages/Lead.vue:583 +#: frontend/src/pages/Contact.vue:304 frontend/src/pages/Lead.vue:584 #: frontend/src/pages/MobileContact.vue:275 #: frontend/src/pages/MobileOrganization.vue:258 #: frontend/src/pages/Organization.vue:300 @@ -3148,11 +3168,11 @@ msgstr "" msgid "Please enter a valid URL" msgstr "" -#: frontend/src/pages/Lead.vue:619 frontend/src/pages/MobileLead.vue:424 +#: frontend/src/pages/Lead.vue:622 frontend/src/pages/MobileLead.vue:424 msgid "Please select an existing contact" msgstr "" -#: frontend/src/pages/Lead.vue:624 frontend/src/pages/MobileLead.vue:429 +#: frontend/src/pages/Lead.vue:627 frontend/src/pages/MobileLead.vue:429 msgid "Please select an existing organization" msgstr "" @@ -3929,7 +3949,7 @@ msgstr "" msgid "Task" msgstr "" -#: frontend/src/pages/Deal.vue:552 frontend/src/pages/Lead.vue:544 +#: frontend/src/pages/Deal.vue:552 frontend/src/pages/Lead.vue:545 #: frontend/src/pages/MobileDeal.vue:454 frontend/src/pages/MobileLead.vue:357 msgid "Tasks" msgstr "" @@ -4320,7 +4340,7 @@ msgstr "" #: crm/fcrm/doctype/crm_notification/crm_notification.json #: frontend/src/components/Layouts/AppSidebar.vue:592 #: frontend/src/components/Settings/Settings.vue:124 -#: frontend/src/pages/Deal.vue:567 frontend/src/pages/Lead.vue:559 +#: frontend/src/pages/Deal.vue:567 frontend/src/pages/Lead.vue:560 #: frontend/src/pages/MobileDeal.vue:469 frontend/src/pages/MobileLead.vue:372 msgid "WhatsApp" msgstr "" @@ -4479,6 +4499,10 @@ msgstr "" msgid "john@doe.com" msgstr "" +#: frontend/src/utils/index.js:116 +msgid "just now" +msgstr "" + #. Option for the 'Type' (Select) field in DocType 'CRM View Settings' #: crm/fcrm/doctype/crm_view_settings/crm_view_settings.json msgid "kanban" @@ -4502,6 +4526,10 @@ msgstr "" msgid "next" msgstr "" +#: frontend/src/utils/index.js:95 +msgid "now" +msgstr "" + #. Option for the 'Color' (Select) field in DocType 'CRM Deal Status' #. Option for the 'Color' (Select) field in DocType 'CRM Lead Status' #: crm/fcrm/doctype/crm_deal_status/crm_deal_status.json @@ -4572,11 +4600,35 @@ msgstr "" msgid "yellow" msgstr "" +#: frontend/src/utils/index.js:128 +msgid "yesterday" +msgstr "" + +#: frontend/src/utils/index.js:107 +msgid "{0} M" +msgstr "" + #: crm/api/todo.py:50 msgid "{0} assigned a {1} {2} to you" msgstr "" -#: frontend/src/pages/Deal.vue:480 frontend/src/pages/Lead.vue:472 +#: frontend/src/utils/index.js:103 +msgid "{0} d" +msgstr "" + +#: frontend/src/utils/index.js:130 +msgid "{0} days ago" +msgstr "" + +#: frontend/src/utils/index.js:99 +msgid "{0} h" +msgstr "" + +#: frontend/src/utils/index.js:124 +msgid "{0} hours ago" +msgstr "" + +#: frontend/src/pages/Deal.vue:480 frontend/src/pages/Lead.vue:473 #: frontend/src/pages/MobileDeal.vue:375 frontend/src/pages/MobileLead.vue:278 msgid "{0} is a required field" msgstr "" @@ -4588,23 +4640,51 @@ msgstr "" msgid "{0} is an invalid email address" msgstr "" -#: frontend/src/data/script.js:232 +#: frontend/src/utils/index.js:97 +msgid "{0} m" +msgstr "" + +#: frontend/src/utils/index.js:120 +msgid "{0} minutes ago" +msgstr "" + +#: frontend/src/utils/index.js:138 +msgid "{0} months ago" +msgstr "" + +#: frontend/src/utils/index.js:105 +msgid "{0} w" +msgstr "" + +#: frontend/src/utils/index.js:134 +msgid "{0} weeks ago" +msgstr "" + +#: frontend/src/utils/index.js:109 +msgid "{0} y" +msgstr "" + +#: frontend/src/utils/index.js:142 +msgid "{0} years ago" +msgstr "" + +#: frontend/src/data/script.js:250 msgid "⚠️ Avoid using \"trigger\" as a field name — it conflicts with the built-in trigger() method." msgstr "" -#: frontend/src/data/script.js:244 +#: frontend/src/data/script.js:262 msgid "⚠️ Method \"{0}\" not found in class." msgstr "" -#: frontend/src/data/script.js:74 +#: frontend/src/data/script.js:82 msgid "⚠️ No class found for doctype: {0}, it is mandatory to have a class for the parent doctype. it can be empty, but it should be present." msgstr "" -#: frontend/src/data/script.js:167 +#: frontend/src/data/script.js:174 msgid "⚠️ No data found for parent field: {0}" msgstr "" -#: frontend/src/data/script.js:175 +#: frontend/src/data/script.js:182 msgid "⚠️ No row found for idx: {0} in parent field: {1}" msgstr "" From 895da1a8125581e8b9476ace591123ab59d7b3d3 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Mon, 2 Jun 2025 19:03:54 +0530 Subject: [PATCH 04/30] fix: remove invasive settings (#884) --- frontend/src/telemetry.ts | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/frontend/src/telemetry.ts b/frontend/src/telemetry.ts index c7c93acd..e8945398 100644 --- a/frontend/src/telemetry.ts +++ b/frontend/src/telemetry.ts @@ -49,7 +49,8 @@ function initPosthog(ps: PosthogSettings) { capture_pageview: true, capture_pageleave: true, enable_heatmaps: false, - disable_session_recording: false, + disable_session_recording: true, + advanced_disable_decide: true, loaded: (ph: typeof posthog) => { window.posthog = ph ph.identify(window.location.hostname) @@ -67,17 +68,9 @@ function capture( } function startRecording() { - if (!isTelemetryEnabled()) return - if (window.posthog?.__loaded) { - window.posthog.startSessionRecording() - } } function stopRecording() { - if (!isTelemetryEnabled()) return - if (window.posthog?.__loaded && window.posthog.sessionRecordingStarted()) { - window.posthog.stopSessionRecording() - } } // Posthog Plugin From 3aa341370b693f7af67f008f785398fb2e0adbac Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 4 Jun 2025 12:48:20 +0530 Subject: [PATCH 05/30] fix: await scripts.list.promise --- frontend/src/data/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/data/script.js b/frontend/src/data/script.js index 265f0bf2..9532fc11 100644 --- a/frontend/src/data/script.js +++ b/frontend/src/data/script.js @@ -33,7 +33,7 @@ export function getScript(doctype, view = 'Form') { } async function setupScript(document, helpers = {}) { - await scripts.promise + await scripts.list.promise let scriptDefs = doctypeScripts[doctype] if (!scriptDefs || Object.keys(scriptDefs).length === 0) return null From 3b73432d8cd8a49b8d0978575ce1d496ec760d20 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 4 Jun 2025 12:49:14 +0530 Subject: [PATCH 06/30] fix: handle controllers for new document --- frontend/src/data/document.js | 56 +++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/frontend/src/data/document.js b/frontend/src/data/document.js index bca9f713..b8a7d911 100644 --- a/frontend/src/data/document.js +++ b/frontend/src/data/document.js @@ -1,6 +1,7 @@ import { getScript } from '@/data/script' import { runSequentially } from '@/utils' import { createDocumentResource, toast } from 'frappe-ui' +import { reactive } from 'vue' const documentsCache = {} const controllersCache = {} @@ -10,27 +11,34 @@ export function useDocument(doctype, docname) { documentsCache[doctype] = documentsCache[doctype] || {} - if (!documentsCache[doctype][docname]) { - documentsCache[doctype][docname] = createDocumentResource({ - doctype: doctype, - name: docname, - onSuccess: async () => await setupFormScript(), - setValue: { - onSuccess: () => { - toast.success(__('Document updated successfully')) + if (!documentsCache[doctype][docname || '']) { + if (docname) { + documentsCache[doctype][docname] = createDocumentResource({ + doctype: doctype, + name: docname, + onSuccess: async () => await setupFormScript(), + setValue: { + onSuccess: () => { + toast.success(__('Document updated successfully')) + }, + onError: (err) => { + toast.error(__('Error updating document')) + console.error(err) + }, }, - onError: (err) => { - toast.error(__('Error updating document')) - console.error(err) - }, - }, - }) + }) + } else { + documentsCache[doctype][''] = reactive({ + doc: {}, + }) + setupFormScript() + } } async function setupFormScript() { if ( controllersCache[doctype] && - typeof controllersCache[doctype][docname] === 'object' + typeof controllersCache[doctype][docname || ''] === 'object' ) { return } @@ -39,9 +47,11 @@ export function useDocument(doctype, docname) { controllersCache[doctype] = {} } - controllersCache[doctype][docname] = {} + controllersCache[doctype][docname || ''] = {} - const controllersArray = await setupScript(documentsCache[doctype][docname]) + const controllersArray = await setupScript( + documentsCache[doctype][docname || ''], + ) if (!controllersArray || controllersArray.length === 0) return @@ -53,14 +63,14 @@ export function useDocument(doctype, docname) { } organizedControllers[controllerKey].push(controller) } - controllersCache[doctype][docname] = organizedControllers + controllersCache[doctype][docname || ''] = organizedControllers } function getControllers(row = null) { const _doctype = row?.doctype || doctype const controllerKey = _doctype.replace(/\s+/g, '') - const docControllers = controllersCache[doctype]?.[docname] + const docControllers = controllersCache[doctype]?.[docname || ''] if ( typeof docControllers === 'object' && @@ -86,7 +96,7 @@ export function useDocument(doctype, docname) { this.value = row[fieldname] this.oldValue = getOldValue(fieldname, row) } else { - this.value = documentsCache[doctype][docname].doc[fieldname] + this.value = documentsCache[doctype][docname || ''].doc[fieldname] this.oldValue = getOldValue(fieldname) } await this[fieldname]?.() @@ -151,9 +161,9 @@ export function useDocument(doctype, docname) { } function getOldValue(fieldname, row) { - if (!documentsCache[doctype][docname]) return '' + if (!documentsCache[doctype][docname || '']) return '' - const document = documentsCache[doctype][docname] + const document = documentsCache[doctype][docname || ''] const oldDoc = document.originalDoc if (row?.name) { @@ -166,7 +176,7 @@ export function useDocument(doctype, docname) { } return { - document: documentsCache[doctype][docname], + document: documentsCache[doctype][docname || ''], triggerOnChange, triggerOnRowAdd, triggerOnRowRemove, From 832323f25ef9f1231eb97f721317f306a0a2eabc Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 4 Jun 2025 12:49:56 +0530 Subject: [PATCH 07/30] fix: handle new document for call log --- .../src/components/Activities/Activities.vue | 4 +- .../src/components/Activities/AllModals.vue | 6 +- .../src/components/Activities/CallArea.vue | 2 +- .../src/components/Modals/CallLogModal.vue | 137 +++++++++--------- frontend/src/pages/CallLogs.vue | 2 +- 5 files changed, 72 insertions(+), 79 deletions(-) diff --git a/frontend/src/components/Activities/Activities.vue b/frontend/src/components/Activities/Activities.vue index 847667a7..8a8004d2 100644 --- a/frontend/src/components/Activities/Activities.vue +++ b/frontend/src/components/Activities/Activities.vue @@ -250,7 +250,7 @@ {{ __(activity.type) }} {{ __(activity.data.field_label) }} @@ -307,7 +307,7 @@ >
{{ __(activity.data.field_label) }} diff --git a/frontend/src/components/Activities/AllModals.vue b/frontend/src/components/Activities/AllModals.vue index 9b312398..4a51734b 100644 --- a/frontend/src/components/Activities/AllModals.vue +++ b/frontend/src/components/Activities/AllModals.vue @@ -91,10 +91,8 @@ function createCallLog() { let doctype = props.doctype let docname = props.doc.data?.name callLog.value = { - data: { - reference_doctype: doctype, - reference_docname: docname, - }, + reference_doctype: doctype, + reference_docname: docname, } showCallLogModal.value = true } diff --git a/frontend/src/components/Activities/CallArea.vue b/frontend/src/components/Activities/CallArea.vue index ba54557e..6cdceeba 100644 --- a/frontend/src/components/Activities/CallArea.vue +++ b/frontend/src/components/Activities/CallArea.vue @@ -97,7 +97,7 @@ v-model:callLogModal="showCallLogModal" v-model:callLog="callLog" /> - +
From c4feed116dcccdf23cc346557c36b3e719111e29 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 4 Jun 2025 19:00:57 +0530 Subject: [PATCH 10/30] fix: handle new document for lead/deal/contact/organization --- .../src/components/Modals/ContactModal.vue | 42 +++++---- frontend/src/components/Modals/DealModal.vue | 79 ++++++++--------- frontend/src/components/Modals/LeadModal.vue | 83 ++++++++--------- .../components/Modals/OrganizationModal.vue | 88 +++++++++++-------- frontend/src/pages/Deal.vue | 1 + frontend/src/pages/MobileDeal.vue | 1 + 6 files changed, 145 insertions(+), 149 deletions(-) diff --git a/frontend/src/components/Modals/ContactModal.vue b/frontend/src/components/Modals/ContactModal.vue index 840fa14f..9238b422 100644 --- a/frontend/src/components/Modals/ContactModal.vue +++ b/frontend/src/components/Modals/ContactModal.vue @@ -25,7 +25,7 @@
@@ -49,9 +49,10 @@ import FieldLayout from '@/components/FieldLayout/FieldLayout.vue' import EditIcon from '@/components/Icons/EditIcon.vue' import { usersStore } from '@/stores/users' import { isMobileView } from '@/composables/settings' +import { useDocument } from '@/data/document' import { capture } from '@/telemetry' import { call, createResource } from 'frappe-ui' -import { ref, nextTick, watch } from 'vue' +import { ref, nextTick, onMounted } from 'vue' import { useRouter } from 'vue-router' const props = defineProps({ @@ -77,23 +78,27 @@ const show = defineModel() const loading = ref(false) -let _contact = ref({}) +const { document: _contact } = useDocument('Contact') + +if (Object.keys(_contact.doc).length != 0) { + _contact.doc = {} +} async function createContact() { - if (_contact.value.email_id) { - _contact.value.email_ids = [{ email_id: _contact.value.email_id }] - delete _contact.value.email_id + if (_contact.doc.email_id) { + _contact.doc.email_ids = [{ email_id: _contact.doc.email_id }] + delete _contact.doc.email_id } - if (_contact.value.mobile_no) { - _contact.value.phone_nos = [{ phone: _contact.value.mobile_no }] - delete _contact.value.mobile_no + if (_contact.doc.mobile_no) { + _contact.doc.phone_nos = [{ phone: _contact.doc.mobile_no }] + delete _contact.doc.mobile_no } const doc = await call('frappe.client.insert', { doc: { doctype: 'Contact', - ..._contact.value, + ..._contact.doc, }, }) if (doc.name) { @@ -130,7 +135,7 @@ const tabs = createResource({ field.read_only = false } else if (field.fieldname == 'address') { field.create = (value, close) => { - _contact.value.address = value + _contact.doc.address = value emit('openAddressModal') show.value = false close() @@ -140,7 +145,7 @@ const tabs = createResource({ show.value = false } } else if (field.fieldtype === 'Table') { - _contact.value[field.fieldname] = [] + _contact.doc[field.fieldname] = [] } }) }) @@ -149,16 +154,9 @@ const tabs = createResource({ }, }) -watch( - () => show.value, - (value) => { - if (!value) return - nextTick(() => { - _contact.value = { ...props.contact.data } - }) - }, -) - +onMounted(() => { + Object.assign(_contact.doc, props.contact.data || props.contact || {}) +}) const showQuickEntryModal = defineModel('showQuickEntryModal') function openQuickEntryModal() { diff --git a/frontend/src/components/Modals/DealModal.vue b/frontend/src/components/Modals/DealModal.vue index 7bd0b592..bf08bdd0 100644 --- a/frontend/src/components/Modals/DealModal.vue +++ b/frontend/src/components/Modals/DealModal.vue @@ -50,7 +50,7 @@ ref="fieldLayoutRef" v-if="tabs.data?.length" :tabs="tabs.data" - :data="deal" + :data="deal.doc" doctype="CRM Deal" /> @@ -76,9 +76,10 @@ import FieldLayout from '@/components/FieldLayout/FieldLayout.vue' import { usersStore } from '@/stores/users' import { statusesStore } from '@/stores/statuses' import { isMobileView } from '@/composables/settings' +import { useDocument } from '@/data/document' import { capture } from '@/telemetry' import { Switch, createResource } from 'frappe-ui' -import { computed, ref, reactive, onMounted, nextTick, watch } from 'vue' +import { computed, ref, onMounted, nextTick, watch } from 'vue' import { useRouter } from 'vue-router' const props = defineProps({ @@ -92,24 +93,11 @@ const show = defineModel() const router = useRouter() const error = ref(null) -const deal = reactive({ - organization: '', - organization_name: '', - website: '', - no_of_employees: '', - territory: '', - annual_revenue: '', - industry: '', - contact: '', - salutation: '', - first_name: '', - last_name: '', - email: '', - mobile_no: '', - gender: '', - status: '', - deal_owner: '', -}) +const { document: deal } = useDocument('CRM Deal') + +if (Object.keys(deal.doc).length != 0) { + deal.doc = {} +} const hasOrganizationSections = ref(true) const hasContactSections = ref(true) @@ -165,11 +153,11 @@ const tabs = createResource({ if (field.fieldname == 'status') { field.fieldtype = 'Select' field.options = dealStatuses.value - field.prefix = getDealStatus(deal.status).color + field.prefix = getDealStatus(deal.doc.status).color } if (field.fieldtype === 'Table') { - deal[field.fieldname] = [] + deal.doc[field.fieldname] = [] } }) }) @@ -180,46 +168,49 @@ const tabs = createResource({ const dealStatuses = computed(() => { let statuses = statusOptions('deal') - if (!deal.status) { - deal.status = statuses[0].value + if (!deal.doc.status) { + deal.doc.status = statuses[0].value } return statuses }) function createDeal() { - if (deal.website && !deal.website.startsWith('http')) { - deal.website = 'https://' + deal.website + if (deal.doc.website && !deal.doc.website.startsWith('http')) { + deal.doc.website = 'https://' + deal.doc.website } if (chooseExistingContact.value) { - deal['first_name'] = null - deal['last_name'] = null - deal['email'] = null - deal['mobile_no'] = null - } else deal['contact'] = null + deal.doc['first_name'] = null + deal.doc['last_name'] = null + deal.doc['email'] = null + deal.doc['mobile_no'] = null + } else deal.doc['contact'] = null createResource({ url: 'crm.fcrm.doctype.crm_deal.crm_deal.create_deal', - params: { args: deal }, + params: { args: deal.doc }, auto: true, validate() { error.value = null - if (deal.annual_revenue) { - if (typeof deal.annual_revenue === 'string') { - deal.annual_revenue = deal.annual_revenue.replace(/,/g, '') - } else if (isNaN(deal.annual_revenue)) { + if (deal.doc.annual_revenue) { + if (typeof deal.doc.annual_revenue === 'string') { + deal.doc.annual_revenue = deal.doc.annual_revenue.replace(/,/g, '') + } else if (isNaN(deal.doc.annual_revenue)) { error.value = __('Annual Revenue should be a number') return error.value } } - if (deal.mobile_no && isNaN(deal.mobile_no.replace(/[-+() ]/g, ''))) { + if ( + deal.doc.mobile_no && + isNaN(deal.doc.mobile_no.replace(/[-+() ]/g, '')) + ) { error.value = __('Mobile No should be a number') return error.value } - if (deal.email && !deal.email.includes('@')) { + if (deal.doc.email && !deal.doc.email.includes('@')) { error.value = __('Invalid Email') return error.value } - if (!deal.status) { + if (!deal.doc.status) { error.value = __('Status is required') return error.value } @@ -252,12 +243,12 @@ function openQuickEntryModal() { } onMounted(() => { - Object.assign(deal, props.defaults) - if (!deal.deal_owner) { - deal.deal_owner = getUser().name + Object.assign(deal.doc, props.defaults) + if (!deal.doc.deal_owner) { + deal.doc.deal_owner = getUser().name } - if (!deal.status && dealStatuses.value[0].value) { - deal.status = dealStatuses.value[0].value + if (!deal.doc.status && dealStatuses.value[0].value) { + deal.doc.status = dealStatuses.value[0].value } }) diff --git a/frontend/src/components/Modals/LeadModal.vue b/frontend/src/components/Modals/LeadModal.vue index 0950b401..f0aab83b 100644 --- a/frontend/src/components/Modals/LeadModal.vue +++ b/frontend/src/components/Modals/LeadModal.vue @@ -23,7 +23,7 @@
- +
@@ -51,7 +51,8 @@ import { isMobileView } from '@/composables/settings' import { capture } from '@/telemetry' import { createResource } from 'frappe-ui' import { useOnboarding } from 'frappe-ui/frappe' -import { computed, onMounted, ref, reactive, nextTick } from 'vue' +import { useDocument } from '@/data/document' +import { computed, onMounted, ref, nextTick } from 'vue' import { useRouter } from 'vue-router' const props = defineProps({ @@ -68,6 +69,20 @@ const router = useRouter() const error = ref(null) const isLeadCreating = ref(false) +const { document: lead } = useDocument('CRM Lead') + +if (Object.keys(lead.doc).length != 0) { + lead.doc = {} +} + +const leadStatuses = computed(() => { + let statuses = statusOptions('lead') + if (!lead.doc.status) { + lead.doc.status = statuses?.[0]?.value + } + return statuses +}) + const tabs = createResource({ url: 'crm.fcrm.doctype.crm_fields_layout.crm_fields_layout.get_fields_layout', cache: ['QuickEntry', 'CRM Lead'], @@ -81,11 +96,11 @@ const tabs = createResource({ if (field.fieldname == 'status') { field.fieldtype = 'Select' field.options = leadStatuses.value - field.prefix = getLeadStatus(lead.status).color + field.prefix = getLeadStatus(lead.doc.status).color } if (field.fieldtype === 'Table') { - lead[field.fieldname] = [] + lead.doc[field.fieldname] = [] } }) }) @@ -94,23 +109,6 @@ const tabs = createResource({ }, }) -const lead = reactive({ - salutation: '', - first_name: '', - last_name: '', - email: '', - mobile_no: '', - gender: '', - organization: '', - website: '', - no_of_employees: '', - territory: '', - annual_revenue: '', - industry: '', - status: '', - lead_owner: '', -}) - const createLead = createResource({ url: 'frappe.client.insert', makeParams(values) { @@ -123,43 +121,38 @@ const createLead = createResource({ }, }) -const leadStatuses = computed(() => { - let statuses = statusOptions('lead') - if (!lead.status) { - lead.status = statuses?.[0]?.value - } - return statuses -}) - function createNewLead() { - if (lead.website && !lead.website.startsWith('http')) { - lead.website = 'https://' + lead.website + if (lead.doc.website && !lead.doc.website.startsWith('http')) { + lead.doc.website = 'https://' + lead.doc.website } - createLead.submit(lead, { + createLead.submit(lead.doc, { validate() { error.value = null - if (!lead.first_name) { + if (!lead.doc.first_name) { error.value = __('First Name is mandatory') return error.value } - if (lead.annual_revenue) { - if (typeof lead.annual_revenue === 'string') { - lead.annual_revenue = lead.annual_revenue.replace(/,/g, '') - } else if (isNaN(lead.annual_revenue)) { + if (lead.doc.annual_revenue) { + if (typeof lead.doc.annual_revenue === 'string') { + lead.doc.annual_revenue = lead.doc.annual_revenue.replace(/,/g, '') + } else if (isNaN(lead.doc.annual_revenue)) { error.value = __('Annual Revenue should be a number') return error.value } } - if (lead.mobile_no && isNaN(lead.mobile_no.replace(/[-+() ]/g, ''))) { + if ( + lead.doc.mobile_no && + isNaN(lead.doc.mobile_no.replace(/[-+() ]/g, '')) + ) { error.value = __('Mobile No should be a number') return error.value } - if (lead.email && !lead.email.includes('@')) { + if (lead.doc.email && !lead.doc.email.includes('@')) { error.value = __('Invalid Email') return error.value } - if (!lead.status) { + if (!lead.doc.status) { error.value = __('Status is required') return error.value } @@ -195,12 +188,12 @@ function openQuickEntryModal() { } onMounted(() => { - Object.assign(lead, props.defaults) - if (!lead.lead_owner) { - lead.lead_owner = getUser().name + Object.assign(lead.doc, props.defaults) + if (!lead.doc?.lead_owner) { + lead.doc.lead_owner = getUser().name } - if (!lead.status && leadStatuses.value[0]?.value) { - lead.status = leadStatuses.value[0].value + if (!lead.doc?.status && leadStatuses.value[0]?.value) { + lead.doc.status = leadStatuses.value[0].value } }) diff --git a/frontend/src/components/Modals/OrganizationModal.vue b/frontend/src/components/Modals/OrganizationModal.vue index 40105697..e652f6a6 100644 --- a/frontend/src/components/Modals/OrganizationModal.vue +++ b/frontend/src/components/Modals/OrganizationModal.vue @@ -9,7 +9,12 @@
-
- +
-
@@ -34,9 +50,10 @@ import FieldLayout from '@/components/FieldLayout/FieldLayout.vue' import EditIcon from '@/components/Icons/EditIcon.vue' import { usersStore } from '@/stores/users' import { isMobileView } from '@/composables/settings' +import { useDocument } from '@/data/document' import { capture } from '@/telemetry' import { call, FeatherIcon, createResource } from 'frappe-ui' -import { ref, nextTick, watch } from 'vue' +import { ref, nextTick, onMounted } from 'vue' import { useRouter } from 'vue-router' const props = defineProps({ @@ -44,7 +61,7 @@ const props = defineProps({ type: Object, default: { redirect: true, - afterInsert: () => { }, + afterInsert: () => {}, }, }, }) @@ -60,30 +77,32 @@ const organization = defineModel('organization') const loading = ref(false) const title = ref(null) -let _organization = ref({ - organization_name: '', - website: '', - annual_revenue: '', - no_of_employees: '1-10', - industry: '', -}) +const { document: _organization } = useDocument('CRM Organization') + +if (Object.keys(_organization.doc).length != 0) { + _organization.doc = { no_of_employees: '1-10' } +} let doc = ref({}) const error = ref(null) async function createOrganization() { - const doc = await call('frappe.client.insert', { - doc: { - doctype: 'CRM Organization', - ..._organization.value, + const doc = await call( + 'frappe.client.insert', + { + doc: { + doctype: 'CRM Organization', + ..._organization.doc, + }, }, - }, { - onError: (err) => { - if (err.error.exc_type == 'ValidationError') { - error.value = err.error?.messages?.[0] - } - } - }) + { + onError: (err) => { + if (err.error.exc_type == 'ValidationError') { + error.value = err.error?.messages?.[0] + } + }, + }, + ) loading.value = false if (doc.name) { capture('organization_created') @@ -116,7 +135,7 @@ const tabs = createResource({ column.fields.forEach((field) => { if (field.fieldname == 'address') { field.create = (value, close) => { - _organization.value.address = value + _organization.doc.address = value emit('openAddressModal') show.value = false close() @@ -126,7 +145,7 @@ const tabs = createResource({ show.value = false } } else if (field.fieldtype === 'Table') { - _organization.value[field.fieldname] = [] + _organization.doc[field.fieldname] = [] } }) }) @@ -135,19 +154,12 @@ const tabs = createResource({ }, }) -watch( - () => show.value, - (value) => { - if (!value) return - nextTick(() => { - // TODO: Issue with FormControl - // title.value.el.focus() - doc.value = organization.value?.doc || organization.value || {} - _organization.value = { ...doc.value } - }) - }, -) - +onMounted(() => { + Object.assign( + _organization.doc, + organization.value?.doc || organization.value || {}, + ) +}) const showQuickEntryModal = defineModel('showQuickEntryModal') function openQuickEntryModal() { diff --git a/frontend/src/pages/Deal.vue b/frontend/src/pages/Deal.vue index e61c0205..454565c0 100644 --- a/frontend/src/pages/Deal.vue +++ b/frontend/src/pages/Deal.vue @@ -280,6 +280,7 @@ }" /> diff --git a/frontend/src/components/Modals/ContactModal.vue b/frontend/src/components/Modals/ContactModal.vue index 9238b422..43520af0 100644 --- a/frontend/src/components/Modals/ContactModal.vue +++ b/frontend/src/components/Modals/ContactModal.vue @@ -49,6 +49,7 @@ import FieldLayout from '@/components/FieldLayout/FieldLayout.vue' import EditIcon from '@/components/Icons/EditIcon.vue' import { usersStore } from '@/stores/users' import { isMobileView } from '@/composables/settings' +import { showQuickEntryModal, quickEntryProps } from '@/composables/modals' import { useDocument } from '@/data/document' import { capture } from '@/telemetry' import { call, createResource } from 'frappe-ui' @@ -157,10 +158,10 @@ const tabs = createResource({ onMounted(() => { Object.assign(_contact.doc, props.contact.data || props.contact || {}) }) -const showQuickEntryModal = defineModel('showQuickEntryModal') function openQuickEntryModal() { showQuickEntryModal.value = true + quickEntryProps.value = { doctype: 'Contact' } nextTick(() => (show.value = false)) } diff --git a/frontend/src/components/Modals/CreateDocumentModal.vue b/frontend/src/components/Modals/CreateDocumentModal.vue index 0c3e5eb1..05e277b9 100644 --- a/frontend/src/components/Modals/CreateDocumentModal.vue +++ b/frontend/src/components/Modals/CreateDocumentModal.vue @@ -48,6 +48,7 @@ import FieldLayout from '@/components/FieldLayout/FieldLayout.vue' import EditIcon from '@/components/Icons/EditIcon.vue' import { usersStore } from '@/stores/users' import { isMobileView } from '@/composables/settings' +import { showQuickEntryModal, quickEntryProps } from '@/composables/modals' import { FeatherIcon, createResource, ErrorMessage, call } from 'frappe-ui' import { ref, nextTick, watch, computed } from 'vue' @@ -62,7 +63,7 @@ const props = defineProps({ }, }) -const emit = defineEmits(['showQuickEntryModal', 'callback']) +const emit = defineEmits(['callback']) const { isManager } = usersStore() @@ -139,9 +140,8 @@ watch( ) function openQuickEntryModal() { - emit('showQuickEntryModal', props.doctype) - nextTick(() => { - show.value = false - }) + showQuickEntryModal.value = true + quickEntryProps.value = { doctype: props.doctype } + nextTick(() => (show.value = false)) } diff --git a/frontend/src/components/Modals/DealModal.vue b/frontend/src/components/Modals/DealModal.vue index bf08bdd0..e84e1a8e 100644 --- a/frontend/src/components/Modals/DealModal.vue +++ b/frontend/src/components/Modals/DealModal.vue @@ -76,6 +76,7 @@ import FieldLayout from '@/components/FieldLayout/FieldLayout.vue' import { usersStore } from '@/stores/users' import { statusesStore } from '@/stores/statuses' import { isMobileView } from '@/composables/settings' +import { showQuickEntryModal, quickEntryProps } from '@/composables/modals' import { useDocument } from '@/data/document' import { capture } from '@/telemetry' import { Switch, createResource } from 'frappe-ui' @@ -233,13 +234,10 @@ function createDeal() { }) } -const showQuickEntryModal = defineModel('quickEntry') - function openQuickEntryModal() { showQuickEntryModal.value = true - nextTick(() => { - show.value = false - }) + quickEntryProps.value = { doctype: 'CRM Deal' } + nextTick(() => (show.value = false)) } onMounted(() => { diff --git a/frontend/src/components/Modals/GlobalModals.vue b/frontend/src/components/Modals/GlobalModals.vue index 79facc48..e31a825b 100644 --- a/frontend/src/components/Modals/GlobalModals.vue +++ b/frontend/src/components/Modals/GlobalModals.vue @@ -4,13 +4,12 @@ v-model="showCreateDocumentModal" :doctype="createDocumentDoctype" :data="createDocumentData" - @showQuickEntryModal="(dt) => openQuickEntryModal(dt)" @callback="(data) => createDocumentCallback(data)" /> @@ -24,14 +23,9 @@ import { createDocumentData, createDocumentCallback, } from '@/composables/document' -import { showAboutModal } from '@/composables/modals' -import { ref } from 'vue' - -const showQuickEntryModal = ref(false) -const quickEntryDoctype = ref('') - -function openQuickEntryModal(dt) { - showQuickEntryModal.value = true - quickEntryDoctype.value = dt -} +import { + showQuickEntryModal, + quickEntryProps, + showAboutModal, +} from '@/composables/modals' diff --git a/frontend/src/components/Modals/LeadModal.vue b/frontend/src/components/Modals/LeadModal.vue index f0aab83b..bbc1adb5 100644 --- a/frontend/src/components/Modals/LeadModal.vue +++ b/frontend/src/components/Modals/LeadModal.vue @@ -48,6 +48,7 @@ import { usersStore } from '@/stores/users' import { statusesStore } from '@/stores/statuses' import { sessionStore } from '@/stores/session' import { isMobileView } from '@/composables/settings' +import { showQuickEntryModal, quickEntryProps } from '@/composables/modals' import { capture } from '@/telemetry' import { createResource } from 'frappe-ui' import { useOnboarding } from 'frappe-ui/frappe' @@ -178,13 +179,10 @@ function createNewLead() { }) } -const showQuickEntryModal = defineModel('quickEntry') - function openQuickEntryModal() { showQuickEntryModal.value = true - nextTick(() => { - show.value = false - }) + quickEntryProps.value = { doctype: 'CRM Lead' } + nextTick(() => (show.value = false)) } onMounted(() => { diff --git a/frontend/src/components/Modals/OrganizationModal.vue b/frontend/src/components/Modals/OrganizationModal.vue index e652f6a6..cc01ce6c 100644 --- a/frontend/src/components/Modals/OrganizationModal.vue +++ b/frontend/src/components/Modals/OrganizationModal.vue @@ -50,6 +50,7 @@ import FieldLayout from '@/components/FieldLayout/FieldLayout.vue' import EditIcon from '@/components/Icons/EditIcon.vue' import { usersStore } from '@/stores/users' import { isMobileView } from '@/composables/settings' +import { showQuickEntryModal, quickEntryProps } from '@/composables/modals' import { useDocument } from '@/data/document' import { capture } from '@/telemetry' import { call, FeatherIcon, createResource } from 'frappe-ui' @@ -160,10 +161,10 @@ onMounted(() => { organization.value?.doc || organization.value || {}, ) }) -const showQuickEntryModal = defineModel('showQuickEntryModal') function openQuickEntryModal() { showQuickEntryModal.value = true + quickEntryProps.value = { doctype: 'CRM Organization' } nextTick(() => (show.value = false)) } diff --git a/frontend/src/composables/modals.js b/frontend/src/composables/modals.js index 446c0485..145d2f80 100644 --- a/frontend/src/composables/modals.js +++ b/frontend/src/composables/modals.js @@ -1,3 +1,6 @@ import { ref } from 'vue'; +export const showQuickEntryModal = ref(false); +export const quickEntryProps = ref({}); + export const showAboutModal = ref(false); \ No newline at end of file diff --git a/frontend/src/pages/Contacts.vue b/frontend/src/pages/Contacts.vue index 905a00b5..14d58aeb 100644 --- a/frontend/src/pages/Contacts.vue +++ b/frontend/src/pages/Contacts.vue @@ -63,16 +63,11 @@ - @@ -82,7 +77,6 @@ import CustomActions from '@/components/CustomActions.vue' import ContactsIcon from '@/components/Icons/ContactsIcon.vue' import LayoutHeader from '@/components/LayoutHeader.vue' import ContactModal from '@/components/Modals/ContactModal.vue' -import QuickEntryModal from '@/components/Modals/QuickEntryModal.vue' import AddressModal from '@/components/Modals/AddressModal.vue' import ContactsListView from '@/components/ListViews/ContactsListView.vue' import ViewControls from '@/components/ViewControls.vue' @@ -97,7 +91,6 @@ const { getFormattedPercent, getFormattedFloat, getFormattedCurrency } = const { getOrganization } = organizationsStore() const showContactModal = ref(false) -const showQuickEntryModal = ref(false) const showAddressModal = ref(false) const contactsListView = ref(null) diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue index 9da55bad..e7ee7955 100644 --- a/frontend/src/pages/Deals.vue +++ b/frontend/src/pages/Deals.vue @@ -241,7 +241,6 @@ - diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue index d1141c92..d099bfea 100644 --- a/frontend/src/pages/Leads.vue +++ b/frontend/src/pages/Leads.vue @@ -267,7 +267,6 @@ - From c4caabe72266efa62976281f2a96036261cfc697 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 4 Jun 2025 19:15:12 +0530 Subject: [PATCH 12/30] fix: moved address modal to global modals and control it using modals.js --- .../src/components/Modals/AddressModal.vue | 112 +++++++----------- .../src/components/Modals/ContactModal.vue | 26 ++-- .../src/components/Modals/GlobalModals.vue | 10 +- .../components/Modals/OrganizationModal.vue | 26 ++-- frontend/src/composables/modals.js | 3 + frontend/src/pages/Contact.vue | 37 ++---- frontend/src/pages/Contacts.vue | 17 --- frontend/src/pages/MobileContact.vue | 36 ++---- frontend/src/pages/MobileOrganization.vue | 24 ++-- frontend/src/pages/Organization.vue | 24 ++-- frontend/src/pages/Organizations.vue | 16 --- 11 files changed, 130 insertions(+), 201 deletions(-) diff --git a/frontend/src/components/Modals/AddressModal.vue b/frontend/src/components/Modals/AddressModal.vue index b9f97750..6428c9a4 100644 --- a/frontend/src/components/Modals/AddressModal.vue +++ b/frontend/src/components/Modals/AddressModal.vue @@ -22,8 +22,12 @@ -
- +
+
@@ -41,24 +45,24 @@ -