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

fixed discount percentage #297

Browse Source
This commit is contained in:
denisdulici 2018-04-18 14:34:33 +03:00
parent acf8247c98
commit c37203076c
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Models/Expense/Bill.php
View File

@ -170,18 +170,16 @@ class Bill extends Model
*/ */
public function getDiscountAttribute() public function getDiscountAttribute()
{ {
$discount = 0; $percent = 0;
foreach ($this->totals as $total) { $discount = $this->totals()->where('code', 'discount')->value('amount');
if ($total->code != 'discount') {
continue;
}
$discount = number_format((($total->amount * 100) / $this->amount), 0); if ($discount) {
$sub_total = $this->totals()->where('code', 'sub_total')->value('amount');
break; $percent = number_format((($discount * 100) / $sub_total), 0);
} }
return $discount; return $percent;
} }
} }

14
app/Models/Income/Invoice.php
View File

@ -172,18 +172,16 @@ class Invoice extends Model
*/ */
public function getDiscountAttribute() public function getDiscountAttribute()
{ {
$discount = 0; $percent = 0;
foreach ($this->totals as $total) { $discount = $this->totals()->where('code', 'discount')->value('amount');
if ($total->code != 'discount') {
continue;
}
$discount = number_format((($total->amount * 100) / $this->amount), 0); if ($discount) {
$sub_total = $this->totals()->where('code', 'sub_total')->value('amount');
break; $percent = number_format((($discount * 100) / $sub_total), 0);
} }
return $discount; return $percent;
} }
} }