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

improved invoice/bill jobs

Browse Source
This commit is contained in:
denisdulici
2019-12-07 12:54:13 +03:00
parent 24cb6dbab7
commit 7e91491145
9 changed files with 515 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
app/Jobs/Expense/CreateBill.php
View File

@@ -4,6 +4,7 @@ namespace App\Jobs\Expense;
use App\Abstracts\Job;
use App\Events\Expense\BillCreated;
use App\Events\Expense\BillCreating;
use App\Models\Expense\Bill;
use App\Models\Expense\BillTotal;
use App\Traits\Currencies;
@@ -15,6 +16,8 @@ class CreateBill extends Job
protected $request;
protected $bill;
/**
* Create a new job instance.
*
@@ -28,153 +31,165 @@ class CreateBill extends Job
/**
* Execute the job.
*
* @return Invoice
* @return Bill
*/
public function handle()
{
$bill = Bill::create($this->request->all());
if (empty($this->request['amount'])) {
$this->request['amount'] = 0;
}
event(new BillCreating($this->request));
$this->bill = Bill::create($this->request->all());
// Upload attachment
if ($this->request->file('attachment')) {
$media = $this->getMedia($this->request->file('attachment'), 'bills');
$bill->attachMedia($media, 'attachment');
$this->bill->attachMedia($media, 'attachment');
}
$taxes = [];
$this->createItemsAndTotals();
$tax_total = 0;
$sub_total = 0;
$discount_total = 0;
$discount = $this->request['discount'];
$this->bill->update($this->request->input());
if ($this->request['items']) {
foreach ($this->request['items'] as $item) {
$bill_item = $this->dispatch(new CreateBillItem($item, $bill, $discount));
$this->bill->createRecurring();
// Calculate totals
$tax_total += $bill_item->tax;
$sub_total += $bill_item->total;
event(new BillCreated($this->bill));
// Set taxes
if ($bill_item->item_taxes) {
foreach ($bill_item->item_taxes as $item_tax) {
if (isset($taxes) && array_key_exists($item_tax['tax_id'], $taxes)) {
$taxes[$item_tax['tax_id']]['amount'] += $item_tax['amount'];
} else {
$taxes[$item_tax['tax_id']] = [
'name' => $item_tax['name'],
'amount' => $item_tax['amount']
];
}
}
}
}
}
$s_total = $sub_total;
// Apply discount to total
if ($discount) {
$s_discount = $s_total * ($discount / 100);
$discount_total += $s_discount;
$s_total = $s_total - $s_discount;
}
$amount = $s_total + $tax_total;
$this->request['amount'] = money($amount, $this->request['currency_code'])->getAmount();
$bill->update($this->request->input());
// Add bill totals
$this->addTotals($bill, $this->request, $taxes, $sub_total, $discount_total, $tax_total);
// Recurring
$bill->createRecurring();
// Fire the event to make it extendible
event(new BillCreated($bill));
return $bill;
return $this->bill;
}
protected function addTotals($bill, $request, $taxes, $sub_total, $discount_total, $tax_total)
protected function createItemsAndTotals()
{
// Check if totals are in request, i.e. api
if (!empty($request['totals'])) {
$sort_order = 1;
foreach ($request['totals'] as $total) {
$total['bill_id'] = $bill->id;
if (empty($total['sort_order'])) {
$total['sort_order'] = $sort_order;
}
BillTotal::create($total);
$sort_order++;
}
return;
}
// Create items
list($sub_total, $taxes) = $this->createItems();
$sort_order = 1;
// Added bill sub total
// Add sub total
BillTotal::create([
'company_id' => $request['company_id'],
'bill_id' => $bill->id,
'company_id' => $this->bill->company_id,
'bill_id' => $this->bill->id,
'code' => 'sub_total',
'name' => 'bills.sub_total',
'amount' => $sub_total,
'sort_order' => $sort_order,
]);
$this->request['amount'] += $sub_total;
$sort_order++;
// Added bill discount
if ($discount_total) {
// Add discount
if (!empty($this->request['discount'])) {
$discount_total = $sub_total * ($this->request['discount'] / 100);
BillTotal::create([
'company_id' => $request['company_id'],
'bill_id' => $bill->id,
'company_id' => $this->bill->company_id,
'bill_id' => $this->bill->id,
'code' => 'discount',
'name' => 'bills.discount',
'amount' => $discount_total,
'sort_order' => $sort_order,
]);
// This is for total
$sub_total = $sub_total - $discount_total;
$this->request['amount'] -= $discount_total;
$sort_order++;
}
// Added bill taxes
if (isset($taxes)) {
// Add taxes
if (!empty($taxes)) {
foreach ($taxes as $tax) {
BillTotal::create([
'company_id' => $request['company_id'],
'bill_id' => $bill->id,
'company_id' => $this->bill->company_id,
'bill_id' => $this->bill->id,
'code' => 'tax',
'name' => $tax['name'],
'amount' => $tax['amount'],
'sort_order' => $sort_order,
]);
$this->request['amount'] += $tax['amount'];
$sort_order++;
}
}
// Added bill total
// Add extra totals, i.e. shipping fee
if (!empty($this->request['totals'])) {
foreach ($this->request['totals'] as $total) {
$total['company_id'] = $this->bill->company_id;
$total['bill_id'] = $this->bill->id;
$total['sort_order'] = $sort_order;
if (empty($total['code'])) {
$total['code'] = 'extra';
}
BillTotal::create($total);
if (empty($total['operator']) || ($total['operator'] == 'addition')) {
$this->request['amount'] += $total['amount'];
} else {
// subtraction
$this->request['amount'] -= $total['amount'];
}
$sort_order++;
}
}
// Add total
BillTotal::create([
'company_id' => $request['company_id'],
'bill_id' => $bill->id,
'company_id' => $this->bill->company_id,
'bill_id' => $this->bill->id,
'code' => 'total',
'name' => 'bills.total',
'amount' => $sub_total + $tax_total,
'amount' => $this->request['amount'],
'sort_order' => $sort_order,
]);
}
protected function createItems()
{
$sub_total = 0;
$taxes = [];
if (empty($this->request['items'])) {
return [$sub_total, $taxes];
}
foreach ((array) $this->request['items'] as $item) {
if (empty($item['discount'])) {
$item['discount'] = !empty($this->request['discount']) ? !empty($this->request['discount']) : 0;
}
$bill_item = $this->dispatch(new CreateBillItem($item, $this->bill));
// Calculate totals
$sub_total += $bill_item->total;
if (!$bill_item->item_taxes) {
continue;
}
// Set taxes
foreach ((array) $bill_item->item_taxes as $item_tax) {
if (array_key_exists($item_tax['tax_id'], $taxes)) {
$taxes[$item_tax['tax_id']]['amount'] += $item_tax['amount'];
} else {
$taxes[$item_tax['tax_id']] = [
'name' => $item_tax['name'],
'amount' => $item_tax['amount']
];
}
}
}
return [$sub_total, $taxes];
}
}