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

naming

Browse Source
This commit is contained in:
denisdulici 2018-11-07 12:07:38 +03:00
parent 9fdcf7dbbe
commit 86330b0a41
6 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -334,14 +334,14 @@ class Items extends Controller
} }
if (!empty($item['tax_id'])) { if (!empty($item['tax_id'])) {
$includes = $compounds = $taxes = []; $inclusives = $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);
switch ($tax->type) { switch ($tax->type) {
case 'included': case 'inclusive':
$includes[] = $tax; $inclusives[] = $tax;
break; break;
case 'compound': case 'compound':
$compounds[] = $tax; $compounds[] = $tax;
@ -357,7 +357,7 @@ class Items extends Controller
} }
} }
if ($includes) { if ($inclusives) {
if ($discount) { if ($discount) {
$item_tax_total = 0; $item_tax_total = 0;
@ -369,20 +369,20 @@ class Items extends Controller
} }
} }
foreach ($includes as $include) { foreach ($inclusives as $inclusive) {
$item_sub_and_tax_total = $item_sub_total + $item_tax_total; $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 - $include->rate)) / 100); $item_tax_total = $item_sub_and_tax_total - (($item_sub_and_tax_total * (100 - $inclusive->rate)) / 100);
$item_sub_total = $item_sub_and_tax_total - $item_tax_total; $item_sub_total = $item_sub_and_tax_total - $item_tax_total;
$item_discount_total = $item_sub_total - ($item_sub_total * ($discount / 100)); $item_discount_total = $item_sub_total - ($item_sub_total * ($discount / 100));
} }
} else { } else {
foreach ($includes as $include) { foreach ($inclusives as $inclusive) {
$item_sub_and_tax_total = $item_discount_total + $item_tax_total; $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 - $include->rate)) / 100); $item_tax_total = $item_sub_and_tax_total - (($item_sub_and_tax_total * (100 - $inclusive->rate)) / 100);
$item_sub_total = $item_sub_and_tax_total - $item_tax_total; $item_sub_total = $item_sub_and_tax_total - $item_tax_total;

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

@ -40,7 +40,7 @@ class Taxes extends Controller
{ {
$types = [ $types = [
'normal' => trans('taxes.normal'), 'normal' => trans('taxes.normal'),
'included' => trans('taxes.included'), 'inclusive' => trans('taxes.inclusive'),
'compound' => trans('taxes.compound'), 'compound' => trans('taxes.compound'),
]; ];
@ -76,7 +76,7 @@ class Taxes extends Controller
{ {
$types = [ $types = [
'normal' => trans('taxes.normal'), 'normal' => trans('taxes.normal'),
'included' => trans('taxes.included'), 'inclusive' => trans('taxes.inclusive'),
'compound' => trans('taxes.compound'), 'compound' => trans('taxes.compound'),
]; ];

24
app/Jobs/Expense/CreateBillItem.php
View File

@ -71,14 +71,14 @@ class CreateBillItem
$item_tax_total = 0; $item_tax_total = 0;
if (!empty($this->data['tax_id'])) { if (!empty($this->data['tax_id'])) {
$includes = $compounds = $taxes = []; $inclusives = $compounds = $taxes = [];
foreach ((array) $this->data['tax_id'] as $tax_id) { foreach ((array) $this->data['tax_id'] as $tax_id) {
$tax = Tax::find($tax_id); $tax = Tax::find($tax_id);
switch ($tax->type) { switch ($tax->type) {
case 'included': case 'included':
$includes[] = $tax; $inclusives[] = $tax;
break; break;
case 'compound': case 'compound':
$compounds[] = $tax; $compounds[] = $tax;
@ -102,7 +102,7 @@ class CreateBillItem
} }
} }
if ($includes) { if ($inclusives) {
if ($this->discount) { if ($this->discount) {
$item_tax_total = 0; $item_tax_total = 0;
@ -114,34 +114,34 @@ class CreateBillItem
} }
} }
foreach ($includes as $include) { foreach ($inclusives as $inclusive) {
$item_sub_and_tax_total = $item_amount + $item_tax_total; $item_sub_and_tax_total = $item_amount + $item_tax_total;
$item_tax_total = $item_sub_and_tax_total - (($item_sub_and_tax_total * (100 - $include->rate)) / 100); $item_tax_total = $item_sub_and_tax_total - (($item_sub_and_tax_total * (100 - $inclusive->rate)) / 100);
$item_sub_total = $item_sub_and_tax_total - $item_tax_total; $item_sub_total = $item_sub_and_tax_total - $item_tax_total;
$item_taxes[] = [ $item_taxes[] = [
'company_id' => $this->bill->company_id, 'company_id' => $this->bill->company_id,
'bill_id' => $this->bill->id, 'bill_id' => $this->bill->id,
'tax_id' => $include->id, 'tax_id' => $inclusive->id,
'name' => $include->name, 'name' => $inclusive->name,
'amount' => $tax_amount, 'amount' => $tax_amount,
]; ];
$item_discount_amount = $item_sub_total - ($item_sub_total * ($this->discount / 100)); $item_discount_amount = $item_sub_total - ($item_sub_total * ($this->discount / 100));
} }
} else { } else {
foreach ($includes as $include) { foreach ($inclusives as $inclusive) {
$item_sub_and_tax_total = $item_discount_amount + $item_tax_total; $item_sub_and_tax_total = $item_discount_amount + $item_tax_total;
$item_tax_total = $tax_amount = $item_sub_and_tax_total - ($item_sub_and_tax_total / (1 + ($include->rate / 100))); $item_tax_total = $tax_amount = $item_sub_and_tax_total - ($item_sub_and_tax_total / (1 + ($inclusive->rate / 100)));
$item_taxes[] = [ $item_taxes[] = [
'company_id' => $this->bill->company_id, 'company_id' => $this->bill->company_id,
'bill_id' => $this->bill->id, 'bill_id' => $this->bill->id,
'tax_id' => $include->id, 'tax_id' => $inclusive->id,
'name' => $include->name, 'name' => $inclusive->name,
'amount' => $tax_amount, 'amount' => $tax_amount,
]; ];
@ -183,7 +183,7 @@ class CreateBillItem
if (!empty($this->data['tax_id'])) { if (!empty($this->data['tax_id'])) {
// set item_taxes for // set item_taxes for
$bill_item->item_taxes = $item_taxes; $bill_item->item_taxes = $item_taxes;
$bill_item->includes = $includes; $bill_item->inclusive = $inclusives;
$bill_item->compounds = $compounds; $bill_item->compounds = $compounds;
} }

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

@ -98,14 +98,14 @@ class CreateInvoiceItem
$item_tax_total = 0; $item_tax_total = 0;
if (!empty($this->data['tax_id'])) { if (!empty($this->data['tax_id'])) {
$includes = $compounds = $taxes = []; $inclusives = $compounds = $taxes = [];
foreach ((array) $this->data['tax_id'] as $tax_id) { foreach ((array) $this->data['tax_id'] as $tax_id) {
$tax = Tax::find($tax_id); $tax = Tax::find($tax_id);
switch ($tax->type) { switch ($tax->type) {
case 'included': case 'inclusive':
$includes[] = $tax; $inclusives[] = $tax;
break; break;
case 'compound': case 'compound':
$compounds[] = $tax; $compounds[] = $tax;
@ -129,7 +129,7 @@ class CreateInvoiceItem
} }
} }
if ($includes) { if ($inclusives) {
if ($this->discount) { if ($this->discount) {
$item_tax_total = 0; $item_tax_total = 0;
@ -141,34 +141,34 @@ class CreateInvoiceItem
} }
} }
foreach ($includes as $include) { foreach ($inclusives as $inclusive) {
$item_sub_and_tax_total = $item_amount + $item_tax_total; $item_sub_and_tax_total = $item_amount + $item_tax_total;
$item_tax_total = $item_sub_and_tax_total - (($item_sub_and_tax_total * (100 - $include->rate)) / 100); $item_tax_total = $item_sub_and_tax_total - (($item_sub_and_tax_total * (100 - $inclusive->rate)) / 100);
$item_sub_total = $item_sub_and_tax_total - $item_tax_total; $item_sub_total = $item_sub_and_tax_total - $item_tax_total;
$item_taxes[] = [ $item_taxes[] = [
'company_id' => $this->invoice->company_id, 'company_id' => $this->invoice->company_id,
'invoice_id' => $this->invoice->id, 'invoice_id' => $this->invoice->id,
'tax_id' => $include->id, 'tax_id' => $inclusive->id,
'name' => $include->name, 'name' => $inclusive->name,
'amount' => $tax_amount, 'amount' => $tax_amount,
]; ];
$item_discount_amount = $item_sub_total - ($item_sub_total * ($this->discount / 100)); $item_discount_amount = $item_sub_total - ($item_sub_total * ($this->discount / 100));
} }
} else { } else {
foreach ($includes as $include) { foreach ($inclusives as $inclusive) {
$item_sub_and_tax_total = $item_discount_amount + $item_tax_total; $item_sub_and_tax_total = $item_discount_amount + $item_tax_total;
$item_tax_total = $tax_amount = $item_sub_and_tax_total - ($item_sub_and_tax_total / (1 + ($include->rate / 100))); $item_tax_total = $tax_amount = $item_sub_and_tax_total - ($item_sub_and_tax_total / (1 + ($inclusive->rate / 100)));
$item_taxes[] = [ $item_taxes[] = [
'company_id' => $this->invoice->company_id, 'company_id' => $this->invoice->company_id,
'invoice_id' => $this->invoice->id, 'invoice_id' => $this->invoice->id,
'tax_id' => $include->id, 'tax_id' => $inclusive->id,
'name' => $include->name, 'name' => $inclusive->name,
'amount' => $tax_amount, 'amount' => $tax_amount,
]; ];
@ -210,7 +210,7 @@ class CreateInvoiceItem
if (!empty($this->data['tax_id'])) { if (!empty($this->data['tax_id'])) {
// set item_taxes for // set item_taxes for
$invoice_item->item_taxes = $item_taxes; $invoice_item->item_taxes = $item_taxes;
$invoice_item->includes = $includes; $invoice_item->inclusives = $inclusives;
$invoice_item->compounds = $compounds; $invoice_item->compounds = $compounds;
} }

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

@ -5,7 +5,7 @@ return [
'rate' => 'Rate', 'rate' => 'Rate',
'rate_percent' => 'Rate (%)', 'rate_percent' => 'Rate (%)',
'normal' => 'Normal', 'normal' => 'Normal',
'included' => 'Included in Price', 'inclusive' => 'Inclusive',
'compound' => 'Compound', 'compound' => 'Compound',
]; ];

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

@ -17,7 +17,7 @@
{{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }} {{ Form::textGroup('rate', trans('taxes.rate'), 'percent') }}
{{ Form::selectGroup('type', trans('general.type'), 'bars', $types, null, []) }} {{ Form::selectGroup('type', trans_choice('general.types', 1), 'bars', $types, null, []) }}
{{ Form::radioGroup('enabled', trans('general.enabled')) }} {{ Form::radioGroup('enabled', trans('general.enabled')) }}
</div> </div>