Merge branch 'master' of https://git.oslog.id/ordo/adw-frontend

src/views/Dashboard/DashboardBOD.js

@@ -449,7 +449,7 @@ const DashboardBOD = () => {
 															data: [
 																PROJECT_EXPENDITURE && PROJECT_EXPENDITURE.total_budget ? PROJECT_EXPENDITURE.total_budget : 0,
 																PROJECT_EXPENDITURE && PROJECT_EXPENDITURE.total_expenditure ? PROJECT_EXPENDITURE.total_expenditure : 0,
-																PROJECT_EXPENDITURE && PROJECT_EXPENDITURE.total_invoice ? PROJECT_EXPENDITURE.total_invoice : 0,
+																PROJECT_EXPENDITURE && PROJECT_EXPENDITURE.total_invoice ? Math.floor(PROJECT_EXPENDITURE.total_invoice) : 0,
 																PROJECT_EXPENDITURE && PROJECT_EXPENDITURE.total_paid_invoice ? PROJECT_EXPENDITURE.total_paid_invoice : 0
 															],
 															borderColor: ['#480CA8', '#B5179E', '#A26A16', '#4C4747'],
@@ -784,7 +784,7 @@ const DashboardBOD = () => {
 														{
 															label: "Invoiced",
 															// data: [16, 8, 12, 10, 13, 12, 10, 10, 8],
-															data: PROJECT_INVOICE_VS_CASH_IN ? PROJECT_INVOICE_VS_CASH_IN.map((item, idx) => item.invoiced) : [],
+															data: PROJECT_INVOICE_VS_CASH_IN ? PROJECT_INVOICE_VS_CASH_IN.map((item, idx) => Math.floor(item.invoiced)) : [],
 															borderColor: '#A36A16',
 															backgroundColor: '#A36A16',
 															// borderWidth: 2,