Apply fixes from StyleCI

This commit is contained in:
Manish Verma
2016-12-13 13:14:54 +00:00
committed by StyleCI Bot
parent 857d3004eb
commit 88f3df2180
161 changed files with 4729 additions and 3879 deletions

View File

@@ -22,7 +22,7 @@ class CreateUsersTable extends Migration
$table->boolean('ban');
$table->string('password', 60);
$table->integer('active');
$table->boolean('is_delete')->default(0);;
$table->boolean('is_delete')->default(0);
$table->string('ext');
$table->integer('country_code');
$table->string('phone_number');

View File

@@ -1,16 +1,16 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class Version1079table extends Migration {
class Version1079table extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up() {
public function up()
{
$current_version1 = \Config::get('app.version');
$current_version2 = explode(' ', $current_version1);
$current_version = $current_version2[1];
@@ -26,9 +26,8 @@ class Version1079table extends Migration {
if (Schema::hasTable('common_settings')) {
$settings = DB::table('common_settings')->where('option_name', 'itil')->first();
if (!$settings) {
DB::table('common_settings')->insert(['option_name'=>'itil','status'=>'0']);
DB::table('common_settings')->insert(['option_name'=>'itil', 'status'=>'0']);
}
}
}
}

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateJobsTable extends Migration
{

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateFailedJobsTable extends Migration
{

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateFieldValuesTable extends Migration
{

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateFaveoMailsTable extends Migration
{

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateFaveoQueuesTable extends Migration
{

View File

@@ -1,8 +1,8 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use App\Model\MailJob\MailService;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateMailServicesTable extends Migration
{
@@ -19,17 +19,15 @@ class CreateMailServicesTable extends Migration
$table->string('short_name');
$table->timestamps();
});
$mail = new MailService();
$services= ['smtp'=>'SMTP','mail'=>'Php Mail','sendmail'=>'Send Mail','mailgun'=>'Mailgun','mandrill'=>'Mandrill','log'=>'Log file'];
foreach($services as $key=>$value){
$mail->create([
'name'=>$value,
'short_name'=>$key,
$services = ['smtp'=>'SMTP', 'mail'=>'Php Mail', 'sendmail'=>'Send Mail', 'mailgun'=>'Mailgun', 'mandrill'=>'Mandrill', 'log'=>'Log file'];
foreach ($services as $key=>$value) {
$mail->create([
'name' => $value,
'short_name'=> $key,
]);
}
}
/**

View File

@@ -1,8 +1,8 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use App\Model\MailJob\QueueService;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateQueueServicesTable extends Migration
{
@@ -20,20 +20,20 @@ class CreateQueueServicesTable extends Migration
$table->integer('status');
$table->timestamps();
});
$queue = new QueueService();
$services = ['sync'=>'Sync','database'=>'Database','beanstalkd'=>'Beanstalkd','sqs'=>'SQS','iron'=>'Iron','redis'=>'Redis'];
foreach($services as $key=>$value){
$services = ['sync'=>'Sync', 'database'=>'Database', 'beanstalkd'=>'Beanstalkd', 'sqs'=>'SQS', 'iron'=>'Iron', 'redis'=>'Redis'];
foreach ($services as $key=>$value) {
$queue->create([
'name'=>$value,
'short_name'=>$key,
'status'=>0,
'name' => $value,
'short_name'=> $key,
'status' => 0,
]);
}
$q = $queue->where('short_name','sync')->first();
if($q){
$q->status = 1;
$q->save();
$q = $queue->where('short_name', 'sync')->first();
if ($q) {
$q->status = 1;
$q->save();
}
}

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateConditionsTable extends Migration
{

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateSocialMediaTable extends Migration
{

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateUserAdditionalInfosTable extends Migration
{

View File

@@ -1,16 +1,17 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AlterTicketSourceTable extends Migration {
class AlterTicketSourceTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up() {
public function up()
{
if (!Schema::hasColumn('ticket_source', 'css_class')) {
Schema::table('ticket_source', function (Blueprint $table) {
$table->string('css_class');
@@ -23,15 +24,16 @@ class AlterTicketSourceTable extends Migration {
}
}
public function values() {
public function values()
{
return[
['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer',],
['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope',],
['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope',],
['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook',],
['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter',],
['name' => 'call', 'value' => 'Call', 'css_class' => 'fa fa-phone',],
['name' => 'chat', 'value' => 'Chat', 'css_class' => 'fa fa-comment',],
['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer'],
['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope'],
['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope'],
['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook'],
['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter'],
['name' => 'call', 'value' => 'Call', 'css_class' => 'fa fa-phone'],
['name' => 'chat', 'value' => 'Chat', 'css_class' => 'fa fa-comment'],
];
}
@@ -40,10 +42,10 @@ class AlterTicketSourceTable extends Migration {
*
* @return void
*/
public function down() {
public function down()
{
Schema::table('ticket_source', function (Blueprint $table) {
//
});
}
}

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateFaveoMailsTable extends Migration
{

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateFaveoQueuesTable extends Migration
{

View File

@@ -1,8 +1,8 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use App\Model\MailJob\MailService;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateMailServicesTable extends Migration
{
@@ -19,17 +19,15 @@ class CreateMailServicesTable extends Migration
$table->string('short_name');
$table->timestamps();
});
$mail = new MailService();
$services= ['smtp'=>'SMTP','mail'=>'Php Mail','sendmail'=>'Send Mail','mailgun'=>'Mailgun','mandrill'=>'Mandrill','log'=>'Log file'];
foreach($services as $key=>$value){
$mail->create([
'name'=>$value,
'short_name'=>$key,
$services = ['smtp'=>'SMTP', 'mail'=>'Php Mail', 'sendmail'=>'Send Mail', 'mailgun'=>'Mailgun', 'mandrill'=>'Mandrill', 'log'=>'Log file'];
foreach ($services as $key=>$value) {
$mail->create([
'name' => $value,
'short_name'=> $key,
]);
}
}
/**

View File

@@ -1,8 +1,8 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use App\Model\MailJob\QueueService;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateQueueServicesTable extends Migration
{
@@ -20,18 +20,18 @@ class CreateQueueServicesTable extends Migration
$table->integer('status');
$table->timestamps();
});
$queue = new QueueService();
$services = ['database'=>'Local Database','beanstalkd'=>'Beanstalkd','sqs'=>'SQS','iron'=>'Iron','redis'=>'Redis'];
$services = ['database'=>'Local Database', 'beanstalkd'=>'Beanstalkd', 'sqs'=>'SQS', 'iron'=>'Iron', 'redis'=>'Redis'];
$status = 0;
foreach($services as $key=>$value){
if($key==='database'){
$status=1;
foreach ($services as $key=>$value) {
if ($key === 'database') {
$status = 1;
}
$queue->create([
'name'=>$value,
'short_name'=>$key,
'status'=>$status,
'name' => $value,
'short_name'=> $key,
'status' => $status,
]);
}
}

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateConditionsTable extends Migration
{

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateSocialMediaTable extends Migration
{

View File

@@ -1,7 +1,7 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class CreateUserAdditionalInfosTable extends Migration
{

View File

@@ -1,16 +1,17 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AlterTicketSourceTable extends Migration {
class AlterTicketSourceTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up() {
public function up()
{
if (!Schema::hasColumn('ticket_source', 'css_class')) {
Schema::table('ticket_source', function (Blueprint $table) {
$table->string('css_class');
@@ -23,13 +24,14 @@ class AlterTicketSourceTable extends Migration {
}
}
public function values() {
public function values()
{
return[
['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer',],
['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope',],
['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope',],
['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook',],
['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter',],
['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer'],
['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope'],
['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope'],
['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook'],
['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter'],
];
}
@@ -38,10 +40,10 @@ class AlterTicketSourceTable extends Migration {
*
* @return void
*/
public function down() {
public function down()
{
Schema::table('ticket_source', function (Blueprint $table) {
//
});
}
}

View File

@@ -1,16 +1,17 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
class AlterTicketSourceTable extends Migration {
class AlterTicketSourceTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up() {
public function up()
{
if (!Schema::hasColumn('ticket_source', 'css_class')) {
Schema::table('ticket_source', function (Blueprint $table) {
$table->string('css_class');
@@ -23,13 +24,14 @@ class AlterTicketSourceTable extends Migration {
}
}
public function values() {
public function values()
{
return[
['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer',],
['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope',],
['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope',],
['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook',],
['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter',],
['name' => 'web', 'value' => 'Web', 'css_class' => 'fa fa-internet-explorer'],
['name' => 'email', 'value' => 'E-mail', 'css_class' => 'fa fa-envelope'],
['name' => 'agent', 'value' => 'Agent Panel', 'css_class' => 'fa fa-envelope'],
['name' => 'facebook', 'value' => 'Facebook', 'css_class' => 'fa fa-facebook'],
['name' => 'twitter', 'value' => 'Twitter', 'css_class' => 'fa fa-twitter'],
];
}
@@ -38,10 +40,10 @@ class AlterTicketSourceTable extends Migration {
*
* @return void
*/
public function down() {
public function down()
{
Schema::table('ticket_source', function (Blueprint $table) {
//
});
}
}

View File

@@ -26,6 +26,7 @@ use App\Model\helpdesk\Utility\CountryCode;
use App\Model\helpdesk\Utility\Date_format;
use App\Model\helpdesk\Utility\Date_time_format;
use App\Model\helpdesk\Utility\Languages;
use App\Model\helpdesk\Utility\Limit_Login;
use App\Model\helpdesk\Utility\Log_notification;
use App\Model\helpdesk\Utility\MailboxProtocol;
use App\Model\helpdesk\Utility\Time_format;
@@ -33,8 +34,6 @@ use App\Model\helpdesk\Utility\Timezones;
use App\Model\helpdesk\Utility\Version_Check;
use App\Model\helpdesk\Workflow\WorkflowClose;
use App\Model\kb\Settings;
use App\Model\helpdesk\Utility\Limit_Login;
// Knowledge base
use Illuminate\Database\Seeder;
@@ -218,7 +217,6 @@ class DatabaseSeeder extends Seeder
Ticket_priority::create(['priority' => 'Normal', 'status' => 1, 'priority_desc' => 'Normal', 'priority_color' => '#00bfef', 'priority_urgency' => '3', 'ispublic' => '1', 'is_default' => '1']);
Ticket_priority::create(['priority' => 'High', 'status' => 1, 'priority_desc' => 'High', 'priority_color' => '#f39c11', 'priority_urgency' => '2', 'ispublic' => '1']);
Ticket_priority::create(['priority' => 'Emergency', 'status' => 1, 'priority_desc' => 'Emergency', 'priority_color' => '#dd4b38', 'priority_urgency' => '1', 'ispublic' => '1']);
/* SLA Plans */
Sla_plan::create(['name' => 'Sla 1', 'grace_period' => '6 Hours', 'status' => '1']);
@@ -272,7 +270,7 @@ class DatabaseSeeder extends Seeder
Company::create(['id' => '1']);
Email::create(['id' => '1', 'template' => 'default', 'email_fetching' => '1', 'notification_cron' => '1', 'all_emails' => '1', 'email_collaborator' => '1', 'attachment' => '1']);
Responder::create(['id' => '1', 'new_ticket' => '1', 'agent_new_ticket' => '1']);
System::create(array('id' => '1', 'status' => '1', 'department' => '1', 'date_time_format' => '1', 'time_zone' => '32'));
System::create(['id' => '1', 'status' => '1', 'department' => '1', 'date_time_format' => '1', 'time_zone' => '32']);
Ticket::create(['num_format' => '$$$$-####-####', 'num_sequence' => 'sequence', 'collision_avoid' => '2', 'priority' => '1', 'sla' => '2', 'help_topic' => '1', 'status' => '1']);
/* Ticket source */
Ticket_source::create(['name' => 'web', 'value' => 'Web']);
@@ -1979,11 +1977,8 @@ class DatabaseSeeder extends Seeder
'numcode' => '716',
'phonecode' => '263', ]);
Security::create(['id' => '1', 'lockout_message' => 'You have been locked out of application due to too many failed login attempts.', 'backlist_offender' => '0', 'backlist_threshold' => '15', 'lockout_period' => '15', 'days_to_keep_logs' => '0']);
TemplateSet::create(['id' => '1', 'name' => 'default', 'active' => '1']);
TemplateType::create(['id' => '1', 'name' => 'assign-ticket']);
@@ -2000,7 +1995,6 @@ class DatabaseSeeder extends Seeder
TemplateType::create(['id' => '12', 'name' => 'team_assign_ticket']);
TemplateType::create(['id' => '13', 'name' => 'reset_new_password']);
Template::create(['id' => '1', 'variable' => '0', 'name' => 'This template is for sending notice to agent when ticket is assigned to them', 'type' => '1', 'message' => '<div>Hello {!!$ticket_agent_name!!},<br /><br /><b>Ticket No:</b> {!!$ticket_number!!}<br />Has been assigned to you by {!!$ticket_assigner!!} <br/> Please check and resppond on the ticket.<br /> Link: {!!$ticket_link!!}<br /><br />Thank You<br />Kind Regards,<br /> {!!$system_from!!}</div>', 'set_id' => '1']);
Template::create(['id' => '2', 'variable' => '1', 'name' => 'This template is for sending notice to client with ticket link to check ticket without logging in to system', 'type' => '2', 'subject' => 'Check your Ticket', 'message' => '<div>Hello {!!$user!!},<br/><br/>Click the link below to view your requested ticket<br/> {!!$ticket_link_with_number!!}<br/><br/>Kind Regards,<br/> {!!$system_from!!}</div>', 'set_id' => '1']);
Template::create(['id' => '3', 'variable' => '0', 'name' => 'This template is for sending notice to client when ticket status is changed to close', 'type' => '3', 'message' => '<div>Hello,<br/><br/>This message is regarding your ticket ID {!!$ticket_number!!}. We are changing the status of this ticket to "Closed" as the issue appears to be resolved.<br/><br/>Thank you<br/>Kind regards,<br/> {!!$system_from!!}</div>', 'set_id' => '1']);
@@ -2012,9 +2006,8 @@ class DatabaseSeeder extends Seeder
Template::create(['id' => '9', 'variable' => '0', 'name' => 'This template is for sending notice to client when a reply made to his/her ticket', 'type' => '9', 'message' => '<span></span><div><span></span><p> {!!$content!!}<br/></p><p> {!!$agent_sign!!} </p><p><b>Ticket Details</b></p><p><b>Ticket ID:</b> {!!$ticket_number!!}</p></div>', 'set_id' => '1']);
Template::create(['id' => '10', 'variable' => '0', 'name' => 'This template is for sending notice to agent when ticket reply is made by client on a ticket', 'type' => '10', 'message' => '<div>Hello {!!$ticket_agent_name!!},<br/><b><br/></b>A reply been made to ticket {!!$ticket_number!!}<br/><b><br/></b><b>From<br/></b><b>Name: </b>{!!$ticket_client_name!!}<br/><b>E-mail: </b>{!!$ticket_client_email!!}<br/><b><br/></b> {!!$content!!}<br/><b><br/></b>Kind Regards,<br/> {!!$system_from!!}</div>', 'set_id' => '1']);
Template::create(['id' => '11', 'variable' => '1', 'name' => 'This template is for sending notice to client about registration confirmation link', 'type' => '11', 'subject' => 'Verify your email address', 'message' => '<p>Hello {!!$user!!}, </p><p>This email is confirmation that you are now registered at our helpdesk.</p><p><b>Registered Email:</b> {!!$email_address!!}</p><p>Please click on the below link to activate your account and Login to the system {!!$password_reset_link!!}</p><p>Thank You.</p><p>Kind Regards,</p><p> {!!$system_from!!} </p>', 'set_id' => '1']);
Template::create(['id' => '12', 'variable' => '1', 'name' => 'This template is for sending notice to team when ticket is assigned to team', 'type' => '12', 'message' => '<div>Hello {!!$ticket_agent_name!!},<br /><br /><b>Ticket No:</b> {!!$ticket_number!!}<br />Has been assigned to your team : {!!$team!!} by {!!$ticket_assigner!!} <br /><br />Thank You<br />Kind Regards,<br />{!!$system_from!!}</div>', 'set_id' => '1']);
Template::create(['id' => '13', 'variable' => '1', 'name' => 'This template is for sending notice to client when password is changed', 'type' => '13', 'subject' => 'Verify your email address', 'message' => 'Hello {!!$user!!},<br /><br />Your password is successfully changed.Your new password is : {!!$user_password!!}<br /><br />Thank You.<br /><br />Kind Regards,<br /> {!!$system_from!!}', 'set_id' => '1']);
Template::create(['id' => '12', 'variable' => '1', 'name' => 'This template is for sending notice to team when ticket is assigned to team', 'type' => '12', 'message' => '<div>Hello {!!$ticket_agent_name!!},<br /><br /><b>Ticket No:</b> {!!$ticket_number!!}<br />Has been assigned to your team : {!!$team!!} by {!!$ticket_assigner!!} <br /><br />Thank You<br />Kind Regards,<br />{!!$system_from!!}</div>', 'set_id' => '1']);
Template::create(['id' => '13', 'variable' => '1', 'name' => 'This template is for sending notice to client when password is changed', 'type' => '13', 'subject' => 'Verify your email address', 'message' => 'Hello {!!$user!!},<br /><br />Your password is successfully changed.Your new password is : {!!$user_password!!}<br /><br />Thank You.<br /><br />Kind Regards,<br /> {!!$system_from!!}', 'set_id' => '1']);
/*
* All the common settings will be listed here
@@ -2032,7 +2025,6 @@ class DatabaseSeeder extends Seeder
Rating::create(['id' => '1', 'name' => 'OverAll Satisfaction', 'display_order' => '1', 'allow_modification' => '1', 'rating_scale' => '5', 'rating_area' => 'Helpdesk Area']);
Rating::create(['id' => '2', 'name' => 'Reply Rating', 'display_order' => '1', 'allow_modification' => '1', 'rating_scale' => '5', 'rating_area' => 'Comment Area']);
Limit_Login::create(['id' => '1']);
}
}