From 55b09c9741549cb95f18e299c7f287c6b271992b Mon Sep 17 00:00:00 2001 From: denisdulici Date: Fri, 29 Sep 2017 23:32:51 +0300 Subject: [PATCH] fixed #30 --- app/Models/Item/Item.php | 17 ++++++++++++++++- resources/views/items/items/index.blade.php | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/app/Models/Item/Item.php b/app/Models/Item/Item.php index 42f218240..65f3cbc65 100644 --- a/app/Models/Item/Item.php +++ b/app/Models/Item/Item.php @@ -26,7 +26,7 @@ class Item extends Model * * @var array */ - protected $sortable = ['name', 'category_id', 'quantity', 'sale_price', 'purchase_price', 'enabled']; + protected $sortable = ['name', 'category', 'quantity', 'sale_price', 'purchase_price', 'enabled']; /** * Searchable rules. @@ -116,4 +116,19 @@ class Item extends Model return $query->get(); } + + /** + * Sort by category name + * + * @param \Illuminate\Database\Eloquent\Builder $query + * @param $direction + * + * @return \Illuminate\Database\Eloquent\Builder + */ + public function categorySortable($query, $direction) + { + return $query->join('categories', 'categories.id', '=', 'items.category_id') + ->orderBy('name', $direction) + ->select('items.*'); + } } diff --git a/resources/views/items/items/index.blade.php b/resources/views/items/items/index.blade.php index 8b9c62e44..18f1226a4 100644 --- a/resources/views/items/items/index.blade.php +++ b/resources/views/items/items/index.blade.php @@ -34,7 +34,7 @@ {{ trans_choice('general.pictures', 1) }} @sortablelink('name', trans('general.name')) - @sortablelink('category.name', trans_choice('general.categories', 1)) + @sortablelink('category', trans_choice('general.categories', 1)) @sortablelink('quantity', trans_choice('items.quantities', 1)) @sortablelink('sale_price', trans('items.sales_price')) @sortablelink('purchase_price', trans('items.purchase_price'))