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

Item multiple tax added

Browse Source
This commit is contained in:
Cüneyt Şentürk 2020-12-08 13:30:06 +03:00
parent 02e73f9ebe
commit 032555507b
9 changed files with 123 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Jobs/Common/CreateItem.php
View File

@ -4,6 +4,7 @@ namespace App\Jobs\Common;
use App\Abstracts\Job;
use App\Models\Common\Item;
use App\Jobs\Common\CreateItemTaxes;
class CreateItem extends Job
{
@ -37,6 +38,8 @@ class CreateItem extends Job
$this->item->attachMedia($media, 'picture');
}
$this->dispatch(new CreateItemTaxes($this->item, $this->request));
});
return $this->item;

54
app/Jobs/Common/CreateItemTaxes.php Normal file
View File

@ -0,0 +1,54 @@
<?php
namespace App\Jobs\Common;
use App\Abstracts\Job;
use App\Models\Common\ItemTax;
class CreateItemTaxes extends Job
{
protected $item;
protected $request;
/**
* Create a new job instance.
*
* @param $item
* @param $request
*/
public function __construct($item, $request)
{
$this->item = $item;
$this->request = $request;
}
/**
* Execute the job.
*
* @return Item
*/
public function handle()
{
\DB::transaction(function () {
// This controller for BC < 2.1
if (!empty($this->request['tax_id'])) {
ItemTax::create([
'company_id' => $this->item->company_id,
'item_id' => $this->item->id,
'tax_id' => $this->request['tax_id']
]);
} else {
foreach ($this->request['tax_ids'] as $tax_id) {
ItemTax::create([
'company_id' => $this->item->company_id,
'item_id' => $this->item->id,
'tax_id' => $tax_id
]);
}
}
});
return $this->item->taxes;
}
}

4
app/Jobs/Common/DeleteItem.php
View File

@ -28,6 +28,10 @@ class DeleteItem extends Job
$this->authorize();
\DB::transaction(function () {
$this->deleteRelationships($this->item, [
'taxes'
]);
$this->item->delete();
});

5
app/Jobs/Common/UpdateItem.php
View File

@ -4,6 +4,7 @@ namespace App\Jobs\Common;
use App\Abstracts\Job;
use App\Models\Common\Item;
use App\Jobs\Common\CreateItemTaxes;
class UpdateItem extends Job
{
@ -39,6 +40,10 @@ class UpdateItem extends Job
$this->item->attachMedia($media, 'picture');
}
$this->deleteRelationships($this->item, ['taxes']);
$this->dispatch(new CreateItemTaxes($this->item, $this->request));
});
return $this->item;

21
app/Models/Common/Item.php
View File

@ -26,7 +26,7 @@ class Item extends Model
*
* @var array
*/
protected $fillable = ['company_id', 'name', 'description', 'sale_price', 'purchase_price', 'category_id', 'tax_id', 'enabled'];
protected $fillable = ['company_id', 'name', 'description', 'sale_price', 'purchase_price', 'category_id', 'enabled'];
/**
* The attributes that should be cast.
@ -46,14 +46,19 @@ class Item extends Model
*/
protected $sortable = ['name', 'category', 'sale_price', 'purchase_price', 'enabled'];
/**
* @var array
*/
public $cloneable_relations = ['taxes'];
public function category()
{
return $this->belongsTo('App\Models\Setting\Category')->withDefault(['name' => trans('general.na')]);
}
public function tax()
public function taxes()
{
return $this->belongsTo('App\Models\Setting\Tax')->withDefault(['name' => trans('general.na'), 'rate' => 0]);
return $this->hasMany('App\Models\Common\ItemTax');
}
public function bill_items()
@ -81,6 +86,16 @@ class Item extends Model
return $this->id;
}
/**
* Get the item id.
*
* @return string
*/
public function getTaxIdsAttribute()
{
return $this->taxes()->pluck('tax_id');
}
/**
* Scope autocomplete.
*

25
app/Models/Common/ItemTax.php Normal file
View File

@ -0,0 +1,25 @@
<?php
namespace App\Models\Common;
use App\Abstracts\Model;
use Bkwld\Cloner\Cloneable;
class ItemTax extends Model
{
use Cloneable;
protected $table = 'item_taxes';
/**
* Attributes that should be mass-assignable.
*
* @var array
*/
protected $fillable = ['company_id', 'item_id', 'tax_id'];
public function tax()
{
return $this->belongsTo('App\Models\Setting\Tax')->withDefault(['name' => trans('general.na'), 'rate' => 0]);
}
}

12
database/migrations/2020_10_13_000000_core_v210.php
View File

@ -16,6 +16,17 @@ class CoreV210 extends Migration
Schema::table('failed_jobs', function (Blueprint $table) {
$table->string('uuid')->after('id')->nullable()->unique();
});
Schema::create('item_taxes', function (Blueprint $table) {
$table->increments('id');
$table->integer('company_id');
$table->integer('item_id');
$table->integer('tax_id');
$table->timestamps();
$table->softDeletes();
$table->index(['company_id', 'item_id']);
});
}
/**
@ -25,6 +36,7 @@ class CoreV210 extends Migration
*/
public function down()
{
Schema::drop('item_taxes');
//
}
}

2
resources/views/common/items/create.blade.php
View File

@ -19,7 +19,7 @@
<div class="row">
{{ Form::textGroup('name', trans('general.name'), 'tag') }}
{{ Form::selectAddNewGroup('tax_id', trans_choice('general.taxes', 1), 'percentage', $taxes, setting('default.tax'), ['path' => route('modals.taxes.create'), 'field' => ['key' => 'id', 'value' => 'title']]) }}
{{ Form::multiSelectAddNewGroup('tax_ids', trans_choice('general.taxes', 1), 'percentage', $taxes, [setting('default.tax')], ['path' => route('modals.taxes.create'), 'field' => ['key' => 'id', 'value' => 'title']]) }}
{{ Form::textareaGroup('description', trans('general.description')) }}

2
resources/views/common/items/edit.blade.php
View File

@ -20,7 +20,7 @@
<div class="row">
{{ Form::textGroup('name', trans('general.name'), 'tag') }}
{{ Form::selectAddNewGroup('tax_id', trans_choice('general.taxes', 1), 'percentage', $taxes, $item->tax_id, ['path' => route('modals.taxes.create'), 'field' => ['key' => 'id', 'value' => 'title']]) }}
{{ Form::multiSelectAddNewGroup('tax_ids', trans_choice('general.taxes', 1), 'percentage', $taxes, $item->tax_ids, ['path' => route('modals.taxes.create'), 'field' => ['key' => 'id', 'value' => 'title']]) }}
{{ Form::textareaGroup('description', trans('general.description')) }}