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\Expense;
use App\Models\Model;
use App\Abstracts\Model;
use App\Models\Setting\Tax;
use App\Traits\DateTime;
@ -53,6 +53,8 @@ class BillTotal extends Model
$percent = 0;
$tax = null;
switch ($this->code) {
case 'discount':
$title = trans($title);
@ -60,22 +62,23 @@ class BillTotal extends Model
break;
case 'tax':
$rate = Tax::where('name', $title)->value('rate');
$tax = Tax::where('name', $title)->first();
if (!empty($rate)) {
$percent = $rate;
if (!empty($tax->rate)) {
$percent = $tax->rate;
}
break;
}
if (!empty($percent)) {
$title .= ' (';
if (setting('general.percent_position', 'after') == 'after') {
$title .= $percent . '%';
if (setting('localisation.percent_position', 'after') == 'after') {
$title .= $this->code == 'discount' ? false : $tax->type == 'fixed' ? $percent : $percent . '%';
} else {
$title .= '%' . $percent;
$title .= $this->code == 'discount' ? false : $tax->type == 'fixed' ? $percent : '%' . $percent;
}
$title .= ')';