diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php
index 75767fb0..00ddfa48 100644
--- a/app/Helpers/helpers.php
+++ b/app/Helpers/helpers.php
@@ -1,5 +1,7 @@
merge($reserved)->toJson();
}
}
+if(!function_exists('help_topics')){
+ function help_topics(){
+ return HelpTopic::where('active',1)
+ ->select(['id','title_'.config('app.locale').' as title'])
+ ->orderBy('position','asc')
+ ->pluck('title','id');
+ }
+}
diff --git a/app/Http/Controllers/Admin/HelpTicketCategoryCrudController.php b/app/Http/Controllers/Admin/HelpTopicCrudController.php
similarity index 86%
rename from app/Http/Controllers/Admin/HelpTicketCategoryCrudController.php
rename to app/Http/Controllers/Admin/HelpTopicCrudController.php
index 3b819d01..30481efe 100644
--- a/app/Http/Controllers/Admin/HelpTicketCategoryCrudController.php
+++ b/app/Http/Controllers/Admin/HelpTopicCrudController.php
@@ -14,7 +14,7 @@ use Backpack\CRUD\CrudPanel;
* @package App\Http\Controllers\Admin
* @property-read CrudPanel $crud
*/
-class HelpTicketCategoryCrudController extends CrudController
+class HelpTopicCrudController extends CrudController
{
public function setup()
{
@@ -23,9 +23,9 @@ class HelpTicketCategoryCrudController extends CrudController
| CrudPanel Basic Information
|--------------------------------------------------------------------------
*/
- $this->crud->setModel('App\Models\HelpTicketCategory');
- $this->crud->setRoute(config('backpack.base.route_prefix') . '/helpTicketCategory');
- $this->crud->setEntityNameStrings('help ticket category', 'help ticket categories');
+ $this->crud->setModel('App\Models\HelpTopic');
+ $this->crud->setRoute(config('backpack.base.route_prefix') . '/helpTopic');
+ $this->crud->setEntityNameStrings('help topic', 'help topics');
/*
|--------------------------------------------------------------------------
@@ -33,7 +33,6 @@ class HelpTicketCategoryCrudController extends CrudController
|--------------------------------------------------------------------------
*/
- // TODO: remove setFromDb() and manually define Fields and Columns
// $this->crud->setFromDb();
$this->crud->setColumns([
['name' => 'position','label'=>'Order Position','type'=>'number'],
@@ -44,8 +43,8 @@ class HelpTicketCategoryCrudController extends CrudController
$this->crud->addFields([
['name' => 'title_tk','label'=>'Title Turkmen','type'=>'text'],
+ ['name' => 'title_ru','label'=>'Title Russian','type'=>'text'],
['name' => 'position','label'=>'Order Position','type'=>'number'],
- ['name' => 'title_ru','label'=>'Title Russioan','type'=>'text'],
['name' => 'active', 'label' => 'Active', 'type' => 'checkbox']
]);
// add asterisk for fields that are required in HelpTicletCategoryRequest
diff --git a/app/Http/Controllers/HelpDeskController.php b/app/Http/Controllers/HelpDeskController.php
index 161744b8..2a48eda3 100644
--- a/app/Http/Controllers/HelpDeskController.php
+++ b/app/Http/Controllers/HelpDeskController.php
@@ -4,7 +4,7 @@
namespace App\Http\Controllers;
-use App\Models\HelpTicketCategory;
+use App\Models\HelpTopic;
class HelpDeskController extends Controller
{
@@ -18,13 +18,7 @@ class HelpDeskController extends Controller
*/
public function create(){
- $categories = HelpTicketCategory::where('active',1)
- ->select(['id','title_'.config('app.locale').' as title'])
- ->orderBy('position','asc')
- ->pluck('title','id');
-// dump($categories);
-
- return $this->render('Pages.HelpDeskCreateForm',$categories);
+ return $this->render('Pages.HelpDeskCreateForm');
}
public function store(){
diff --git a/app/Models/HelpTicket.php b/app/Models/HelpTicket.php
index 6341641e..276a4ff3 100644
--- a/app/Models/HelpTicket.php
+++ b/app/Models/HelpTicket.php
@@ -36,7 +36,7 @@ class HelpTicket extends Model
*/
public function category(){
- return $this->belongsTo(HelpTicketCategory::class,'ticket_category_id');
+ return $this->belongsTo(HelpTopic::class,'ticket_category_id');
}
public function comments(){
diff --git a/app/Models/HelpTicketCategory.php b/app/Models/HelpTopic.php
similarity index 97%
rename from app/Models/HelpTicketCategory.php
rename to app/Models/HelpTopic.php
index 9d331042..8b0b5ea7 100644
--- a/app/Models/HelpTicketCategory.php
+++ b/app/Models/HelpTopic.php
@@ -5,7 +5,7 @@ namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Backpack\CRUD\CrudTrait;
-class HelpTicketCategory extends Model
+class HelpTopic extends Model
{
use CrudTrait;
diff --git a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php
index 3cfaf259..5503f68d 100644
--- a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php
+++ b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php
@@ -23,7 +23,7 @@
{!! Form::label('category', trans("ClientSide.category"), array('class'=>'control-label')) !!}
- {!! Form::select('category',$categories->pluck('id','title'), old('category'), ['class' => 'form-control','id'=>'category']) !!}
+ {!! Form::select('category',help_topics(), old('category'), ['class' => 'form-control','id'=>'category']) !!}