diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index f9621b127d87..cc0b231913b4 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -49,7 +49,7 @@ var label = " {!! trans('texts.expenses') !!}: "; } - return label + formatMoney(item.yLabel, chartCurrencyId, account.country_id); + return label + formatMoney(item.yLabel, realCurrencyId, account.country_id); } } }, @@ -73,7 +73,7 @@ ticks: { beginAtZero: true, callback: function(label, index, labels) { - return formatMoney(label, chartCurrencyId, account.country_id); + return formatMoney(label, realCurrencyId, account.country_id); } }, }] @@ -85,6 +85,7 @@ var account = {!! $account !!}; var chartGroupBy = 'day'; + var realCurrencyId = {{ $account->getCurrencyId() }}; var chartCurrencyId = {{ $account->getCurrencyId() }}; var chartQuarter = moment().quarter(); var dateRanges = {!! $account->present()->dateRangeOptions !!}; @@ -161,10 +162,11 @@ t.addClass("active").siblings().removeClass("active"); if(t.attr("data-button") === "totals"){ - - chartCurrencyId = 'totals'; + realCurrencyId = account.currency.id; + chartCurrencyId = "totals"; }else { - chartCurrencyId = currencyMap[t.text()].id; + realCurrencyId = currencyMap[t.text()].id; + chartCurrencyId = realCurrencyId; } displayTotalsNote(); @@ -191,10 +193,6 @@ response = JSON.parse(response); loadChart(response.data); - var realCurrencyId = chartCurrencyId; - if(chartCurrencyId === "totals") realCurrencyId = account.currency.id; - - var totals = response.totals; $('.revenue-div').text(formatMoney(totals.revenue, realCurrencyId, account.country_id)); $('.outstanding-div').text(formatMoney(totals.balance, realCurrencyId, account.country_id));