update v1.0.7.9 R.C.

This is a Release Candidate. We are still testing.
This commit is contained in:
Sujit Prasad
2016-08-03 20:04:36 +05:30
parent 8b6b924d09
commit ffa56a43cb
3830 changed files with 181529 additions and 495353 deletions

View File

@@ -28,7 +28,6 @@ class Ticket2Controller extends Controller
*/
public function __construct()
{
SettingsController::smtp();
$this->middleware('auth');
}
@@ -51,6 +50,11 @@ class Ticket2Controller extends Controller
}
}
/**
* this function returns the list of open tickets of a particular department
* @param type $id
* @return type
*/
public function getOpenTickets($id)
{
if (Auth::user()->role == 'admin') {
@@ -59,7 +63,6 @@ class Ticket2Controller extends Controller
$dept = Department::where('id', '=', Auth::user()->primary_dpt)->first();
$tickets = Tickets::where('status', '=', 1)->where('isanswered', '=', 0)->where('dept_id', '=', $dept->id)->get();
}
return Ttable::getTable($tickets);
}
@@ -81,23 +84,27 @@ class Ticket2Controller extends Controller
return view('themes.default1.agent.helpdesk.dept-ticket.closed', compact('id'));
}
}
/**
* this function returns the list of close tickets of a particular department
* @param type $id
* @return type
*/
public function getCloseTickets($id)
{
if (Auth::user()->role == 'admin') {
$tickets = Tickets::where('status', '=', '2')->where('dept_id', '=', $id)->get();
$tickets = Tickets::where('status', '=', '2')->where('status', '=', '3')->where('dept_id', '=', $id)->get();
} else {
$dept = Department::where('id', '=', Auth::user()->primary_dpt)->first();
$tickets = Tickets::where('status', '=', '2')->where('dept_id', '=', $dept->id)->get();
$tickets = Tickets::where('status', '=', '2')->where('status', '=', '3')->where('dept_id', '=', $dept->id)->get();
}
return Ttable::getTable($tickets);
}
/**
* Show the Inbox ticket list page.
*
* @return type response
* this function returns the list of close tickets of a particular department
* @param type $id
* @return type
*/
public function deptinprogress($id)
{
@@ -129,4 +136,5 @@ class Ticket2Controller extends Controller
return Ttable::getTable($tickets);
}
}
}