diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index fd06d1a2e..02f9cbb8e 100644 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -242,11 +242,11 @@ class TicketController extends Controller public function size() { + $size = 0; $files = Input::file('attachment'); if (!$files) { - throw new \Exception('file size exceeded'); + return $size; } - $size = 0; if (count($files) > 0) { foreach ($files as $file) { $size += $file->getSize(); diff --git a/resources/lang/en/lang.php b/resources/lang/en/lang.php index 222b600af..b122d5e61 100644 --- a/resources/lang/en/lang.php +++ b/resources/lang/en/lang.php @@ -1615,4 +1615,5 @@ return [ 'system-outgoing-incoming-mail-not-configured' => 'You have not configured system mail. Faveo can\'t fetch tickets from mail or send mail to users without it.', 'confihure-the-mail-now' => 'Click here to configure the mail.', 'system-mail-not-configured-agent-message' => 'System incoming and outgoing email settings are not configured. Please contct your system\'s admin and report the problem.', + 'ticket-assigned-successfully' => 'Selected tickets have been assigned sucessfully.', ]; diff --git a/resources/views/themes/default1/admin/helpdesk/settings/cron/cron-new.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/cron/cron-new.blade.php index 6ac739d83..ae51536aa 100644 --- a/resources/views/themes/default1/admin/helpdesk/settings/cron/cron-new.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/settings/cron/cron-new.blade.php @@ -50,7 +50,7 @@
 {!!Lang::get('lang.crone-url-message')!!} - {!!Lang::get('lang.click')!!} {!!Lang::get('lang.check-cron-set')!!} + {!!Lang::get('lang.click')!!} {!!Lang::get('lang.check-cron-set')!!}
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/status-edit.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/status-edit.blade.php index c4d0b54fb..d642e7e3d 100644 --- a/resources/views/themes/default1/admin/helpdesk/settings/status-edit.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/settings/status-edit.blade.php @@ -63,12 +63,75 @@ class="active"
-
-
+
+
- {!! Form::text('icon_class',null,['class'=>'form-control'])!!} -
+ +
diff --git a/resources/views/themes/default1/admin/helpdesk/settings/status.blade.php b/resources/views/themes/default1/admin/helpdesk/settings/status.blade.php index af437eb08..5f65303e4 100644 --- a/resources/views/themes/default1/admin/helpdesk/settings/status.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/settings/status.blade.php @@ -21,9 +21,6 @@ class="active"

{!! Lang::get('lang.list_of_status') !!}

-
- -
@@ -58,24 +55,6 @@ class="active" {!! $status->sort !!} - - @endforeach @@ -84,95 +63,4 @@ class="active"
- - @stop \ No newline at end of file diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/more/tickets-options-script.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/more/tickets-options-script.blade.php index 6b9c34851..3b5e183d7 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/more/tickets-options-script.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/more/tickets-options-script.blade.php @@ -305,12 +305,16 @@ var filterClick = 0; $('#assign-form').on('submit', function() { var t_id = ""; $("input[name='select_all[]']:checked:enabled").each(function() { - t_id = $(this).val() + "," + t_id; + if(t_id == "") { + t_id = $(this).val(); + } else { + t_id = $(this).val() + "," + t_id; + } }); //var t_id = $("input[name='select_all[]']").val(); $.ajax({ type: "PATCH", - url: "{{url('ticket/assign')}}", + url: "{{url('ticket/assign')}}/"+t_id, dataType: "html", data: $(this).serialize() + '&ticket_id=' + t_id, beforeSend: function() { diff --git a/routes/web.php b/routes/web.php index 85524443d..7d2fd6a85 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,6 +14,7 @@ Route::group(['middleware' => ['web']], function () { Route::group(['middleware' => 'update', 'middleware' => 'install'], function () { Auth::routes(); Route::post('login', ['uses' => 'Auth\AuthController@postLogin', 'as' => 'post.login']); + Route::post('auth/register', ['uses' => 'Auth\AuthController@postRegister', 'as' => 'post.register']); Route::get('auth/logout', ['uses' => 'Auth\AuthController@getLogout', 'as' => 'get.logout']); Route::get('social/login/redirect/{provider}/{redirect?}', ['uses' => 'Auth\AuthController@redirectToProvider', 'as' => 'social.login']); Route::get('social/login/{provider}', ['as'=>'social.login.callback', 'uses'=>'Auth\AuthController@handleProviderCallback']);