Merge Branch

This commit is contained in:
Sada Shiva
2016-02-02 18:39:22 +05:30
parent a302235274
commit 11f4b086b7
20 changed files with 542 additions and 78 deletions

View File

@@ -27,6 +27,7 @@ use App\Model\helpdesk\Utility\Time_format;
use Illuminate\Http\Request;
use Input;
use Exception;
use DB;
/**
* SettingsController
@@ -54,7 +55,25 @@ class SettingsController extends Controller {
public function settings() {
return view('themes.default1.admin.helpdesk.setting');
}
public function RatingSettings() {
$ratings = DB::table('settings_ratings')->get();
return view('themes.default1.admin.helpdesk.settings.ratings',compact('ratings'));
}
public function PostRatingSettings($slug) {
$name = Input::get('rating_name');
$publish = Input::get('publish');
$modify = Input::get('modify');
DB::table('settings_ratings')->whereSlug($slug)->update(array('rating_name' => $name,'publish' => $publish, 'modify' => $modify));
return redirect()->back()->with('success', 'Successfully updated');
}
public function RatingDelete($slug) {
DB::table('settings_ratings')->whereSlug($slug)->delete();
return redirect()->back()->with('success', 'Successfully Deleted');
}
/**
* @param int $id
* @return Response

View File

@@ -2182,5 +2182,15 @@ class TicketController extends Controller {
return view('themes.default1.agent.helpdesk.dept-ticket.inprogress',compact('id'));
}
}
public function rating($id,$rating) {
Tickets::where('id', $id)->update(array('rating' => $rating));
return redirect()->back()->with('Success','Thank you for your rating!');
}
public function ratingReply($id,$rating) {
Tickets::where('id', $id)->update(array('ratingreply' => $rating));
return redirect()->back()->with('Success','Thank you for your rating!');
}
}

View File

@@ -1,6 +1,6 @@
<?php
"%smtplink%";
\App\Http\Controllers\Common\SettingsController::smtp();
/*
|--------------------------------------------------------------------------
@@ -178,7 +178,7 @@ Route::group(['middleware' => 'role.agent', 'middleware' => 'auth'], function ()
Route::get('agen1', 'Agent\helpdesk\DashboardController@ChartData');
Route::post('chart-range', ['as' => 'post.chart', 'uses' => 'Agent\helpdesk\DashboardController@ChartData']);
Route::post('chart-range/{date1}/{date2}', ['as' => 'post.chart', 'uses' => 'Agent\helpdesk\DashboardController@ChartData']);
Route::resource('user', 'Agent\helpdesk\UserController'); /* User router is used to control the CRUD of user */
@@ -216,7 +216,11 @@ Route::group(['middleware' => 'role.agent', 'middleware' => 'auth'], function ()
Route::get('/test', ['as' => 'thr', 'uses' => 'Agent\helpdesk\MailController@fetchdata']); /* Fetch Emails */
Route::get('/ticket', ['as' => 'ticket', 'uses' => 'Agent\helpdesk\TicketController@ticket_list']); /* Get Ticket */
Route::post('rating/{id}/{rating}', ['as' => 'ticket.rating' , 'uses' => 'Agent\helpdesk\TicketController@rating']); /* Get overall Ratings */
Route::post('rating2/{id}/{rating}', ['as' => 'ticket.rating2' , 'uses' => 'Agent\helpdesk\TicketController@ratingReply']); /* Get reply Ratings */
Route::get('/ticket', ['as' => 'ticket', 'uses' => 'Agent\helpdesk\TicketController@ticket_list']); /* Get Ticket */
Route::get('/ticket/inbox', ['as' => 'inbox.ticket', 'uses' => 'Agent\helpdesk\TicketController@inbox_ticket_list']); /* Get Inbox Ticket */
@@ -529,6 +533,12 @@ $router->get('test', 'ArticleController@test');
$router->post('image', 'Agent\kb\SettingsController@image');
Route::get('getratings', 'Admin\helpdesk\SettingsController@RatingSettings');
Route::get('deleter/{rating}',[
'as'=>'ratings.delete' ,'uses'=>'Admin\helpdesk\SettingsController@RatingDelete'
]);
Route::patch('postratings/{slug}',['as'=>'settings.rating','uses'=> 'Admin\helpdesk\SettingsController@PostRatingSettings']);
$router->get('direct', function () {
return view('direct');
});