Skip to content

Commit

Permalink
Merge pull request #3293 from ladybirdweb/analysis-Px30Eo
Browse files Browse the repository at this point in the history 
Apply fixes from StyleCI
  • Loading branch information
@bhanu2217
bhanu2217 authored Mar 31, 2020
2 parents 7c4aea7 + ebffc92 commit afe90f7
Show file tree
Hide file tree
Showing 75 changed files with 1,285 additions and 1,030 deletions.
153 changes: 111 additions & 42 deletions app/Api/v1/ApiController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,8 @@ public function ticketReply()
//dd($this->request->all());
try {
$v = \Validator::make($this->request->all(), [
'ticket_id' => 'required|exists:tickets,id',
'reply_content' => 'required',
'ticket_id' => 'required|exists:tickets,id',
'reply_content' => 'required',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -225,12 +225,12 @@ public function editTicket()
{
try {
$v = \Validator::make($this->request->all(), [
'ticket_id' => 'required|exists:tickets,id',
'subject' => 'required',
'sla_plan' => 'required|exists:sla_plan,id',
'help_topic' => 'required|exists:help_topic,id',
'ticket_source' => 'required|exists:ticket_source,id',
'ticket_priority' => 'required|exists:ticket_priority,priority_id',
'ticket_id' => 'required|exists:tickets,id',
'subject' => 'required',
'sla_plan' => 'required|exists:sla_plan,id',
'help_topic' => 'required|exists:help_topic,id',
'ticket_source' => 'required|exists:ticket_source,id',
'ticket_priority' => 'required|exists:ticket_priority,priority_id',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -262,7 +262,7 @@ public function deleteTicket()
{
try {
$v = \Validator::make($this->request->all(), [
'ticket_id' => 'required|exists:tickets,id',
'ticket_id' => 'required|exists:tickets,id',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -496,8 +496,8 @@ public function assignTicket()
{
try {
$v = \Validator::make($this->request->all(), [
'ticket_id' => 'required',
'user' => 'required',
'ticket_id' => 'required',
'user' => 'required',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -535,7 +535,7 @@ public function getCustomers()
{
try {
$v = \Validator::make($this->request->all(), [
'search' => 'required',
'search' => 'required',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -602,7 +602,7 @@ public function getCustomer()
{
try {
$v = \Validator::make($this->request->all(), [
'user_id' => 'required',
'user_id' => 'required',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -635,7 +635,7 @@ public function searchTicket()
{
try {
$v = \Validator::make($this->request->all(), [
'search' => 'required',
'search' => 'required',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -668,7 +668,7 @@ public function ticketThreads()
{
try {
$v = \Validator::make($this->request->all(), [
'id' => 'required',
'id' => 'required',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -708,7 +708,7 @@ public function checkUrl()
//dd($this->request);
try {
$v = \Validator::make($this->request->all(), [
'url' => 'required|url',
'url' => 'required|url',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -1013,9 +1013,9 @@ public function internalNote()
{
try {
$v = \Validator::make($this->request->all(), [
'user_id' => 'required|exists:users,id',
'ticket_id' => 'required|exists:tickets,id',
'body' => 'required',
'user_id' => 'required|exists:users,id',
'ticket_id' => 'required|exists:tickets,id',
'body' => 'required',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -1092,7 +1092,7 @@ public function getMyTicketsAgent()
{
try {
$v = \Validator::make($this->request->all(), [
'user_id' => 'required|exists:users,id',
'user_id' => 'required|exists:users,id',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -1123,7 +1123,24 @@ public function getMyTicketsAgent()
->leftJoin('ticket_attachment', 'ticket_attachment.thread_id', '=', 'ticket_thread.id')
->where('users.id', $id)
->select(
'ticket_priority.priority_color as priority_color', \DB::raw('substring_index(group_concat(ticket_thread.title order by ticket_thread.id asc) , ",", 1) as title'), 'tickets.duedate as overdue_date', \DB::raw('count(ticket_attachment.id) as attachment'), \DB::raw('max(ticket_thread.updated_at) as updated_at'), 'client.user_name', 'client.first_name', 'client.last_name', 'client.email', 'client.profile_pic', 'ticket_number', 'tickets.id', 'tickets.created_at', 'department.name as department_name', 'ticket_priority.priority as priotity_name', 'sla_plan.name as sla_plan_name', 'help_topic.topic as help_topic_name', 'ticket_status.name as ticket_status_name'
'ticket_priority.priority_color as priority_color',
\DB::raw('substring_index(group_concat(ticket_thread.title order by ticket_thread.id asc) , ",", 1) as title'),
'tickets.duedate as overdue_date',
\DB::raw('count(ticket_attachment.id) as attachment'),
\DB::raw('max(ticket_thread.updated_at) as updated_at'),
'client.user_name',
'client.first_name',
'client.last_name',
'client.email',
'client.profile_pic',
'ticket_number',
'tickets.id',
'tickets.created_at',
'department.name as department_name',
'ticket_priority.priority as priotity_name',
'sla_plan.name as sla_plan_name',
'help_topic.topic as help_topic_name',
'ticket_status.name as ticket_status_name'
)
->orderBy('updated_at', 'desc')
->groupby('tickets.id')
Expand All @@ -1149,7 +1166,7 @@ public function getMyTicketsUser()
{
try {
$v = \Validator::make($this->request->all(), [
'user_id' => 'required|exists:users,id',
'user_id' => 'required|exists:users,id',
]);
if ($v->fails()) {
$error = $v->errors();
Expand All @@ -1166,7 +1183,20 @@ public function getMyTicketsUser()
->leftJoin('user_assign_organization', 'users.id', '=', 'user_assign_organization.user_id')
->leftJoin('organization', 'user_assign_organization.org_id', '=', 'organization.id')
->select(
'users.first_name', 'users.last_name', 'users.user_name', 'users.email', 'users.id', 'users.profile_pic', 'users.ban', 'users.active', 'users.is_delete', 'users.phone_number', 'users.ext', 'users.country_code', 'users.mobile', 'organization.name as company'
'users.first_name',
'users.last_name',
'users.user_name',
'users.email',
'users.id',
'users.profile_pic',
'users.ban',
'users.active',
'users.is_delete',
'users.phone_number',
'users.ext',
'users.country_code',
'users.mobile',
'organization.name as company'
)->first()->toArray();
$result = $this->user->join('tickets', function ($join) use ($id) {
$join->on('users.id', '=', 'tickets.user_id')
Expand Down Expand Up @@ -1206,7 +1236,7 @@ public function getTicketById()
{
try {
$v = \Validator::make($this->request->all(), [
'ticket_id' => 'required|exists:tickets,id',
'ticket_id' => 'required|exists:tickets,id',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -1234,7 +1264,39 @@ public function getTicketById()
//$select = 'users.email','users.user_name','users.first_name','users.last_name','tickets.id','ticket_number','num_sequence','user_id','priority_id','sla','max_open_ticket','captcha','status','lock_by','lock_at','source','isoverdue','reopened','isanswered','is_deleted', 'closed','is_transfer','transfer_at','reopened_at','duedate','closed_at','last_message_at';

$result = $response->addSelect(
'users.email', 'users.user_name', 'users.first_name', 'users.last_name', 'tickets.id', 'ticket_number', 'user_id', 'ticket_priority.priority_id', 'ticket_priority.priority as priority_name', 'department.name as dept_name', 'ticket_status.name as status_name', 'sla_plan.name as sla_name', 'ticket_source.name as source_name', 'sla_plan.id as sla', 'ticket_status.id as status', 'lock_by', 'lock_at', 'ticket_source.id as source', 'isoverdue', 'reopened', 'isanswered', 'is_deleted', 'closed', 'reopened_at', 'duedate', 'closed_at', 'tickets.created_at', 'tickets.updated_at', 'ticket_priority.priority_color as priority_color', 'help_topic.id as helptopic_id', 'help_topic.topic as helptopic_name', 'sla_plan.grace_period as grace_period')->first();
'users.email',
'users.user_name',
'users.first_name',
'users.last_name',
'tickets.id',
'ticket_number',
'user_id',
'ticket_priority.priority_id',
'ticket_priority.priority as priority_name',
'department.name as dept_name',
'ticket_status.name as status_name',
'sla_plan.name as sla_name',
'ticket_source.name as source_name',
'sla_plan.id as sla',
'ticket_status.id as status',
'lock_by',
'lock_at',
'ticket_source.id as source',
'isoverdue',
'reopened',
'isanswered',
'is_deleted',
'closed',
'reopened_at',
'duedate',
'closed_at',
'tickets.created_at',
'tickets.updated_at',
'ticket_priority.priority_color as priority_color',
'help_topic.id as helptopic_id',
'help_topic.topic as helptopic_name',
'sla_plan.grace_period as grace_period'
)->first();
// $resultticket_source
$result2 = $result;
$result = $result->toArray();
Expand Down Expand Up @@ -1344,10 +1406,12 @@ public function avatarUrl($email)
public function addCollaboratorForTicket()
{
try {
$v = \Validator::make(\Input::get(), [
'email' => 'required|email|unique:users',
'ticket_id' => 'required',
]
$v = \Validator::make(
\Input::get(),
[
'email' => 'required|email|unique:users',
'ticket_id' => 'required',
]
);
if ($v->fails()) {
$error = $v->messages();
Expand Down Expand Up @@ -1375,9 +1439,11 @@ public function addCollaboratorForTicket()
public function getCollaboratorForTicket()
{
try {
$v = \Validator::make(\Input::get(), [
'ticket_id' => 'required',
]
$v = \Validator::make(
\Input::get(),
[
'ticket_id' => 'required',
]
);
if ($v->fails()) {
$error = $v->messages();
Expand Down Expand Up @@ -1405,10 +1471,12 @@ public function getCollaboratorForTicket()
public function deleteCollaborator()
{
try {
$v = \Validator::make(\Input::get(), [
'ticketid' => 'required',
'email' => 'required',
]
$v = \Validator::make(
\Input::get(),
[
'ticketid' => 'required',
'email' => 'required',
]
);
if ($v->fails()) {
$result = $v->messages();
Expand Down Expand Up @@ -1538,8 +1606,8 @@ public function register(Request $request)
{
try {
$v = \Validator::make($request->all(), [
'email' => 'required|email|unique:users',
'password' => 'required|min:6',
'email' => 'required|email|unique:users',
'password' => 'required|min:6',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down Expand Up @@ -1573,10 +1641,11 @@ public function createUser()
{
try {
$v = \Validator::make(
$this->request->all(), [
'username' => 'required|unique:users,user_name',
'first_name' => 'required',
]
$this->request->all(),
[
'username' => 'required|unique:users,user_name',
'first_name' => 'required',
]
);
if ($v->fails()) {
$error = $v->messages();
Expand Down
2 changes: 1 addition & 1 deletion app/Api/v1/ApiExceptAuthController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public function checkUrl()
//dd($this->request);
try {
$v = \Validator::make($this->request->all(), [
'url' => 'required|url',
'url' => 'required|url',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down
31 changes: 16 additions & 15 deletions app/Api/v1/InstallerApiController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ class InstallerApiController extends Controller
public function config_database(Request $request)
{
$rules = [
'database' => 'required|min:1',
'host' => 'required',
'databasename' => 'required|min:1',
'dbusername' => 'required|min:1',
];
'database' => 'required|min:1',
'host' => 'required',
'databasename' => 'required|min:1',
'dbusername' => 'required|min:1',
];
if ($request->port) {
$rules['port'] = 'integer|min:0';
}
Expand All @@ -52,7 +52,8 @@ public function config_database(Request $request)
'databasename' => $request->databasename,
'dbusername' => $request->dbusername,
'port' => $request->port,
], $rules
],
$rules
);
if ($validator->fails()) {
$jsons = $validator->messages();
Expand Down Expand Up @@ -200,15 +201,15 @@ public function config_system(Request $request)

// Creating user
$user = User::create([
'first_name' => $firstname,
'last_name' => $lastname,
'email' => $email,
'user_name' => $username,
'password' => Hash::make($password),
'active' => 1,
'role' => 'admin',
'assign_group' => 1,
'primary_dpt' => 1,
'first_name' => $firstname,
'last_name' => $lastname,
'email' => $email,
'user_name' => $username,
'password' => Hash::make($password),
'active' => 1,
'role' => 'admin',
'assign_group' => 1,
'primary_dpt' => 1,
]);

// Setting database installed status
Expand Down
4 changes: 2 additions & 2 deletions app/Api/v1/TokenAuthController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public function checkUrl(Request $request)
{
try {
$v = \Validator::make($request->all(), [
'url' => 'required|url',
'url' => 'required|url',
]);
if ($v->fails()) {
$error = $v->errors();
Expand All @@ -155,7 +155,7 @@ public function forgotPassword(Request $request)
{
try {
$v = \Validator::make($request->all(), [
'email' => 'required|email|exists:users,email',
'email' => 'required|email|exists:users,email',
]);
if ($v->fails()) {
$error = $v->errors();
Expand Down
3 changes: 2 additions & 1 deletion app/Console/Commands/Install.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ public function handle()
$this->appEnv();
if ($this->confirm('Do you want to intall faveo?')) {
$default = $this->choice(
'Which sql engine would you like to use?', ['mysql']
'Which sql engine would you like to use?',
['mysql']
);
$host = $this->ask('Enter your sql host');
$database = $this->ask('Enter your database name');
Expand Down
2 changes: 1 addition & 1 deletion app/Exceptions/Handler.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Handler extends ExceptionHandler
* @var array
*/
protected $dontReport = [
// 'Symfony\Component\HttpKernel\Exception\HttpException',
// 'Symfony\Component\HttpKernel\Exception\HttpException',
\Illuminate\Http\Exception\HttpResponseException::class,
foundation::class,
AuthorizationException::class,
Expand Down
Loading

0 comments on commit afe90f7

Please sign in to comment.