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

refs #1408 discount show rate

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-04-20 04:42:48 +03:00
parent 550be2ef53
commit 929e1a74bd
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Models/Purchase/BillTotal.php
View File

@ -72,13 +72,12 @@ class BillTotal extends Model
} }
if (!empty($percent)) { if (!empty($percent)) {
$title .= ' ('; $title .= ' (';
if (setting('localisation.percent_position', 'after') == 'after') { if (setting('localisation.percent_position', 'after') == 'after') {
$title .= ($this->code == 'discount') ? false : (($tax->type == 'fixed') ? $percent : $percent . '%'); $title .= ($this->code == 'discount') ? $percent. '%' : (($tax->type == 'fixed') ? $percent : $percent . '%');
} else { } else {
$title .= ($this->code == 'discount') ? false : (($tax->type == 'fixed') ? $percent : '%' . $percent); $title .= ($this->code == 'discount') ? '%' .$percent : (($tax->type == 'fixed') ? $percent : '%' . $percent);
} }
$title .= ')'; $title .= ')';

5
app/Models/Sale/InvoiceTotal.php
View File

@ -72,13 +72,12 @@ class InvoiceTotal extends Model
} }
if (!empty($percent)) { if (!empty($percent)) {
$title .= ' ('; $title .= ' (';
if (setting('localisation.percent_position', 'after') == 'after') { if (setting('localisation.percent_position', 'after') == 'after') {
$title .= ($this->code == 'discount') ? false : (($tax->type == 'fixed') ? $percent : $percent . '%'); $title .= ($this->code == 'discount') ? $percent. '%' : (($tax->type == 'fixed') ? $percent : $percent . '%');
} else { } else {
$title .= ($this->code == 'discount') ? false : (($tax->type == 'fixed') ? $percent : '%' . $percent); $title .= ($this->code == 'discount') ? '%' .$percent : (($tax->type == 'fixed') ? $percent : '%' . $percent);
} }
$title .= ')'; $title .= ')';