v2 first commit

This commit is contained in:
denisdulici
2019-11-16 10:21:14 +03:00
parent 5b23e9c2c4
commit 6d50fa8442
3075 changed files with 3451681 additions and 65594 deletions

View File

@ -2,7 +2,7 @@
namespace App\Models\Setting;
use App\Models\Model;
use App\Abstracts\Model;
class Tax extends Model
{
@ -65,12 +65,11 @@ class Tax extends Model
{
$title = $this->name . ' (';
if (setting('general.percent_position', 'after') == 'after') {
$title .= $this->rate . '%';
if (setting('localisation.percent_position', 'after') == 'after') {
$title .= $this->getAttribute('type') == 'fixed' ? $this->rate : $this->rate . '%';
} else {
$title .= '%' . $this->rate;
$title .= $this->getAttribute('type') == 'fixed' ? $this->rate : '%' . $this->rate;
}
$title .= ')';
return $title;