From 929e1a74bd6e570afe3990d676a92328dde8ede7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Mon, 20 Apr 2020 04:42:48 +0300 Subject: [PATCH] refs #1408 discount show rate --- app/Models/Purchase/BillTotal.php | 5 ++--- app/Models/Sale/InvoiceTotal.php | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/Models/Purchase/BillTotal.php b/app/Models/Purchase/BillTotal.php index d46250dd4..de6a531f5 100644 --- a/app/Models/Purchase/BillTotal.php +++ b/app/Models/Purchase/BillTotal.php @@ -72,13 +72,12 @@ class BillTotal extends Model } if (!empty($percent)) { - $title .= ' ('; 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 { - $title .= ($this->code == 'discount') ? false : (($tax->type == 'fixed') ? $percent : '%' . $percent); + $title .= ($this->code == 'discount') ? '%' .$percent : (($tax->type == 'fixed') ? $percent : '%' . $percent); } $title .= ')'; diff --git a/app/Models/Sale/InvoiceTotal.php b/app/Models/Sale/InvoiceTotal.php index d15a925b5..c04fa59c1 100644 --- a/app/Models/Sale/InvoiceTotal.php +++ b/app/Models/Sale/InvoiceTotal.php @@ -72,13 +72,12 @@ class InvoiceTotal extends Model } if (!empty($percent)) { - $title .= ' ('; 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 { - $title .= ($this->code == 'discount') ? false : (($tax->type == 'fixed') ? $percent : '%' . $percent); + $title .= ($this->code == 'discount') ? '%' .$percent : (($tax->type == 'fixed') ? $percent : '%' . $percent); } $title .= ')';