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

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
denisdulici 2018-09-08 17:05:18 +03:00
commit fb8c918ae2
3 changed files with 92 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
app/Models/Setting/Currency.php
View File

@ -73,4 +73,74 @@ class Currency extends Model
{
$this->attributes['rate'] = (double) $value;
}
/**
* Get the current precision.
*
* @return string
*/
public function getPrecisionAttribute($value)
{
if (empty($value)) {
return config('money.' . $this->code . '.precision');
}
return $value;
}
/**
* Get the current symbol.
*
* @return string
*/
public function getSymbolAttribute($value)
{
if (empty($value)) {
return config('money.' . $this->code . '.symbol');
}
return $value;
}
/**
* Get the current symbol_first.
*
* @return string
*/
public function getSymbolFirstAttribute($value)
{
if (empty($value)) {
return config('money.' . $this->code . '.symbol_first');
}
return $value;
}
/**
* Get the current decimal_mark.
*
* @return string
*/
public function getDecimalMarkAttribute($value)
{
if (empty($value)) {
return config('money.' . $this->code . '.decimal_mark');
}
return $value;
}
/**
* Get the current thousands_separator.
*
* @return string
*/
public function getThousandsSeparatorAttribute($value)
{
if (empty($value)) {
return config('money.' . $this->code . '.thousands_separator');
}
return $value;
}
}

38
composer.lock generated
View File

@ -2510,23 +2510,23 @@
},
{
"name": "maatwebsite/excel",
"version": "2.1.29",
"version": "2.1.30",
"source": {
"type": "git",
"url": "https://github.com/Maatwebsite/Laravel-Excel.git",
"reference": "e1e1e1a9f69ba98ce6946e4f150e5531a5250d08"
"reference": "f5540c4ba3ac50cebd98b09ca42e61f926ef299f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/e1e1e1a9f69ba98ce6946e4f150e5531a5250d08",
"reference": "e1e1e1a9f69ba98ce6946e4f150e5531a5250d08",
"url": "https://api.github.com/repos/Maatwebsite/Laravel-Excel/zipball/f5540c4ba3ac50cebd98b09ca42e61f926ef299f",
"reference": "f5540c4ba3ac50cebd98b09ca42e61f926ef299f",
"shasum": ""
},
"require": {
"illuminate/cache": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
"illuminate/config": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
"illuminate/filesystem": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
"illuminate/support": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
"illuminate/cache": "^5.0",
"illuminate/config": "^5.0",
"illuminate/filesystem": "^5.0",
"illuminate/support": "^5.0",
"jeremeamia/superclosure": "^2.3",
"nesbot/carbon": "~1.0",
"php": ">=5.5",
@ -2540,10 +2540,10 @@
"phpunit/phpunit": "~4.0"
},
"suggest": {
"illuminate/http": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
"illuminate/queue": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
"illuminate/routing": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*",
"illuminate/view": "5.0.*|5.1.*|5.2.*|5.3.*|5.4.*|5.5.*|5.6.*"
"illuminate/http": "^5.0",
"illuminate/queue": "^5.0",
"illuminate/routing": "^5.0",
"illuminate/view": "^5.0"
},
"type": "library",
"extra": {
@ -2574,7 +2574,7 @@
"email": "patrick@maatwebsite.nl"
}
],
"description": "An eloquent way of importing and exporting Excel and CSV in Laravel 4 with the power of PHPExcel",
"description": "Supercharged Excel exports in Laravel",
"keywords": [
"PHPExcel",
"batch",
@ -2584,7 +2584,7 @@
"import",
"laravel"
],
"time": "2018-08-29T06:46:16+00:00"
"time": "2018-09-04T19:00:09+00:00"
},
{
"name": "maximebf/debugbar",
@ -3503,16 +3503,16 @@
},
{
"name": "psy/psysh",
"version": "v0.9.7",
"version": "v0.9.8",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
"reference": "4f5b6c090948773a8bfeea6a0f07ab7d0b24e932"
"reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/4f5b6c090948773a8bfeea6a0f07ab7d0b24e932",
"reference": "4f5b6c090948773a8bfeea6a0f07ab7d0b24e932",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/ed3c32c4304e1a678a6e0f9dc11dd2d927d89555",
"reference": "ed3c32c4304e1a678a6e0f9dc11dd2d927d89555",
"shasum": ""
},
"require": {
@ -3573,7 +3573,7 @@
"interactive",
"shell"
],
"time": "2018-08-11T15:54:43+00:00"
"time": "2018-09-05T11:40:09+00:00"
},
{
"name": "ramsey/uuid",

6
config/version.php
View File

@ -10,15 +10,15 @@ return [
'minor' => '2',
'patch' => '14',
'patch' => '15',
'build' => '',
'status' => 'Stable',
'date' => '1-September-2018',
'date' => '6-September-2018',
'time' => '15:30',
'time' => '12:00',
'zone' => 'GMT +3',