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

Tax rate change workflow.

Browse Source
This commit is contained in:
cuneytsenturk
2018-11-06 17:55:31 +03:00
parent f3a7055682
commit 79ebd9d025
10 changed files with 176 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
app/Http/Controllers/Common/Items.php
View File

@@ -323,20 +323,78 @@ class Items extends Controller
$quantity = (double) $item['quantity']; $quantity = (double) $item['quantity'];
$item_tax_total = 0; $item_tax_total = 0;
$item_tax_amount = 0;
$item_sub_total = ($price * $quantity); $item_sub_total = ($price * $quantity);
$item_discount_total = $item_sub_total;
// Apply discount to item
if ($discount) {
$item_discount_total = $item_sub_total - ($item_sub_total * ($discount / 100));
}
if (!empty($item['tax_id'])) { if (!empty($item['tax_id'])) {
$calculates = $compounds = $taxes = [];
foreach ($item['tax_id'] as $tax_id) { foreach ($item['tax_id'] as $tax_id) {
$tax = Tax::find($tax_id); $tax = Tax::find($tax_id);
$item_tax = (($price * $quantity) / 100) * $tax->rate; switch ($tax->type) {
case 'calculate':
$calculates[] = $tax;
break;
case 'compound':
$compounds[] = $tax;
break;
case 'normal':
default:
$taxes[] = $tax;
// Apply discount to tax $item_tax_amount = ($item_discount_total / 100) * $tax->rate;
if ($discount) {
$item_tax = $item_tax - ($item_tax * ($discount / 100)); $item_tax_total += $item_tax_amount;
break;
} }
}
$item_tax_total += $item_tax; if ($calculates) {
if ($discount) {
$item_tax_total = 0;
if ($taxes) {
foreach ($taxes as $tax) {
$item_tax_amount = ($item_sub_total / 100) * $tax->rate;
$item_tax_total += $item_tax_amount;
}
}
foreach ($calculates as $calculate) {
$item_sub_and_tax_total = $item_sub_total + $item_tax_total;
$item_tax_total = $item_sub_and_tax_total - (($item_sub_and_tax_total * (100 - $calculate->rate)) / 100);
$item_sub_total = $item_sub_and_tax_total - $item_tax_total;
$item_discount_total = $item_sub_total - ($item_sub_total * ($discount / 100));
}
} else {
foreach ($calculates as $calculate) {
$item_sub_and_tax_total = $item_discount_total + $item_tax_total;
$item_tax_total = $item_sub_and_tax_total - (($item_sub_and_tax_total * (100 - $calculate->rate)) / 100);
$item_sub_total = $item_sub_and_tax_total - $item_tax_total;
$item_discount_total = $item_sub_total - ($item_sub_total * ($discount / 100));
}
}
}
if ($compounds) {
foreach ($compounds as $compound) {
$item_tax_total += (($item_discount_total + $item_tax_total) / 100) * $compound->rate;
}
} }
} }

16
app/Http/Controllers/Settings/Taxes.php
View File

@@ -38,7 +38,13 @@ class Taxes extends Controller
*/ */
public function create() public function create()
{ {
return view('settings.taxes.create'); $types = [
'normal' => trans('taxes.normal'),
'calculate' => trans('taxes.calculate'),
'compound' => trans('taxes.compound'),
];
return view('settings.taxes.create', compact('types'));
} }
/** /**
@@ -68,7 +74,13 @@ class Taxes extends Controller
*/ */
public function edit(Tax $tax) public function edit(Tax $tax)
{ {
return view('settings.taxes.edit', compact('tax')); $types = [
'normal' => trans('taxes.normal'),
'calculate' => trans('taxes.calculate'),
'compound' => trans('taxes.compound'),
];
return view('settings.taxes.edit', compact('tax', 'types'));
} }
/** /**

2
app/Jobs/Income/CreateInvoice.php
View File

@@ -159,4 +159,4 @@ class CreateInvoice
'sort_order' => $sort_order, 'sort_order' => $sort_order,
]); ]);
} }
} }

113
app/Jobs/Income/CreateInvoiceItem.php
View File

@@ -44,6 +44,14 @@ class CreateInvoiceItem
$item_sku = ''; $item_sku = '';
$item_id = !empty($this->data['item_id']) ? $this->data['item_id'] : 0; $item_id = !empty($this->data['item_id']) ? $this->data['item_id'] : 0;
$item_amount = (double) $this->data['price'] * (double) $this->data['quantity'];
$item_discount_amount = $item_amount;
// Apply discount to tax
if ($this->discount) {
$item_discount_amount = $item_amount * ($this->discount / 100);
}
if (!empty($item_id)) { if (!empty($item_id)) {
$item_object = Item::find($item_id); $item_object = Item::find($item_id);
@@ -85,32 +93,72 @@ class CreateInvoiceItem
$item_sku = $this->data['sku']; $item_sku = $this->data['sku'];
} }
$item_tax = 0; $tax_amount = 0;
$item_taxes = []; $item_taxes = [];
$invoice_item_taxes = []; $item_tax_total = 0;
if (!empty($this->data['tax_id'])) { if (!empty($this->data['tax_id'])) {
$calculates = $compounds = [];
foreach ((array) $this->data['tax_id'] as $tax_id) { foreach ((array) $this->data['tax_id'] as $tax_id) {
$tax_object = Tax::find($tax_id); $tax = Tax::find($tax_id);
$item_taxes[] = $tax_id; switch ($tax->type) {
case 'calculate':
$calculates[] = $tax;
break;
case 'compound':
$compounds[] = $tax;
break;
case 'normal':
default:
$tax_amount = ($item_discount_amount / 100) * $tax->rate;
$tax = (((double) $this->data['price'] * (double) $this->data['quantity']) / 100) * $tax_object->rate; $item_taxes[] = [
'company_id' => $this->invoice->company_id,
'invoice_id' => $this->invoice->id,
'tax_id' => $tax_id,
'name' => $tax->name,
'amount' => $tax_amount,
];
// Apply discount to tax $item_tax_total += $tax_amount;
if ($this->discount) { break;
$tax = $tax - ($tax * ($this->discount / 100));
} }
}
$invoice_item_taxes[] = [ if ($calculates) {
'company_id' => $this->invoice->company_id, foreach ($calculates as $calculate) {
'invoice_id' => $this->invoice->id, $item_sub_and_tax_total = $item_discount_amount + $item_tax_total;
'tax_id' => $tax_id,
'name' => $tax_object->name,
'amount' => $tax,
];
$item_tax += $tax; $item_tax_total = $tax_amount = $item_sub_and_tax_total - ($item_sub_and_tax_total / (1 + ($calculate->rate / 100)));
$item_taxes[] = [
'company_id' => $this->invoice->company_id,
'invoice_id' => $this->invoice->id,
'tax_id' => $calculate->id,
'name' => $calculate->name,
'amount' => $tax_amount,
];
$item_amount = $item_sub_and_tax_total - $item_tax_total;
}
}
if ($compounds) {
foreach ($compounds as $compound) {
$tax_amount = (($item_discount_amount + $item_tax_total) / 100) * $compound->rate;
$item_tax_total += $tax_amount;
$item_taxes[] = [
'company_id' => $this->invoice->company_id,
'invoice_id' => $this->invoice->id,
'tax_id' => $compound->id,
'name' => $compound->name,
'amount' => $tax_amount,
];
}
} }
} }
@@ -122,24 +170,31 @@ class CreateInvoiceItem
'sku' => $item_sku, 'sku' => $item_sku,
'quantity' => (double) $this->data['quantity'], 'quantity' => (double) $this->data['quantity'],
'price' => (double) $this->data['price'], 'price' => (double) $this->data['price'],
'tax' => $item_tax, 'tax' => $item_tax_total,
'tax_id' => 0, // (int) $item_taxes; 'tax_id' => 0,
'total' => (double) $this->data['price'] * (double) $this->data['quantity'], 'total' => $item_amount,
]); ]);
if ($invoice_item_taxes) { if (!empty($this->data['tax_id'])) {
foreach ($invoice_item_taxes as $invoice_item_tax) { // set item_taxes for
$invoice_item_tax['invoice_item_id'] = $invoice_item->id; $invoice_item->item_taxes = $item_taxes;
$invoice_item->calculates = $calculates;
$invoice_item->compounds = $compounds;
}
InvoiceItemTax::create($invoice_item_tax); if ($item_taxes) {
foreach ($item_taxes as $item_tax) {
$item_tax['invoice_item_id'] = $invoice_item->id;
InvoiceItemTax::create($item_tax);
// Set taxes // Set taxes
if (isset($taxes) && array_key_exists($invoice_item_tax['tax_id'], $taxes)) { if (isset($taxes) && array_key_exists($item_tax['tax_id'], $taxes)) {
$taxes[$invoice_item_tax['tax_id']]['amount'] += $invoice_item_tax['amount']; $taxes[$item_tax['tax_id']]['amount'] += $item_tax['amount'];
} else { } else {
$taxes[$invoice_item_tax['tax_id']] = [ $taxes[$item_tax['tax_id']] = [
'name' => $invoice_item_tax['name'], 'name' => $item_tax['name'],
'amount' => $invoice_item_tax['amount'] 'amount' => $item_tax['amount']
]; ];
} }
} }
@@ -147,4 +202,4 @@ class CreateInvoiceItem
return $invoice_item; return $invoice_item;
} }
} }

4
app/Models/Income/Invoice.php
View File

@@ -212,6 +212,10 @@ class Invoice extends Model
*/ */
public function getPaidAttribute() public function getPaidAttribute()
{ {
if (empty($this->amount)) {
return false;
}
$paid = 0; $paid = 0;
$reconciled = $reconciled_amount = 0; $reconciled = $reconciled_amount = 0;

2
app/Models/Setting/Tax.php
View File

@@ -21,7 +21,7 @@ class Tax extends Model
* *
* @var array * @var array
*/ */
protected $fillable = ['company_id', 'name', 'rate', 'calculate', 'compound', 'enabled']; protected $fillable = ['company_id', 'name', 'rate', 'type', 'enabled'];
/** /**
* Sortable columns. * Sortable columns.

6
database/migrations/2018_11_05_000000_add_tax_columns.php
View File

@@ -12,8 +12,7 @@ class AddTaxColumns extends Migration
public function up() public function up()
{ {
Schema::table('taxes', function ($table) { Schema::table('taxes', function ($table) {
$table->boolean('calculate')->default(0); $table->string('type')->default('normal');
$table->boolean('compound')->default(0);
}); });
} }
@@ -26,8 +25,7 @@ class AddTaxColumns extends Migration
{ {
Schema::table('taxes', function ($table) { Schema::table('taxes', function ($table) {
$table->dropColumn([ $table->dropColumn([
'calculate', 'type',
'compound',
]); ]);
}); });
} }

1
resources/lang/en-GB/taxes.php
View File

@@ -4,6 +4,7 @@ return [
'rate' => 'Rate', 'rate' => 'Rate',
'rate_percent' => 'Rate (%)', 'rate_percent' => 'Rate (%)',
'normal' => 'Normal',
'calculate' => 'Calculate as VAT/GST', 'calculate' => 'Calculate as VAT/GST',
'compound' => 'Compound', 'compound' => 'Compound',

14
resources/views/settings/taxes/create.blade.php
View File

@@ -12,9 +12,7 @@
{{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }} {{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }}
{{ Form::radioGroup('calculate', trans('taxes.calculate')) }} {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, null, []) }}
{{ Form::radioGroup('compound', trans('taxes.compound')) }}
{{ Form::radioGroup('enabled', trans('general.enabled')) }} {{ Form::radioGroup('enabled', trans('general.enabled')) }}
</div> </div>
@@ -36,17 +34,11 @@
$(document).ready(function() { $(document).ready(function() {
$('#enabled_1').trigger('click'); $('#enabled_1').trigger('click');
$('#calculate_0').trigger('click');
$('#compound_0').trigger('click');
$('#name').focus(); $('#name').focus();
$("#calculate").select2({ $("#type").select2({
placeholder: "{{ trans('general.form.select.field', ['field' => trans('taxes.calculate')]) }}" placeholder: "{{ trans('general.form.select.field', ['field' => trans('general.type')]) }}"
});
$("#compound").select2({
placeholder: "{{ trans('general.form.select.field', ['field' => trans('taxes.compound')]) }}"
}); });
}); });
</script> </script>

12
resources/views/settings/taxes/edit.blade.php
View File

@@ -17,9 +17,7 @@
{{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }} {{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }}
{{ Form::radioGroup('calculate', trans('taxes.calculate')) }} {{ Form::selectGroup('type', trans('general.type'), 'bars', $types, null, []) }}
{{ Form::radioGroup('compound', trans('taxes.compound')) }}
{{ Form::radioGroup('enabled', trans('general.enabled')) }} {{ Form::radioGroup('enabled', trans('general.enabled')) }}
</div> </div>
@@ -44,12 +42,8 @@
$(document).ready(function() { $(document).ready(function() {
$('#name').focus(); $('#name').focus();
$("#calculate").select2({ $("#type").select2({
placeholder: "{{ trans('general.form.select.field', ['field' => trans('taxes.calculate')]) }}" placeholder: "{{ trans('general.form.select.field', ['field' => trans('general.type')]) }}"
});
$("#compound").select2({
placeholder: "{{ trans('general.form.select.field', ['field' => trans('taxes.compound')]) }}"
}); });
}); });
</script> </script>