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

Rename discount type Normal => Percentage #kbcqjv

Browse Source
This commit is contained in:
Burak Çakırel
2021-08-15 22:35:05 +01:00
parent e8720c6a8a
commit 5aa6071e9b
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Jobs/Document/CreateDocumentItem.php
View File

@ -45,7 +45,7 @@ class CreateDocumentItem extends Job
if (!empty($this->request['discount'])) {
$discount = $this->request['discount'];
if ($this->request['discount_type'] === 'normal') {
if ($this->request['discount_type'] === 'percentage') {
$item_discounted_amount = $item_amount -= ($item_amount * ($this->request['discount'] / 100));
} else {
$item_discounted_amount = $item_amount -= $this->request['discount'];
@ -150,10 +150,10 @@ class CreateDocumentItem extends Job
$item_tax_total += $tax_amount;
}
if (!empty($this->request['discount_type']) && $this->request['discount_type'] === 'normal') {
$item_amount = ($item_amount - $item_tax_total) / (1 - $discount / 100);
} else {
if (!empty($this->request['discount_type']) && $this->request['discount_type'] === 'fixed') {
$item_amount = ($item_amount - $item_tax_total) - $discount;
} else {
$item_amount = ($item_amount - $item_tax_total) / (1 - $discount / 100);
}
}
@ -186,7 +186,7 @@ class CreateDocumentItem extends Job
$this->request['quantity'] = (double) $this->request['quantity'];
$this->request['price'] = round($this->request['price'], $precision);
$this->request['tax'] = round($item_tax_total, $precision);
$this->request['discount_type'] = !empty($this->request['discount_type']) ? $this->request['discount_type'] : 'normal';
$this->request['discount_type'] = !empty($this->request['discount_type']) ? $this->request['discount_type'] : 'percentage';
$this->request['discount_rate'] = !empty($this->request['discount']) ? $this->request['discount'] : 0;
$this->request['total'] = round($item_amount, $precision);

4
app/Jobs/Document/CreateDocumentItemsAndTotals.php
View File

@ -71,7 +71,7 @@ class CreateDocumentItemsAndTotals extends Job
}
if (!empty($this->request['discount'])) {
if ($this->request['discount_type'] === 'normal') {
if ($this->request['discount_type'] === 'percentage') {
$discount_total = $sub_total * ($this->request['discount'] / 100);
} else {
$discount_total = $this->request['discount'];
@ -195,7 +195,7 @@ class CreateDocumentItemsAndTotals extends Job
$discount_amount = 0;
if (!empty($item['discount'])) {
if ($item['discount_type'] === 'normal') {
if ($item['discount_type'] === 'percentage') {
$discount_amount = ($item_amount * ($item['discount'] / 100));
} else {
$discount_amount = $item['discount'];