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

fixed document total issue

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-09-15 01:16:59 +03:00
parent 3af0787775
commit c3c866580a
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,7 +159,7 @@ class CreateDocumentItem extends Job implements HasOwner, HasSource, ShouldCreat
$this->request['quantity'] = (double) $this->request['quantity']; $this->request['quantity'] = (double) $this->request['quantity'];
$this->request['price'] = round($this->request['price'], $precision); $this->request['price'] = round($this->request['price'], $precision);
$this->request['tax'] = round($item_tax_total, $precision); $this->request['tax'] = round($item_tax_total, $precision);
$this->request['discount_type'] = !empty($this->request['discount_type']) ? $this->request['discount_type'] : 'percentage'; $this->request['discount_type'] = ! empty($this->request['discount_type']) ? $this->request['discount_type'] : null;
$this->request['discount_rate'] = !empty($this->request['discount']) ? $this->request['discount'] : 0; $this->request['discount_rate'] = !empty($this->request['discount']) ? $this->request['discount'] : 0;
$this->request['total'] = round($actual_price_item, $precision); $this->request['total'] = round($actual_price_item, $precision);
$this->request['created_from'] = $this->request['created_from']; $this->request['created_from'] = $this->request['created_from'];

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

@ -227,6 +227,17 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
$discount_amount_total += $discount_amount; $discount_amount_total += $discount_amount;
// Calculate global discount total
if (! empty($item['global_discount'])) {
if ($item['global_discount_type'] === 'percentage') {
$global_discount_amount = $document_item->total * ($item['global_discount'] / 100);
} else {
$global_discount_amount = $item['global_discount'];
}
$actual_total -= $global_discount_amount;
}
if (! $document_item->item_taxes) { if (! $document_item->item_taxes) {
continue; continue;
} }