test/crm
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: render lead/deal in contact & organization correctly

Browse Source
This commit is contained in:
Shariq Ansari 2023-11-06 22:10:41 +05:30
parent 70c46ab30f
commit b67fc41d3f
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,7 +306,7 @@ const leads = createListResource({
], ],
filters: { filters: {
email: contact.value.email_id, email: contact.value.email_id,
is_deal: 0, converted: 0,
}, },
orderBy: 'modified desc', orderBy: 'modified desc',
pageLength: 20, pageLength: 20,
@ -321,7 +321,7 @@ const deals = createListResource({
'name', 'name',
'organization', 'organization',
'annual_revenue', 'annual_revenue',
'deal_status', 'status',
'email', 'email',
'mobile_no', 'mobile_no',
'lead_owner', 'lead_owner',
@ -329,7 +329,7 @@ const deals = createListResource({
], ],
filters: { filters: {
email: contact.value.email_id, email: contact.value.email_id,
is_deal: 1, converted: 1,
}, },
orderBy: 'modified desc', orderBy: 'modified desc',
pageLength: 20, pageLength: 20,
@ -388,9 +388,9 @@ function getDealRowObject(deal) {
logo: getOrganization(deal.organization)?.organization_logo, logo: getOrganization(deal.organization)?.organization_logo,
}, },
annual_revenue: formatNumberIntoCurrency(deal.annual_revenue), annual_revenue: formatNumberIntoCurrency(deal.annual_revenue),
deal_status: { status: {
label: deal.deal_status, label: deal.status,
color: dealStatuses[deal.deal_status]?.color, color: dealStatuses[deal.status]?.color,
}, },
email: deal.email, email: deal.email,
mobile_no: deal.mobile_no, mobile_no: deal.mobile_no,
@ -456,7 +456,7 @@ const dealColumns = [
}, },
{ {
label: 'Status', label: 'Status',
key: 'deal_status', key: 'status',
width: '10rem', width: '10rem',
}, },
{ {

14
frontend/src/pages/Organization.vue
View File

@ -298,7 +298,7 @@ const leads = createListResource({
], ],
filters: { filters: {
organization: props.organization.name, organization: props.organization.name,
is_deal: 0, converted: 0,
}, },
orderBy: 'modified desc', orderBy: 'modified desc',
pageLength: 20, pageLength: 20,
@ -313,7 +313,7 @@ const deals = createListResource({
'name', 'name',
'organization', 'organization',
'annual_revenue', 'annual_revenue',
'deal_status', 'status',
'email', 'email',
'mobile_no', 'mobile_no',
'lead_owner', 'lead_owner',
@ -321,7 +321,7 @@ const deals = createListResource({
], ],
filters: { filters: {
organization: props.organization.name, organization: props.organization.name,
is_deal: 1, converted: 1,
}, },
orderBy: 'modified desc', orderBy: 'modified desc',
pageLength: 20, pageLength: 20,
@ -409,9 +409,9 @@ function getDealRowObject(deal) {
logo: props.organization?.organization_logo, logo: props.organization?.organization_logo,
}, },
annual_revenue: formatNumberIntoCurrency(deal.annual_revenue), annual_revenue: formatNumberIntoCurrency(deal.annual_revenue),
deal_status: { status: {
label: deal.deal_status, label: deal.status,
color: dealStatuses[deal.deal_status]?.color, color: dealStatuses[deal.status]?.color,
}, },
email: deal.email, email: deal.email,
mobile_no: deal.mobile_no, mobile_no: deal.mobile_no,
@ -498,7 +498,7 @@ const dealColumns = [
}, },
{ {
label: 'Status', label: 'Status',
key: 'deal_status', key: 'status',
width: '10rem', width: '10rem',
}, },
{ {