diff --git a/frontend/src/components/Modals/DealModal.vue b/frontend/src/components/Modals/DealModal.vue index 08260ef0..15147f69 100644 --- a/frontend/src/components/Modals/DealModal.vue +++ b/frontend/src/components/Modals/DealModal.vue @@ -147,15 +147,15 @@ const dealStatuses = computed(() => { }) function createDeal() { + if (deal.website && !deal.website.startsWith('http')) { + deal.website = 'https://' + deal.website + } createResource({ url: 'crm.fcrm.doctype.crm_deal.crm_deal.create_deal', params: { args: deal }, auto: true, validate() { error.value = null - if (deal.website && !deal.website.startsWith('http')) { - deal.website = 'https://' + deal.website - } if (deal.annual_revenue) { deal.annual_revenue = deal.annual_revenue.replace(/,/g, '') if (isNaN(deal.annual_revenue)) { @@ -182,6 +182,14 @@ function createDeal() { show.value = false router.push({ name: 'Deal', params: { dealId: name } }) }, + onError(err) { + isDealCreating.value = false + if (!err.messages) { + error.value = err.message + return + } + error.value = err.messages.join('\n') + }, }) } diff --git a/frontend/src/components/Modals/LeadModal.vue b/frontend/src/components/Modals/LeadModal.vue index d288196d..6a3d35fd 100644 --- a/frontend/src/components/Modals/LeadModal.vue +++ b/frontend/src/components/Modals/LeadModal.vue @@ -97,6 +97,10 @@ const leadStatuses = computed(() => { }) function createNewLead() { + if (lead.website && !lead.website.startsWith('http')) { + lead.website = 'https://' + lead.website + } + createLead.submit(lead, { validate() { error.value = null @@ -104,9 +108,6 @@ function createNewLead() { error.value = __('First Name is mandatory') return error.value } - if (lead.website && !lead.website.startsWith('http')) { - lead.website = 'https://' + lead.website - } if (lead.annual_revenue) { lead.annual_revenue = lead.annual_revenue.replace(/,/g, '') if (isNaN(lead.annual_revenue)) { @@ -133,6 +134,14 @@ function createNewLead() { show.value = false router.push({ name: 'Lead', params: { leadId: data.name } }) }, + onError(err) { + isLeadCreating.value = false + if (!err.messages) { + error.value = err.message + return + } + error.value = err.messages.join('\n') + }, }) }