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

Document discount & tax calculation issue fixed.

Browse Source
This commit is contained in:
EnesSacid-Buker
2022-04-15 17:53:45 +03:00
parent 938d43c58b
commit a6cdd57bbe
3 changed files with 313 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,110 +33,49 @@ class CreateDocumentItem extends Job implements HasOwner, HasSource, ShouldCreat
$item_amount = (double) $this->request['price'] * (double) $this->request['quantity'];
$discount = 0;
$item_discounted_amount = $item_amount;
// Apply line discount to amount
if (!empty($this->request['discount'])) {
$discount = $this->request['discount'];
if ($this->request['discount_type'] === 'percentage') {
$item_discounted_amount = $item_amount -= ($item_amount * ($this->request['discount'] / 100));
$item_discounted_amount -= ($item_amount * ($this->request['discount'] / 100));
} else {
$item_discounted_amount = $item_amount -= $this->request['discount'];
$item_discounted_amount -= $this->request['discount'];
}
}
// Apply total discount to amount
if (!empty($this->request['global_discount'])) {
if ($this->request['global_discount_type'] === 'percentage') {
$item_discounted_amount -= $item_discounted_amount * ($this->request['global_discount'] / 100);
} else {
$item_discounted_amount -= $this->request['global_discount'];
}
}
$tax_amount = 0;
$item_taxes = [];
$item_tax_total = 0;
$actual_price_item = $item_amount = $item_discounted_amount;
$item_taxes = [];
$doc_parms = [
'company_id' => $this->document->company_id,
'type' => $this->document->type,
'document_id' => $this->document->id,
];
if (!empty($this->request['tax_ids'])) {
$inclusives = $compounds = [];
// New variables by tax type & tax sorting
foreach ((array) $this->request['tax_ids'] as $tax_id) {
$tax = Tax::find($tax_id);
switch ($tax->type) {
case 'inclusive':
$inclusives[] = $tax;
break;
case 'compound':
$compounds[] = $tax;
break;
case 'fixed':
$tax_amount = $tax->rate * (double) $this->request['quantity'];
// @todo tax calculate check here
//$tax_amount = round(abs($tax_amount), $precision);
$item_taxes[] = [
'company_id' => $this->document->company_id,
'type' => $this->document->type,
'document_id' => $this->document->id,
'tax_id' => $tax_id,
'name' => $tax->name,
'amount' => $tax_amount,
];
$item_tax_total += $tax_amount;
break;
case 'withholding':
$tax_amount = 0 - $item_discounted_amount * ($tax->rate / 100);
// @todo tax calculate check here
//$tax_amount = round(abs($tax_amount), $precision);
$item_taxes[] = [
'company_id' => $this->document->company_id,
'type' => $this->document->type,
'document_id' => $this->document->id,
'tax_id' => $tax_id,
'name' => $tax->name,
'amount' => $tax_amount,
];
$item_tax_total += $tax_amount;
break;
default:
$tax_amount = $item_discounted_amount * ($tax->rate / 100);
// @todo tax calculate check here
//$tax_amount = round(abs($tax_amount), $precision);
$item_taxes[] = [
'company_id' => $this->document->company_id,
'type' => $this->document->type,
'document_id' => $this->document->id,
'tax_id' => $tax_id,
'name' => $tax->name,
'amount' => $tax_amount,
];
$item_tax_total += $tax_amount;
break;
}
${$tax->type . 's'}[] = $tax;
}
if ($inclusives) {
$item_amount = $item_discounted_amount + $item_tax_total;
$item_base_rate = $item_amount / (1 + collect($inclusives)->sum('rate') / 100);
if (isset($inclusives)) {
foreach ($inclusives as $inclusive) {
$tax_amount = $item_base_rate * ($inclusive->rate / 100);
$tax_amount = $item_discounted_amount - ($item_discounted_amount / (1 + $inclusive->rate / 100));
$tax_amount = round(abs($tax_amount), $precision);
$item_taxes[] = [
'company_id' => $this->document->company_id,
'type' => $this->document->type,
'document_id' => $this->document->id,
$item_taxes[] = $doc_parms + [
'tax_id' => $inclusive->id,
'name' => $inclusive->name,
'amount' => $tax_amount,
@ -145,23 +84,59 @@ class CreateDocumentItem extends Job implements HasOwner, HasSource, ShouldCreat
$item_tax_total += $tax_amount;
}
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);
$actual_price_item = $item_discounted_amount - $item_tax_total;
}
if (isset($fixeds)) {
foreach ($fixeds as $tax) {
$tax_amount = $tax->rate * (double) $this->request['quantity'];
$item_taxes[] = $doc_parms + [
'tax_id' => $tax->id,
'name' => $tax->name,
'amount' => $tax_amount,
];
$item_tax_total += $tax_amount;
$item_amount += $tax_amount;
}
}
if ($compounds) {
if (isset($normals)) {
foreach ($normals as $tax) {
$tax_amount = $actual_price_item * ($tax->rate / 100);
$item_taxes[] = $doc_parms + [
'tax_id' => $tax->id,
'name' => $tax->name,
'amount' => $tax_amount,
];
$item_tax_total += $tax_amount;
$item_amount += $tax_amount;
}
}
if (isset($withholdings)) {
foreach ($withholdings as $tax) {
$tax_amount = -($actual_price_item * ($tax->rate / 100));
$item_taxes[] = $doc_parms + [
'tax_id' => $tax->id,
'name' => $tax->name,
'amount' => $tax_amount,
];
$item_tax_total += $tax_amount;
$item_amount += $tax_amount;
}
}
if (isset($compounds)) {
foreach ($compounds as $compound) {
$tax_amount = (($item_discounted_amount + $item_tax_total) / 100) * $compound->rate;
$tax_amount = ($item_amount / 100) * $compound->rate;
$tax_amount = round(abs($tax_amount), $precision);
$item_taxes[] = [
'company_id' => $this->document->company_id,
'type' => $this->document->type,
'document_id' => $this->document->id,
$item_taxes[] = $doc_parms + [
'tax_id' => $compound->id,
'name' => $compound->name,
'amount' => $tax_amount,
@ -183,7 +158,7 @@ class CreateDocumentItem extends Job implements HasOwner, HasSource, ShouldCreat
$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_rate'] = !empty($this->request['discount']) ? $this->request['discount'] : 0;
$this->request['total'] = round($item_amount, $precision);
$this->request['total'] = round($actual_price_item, $precision);
$this->request['created_from'] = $this->request['created_from'];
$this->request['created_by'] = $this->request['created_by'];
@ -195,8 +170,8 @@ class CreateDocumentItem extends Job implements HasOwner, HasSource, ShouldCreat
if (!empty($item_taxes)) {
$document_item->item_taxes = $item_taxes;
$document_item->inclusives = $inclusives;
$document_item->compounds = $compounds;
$document_item->inclusives = $inclusives ?? null;
$document_item->compounds = $compounds ?? null;
foreach ($item_taxes as $item_tax) {
$item_tax['document_item_id'] = $document_item->id;

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

@ -30,7 +30,7 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
{
$precision = config('money.' . $this->document->currency_code . '.precision');
list($sub_total, $discount_amount_total, $taxes) = $this->createItems();
list($sub_total, $actual_total, $discount_amount_total, $taxes) = $this->createItems();
$sort_order = 1;
@ -47,7 +47,7 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
'created_by' => $this->request['created_by'],
]);
$this->request['amount'] += $sub_total;
$this->request['amount'] += $actual_total;
$sort_order++;
@ -70,7 +70,7 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
if (!empty($this->request['discount'])) {
if ($this->request['discount_type'] === 'percentage') {
$discount_total = $sub_total * ($this->request['discount'] / 100);
$discount_total = ($sub_total - $discount_amount_total) * ($this->request['discount'] / 100);
} else {
$discount_total = $this->request['discount'];
}
@ -87,8 +87,6 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
'created_by' => $this->request['created_by'],
]);
$this->request['amount'] -= $discount_total;
$sort_order++;
}
@ -142,8 +140,6 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
}
}
$this->request['amount'] = round($this->request['amount'], $precision);
// Add total
DocumentTotal::create([
'company_id' => $this->document->company_id,
@ -151,7 +147,7 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
'document_id' => $this->document->id,
'code' => 'total',
'name' => 'invoices.total',
'amount' => $this->request['amount'],
'amount' => round($this->request['amount'], $precision),
'sort_order' => $sort_order,
'created_from' => $this->request['created_from'],
'created_by' => $this->request['created_by'],
@ -160,19 +156,29 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
protected function createItems(): array
{
$sub_total = $discount_amount = $discount_amount_total = 0;
$sub_total = $actual_total = $discount_amount = $discount_amount_total = 0;
$taxes = [];
if (empty($this->request['items'])) {
return [$sub_total, $discount_amount_total, $taxes];
return [$sub_total, $actual_total, $discount_amount_total, $taxes];
}
foreach ((array) $this->request['items'] as $item) {
if (!empty($this->request['discount']) && $this->request['discount_type'] !== 'percentage') {
$for_fixed_discount = $this->fixedDiscountCalculate();
}
foreach ((array) $this->request['items'] as $key => $item) {
$item['global_discount'] = 0;
if (!empty($this->request['discount'])) {
$item['global_discount'] = $this->request['discount'];
if (isset($for_fixed_discount)) {
$item['global_discount'] = ($for_fixed_discount[$key] / ($for_fixed_discount['total'] / 100)) * ($this->request['discount'] / 100);
$item['global_discount_type'] = '';
} else {
$item['global_discount'] = $this->request['discount'];
$item['global_discount_type'] = $this->request['discount_type'];
}
}
$item['created_from'] = $this->request['created_from'];
@ -214,7 +220,8 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
}
// Calculate totals
$sub_total += $document_item->total;
$sub_total += $item_amount;
$actual_total += $document_item->total;
$discount_amount_total += $discount_amount;
@ -235,6 +242,30 @@ class CreateDocumentItemsAndTotals extends Job implements HasOwner, HasSource, S
}
}
return [$sub_total, $discount_amount_total, $taxes];
return [$sub_total, $actual_total, $discount_amount_total, $taxes];
}
public function fixedDiscountCalculate()
{
$total = 0;
foreach ((array) $this->request['items'] as $item) {
$sub = (double) $item['price'] * (double) $item['quantity'];
if (! empty($this->request['discount'])) {
if ($item['discount_type'] === 'percentage') {
$sub -= ($sub * ($item['discount'] / 100));
} else {
$sub -= $item['discount'];
}
}
$total += $sub;
$item_total[] = $sub;
}
$item_total['total'] = $total;
return $item_total;
}
}