shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

typo

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-09-03 00:02:16 +03:00
parent cc73dee749
commit 59282c36f0
1 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Traits/Charts.php
View File

@ -2,10 +2,7 @@
namespace App\Traits; namespace App\Traits;
use Akaunting\Money\Money;
use App\Utilities\Chartjs; use App\Utilities\Chartjs;
use Balping\JsonRaw\Raw; use Balping\JsonRaw\Raw;
trait Charts trait Charts
@ -145,11 +142,11 @@ trait Charts
var numbers = toStr(input).replace(/\D+/g, '') || '0'; var numbers = toStr(input).replace(/\D+/g, '') || '0';
var currency = numbersToCurrency(numbers, opt.precision); var currency = numbersToCurrency(numbers, opt.precision);
var parts = toStr(currency).split('.'); 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]; var decimal = parts[1];
if (opt.isPrefix == 1) { if (opt.isPrefix == 1) {
return opt.symbol + negative + joinIntegerAndDecimal(integer, decimal, opt.decimal) return opt.symbol + negative + joinIntegerAndDecimal(integer, decimal, opt.decimal);
} }
return negative + joinIntegerAndDecimal(integer, decimal, opt.decimal) + opt.symbol; return negative + joinIntegerAndDecimal(integer, decimal, opt.decimal) + opt.symbol;
@ -200,11 +197,11 @@ trait Charts
var numbers = toStr(input).replace(/\D+/g, '') || '0'; var numbers = toStr(input).replace(/\D+/g, '') || '0';
var currency = numbersToCurrency(numbers, opt.precision); var currency = numbersToCurrency(numbers, opt.precision);
var parts = toStr(currency).split('.'); 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]; var decimal = parts[1];
if (opt.isPrefix == 1) { if (opt.isPrefix == 1) {
return opt.symbol + negative + joinIntegerAndDecimal(integer, decimal, opt.decimal) return opt.symbol + negative + joinIntegerAndDecimal(integer, decimal, opt.decimal);
} else { } else {
return negative + joinIntegerAndDecimal(integer, decimal, opt.decimal) + opt.symbol; return negative + joinIntegerAndDecimal(integer, decimal, opt.decimal) + opt.symbol;
} }
@ -222,7 +219,7 @@ trait Charts
'ticks' => [ 'ticks' => [
'padding' => 10, 'padding' => 10,
'fontColor' => '#9e9e9e', 'fontColor' => '#9e9e9e',
]], ],
'gridLines' => [ 'gridLines' => [
'drawBorder' => false, 'drawBorder' => false,
'color' => 'rgba(29,140,248,0.1)', 'color' => 'rgba(29,140,248,0.1)',