diff --git a/app/FaveoLog/lang/ar/lang.php b/app/FaveoLog/lang/ar/lang.php new file mode 100644 index 000000000..92424de9d --- /dev/null +++ b/app/FaveoLog/lang/ar/lang.php @@ -0,0 +1,7 @@ + 'مؤلف', + 'system_logs' => 'سجلات النظام', + +]; diff --git a/app/FaveoLog/lang/en/lang.php b/app/FaveoLog/lang/en/lang.php index 8ba309453..737c0702e 100644 --- a/app/FaveoLog/lang/en/lang.php +++ b/app/FaveoLog/lang/en/lang.php @@ -1,5 +1,6 @@ 'Logs', + 'logs' => 'Logs', + 'system_logs' => 'System logs', ]; diff --git a/app/FaveoLog/views/log.blade.php b/app/FaveoLog/views/log.blade.php index d7a58e8f7..49445fd88 100644 --- a/app/FaveoLog/views/log.blade.php +++ b/app/FaveoLog/views/log.blade.php @@ -41,10 +41,10 @@ class="nav-link active"
-

System Logs

+

{{Lang::get('log::lang.system_logs')}}

@@ -61,7 +61,7 @@ class="nav-link active"
@if ($logs === null)
- Log file >50M, please download it. + {{trans('lang.log_file_50M_please_download_it.')}}
@else diff --git a/app/FaveoStorage/lang/ar/lang.php b/app/FaveoStorage/lang/ar/lang.php new file mode 100644 index 000000000..4b52b57f8 --- /dev/null +++ b/app/FaveoStorage/lang/ar/lang.php @@ -0,0 +1,9 @@ + 'تخزين', + 'root' => 'جذر', + 'system_logs' => 'سجلات النظام', + 'default' => 'الافتراضي', + 'save' => 'حفظ', +]; diff --git a/app/FaveoStorage/lang/en/lang.php b/app/FaveoStorage/lang/en/lang.php index e4525d062..b6e074688 100644 --- a/app/FaveoStorage/lang/en/lang.php +++ b/app/FaveoStorage/lang/en/lang.php @@ -13,4 +13,5 @@ return [ 'container' => 'Container', 'endpoint' => 'End Point', 'url_type' => 'Url Type', + 'save' => 'Save', ]; diff --git a/app/FaveoStorage/views/settings.blade.php b/app/FaveoStorage/views/settings.blade.php index e5372e139..c37b96cf7 100644 --- a/app/FaveoStorage/views/settings.blade.php +++ b/app/FaveoStorage/views/settings.blade.php @@ -114,7 +114,7 @@ class="nav-link active" diff --git a/app/Http/Controllers/Admin/helpdesk/SettingsController.php b/app/Http/Controllers/Admin/helpdesk/SettingsController.php index 003a10779..e1063d01d 100644 --- a/app/Http/Controllers/Admin/helpdesk/SettingsController.php +++ b/app/Http/Controllers/Admin/helpdesk/SettingsController.php @@ -763,7 +763,7 @@ class SettingsController extends Controller { $days = Input::get('no_of_days'); if ($days == null) { - return redirect()->back()->with('fails', 'Please enter valid no of days'); + return redirect()->back()->with('fails', \Illuminate\Support\Facades\Lang::get('lang.please_enter_valid_no_days')); } $date = new DateTime(); $date->modify($days.' day'); diff --git a/app/Http/Controllers/Admin/helpdesk/UrlSettingController.php b/app/Http/Controllers/Admin/helpdesk/UrlSettingController.php index ba5006d8f..7bb7a6c44 100644 --- a/app/Http/Controllers/Admin/helpdesk/UrlSettingController.php +++ b/app/Http/Controllers/Admin/helpdesk/UrlSettingController.php @@ -36,7 +36,7 @@ class UrlSettingController extends Controller $string = $string_www.$sting_ssl; $this->writeHtaccess($string); - return redirect()->back()->with('success', 'updated'); + return redirect()->back()->with('success', trans('lang.updated')); } catch (Exception $ex) { dd($ex); diff --git a/app/Http/Controllers/Agent/helpdesk/OrganizationController.php b/app/Http/Controllers/Agent/helpdesk/OrganizationController.php index db8a55477..3b4ac86ba 100644 --- a/app/Http/Controllers/Agent/helpdesk/OrganizationController.php +++ b/app/Http/Controllers/Agent/helpdesk/OrganizationController.php @@ -108,15 +108,15 @@ class OrganizationController extends Controller diff --git a/app/Http/Controllers/Agent/helpdesk/TicketController.php b/app/Http/Controllers/Agent/helpdesk/TicketController.php index e85890f4a..5c88f272f 100755 --- a/app/Http/Controllers/Agent/helpdesk/TicketController.php +++ b/app/Http/Controllers/Agent/helpdesk/TicketController.php @@ -437,7 +437,7 @@ class TicketController extends Controller return response()->json(compact('result')); } - $result = ['success' => 'Replyed successfully']; + $result = ['success' => Lang::get('lang.you_have_successfully_replied_to_your_ticket')]; return response()->json(compact('result')); } diff --git a/app/Http/Controllers/Agent/kb/ArticleController.php b/app/Http/Controllers/Agent/kb/ArticleController.php index 2a41a1549..15196a257 100644 --- a/app/Http/Controllers/Agent/kb/ArticleController.php +++ b/app/Http/Controllers/Agent/kb/ArticleController.php @@ -46,7 +46,7 @@ class ArticleController extends Controller // checking authentication $this->middleware('auth'); // checking roles - $this->middleware('roles'); + $this->middleware('role.agent'); SettingsController::language(); } @@ -91,15 +91,15 @@ class ArticleController extends Controller diff --git a/app/Http/Controllers/Agent/kb/CategoryController.php b/app/Http/Controllers/Agent/kb/CategoryController.php index bdf2b75b8..b0ba32ee6 100644 --- a/app/Http/Controllers/Agent/kb/CategoryController.php +++ b/app/Http/Controllers/Agent/kb/CategoryController.php @@ -40,7 +40,7 @@ class CategoryController extends Controller // checking authentication $this->middleware('auth'); // checking roles - $this->middleware('roles'); + $this->middleware('role.agent'); SettingsController::language(); } @@ -150,9 +150,9 @@ class CategoryController extends Controller try { $category->fill($request->input())->save(); - return Redirect::back()->with('success', Lang::get('lang.category_inserted_successfully')); + return redirect('category')->with('success', Lang::get('lang.category_inserted_successfully')); } catch (Exception $e) { - return Redirect::back()->with('fails', Lang::get('lang.category_not_inserted').'
  • '.$e->getMessage().'
  • '); + return redirect('category')->with('fails', Lang::get('lang.category_not_inserted').'
  • '.$e->getMessage().'
  • '); } } diff --git a/app/Http/Controllers/Agent/kb/PageController.php b/app/Http/Controllers/Agent/kb/PageController.php index 1e2ff6dc7..febbc3bd0 100644 --- a/app/Http/Controllers/Agent/kb/PageController.php +++ b/app/Http/Controllers/Agent/kb/PageController.php @@ -6,7 +6,6 @@ use App\Http\Controllers\Agent\helpdesk\TicketController; use App\Http\Controllers\Controller; use App\Http\Requests\kb\PageRequest; // request -use App\Http\Requests\kb\PageUpdate; use App\Model\kb\Page; use Datatable; // Model @@ -38,7 +37,7 @@ class PageController extends Controller // checking authentication $this->middleware('auth'); // checking roles - $this->middleware('roles'); + $this->middleware('role.agent'); $this->page = $page; SettingsController::language(); } @@ -86,20 +85,20 @@ class PageController extends Controller /* add column Actions */ /* there are action buttons and modal popup to delete a data column */ ->addColumn('Actions', function ($model) { - return ' slug.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').' slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').' + return ' id.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').' slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').' - + @forelse($statuses as $status) - + @empty @endforelse diff --git a/resources/views/themes/default1/agent/helpdesk/dept-ticket/tickets.blade.php b/resources/views/themes/default1/agent/helpdesk/dept-ticket/tickets.blade.php index ff88f6abc..717085179 100644 --- a/resources/views/themes/default1/agent/helpdesk/dept-ticket/tickets.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/dept-ticket/tickets.blade.php @@ -140,7 +140,7 @@ if (Auth::user()->role == 'agent') {
    - +
    diff --git a/resources/views/themes/default1/agent/helpdesk/organization/index.blade.php b/resources/views/themes/default1/agent/helpdesk/organization/index.blade.php index ed200f3b5..534fc22eb 100644 --- a/resources/views/themes/default1/agent/helpdesk/organization/index.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/organization/index.blade.php @@ -1,4 +1,4 @@ -@extends('themes.default1.agent.layout.agent') + @extends('themes.default1.agent.layout.agent') @section('Users') class="nav-link active" @@ -40,20 +40,20 @@ class="nav-link active" @endif
    - +
    - +

    {{Lang::get('lang.organization_list')}}

    - +
    - +
    - + {!! Datatable::table() ->addColumn(Lang::get('lang.name'), Lang::get('lang.website'), diff --git a/resources/views/themes/default1/agent/helpdesk/report/index.blade.php b/resources/views/themes/default1/agent/helpdesk/report/index.blade.php index b989d24a4..b99ed9a4a 100755 --- a/resources/views/themes/default1/agent/helpdesk/report/index.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/report/index.blade.php @@ -138,7 +138,7 @@ class="active"
    {!! Form::label('filter', 'Filter:',['style' => 'visibility:hidden;']) !!}
    - +

    @@ -149,9 +149,9 @@ class="active"
    - - - + + +
    diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php index 812b436cb..f9e8ae583 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/inbox.blade.php @@ -213,7 +213,7 @@ if (Auth::user()->role == 'agent') {
    diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/more/tickets-model.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/more/tickets-model.blade.php index 718187642..433aef693 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/more/tickets-model.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/more/tickets-model.blade.php @@ -57,7 +57,7 @@
    {!! Form::open(['id'=>'merge-form','method' => 'PATCH'] )!!} - +
    diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/new.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/new.blade.php index e67214de4..c743ab094 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/new.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/new.blade.php @@ -262,7 +262,7 @@ class="active"
    get(); ?> - {!! Form::select('priority', ['Priority'=>$Priority->pluck('priority_desc','priority_id')->toArray()],null,['class' => 'form-control select']) !!} + {!! Form::select('priority', [Lang::get('lang.priorities')=>$Priority->pluck('priority_desc','priority_id')->toArray()],null,['class' => 'form-control select']) !!}
    diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php index a0397d8cf..5abd79e85 100644 --- a/resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/tickets.blade.php @@ -117,7 +117,7 @@ if (Request::has('assigned')) @elseif($activepage == 'overdue') {{Lang::get('lang.overdue')}} @elseif($activepage == 'closed') - {{Lang::get('lang.closed')}} +{{-- {{Lang::get('lang.closed')}}--}} @elseif($activepage == 'approval') {{Lang::get('lang.approval')}} @elseif($activepage == 0) @@ -185,7 +185,7 @@ if (Request::has('assigned')) @foreach($statuses as $ticket_status) - {!! $ticket_status->name !!} + {{trans('lang.'.strtolower($ticket_status->name)) }} @endforeach diff --git a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php index 17f6714ea..e6a986a90 100755 --- a/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/ticket/timeline.blade.php @@ -1,4 +1,5 @@ @extends('themes.default1.agent.layout.agent') + @section('Tickets') class="nav-link active" @@ -138,17 +139,17 @@ if ($thread->title != "") { if ($group->can_edit_ticket == 1) { ?> can_assign_ticket == 1) { ?> @if($tickets->assigned_to == Auth::user()->id) @endif @@ -156,7 +157,7 @@ if ($thread->title != "") { - Generate PDF + {{trans('lang.generate_pdf')}}
    - +
    @@ -1829,17 +1830,21 @@ if ($thread->title != "") { $("#t1").hide(); $("#show3").show(); $('html, body').animate({ - scrollTop: $("#form3").offset().top + scrollTop: $("#inboxactions").offset().top }, 500); }, success: function(json) { + $("#show3").hide(); + $("#t1").show(); + setTimeout(function () { + location.reload(); + }, 4000); + $("#alert21").show(); $('#message-success2').html(json.result.success); - location.reload(); - - // $('html, body').animate({ scrollTop: $("#heading").offset().top }, 500); }, - error: function(json) { + + error: function(json) { $("#show3").hide(); $("#t1").show(); var res = ""; @@ -1851,6 +1856,7 @@ if ($thread->title != "") { } }) return false; + }); // Surrender $('#Surrender').on('click', function() { @@ -2152,7 +2158,7 @@ echo $ticket_data->title; // $("#alert21").show(); // $('#message-success2').html(message); $('#replybtn').attr('disabled', false); - // setInterval(function(){$("#alert21").hide(); },8000); + // setInterval(function(){$("#alert21").hide(); },8000); } else if (response == 1 || response == 4){ // alert(response); // var message = "{{Lang::get('lang.access-ticket')}}"+locktime/(60*1000) diff --git a/resources/views/themes/default1/agent/helpdesk/user/index.blade.php b/resources/views/themes/default1/agent/helpdesk/user/index.blade.php index 1043d7feb..dd20001a0 100644 --- a/resources/views/themes/default1/agent/helpdesk/user/index.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/user/index.blade.php @@ -93,7 +93,7 @@ class="nav-link active"
    - + {!!$table->render('vendor.Chumper.template')!!} {!! $table->script('vendor.Chumper.user-javascript') !!} diff --git a/resources/views/themes/default1/agent/helpdesk/user/show.blade.php b/resources/views/themes/default1/agent/helpdesk/user/show.blade.php index 5f35e817f..a7f245c74 100644 --- a/resources/views/themes/default1/agent/helpdesk/user/show.blade.php +++ b/resources/views/themes/default1/agent/helpdesk/user/show.blade.php @@ -1296,9 +1296,9 @@ class="nav-link active"
    diff --git a/resources/views/themes/default1/agent/layout/agent.blade.php b/resources/views/themes/default1/agent/layout/agent.blade.php index 590f4b865..8e5d22f05 100755 --- a/resources/views/themes/default1/agent/layout/agent.blade.php +++ b/resources/views/themes/default1/agent/layout/agent.blade.php @@ -310,7 +310,7 @@ class="img-size-50"> - @@ -445,6 +445,7 @@ + flatMap(function ($values) { return $values->keyBy('status'); @@ -472,7 +473,7 @@ -

    {!! $name !!}

    +

    {!!trans('lang.'.strtolower($name))!!}

    @foreach($statuses as $status) @@ -483,7 +484,7 @@ diff --git a/resources/views/themes/default1/agent/layout/sidebar.blade.php b/resources/views/themes/default1/agent/layout/sidebar.blade.php index 362dcc537..8c9f2d23c 100644 --- a/resources/views/themes/default1/agent/layout/sidebar.blade.php +++ b/resources/views/themes/default1/agent/layout/sidebar.blade.php @@ -9,7 +9,7 @@ @stop @section('sidebar') - + - + updated_at ?> + status)->first(); ?> diff --git a/resources/views/themes/default1/client/helpdesk/unauth/showticket.blade.php b/resources/views/themes/default1/client/helpdesk/unauth/showticket.blade.php index b2dd2249e..a4ed72c61 100755 --- a/resources/views/themes/default1/client/helpdesk/unauth/showticket.blade.php +++ b/resources/views/themes/default1/client/helpdesk/unauth/showticket.blade.php @@ -1,174 +1,265 @@ @extends('themes.default1.client.layout.client') -@section('content') +@section('content') id)->first(); //$user = App\User::where('id','=',$id1)->first(); ?> + + + + -
    -
    -
    -
    -

    {{$thread->title}}

    ( {{$tickets->ticket_number}} ) -
    -
    -
    -
    - - {{-- --}} - -
    - - +
    - -
    +
    + +

    {{$thread->title}} + + ( {{$tickets->ticket_number}} ) +

    +
    + +
    + +
    + + + + +
    {!! Form::close() !!}
    -

    -
    - -
    -
    {!! Form::open(['route'=>['groups.destroy', $group->id],'method'=>'DELETE']) !!} - Edit + {{trans('lang.edit')}} - {!! Form::button(' Delete', + {!! Form::button(' '.trans('lang.delete'), ['type' => 'submit', 'class'=> 'btn btn-danger btn-xs', 'onclick'=>'return confirm("Are you sure?")']) diff --git a/resources/views/themes/default1/admin/helpdesk/emails/emails/index.blade.php b/resources/views/themes/default1/admin/helpdesk/emails/emails/index.blade.php index 68a9b3395..47c1a6d7e 100644 --- a/resources/views/themes/default1/admin/helpdesk/emails/emails/index.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/emails/emails/index.blade.php @@ -114,15 +114,15 @@ class="nav-link active" {!! UTC::usertimezone($email->updated_at) !!} {!! Form::open(['route'=>['emails.destroy', $email->id],'method'=>'DELETE']) !!} - Edit + {{Lang::get('lang.edit')}} @if($default_email == $email->id) - {!! Form::button(' Delete', + {!! Form::button(' '.Lang::get('lang.delete'), ['class'=> 'btn btn-danger btn-xs '. $disabled]) !!} @else - {!! Form::button(' Delete', + {!! Form::button(' '.Lang::get('lang.delete'), ['type' => 'submit', 'class'=> 'btn btn-danger btn-xs', 'onclick'=>'return confirm("Are you sure?")']) diff --git a/resources/views/themes/default1/admin/helpdesk/manage/form/index.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/form/index.blade.php index dcbe60409..b569fc0ca 100644 --- a/resources/views/themes/default1/admin/helpdesk/manage/form/index.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/manage/form/index.blade.php @@ -73,7 +73,7 @@ class="nav-link active" {!! link_to_route('forms.show', Lang::get('lang.view_this_form') ,[$form->id],['id'=>'View','class'=>'btn btn-primary btn-sm']) !!}
    - {!! link_to_route('forms.add.child', 'Add Child' ,[$form->id],['id'=>'add-child','class'=>'btn btn-primary btn-sm']) !!} + {!! link_to_route('forms.add.child', Lang::get('lang.add-child') ,[$form->id],['id'=>'add-child','class'=>'btn btn-primary btn-sm']) !!}
    diff --git a/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php index fd5b721ce..1652d4c8e 100644 --- a/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/manage/ticket_priority/index.blade.php @@ -66,8 +66,8 @@ class="nav-link active"
    - - + +
    diff --git a/resources/views/themes/default1/admin/helpdesk/manage/workflow/edit.blade.php b/resources/views/themes/default1/admin/helpdesk/manage/workflow/edit.blade.php index eb1fad09a..8d05d847c 100644 --- a/resources/views/themes/default1/admin/helpdesk/manage/workflow/edit.blade.php +++ b/resources/views/themes/default1/admin/helpdesk/manage/workflow/edit.blade.php @@ -282,7 +282,7 @@ class="nav-link active"
    {!! $rating->display_order !!} {!! $rating->rating_area !!} - {!! link_to_route('rating.edit','Edit Ratings',[$rating->id],['class'=>'btn btn-primary btn-sm']) !!} - + {!! link_to_route('rating.edit',trans('lang.edit_ratings'),[$rating->id],['class'=>'btn btn-primary btn-sm']) !!} +
    Department{{trans('lang.department')}}{!! $status !!}{{trans('lang.'.strtolower($status))}} {{$priority->priority}} {!! $username !!}{!! $title->updated_at !!}{!! UTC::usertimezone($updated) !!} {!! $status->name !!}
    - get(); ?> + +
    + +
    + +
    + + + get(); ?> {!! csrf_field() !!} - @foreach($ratings as $rating) + @foreach($ratings as $rating) - @if($rating->rating_area == 'Helpdesk Area') - id)->where('ticket_id', '=', $tickets->id)->first(); - if ($rating_value == null) { - $ratingval = '0'; - } else { - $ratingval = $rating_value->rating_value; - } - ?> - -   - - - @endif + @if($rating->rating_area == 'Helpdesk Area') + id)->where('ticket_id', '=', $tickets->id)->first(); + if ($rating_value == null) { + $ratingval = '0'; + } else { + $ratingval = $rating_value->rating_value; + } + ?> + + + +   + + + + @endif @endforeach -
    {!! $rating->name !!}  
    - rating_scale; $i++) { ?> - /> - -
    {!! $rating->name !!}  
    + + rating_scale; $i++) { ?> + /> + +
    + + +
    -
    -
    -
    - +
    id)->where('is_internal', '=', 0)->paginate(10); foreach ($conversations as $conversation) { @@ -179,12 +270,13 @@ foreach ($conversations as $conversation) { $time = $ConvDate[1]; $time = substr($time, 0, -3); if (isset($data) && $date == $data) { - + } else { $data = $ConvDate[0]; } $role = App\User::where('id', '=', $conversation->user_id)->first(); + $attachment = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $conversation->id)->first(); if ($attachment == null) { $body = $conversation->body; @@ -193,9 +285,9 @@ foreach ($conversations as $conversation) { $attachments = App\Model\helpdesk\Ticket\Ticket_attachments::where('thread_id', '=', $conversation->id)->orderBy('id', 'DESC')->get(); foreach ($attachments as $attachment) { if ($attachment->type == 'pdf') { - + } elseif ($attachment->type == 'docx') { - + } else { $image = @imagecreatefromstring($attachment->file); ob_start(); @@ -209,7 +301,7 @@ foreach ($conversations as $conversation) { $start = ""; $end = ""; if (strpos($string, $start) == false || strpos($string, $start) == false) { - + } else { $ini = strpos($string, $start); $ini += strlen($start); @@ -225,7 +317,7 @@ foreach ($conversations as $conversation) { $start = ""; $end = ""; if (strpos($string, $start) == false || strpos($string, $start) == false) { - + } else { $ini = strpos($string, $start); $ini += strlen($start); @@ -237,8 +329,9 @@ foreach ($conversations as $conversation) { ?>
    1. +
      -