diff --git a/app/Api/v1/ApiController.php b/app/Api/v1/ApiController.php index 4fdba2cf5..43ef74024 100644 --- a/app/Api/v1/ApiController.php +++ b/app/Api/v1/ApiController.php @@ -1106,7 +1106,7 @@ class ApiController extends Controller return response()->json(compact('error')); } //$user = \JWTAuth::parseToken()->authenticate(); - $result = $this->user->join('tickets', function ($join) use ($id) { + $result = $this->user->join('tickets', function ($join) { $join->on('users.id', '=', 'tickets.assigned_to') ->where('status', '=', 1); //->where('user_id', '=', $id); diff --git a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php index 7162fbe55..42f4e926c 100644 --- a/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php +++ b/app/Http/Controllers/Agent/helpdesk/Filter/FilterController.php @@ -627,7 +627,7 @@ class FilterController extends Controller * * @param string $value * - * @var date string, date string $end + * @var date string, date string * * @return array of start and end date */ @@ -874,7 +874,7 @@ class FilterController extends Controller * * @param array $dates, builder $table, $column (type of filter based on which column is being chosen), $value * - * @var string (name of column), array $dates + * @var string (name of column), array * * @return builder */ diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index f4e198633..bd50dd1c5 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -626,8 +626,7 @@ class TicketController extends Controller public function create_user($emailadd, $username, $subject, $body, $phone, $phonecode, $mobile_number, $helptopic, $sla, $priority, $source, $headers, $dept, $assignto, $from_data, $auto_response, $status) { // define global variables - $email; - $username; + $unique = $emailadd; if (!$emailadd) { $unique = $mobile_number; @@ -1087,6 +1086,7 @@ class TicketController extends Controller $thread->body = $body; if ($thread->save()) { \Event::fire('ticket.details', ['ticket' => $thread]); //get the ticket details + return true; } } @@ -2037,6 +2037,7 @@ class TicketController extends Controller $ticket->lock_by = Auth::user()->id; $ticket->lock_at = date('Y-m-d H:i:s'); $ticket->save(); //ticket is available and lock ticket for new user + return 2; } } diff --git a/app/Http/Controllers/Agent/helpdesk/UserController.php b/app/Http/Controllers/Agent/helpdesk/UserController.php index b2760e758..cce38c8ca 100644 --- a/app/Http/Controllers/Agent/helpdesk/UserController.php +++ b/app/Http/Controllers/Agent/helpdesk/UserController.php @@ -81,7 +81,7 @@ class UserController extends Controller try { /* get all values in Sys_user */ - $table = \ Datatable::table() + $table = \Datatable::table() ->addColumn( Lang::get('lang.name'), Lang::get('lang.email'), diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index a1d64d8fd..a0be30f8e 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -89,8 +89,8 @@ class RouteServiceProvider extends ServiceProvider 'middleware' => ['web', 'installer'], 'namespace' => $this->namespace, ], function ($router) { - require base_path('routes/installer.php'); - }); + require base_path('routes/installer.php'); + }); } /** @@ -107,7 +107,7 @@ class RouteServiceProvider extends ServiceProvider 'namespace' => $this->namespace, 'prefix' => 'app/update', ], function ($router) { - require base_path('routes/update.php'); - }); + require base_path('routes/update.php'); + }); } }