fix: show correct validation error in quick entry modal

This commit is contained in:
Shariq Ansari 2024-06-20 11:54:54 +05:30
parent be7ac19cc7
commit f2aded5251
2 changed files with 23 additions and 6 deletions

View File

@ -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')
},
})
}

View File

@ -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')
},
})
}