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

fixed tax_ids check

Browse Source
This commit is contained in:
Denis Duliçi
2020-12-14 16:04:54 +03:00
parent 348e957735
commit 92715de2d0
3 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/Jobs/Common/CreateItemTaxes.php
View File

@ -26,26 +26,26 @@ class CreateItemTaxes extends Job
/** /**
* Execute the job. * Execute the job.
* *
* @return Item * @return mixed
*/ */
public function handle() public function handle()
{ {
// BC for 2.0 version
if (!empty($this->request['tax_id'])) {
$this->request['tax_ids'][] = $this->request['tax_id'];
}
if (empty($this->request['tax_ids'])) {
return false;
}
\DB::transaction(function () { \DB::transaction(function () {
// This controller for BC < 2.1 foreach ($this->request['tax_ids'] as $tax_id) {
if (!empty($this->request['tax_id'])) {
ItemTax::create([ ItemTax::create([
'company_id' => $this->item->company_id, 'company_id' => $this->item->company_id,
'item_id' => $this->item->id, 'item_id' => $this->item->id,
'tax_id' => $this->request['tax_id'] 'tax_id' => $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
]);
}
} }
}); });

1
database/factories/Item.php
View File

@ -28,7 +28,6 @@ class Item extends Factory
'purchase_price' => $this->faker->randomFloat(2, 10, 20), 'purchase_price' => $this->faker->randomFloat(2, 10, 20),
'sale_price' => $this->faker->randomFloat(2, 10, 20), 'sale_price' => $this->faker->randomFloat(2, 10, 20),
'category_id' => $this->company->categories()->item()->get()->random(1)->pluck('id')->first(), 'category_id' => $this->company->categories()->item()->get()->random(1)->pluck('id')->first(),
'tax_ids' => [],
'enabled' => $this->faker->boolean ? 1 : 0, 'enabled' => $this->faker->boolean ? 1 : 0,
]; ];
} }

13
tests/Feature/Common/ItemsTest.php
View File

@ -34,7 +34,7 @@ class ItemsTest extends FeatureTestCase
$this->assertFlashLevel('success'); $this->assertFlashLevel('success');
$this->assertDatabaseHas('items', $this->getAssertRequest($request)); $this->assertDatabaseHas('items', $request);
} }
public function testItShouldSeeItemUpdatePage() public function testItShouldSeeItemUpdatePage()
@ -64,7 +64,7 @@ class ItemsTest extends FeatureTestCase
$this->assertFlashLevel('success'); $this->assertFlashLevel('success');
$this->assertDatabaseHas('items', $this->getAssertRequest($request)); $this->assertDatabaseHas('items', $request);
} }
public function testItShouldDeleteItem() public function testItShouldDeleteItem()
@ -79,18 +79,11 @@ class ItemsTest extends FeatureTestCase
$this->assertFlashLevel('success'); $this->assertFlashLevel('success');
$this->assertSoftDeleted('items', $this->getAssertRequest($request)); $this->assertSoftDeleted('items', $request);
} }
public function getRequest() public function getRequest()
{ {
return Item::factory()->enabled()->raw(); return Item::factory()->enabled()->raw();
} }
public function getAssertRequest($request)
{
unset($request['tax_ids']);
return $request;
}
} }