Skip to content

Commit

Permalink
naming
Browse files Browse the repository at this point in the history
  • Loading branch information
@denisdulici
denisdulici committed Nov 7, 2018
1 parent 9fdcf7d commit 86330b0
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 37 deletions.
16 changes: 8 additions & 8 deletions app/Http/Controllers/Common/Items.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,14 +334,14 @@ public function totalItem(TRequest $request)
}

if (!empty($item['tax_id'])) {
$includes = $compounds = $taxes = [];
$inclusives = $compounds = $taxes = [];

foreach ($item['tax_id'] as $tax_id) {
$tax = Tax::find($tax_id);

switch ($tax->type) {
case 'included':
$includes[] = $tax;
case 'inclusive':
$inclusives[] = $tax;
break;
case 'compound':
$compounds[] = $tax;
Expand All @@ -357,7 +357,7 @@ public function totalItem(TRequest $request)
}
}

if ($includes) {
if ($inclusives) {
if ($discount) {
$item_tax_total = 0;

Expand All @@ -369,20 +369,20 @@ public function totalItem(TRequest $request)
}
}

foreach ($includes as $include) {
foreach ($inclusives as $inclusive) {
$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_discount_total = $item_sub_total - ($item_sub_total * ($discount / 100));
}
} else {
foreach ($includes as $include) {
foreach ($inclusives as $inclusive) {
$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;

Expand Down
4 changes: 2 additions & 2 deletions app/Http/Controllers/Settings/Taxes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public function create()
{
$types = [
'normal' => trans('taxes.normal'),
'included' => trans('taxes.included'),
'inclusive' => trans('taxes.inclusive'),
'compound' => trans('taxes.compound'),
];

Expand Down Expand Up @@ -76,7 +76,7 @@ public function edit(Tax $tax)
{
$types = [
'normal' => trans('taxes.normal'),
'included' => trans('taxes.included'),
'inclusive' => trans('taxes.inclusive'),
'compound' => trans('taxes.compound'),
];

Expand Down
24 changes: 12 additions & 12 deletions app/Jobs/Expense/CreateBillItem.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,14 @@ public function handle()
$item_tax_total = 0;

if (!empty($this->data['tax_id'])) {
$includes = $compounds = $taxes = [];
$inclusives = $compounds = $taxes = [];

foreach ((array) $this->data['tax_id'] as $tax_id) {
$tax = Tax::find($tax_id);

switch ($tax->type) {
case 'included':
$includes[] = $tax;
$inclusives[] = $tax;
break;
case 'compound':
$compounds[] = $tax;
Expand All @@ -102,7 +102,7 @@ public function handle()
}
}

if ($includes) {
if ($inclusives) {
if ($this->discount) {
$item_tax_total = 0;

Expand All @@ -114,34 +114,34 @@ public function handle()
}
}

foreach ($includes as $include) {
foreach ($inclusives as $inclusive) {
$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_taxes[] = [
'company_id' => $this->bill->company_id,
'bill_id' => $this->bill->id,
'tax_id' => $include->id,
'name' => $include->name,
'tax_id' => $inclusive->id,
'name' => $inclusive->name,
'amount' => $tax_amount,
];

$item_discount_amount = $item_sub_total - ($item_sub_total * ($this->discount / 100));
}
} else {
foreach ($includes as $include) {
foreach ($inclusives as $inclusive) {
$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[] = [
'company_id' => $this->bill->company_id,
'bill_id' => $this->bill->id,
'tax_id' => $include->id,
'name' => $include->name,
'tax_id' => $inclusive->id,
'name' => $inclusive->name,
'amount' => $tax_amount,
];

Expand Down Expand Up @@ -183,7 +183,7 @@ public function handle()
if (!empty($this->data['tax_id'])) {
// set item_taxes for
$bill_item->item_taxes = $item_taxes;
$bill_item->includes = $includes;
$bill_item->inclusive = $inclusives;
$bill_item->compounds = $compounds;
}

Expand Down
26 changes: 13 additions & 13 deletions app/Jobs/Income/CreateInvoiceItem.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,14 +98,14 @@ public function handle()
$item_tax_total = 0;

if (!empty($this->data['tax_id'])) {
$includes = $compounds = $taxes = [];
$inclusives = $compounds = $taxes = [];

foreach ((array) $this->data['tax_id'] as $tax_id) {
$tax = Tax::find($tax_id);

switch ($tax->type) {
case 'included':
$includes[] = $tax;
case 'inclusive':
$inclusives[] = $tax;
break;
case 'compound':
$compounds[] = $tax;
Expand All @@ -129,7 +129,7 @@ public function handle()
}
}

if ($includes) {
if ($inclusives) {
if ($this->discount) {
$item_tax_total = 0;

Expand All @@ -141,34 +141,34 @@ public function handle()
}
}

foreach ($includes as $include) {
foreach ($inclusives as $inclusive) {
$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_taxes[] = [
'company_id' => $this->invoice->company_id,
'invoice_id' => $this->invoice->id,
'tax_id' => $include->id,
'name' => $include->name,
'tax_id' => $inclusive->id,
'name' => $inclusive->name,
'amount' => $tax_amount,
];

$item_discount_amount = $item_sub_total - ($item_sub_total * ($this->discount / 100));
}
} else {
foreach ($includes as $include) {
foreach ($inclusives as $inclusive) {
$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[] = [
'company_id' => $this->invoice->company_id,
'invoice_id' => $this->invoice->id,
'tax_id' => $include->id,
'name' => $include->name,
'tax_id' => $inclusive->id,
'name' => $inclusive->name,
'amount' => $tax_amount,
];

Expand Down Expand Up @@ -210,7 +210,7 @@ public function handle()
if (!empty($this->data['tax_id'])) {
// set item_taxes for
$invoice_item->item_taxes = $item_taxes;
$invoice_item->includes = $includes;
$invoice_item->inclusives = $inclusives;
$invoice_item->compounds = $compounds;
}

Expand Down
2 changes: 1 addition & 1 deletion resources/lang/en-GB/taxes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
'rate' => 'Rate',
'rate_percent' => 'Rate (%)',
'normal' => 'Normal',
'included' => 'Included in Price',
'inclusive' => 'Inclusive',
'compound' => 'Compound',

];
2 changes: 1 addition & 1 deletion resources/views/settings/taxes/edit.blade.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

{{ 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')) }}
</div>
Expand Down

0 comments on commit 86330b0

Please sign in to comment.