Skip to content

Commit

Permalink
Bill item tax multible files added
Browse files Browse the repository at this point in the history
  • Loading branch information
@cuneytsenturk
cuneytsenturk committed Oct 22, 2018
1 parent 8fcfccc commit dedcb94
Show file tree
Hide file tree
Showing 8 changed files with 277 additions and 58 deletions.
128 changes: 83 additions & 45 deletions app/Http/Controllers/Expenses/Bills.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ public function store(Request $request)

if ($request['item']) {
foreach ($request['item'] as $item) {
unset($tax_object);
$item_sku = '';

if (!empty($item['item_id'])) {
Expand All @@ -183,18 +182,32 @@ public function store(Request $request)
$item_object->save();
}

$tax = $tax_id = 0;
$item_tax = 0;
$item_taxes = [];
$bill_item_taxes = [];

if (!empty($item['tax_id'])) {
$tax_object = Tax::find($item['tax_id']);
foreach ($item['tax_id'] as $tax_id) {
$tax_object = Tax::find($tax_id);

$item_taxes[] = $tax_id;

$tax_id = $item['tax_id'];
$tax = (((double) $item['price'] * (double) $item['quantity']) / 100) * $tax_object->rate;

// Apply discount to tax
if ($discount) {
$tax = $tax - ($tax * ($discount / 100));
}

$tax = (((double) $item['price'] * (double) $item['quantity']) / 100) * $tax_object->rate;
$bill_item_taxes[] = [
'company_id' => $request['company_id'],
'bill_id' => $bill->id,
'tax_id' => $tax_id,
'name' => $tax_object->name,
'amount' => $tax,
];

// Apply discount to tax
if ($discount) {
$tax = $tax - ($tax * ($discount / 100));
$item_tax += $tax;
}
}

Expand All @@ -203,29 +216,33 @@ public function store(Request $request)
$bill_item['sku'] = $item_sku;
$bill_item['quantity'] = (double) $item['quantity'];
$bill_item['price'] = (double) $item['price'];
$bill_item['tax'] = $tax;
$bill_item['tax_id'] = $tax_id;
$bill_item['tax'] = $item_tax;
$bill_item['tax_id'] = 0;//$tax_id;
$bill_item['total'] = (double) $item['price'] * (double) $item['quantity'];

BillItem::create($bill_item);
$bill_item_created = BillItem::create($bill_item);

// Set taxes
if (isset($tax_object)) {
if (isset($taxes) && array_key_exists($tax_object->id, $taxes)) {
$taxes[$tax_object->id]['amount'] += $tax;
} else {
$taxes[$tax_object->id] = [
'name' => $tax_object->name,
'amount' => $tax
];
if ($bill_item_taxes) {
foreach ($bill_item_taxes as $bill_item_tax) {
$bill_item_tax['invoice_item_id'] = $bill_item_created->id;

BillItemTax::create($bill_item_tax);

// Set taxes
if (isset($taxes) && array_key_exists($bill_item_tax['tax_id'], $taxes)) {
$taxes[$bill_item_tax['tax_id']]['amount'] += $bill_item_tax['amount'];
} else {
$taxes[$bill_item_tax['tax_id']] = [
'name' => $bill_item_tax['name'],
'amount' => $bill_item_tax['amount']
];
}
}
}

// Calculate totals
$tax_total += $tax;
$tax_total += $item_tax;
$sub_total += $bill_item['total'];

unset($tax_object);
}
}

Expand Down Expand Up @@ -398,18 +415,32 @@ public function update(Bill $bill, Request $request)
$item_sku = $item_object->sku;
}

$tax = $tax_id = 0;
$item_tax = 0;
$item_taxes = [];
$bill_item_taxes = [];

if (!empty($item['tax_id'])) {
$tax_object = Tax::find($item['tax_id']);
foreach ($item['tax_id'] as $tax_id) {
$tax_object = Tax::find($tax_id);

$tax_id = $item['tax_id'];
$item_taxes[] = $tax_id;

$tax = (((double) $item['price'] * (double) $item['quantity']) / 100) * $tax_object->rate;
$tax = (((double) $item['price'] * (double) $item['quantity']) / 100) * $tax_object->rate;

// Apply discount to tax
if ($discount) {
$tax = $tax - ($tax * ($discount / 100));
}

// Apply discount to tax
if ($discount) {
$tax = $tax - ($tax * ($discount / 100));
$bill_item_taxes[] = [
'company_id' => $request['company_id'],
'bill_id' => $bill->id,
'tax_id' => $tax_id,
'name' => $tax_object->name,
'amount' => $tax,
];

$item_tax += $tax;
}
}

Expand All @@ -418,25 +449,32 @@ public function update(Bill $bill, Request $request)
$bill_item['sku'] = $item_sku;
$bill_item['quantity'] = (double) $item['quantity'];
$bill_item['price'] = (double) $item['price'];
$bill_item['tax'] = $tax;
$bill_item['tax_id'] = $tax_id;
$bill_item['tax'] = $item_tax;
$bill_item['tax_id'] = 0;//$tax_id;
$bill_item['total'] = (double) $item['price'] * (double) $item['quantity'];

if (isset($tax_object)) {
if (isset($taxes) && array_key_exists($tax_object->id, $taxes)) {
$taxes[$tax_object->id]['amount'] += $tax;
} else {
$taxes[$tax_object->id] = [
'name' => $tax_object->name,
'amount' => $tax
];
}
}

$tax_total += $tax;
$tax_total += $item_tax;
$sub_total += $bill_item['total'];

BillItem::create($bill_item);
$bill_item_created = BillItem::create($bill_item);

if ($bill_item_taxes) {
foreach ($bill_item_taxes as $bill_item_tax) {
$bill_item_tax['invoice_item_id'] = $bill_item_created->id;

BillItemTax::create($bill_item_tax);

// Set taxes
if (isset($taxes) && array_key_exists($bill_item_tax['tax_id'], $taxes)) {
$taxes[$bill_item_tax['tax_id']]['amount'] += $bill_item_tax['amount'];
} else {
$taxes[$bill_item_tax['tax_id']] = [
'name' => $bill_item_tax['name'],
'amount' => $bill_item_tax['amount']
];
}
}
}
}
}

Expand Down
5 changes: 5 additions & 0 deletions app/Models/Expense/Bill.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@ public function items()
return $this->hasMany('App\Models\Expense\BillItem');
}

public function itemTaxes()
{
return $this->hasMany('App\Models\Expense\BillItemTax');
}

public function payments()
{
return $this->hasMany('App\Models\Expense\BillPayment');
Expand Down
24 changes: 24 additions & 0 deletions app/Models/Expense/BillItem.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,11 @@ public function item()
return $this->belongsTo('App\Models\Common\Item');
}

public function itemTaxes()
{
return $this->hasMany('App\Models\Expense\BillItemTax', 'bill_item_id', 'id');
}

public function tax()
{
return $this->belongsTo('App\Models\Setting\Tax');
Expand Down Expand Up @@ -66,4 +71,23 @@ public function setTaxAttribute($value)
{
$this->attributes['tax'] = (double) $value;
}

/**
* Convert tax to double.
*
* @param string $value
* @return void
*/
public function getTaxIdAttribute($value)
{
$tax_ids = [];

if (!empty($value)) {
$tax_ids[] = $value;

return $tax_ids;
}

return $this->itemTaxes->pluck('tax_id');
}
}
47 changes: 47 additions & 0 deletions app/Models/Expense/BillItemTax.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?php

namespace App\Models\Expense;

use App\Models\Model;
use App\Traits\Currencies;

class BillItemTax extends Model
{

use Currencies;

protected $table = 'bill_item_taxes';

/**
* Attributes that should be mass-assignable.
*
* @var array
*/
protected $fillable = ['company_id', 'bill_id', 'bill_item_id', 'tax_id', 'name', 'amount'];

public function bill()
{
return $this->belongsTo('App\Models\Expense\Bill');
}

public function item()
{
return $this->belongsTo('App\Models\Common\Item');
}

public function tax()
{
return $this->belongsTo('App\Models\Setting\Tax');
}

/**
* Convert amount to double.
*
* @param string $value
* @return void
*/
public function setAmountAttribute($value)
{
$this->attributes['amount'] = (double) $value;
}
}
39 changes: 39 additions & 0 deletions database/migrations/2018_10_22_000000_create_bill_item_taxes_table.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;

class CreateBillItemTaxesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('bill_item_taxes', function (Blueprint $table) {
$table->increments('id');
$table->integer('company_id');
$table->integer('bill_id');
$table->integer('bill_item_id');
$table->integer('tax_id');
$table->string('name');
$table->double('amount', 15, 4)->default('0.0000');
$table->timestamps();
$table->softDeletes();

$table->index('company_id');
});
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::drop('bill_item_taxes');
}
}

0 comments on commit dedcb94

Please sign in to comment.