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

refactored calculations

Browse Source
This commit is contained in:
Denis Duliçi
2020-07-06 09:54:18 +03:00
parent acacacbe62
commit 630fdb6e85
20 changed files with 549 additions and 871 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Jobs/Purchase/CreateBillItem.php
View File

@ -10,20 +10,20 @@ use Illuminate\Support\Str;
class CreateBillItem extends Job
{
protected $request;
protected $bill;
protected $request;
/**
* Create a new job instance.
*
* @param $request
* @param $bill
* @param $request
*/
public function __construct($request, $bill)
public function __construct($bill, $request)
{
$this->request = $request;
$this->bill = $bill;
$this->request = $request;
}
/**
@ -34,10 +34,11 @@ class CreateBillItem extends Job
public function handle()
{
$item_id = !empty($this->request['item_id']) ? $this->request['item_id'] : 0;
$precision = config('money.' . $this->bill->currency_code . '.precision');
$item_amount = (double) $this->request['price'] * (double) $this->request['quantity'];
$discount = 0;
$item_discounted_amount = $item_amount;
// Apply line discount to amount
@ -110,7 +111,7 @@ class CreateBillItem extends Job
$item_base_rate = $item_amount / (1 + collect($inclusives)->sum('rate') / 100);
foreach ($inclusives as $inclusive) {
$item_tax_total += $tax_amount = $item_base_rate * ($inclusive->rate / 100);
$tax_amount = $item_base_rate * ($inclusive->rate / 100);
$item_taxes[] = [
'company_id' => $this->bill->company_id,
@ -119,6 +120,8 @@ class CreateBillItem extends Job
'name' => $inclusive->name,
'amount' => $tax_amount,
];
$item_tax_total += $tax_amount;
}
$item_amount = ($item_amount - $item_tax_total) / (1 - $discount / 100);
@ -128,8 +131,6 @@ class CreateBillItem extends Job
foreach ($compounds as $compound) {
$tax_amount = (($item_discounted_amount + $item_tax_total) / 100) * $compound->rate;
$item_tax_total += $tax_amount;
$item_taxes[] = [
'company_id' => $this->bill->company_id,
'bill_id' => $this->bill->id,
@ -137,6 +138,8 @@ class CreateBillItem extends Job
'name' => $compound->name,
'amount' => $tax_amount,
];
$item_tax_total += $tax_amount;
}
}
}
@ -147,10 +150,10 @@ class CreateBillItem extends Job
'item_id' => $item_id,
'name' => Str::limit($this->request['name'], 180, ''),
'quantity' => (double) $this->request['quantity'],
'price' => (double) $this->request['price'],
'tax' => $item_tax_total,
'price' => round($this->request['price'], $precision),
'tax' => round($item_tax_total, $precision),
'discount_rate' => !empty($this->request['discount']) ? $this->request['discount'] : 0,
'total' => $item_amount,
'total' => round($item_amount, $precision),
]);
$bill_item->item_taxes = false;
@ -164,6 +167,7 @@ class CreateBillItem extends Job
foreach ($item_taxes as $item_tax) {
$item_tax['bill_item_id'] = $bill_item->id;
$item_tax['amount'] = round($item_tax['amount'], $precision);
BillItemTax::create($item_tax);
}