From d7a77db621f6d4e2b3ccd35988604b31469adb24 Mon Sep 17 00:00:00 2001 From: sujitprasad Date: Wed, 2 Dec 2015 15:21:33 +0530 Subject: [PATCH] update version 1.0.2.1 --- code/.gitignore | 2 + .../Admin/helpdesk/SettingsController.php | 2 +- .../Agent/helpdesk/TicketController.php | 1 - .../Agent/kb/ArticleController.php | 21 +++-- .../Agent/kb/CategoryController.php | 45 ++++++---- .../Controllers/Agent/kb/PageController.php | 15 ++-- .../Installer/helpdesk/InstallController.php | 3 +- code/app/Http/Requests/kb/ArticleUpdate.php | 30 +++++++ code/app/Http/Requests/kb/CategoryUpdate.php | 30 +++++++ code/app/Http/Requests/kb/PageUpdate.php | 30 +++++++ code/app/Http/routes.php | 4 +- code/config/app.php | 2 +- code/config/database.php | 78 ++++++++++-------- ...5_05_01_100249_create_categories_table.php | 2 +- ...015_05_01_114710_create_articles_table.php | 2 +- ...015_05_06_060231_create_contacts_table.php | 2 +- .../2015_05_14_072226_create_pages_table.php | 2 +- ...09_105525_create_canned_response_table.php | 2 +- .../2015_11_02_063848_create_side_table.php | 4 +- code/resources/lang/en/lang.php | 38 ++++----- code/resources/views/auth/reset.blade.php | 4 +- .../views/emails/Ticket_Create.blade.php | 4 +- .../views/emails/check_ticket.blade.php | 2 +- code/resources/views/emails/pass.blade.php | 4 +- .../resources/views/emails/password.blade.php | 2 +- .../agent/kb/article/create.blade.php | 2 +- .../default1/agent/kb/article/edit.blade.php | 4 +- .../default1/agent/kb/category/edit.blade.php | 2 +- .../default1/agent/layout/agent.blade.php | 2 +- .../client/helpdesk/ckeckticket.blade.php | 15 ++-- .../default1/client/helpdesk/form.blade.php | 4 + .../helpdesk/guest-user/index.blade.php | 14 +++- .../client/helpdesk/mytickets.blade.php | 4 + .../client/kb/article-list/articles.blade.php | 4 + .../client/kb/article-list/category.blade.php | 4 + .../kb/article-list/categoryList.blade.php | 4 + .../client/kb/article-list/home.blade.php | 11 ++- .../client/kb/article-list/show.blade.php | 10 ++- .../default1/client/layout/client.blade.php | 16 +++- lb-faveo/Img/Ladybird.png | Bin 26398 -> 0 bytes lb-faveo/Img/icon/faveokb.png | Bin 385759 -> 0 bytes lb-faveo/dist/images/knowledgebase.png | Bin 0 -> 768 bytes lb-faveo/dist/images/news.png | Bin 0 -> 470 bytes lb-faveo/dist/images/submitticket.png | Bin 0 -> 726 bytes lb-faveo/dist/img/ladybird.ico | Bin 5430 -> 0 bytes lb-faveo/dist/img/ladybird.png | Bin 4091 -> 0 bytes 46 files changed, 295 insertions(+), 132 deletions(-) create mode 100644 code/.gitignore create mode 100644 code/app/Http/Requests/kb/ArticleUpdate.php create mode 100644 code/app/Http/Requests/kb/CategoryUpdate.php create mode 100644 code/app/Http/Requests/kb/PageUpdate.php delete mode 100644 lb-faveo/Img/Ladybird.png delete mode 100644 lb-faveo/Img/icon/faveokb.png create mode 100644 lb-faveo/dist/images/knowledgebase.png create mode 100644 lb-faveo/dist/images/news.png create mode 100644 lb-faveo/dist/images/submitticket.png delete mode 100644 lb-faveo/dist/img/ladybird.ico delete mode 100644 lb-faveo/dist/img/ladybird.png diff --git a/code/.gitignore b/code/.gitignore new file mode 100644 index 000000000..dc150eb5d --- /dev/null +++ b/code/.gitignore @@ -0,0 +1,2 @@ +/node_modules +.env diff --git a/code/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/code/app/Http/Controllers/Admin/helpdesk/SettingsController.php index b128551a3..45347f937 100644 --- a/code/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/code/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -78,7 +78,7 @@ class SettingsController extends Controller { $companys = $company->whereId('1')->first(); if (Input::file('logo')) { $name = Input::file('logo')->getClientOriginalName(); - $destinationPath = 'dist'; + $destinationPath = 'lb-faveo/dist/'; $fileName = rand(0000, 9999) . '.' . $name; Input::file('logo')->move($destinationPath, $fileName); $companys->logo = $fileName; diff --git a/code/app/Http/Controllers/Agent/helpdesk/TicketController.php b/code/app/Http/Controllers/Agent/helpdesk/TicketController.php index 6fff9bf2e..0977a9a20 100644 --- a/code/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/code/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -640,7 +640,6 @@ class TicketController extends Controller { } } - /** * Default helptopic * @return type string diff --git a/code/app/Http/Controllers/Agent/kb/ArticleController.php b/code/app/Http/Controllers/Agent/kb/ArticleController.php index 9a7d887d1..c3e02a653 100644 --- a/code/app/Http/Controllers/Agent/kb/ArticleController.php +++ b/code/app/Http/Controllers/Agent/kb/ArticleController.php @@ -5,6 +5,7 @@ use App\Http\Controllers\Agent\kb\SettingsController; use App\Http\Controllers\Client\kb\UserController; use App\Http\Controllers\Agent\helpdesk\TicketController; use App\Http\Requests\kb\ArticleRequest; +use App\Http\Requests\kb\ArticleUpdate; use App\Model\kb\Article; use App\Model\kb\Category; use App\Model\kb\Relationship; @@ -62,8 +63,8 @@ class ArticleController extends Controller { ->addColumn('Actions', function ($model) { //return 'id . ' class="btn btn-danger btn-flat" onclick="myFunction()">Delete id . '/edit class="btn btn-warning btn-flat">Edit id . ' class="btn btn-warning btn-flat">View'; //return '
id . '/edit class="btn btn-warning btn-flat">Edit id . ' class="btn btn-warning btn-flat">View'; - return ' slug . '/edit class="btn btn-warning btn-xs">' . \Lang::get('lang.edit') . ' slug .' class="btn btn-primary btn-xs">' . \Lang::get('lang.view') . ' -