From 59282c36f0c69d330302c1577aeeb069b4055d30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Fri, 3 Sep 2021 00:02:16 +0300 Subject: [PATCH] typo --- app/Traits/Charts.php | 45 ++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 24 deletions(-) diff --git a/app/Traits/Charts.php b/app/Traits/Charts.php index 2eb56585a..7c442f2d8 100644 --- a/app/Traits/Charts.php +++ b/app/Traits/Charts.php @@ -2,10 +2,7 @@ namespace App\Traits; -use Akaunting\Money\Money; - use App\Utilities\Chartjs; - use Balping\JsonRaw\Raw; trait Charts @@ -108,7 +105,7 @@ trait Charts 'intersect' => 0, 'position' => 'nearest', 'callbacks' => [ - 'label' => new Raw("function(tooltipItem, data) { + 'label' => new Raw("function(tooltipItem, data) { const moneySettings = { decimal: '" . config('money.' . setting('default.currency') . '.decimal_mark') . "', thousands: '". config('money.' . setting('default.currency') . '.thousands_separator') . "', @@ -129,7 +126,7 @@ trait Charts function numbersToCurrency(numbers, precision) { var exp = Math.pow(10, precision); var float = parseFloat(numbers) / exp; - + return float.toFixed(fixed(precision)); }; @@ -138,18 +135,18 @@ trait Charts }; if (typeof input === 'number') { - input = input.toFixed(fixed(opt.precision)); + input = input.toFixed(fixed(opt.precision)); }; var negative = input.indexOf('-') >= 0 ? '-' : ''; var numbers = toStr(input).replace(/\D+/g, '') || '0'; var currency = numbersToCurrency(numbers, opt.precision); var parts = toStr(currency).split('.'); - var integer = parts[0].replace(/(\d)(?=(?:\d{3})+\b)/gm, opt.thousands);; + var integer = parts[0].replace(/(\d)(?=(?:\d{3})+\b)/gm, opt.thousands); var decimal = parts[1]; - if(opt.isPrefix == 1) { - return opt.symbol + negative + joinIntegerAndDecimal(integer, decimal, opt.decimal) + if (opt.isPrefix == 1) { + return opt.symbol + negative + joinIntegerAndDecimal(integer, decimal, opt.decimal); } return negative + joinIntegerAndDecimal(integer, decimal, opt.decimal) + opt.symbol; @@ -163,7 +160,7 @@ trait Charts 'yAxes' => [[ 'ticks' => [ 'beginAtZero' => true, - 'callback' => new Raw("function(value, index, values) { + 'callback' => new Raw("function(value, index, values) { const moneySettings = { decimal: '" . config('money.' . setting('default.currency') . '.decimal_mark') . "', thousands: '". config('money.' . setting('default.currency') . '.thousands_separator') . "', @@ -171,45 +168,45 @@ trait Charts isPrefix: '" . config('money.' . setting('default.currency') . '.symbol_first') . "', precision: '" . config('money.' . setting('default.currency') . '.precision') . "', }; - + const formattedCurrency = function (input, opt = moneySettings) { function fixed (precision) { return Math.max(0, Math.min(precision, 20)); }; - + function toStr(value) { return value ? value.toString() : ''; }; - + function numbersToCurrency(numbers, precision) { var exp = Math.pow(10, precision); var float = parseFloat(numbers) / exp; - + return float.toFixed(fixed(precision)); }; - + function joinIntegerAndDecimal (integer, decimal, separator) { return decimal ? integer + separator + decimal : integer; }; - + if (typeof input === 'number') { - input = input.toFixed(fixed(opt.precision)); + input = input.toFixed(fixed(opt.precision)); }; - + var negative = input.indexOf('-') >= 0 ? '-' : ''; var numbers = toStr(input).replace(/\D+/g, '') || '0'; var currency = numbersToCurrency(numbers, opt.precision); var parts = toStr(currency).split('.'); - var integer = parts[0].replace(/(\d)(?=(?:\d{3})+\b)/gm, opt.thousands);; + var integer = parts[0].replace(/(\d)(?=(?:\d{3})+\b)/gm, opt.thousands); var decimal = parts[1]; - - if(opt.isPrefix == 1) { - return opt.symbol + negative + joinIntegerAndDecimal(integer, decimal, opt.decimal) + + if (opt.isPrefix == 1) { + return opt.symbol + negative + joinIntegerAndDecimal(integer, decimal, opt.decimal); } else { return negative + joinIntegerAndDecimal(integer, decimal, opt.decimal) + opt.symbol; } }; - + return formattedCurrency(value, moneySettings); }"), ], @@ -222,7 +219,7 @@ trait Charts 'ticks' => [ 'padding' => 10, 'fontColor' => '#9e9e9e', - ]], + ], 'gridLines' => [ 'drawBorder' => false, 'color' => 'rgba(29,140,248,0.1)',