cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.10.1 build updates

Browse Source 
- Fixed API issues
- Updated release notes and readme files
- Updated dummy database files
- dumped composer to with --no-dev to ignore dev dependency

- ignored tests directory and phpunit.xml while downloading compressed archives of the repo
This commit is contained in:
Manish Verma
2018-09-19 14:07:25 +05:30
committed by Manish Verma
parent 97e45c8a9f
commit 00a7111421
6 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Api/v1/ApiController.php
View File

@@ -359,7 +359,7 @@ class ApiController extends Controller
->leftJoin('ticket_attachment', 'ticket_attachment.thread_id', '=', 'ticket_thread.id');
if ($user->role == 'agent') {
$id = $user->id;
$dept = \DB::table('department_assign_agents')->where('agent_id', '=', $id)->pluck('department_id')->toArray();
$dept[] = $user->primary_dpt;
$unassigned = $unassigned->where(function ($query) use ($dept, $id) {
$query->whereIn('tickets.dept_id', $dept)
->orWhere('assigned_to', '=', $id);
@@ -412,7 +412,7 @@ class ApiController extends Controller
->leftJoin('ticket_attachment', 'ticket_attachment.thread_id', '=', 'ticket_thread.id');
if ($user->role == 'agent') {
$id = $user->id;
$dept = \DB::table('department_assign_agents')->where('agent_id', '=', $id)->pluck('department_id')->toArray();
$dept[] = $user->primary_dpt;
$result = $result->where(function ($query) use ($dept, $id) {
$query->whereIn('tickets.dept_id', $dept)
->orWhere('assigned_to', '=', $id);
@@ -977,7 +977,7 @@ class ApiController extends Controller
->where('ticket_status.name', 'Open');
if ($user->role == 'agent') {
$id = $user->id;
$dept = \DB::table('department_assign_agents')->where('agent_id', '=', $id)->pluck('department_id')->toArray();
$dept[] = $user->primary_dpt;
$inbox = $inbox->where(function ($query) use ($dept, $id) {
$query->whereIn('tickets.dept_id', $dept)
->orWhere('assigned_to', '=', $id);
@@ -1061,7 +1061,7 @@ class ApiController extends Controller
->leftJoin('ticket_attachment', 'ticket_attachment.thread_id', '=', 'ticket_thread.id');
if ($user->role == 'agent') {
$id = $user->id;
$dept = \DB::table('department_assign_agents')->where('agent_id', '=', $id)->pluck('department_id')->toArray();
$dept[] = $user->primary_dpt;
$trash = $trash->where(function ($query) use ($dept, $id) {
$query->whereIn('tickets.dept_id', $dept)
->orWhere('assigned_to', '=', $id);
@@ -1432,7 +1432,7 @@ class ApiController extends Controller
$tickets = \DB::table('tickets');
if ($user->role == 'agent') {
$id = $user->id;
$dept = DepartmentAssignAgents::where('agent_id', '=', $id)->pluck('department_id')->toArray();
$dept[] = $user->primary_dpt;
$tickets = $tickets->whereIn('tickets.dept_id', $dept)->orWhere('assigned_to', '=', $user->id);
}
$department = $this->department->select('name', 'id')->get()->toArray();