From 4d6604ab7a11b9a00fa346f6d401abaed91cac32 Mon Sep 17 00:00:00 2001 From: rajabxahmd Date: Mon, 17 Mar 2025 12:39:52 +0530 Subject: [PATCH] fix: improper currency formatting issue in kanban view --- frontend/src/pages/Deals.vue | 14 +++++++++++--- frontend/src/pages/Leads.vue | 14 +++++++++++--- frontend/src/pages/Tasks.vue | 14 +++++++++++--- 3 files changed, 33 insertions(+), 9 deletions(-) diff --git a/frontend/src/pages/Deals.vue b/frontend/src/pages/Deals.vue index 578534b7..37b3dd70 100644 --- a/frontend/src/pages/Deals.vue +++ b/frontend/src/pages/Deals.vue @@ -387,9 +387,17 @@ function parseRows(rows, columns = []) { deals.value.data.rows.forEach((row) => { _rows[row] = deal[row] - let fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type + let fieldType; + if (deals.value.data.view_type === 'kanban') { + fieldType = columns?.find( + (col) => (col.fieldname || col.value) == row, + )?.fieldtype + } + else { + fieldType = columns?.find( + (col) => (col.key || col.value) == row, + )?.type + } if ( fieldType && diff --git a/frontend/src/pages/Leads.vue b/frontend/src/pages/Leads.vue index 98afce8f..cbabb3e6 100644 --- a/frontend/src/pages/Leads.vue +++ b/frontend/src/pages/Leads.vue @@ -407,9 +407,17 @@ function parseRows(rows, columns = []) { leads.value?.data.rows.forEach((row) => { _rows[row] = lead[row] - let fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type + let fieldType; + if (leads.value.data.view_type === 'kanban') { + fieldType = columns?.find( + (col) => (col.fieldname || col.value) == row, + )?.fieldtype + } + else { + fieldType = columns?.find( + (col) => (col.key || col.value) == row, + )?.type + } if ( fieldType && diff --git a/frontend/src/pages/Tasks.vue b/frontend/src/pages/Tasks.vue index 69662d9e..3a17614f 100644 --- a/frontend/src/pages/Tasks.vue +++ b/frontend/src/pages/Tasks.vue @@ -262,9 +262,17 @@ function parseRows(rows, columns = []) { tasks.value?.data.rows.forEach((row) => { _rows[row] = task[row] - let fieldType = columns?.find( - (col) => (col.key || col.value) == row, - )?.type + let fieldType; + if (tasks.value.data.view_type === 'kanban') { + fieldType = columns?.find( + (col) => (col.fieldname || col.value) == row, + )?.fieldtype + } + else { + fieldType = columns?.find( + (col) => (col.key || col.value) == row, + )?.type + } if ( fieldType &&