master branch merge

This commit is contained in:
Cüneyt Şentürk
2020-05-29 14:04:34 +03:00
224 changed files with 3473 additions and 1549 deletions

View File

@ -50,7 +50,7 @@ class Items extends Controller
*/
public function create()
{
$categories = Category::type('item')->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');
@ -129,7 +129,7 @@ class Items extends Controller
*/
public function edit(Item $item)
{
$categories = Category::type('item')->enabled()->orderBy('name')->pluck('name', 'id');
$categories = Category::item()->enabled()->orderBy('name')->pluck('name', 'id');
$taxes = Tax::enabled()->orderBy('name')->get()->pluck('title', 'id');