cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pr-8202' into development

Browse Source
This commit is contained in:
RaffiMohammed
2023-10-26 13:34:33 +05:30
parent 13b88b5f9a 75cfc52dbf
commit 8e8e1e531f
69 changed files with 2207 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/FaveoLog/lang/ar/lang.php Normal file
View File

@@ -0,0 +1,7 @@
<?php
return[
'logs' => 'مؤلف',
'system_logs' => 'سجلات النظام',
];

3
app/FaveoLog/lang/en/lang.php
View File

@@ -1,5 +1,6 @@
<?php
return [
'logs' => 'Logs',
'logs' => 'Logs',
'system_logs' => 'System logs',
];

8
app/FaveoLog/views/log.blade.php
View File

@@ -41,10 +41,10 @@ class="nav-link active"
<div class="container-fluid">
<div class="card card-light">
<div class="card-header">
<h3 class="card-title">System Logs</h3>
<h3 class="card-title">{{Lang::get('log::lang.system_logs')}}</h3>
<div class="card-tools">
<a href="?dl={{ base64_encode($current_file) }}" class="btn btn-primary btn-sm text-white"><span class="fas fa-download"></span> Download file</a>
<a id="delete-log" href="?del={{ base64_encode($current_file) }}" class="btn btn-danger btn-sm text-white"><span class="fas fa-trash"></span> Delete file</a>
<a href="?dl={{ base64_encode($current_file) }}" class="btn btn-primary btn-sm text-white"><span class="fas fa-download"></span>{{trans('lang.download_file')}}</a>
<a id="delete-log" href="?del={{ base64_encode($current_file) }}" class="btn btn-danger btn-sm text-white"><span class="fas fa-trash"></span>{{trans('lang.delete_file')}}</a>
</div>
</div>
<div class="card-body">
@@ -61,7 +61,7 @@ class="nav-link active"
<div class="col-md-10 table-container">
@if ($logs === null)
<div>
Log file >50M, please download it.
{{trans('lang.log_file_50M_please_download_it.')}}
</div>
@else
<table id="table-log" class="table table-striped">

9
app/FaveoStorage/lang/ar/lang.php Normal file
View File

@@ -0,0 +1,9 @@
<?php
return[
'storage' => 'تخزين',
'root' => 'جذر',
'system_logs' => 'سجلات النظام',
'default' => 'الافتراضي',
'save' => 'حفظ',
];

1
app/FaveoStorage/lang/en/lang.php
View File

@@ -13,4 +13,5 @@ return [
'container' => 'Container',
'endpoint' => 'End Point',
'url_type' => 'Url Type',
'save' => 'Save',
];

2
app/FaveoStorage/views/settings.blade.php
View File

@@ -114,7 +114,7 @@ class="nav-link active"
<!-- /.box-body -->
</div>
<div class="card-footer">
{!! Form::submit('Save',['class'=>'btn btn-success']) !!}
{!! Form::submit(Lang::get('storage::lang.save'),['class'=>'btn btn-success']) !!}
{!! Form::close() !!}
</div>
<!-- /.box -->

2
app/Http/Controllers/Admin/helpdesk/SettingsController.php
View File

@@ -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');

2
app/Http/Controllers/Admin/helpdesk/UrlSettingController.php
View File

@@ -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);

6
app/Http/Controllers/Agent/helpdesk/OrganizationController.php
View File

@@ -108,15 +108,15 @@ class OrganizationController extends Controller
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Are You Sure ?</h4>
<h4 class="modal-title">'.\Lang::get('lang.are_you_sure').'</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div>
<div class="modal-body">
'.$model->user_name.'
</div>
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">Close</button>
<a href="'.route('org.delete', $model->id).'"><button class="btn btn-danger">delete</button></a>
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">'.\Lang::get('lang.close').'</button>
<a href="'.route('org.delete', $model->id).'"><button class="btn btn-danger">'.\Lang::get('lang.delete').'</button></a>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->

8
app/Http/Controllers/Agent/kb/ArticleController.php
View File

@@ -91,15 +91,15 @@ class ArticleController extends Controller
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Delete</h4>
<h4 class="modal-title">'.Lang::get('lang.delete').'</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div>
<div class="modal-body">
Are you sure you want to delete <b> '.$model->name.' </b> ?
<span>'.Lang::get('lang.are_you_sure_you_want_to_delete').'</span>&nbsp; <b> '.$model->name.' </b> ?
</div>
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">Close</button>
<a href='.url("article/delete/$model->slug").'><button class="btn btn-danger">delete</button></a>
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">'.Lang::get('lang.close').'</button>
<a href='.url("article/delete/$model->slug").'><button class="btn btn-danger">'.Lang::get('lang.delete').'</button></a>
</div>
</div>
</div>

9
app/Http/Controllers/Agent/kb/PageController.php
View File

@@ -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
@@ -91,15 +90,15 @@ class PageController extends Controller
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title">Delete</h4>
<h4 class="modal-title">'.Lang::get('lang.delete').'</h4>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
</div>
<div class="modal-body">
Are you sure you want to delete <b>'.$model->name.'</b> ?
<span>'.Lang::get('lang.are_you_sure_you_want_to_delete').'</span>&nbsp;<b>'.$model->name.'</b> ?
</div>
<div class="modal-footer justify-content-between">
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">Close</button>
<a href="page/delete/'.$model->id.'"><button class="btn btn-danger">Delete</button></a>
<button type="button" class="btn btn-default" data-dismiss="modal" id="dismis2">'.Lang::get('lang.close').'</button>
<a href="page/delete/'.$model->id.'"><button class="btn btn-danger">'.Lang::get('lang.delete').'</button></a>
</div>
</div>
</div>

2
app/Http/Controllers/Common/SettingsController.php
View File

@@ -214,7 +214,7 @@ class SettingsController extends Controller
try {
$widget->save();
return redirect()->back()->with('success', $widget->name.' Saved Successfully');
return redirect()->back()->with('success', $widget->name.trans('lang.save-successful'));
} catch (Exception $e) {
return redirect()->back()->with('fails', $e->errorInfo[2]);
}

4
app/Http/Controllers/Job/QueueController.php
View File

@@ -70,7 +70,7 @@ class QueueController extends Controller
}
}
return redirect()->back()->with('success', 'Updated');
return redirect()->back()->with('success', trans('lang.updated'));
} catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
}
@@ -95,7 +95,7 @@ class QueueController extends Controller
$queue->status = 1;
$queue->save();
return redirect()->back()->with('success', 'Activated');
return redirect()->back()->with('success', trans('lang.activated'));
} catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
}

6
app/Http/Requests/helpdesk/Job/TaskRequest.php
View File

@@ -36,9 +36,9 @@ class TaskRequest extends Request
public function messages()
{
return [
'fetching-commands.required_if' => 'Please choose your Email Fetching timing',
'notification-commands.required_if' => 'Please choose your Email Notification timing',
'work-commands.required_if' => 'Please choose your Auto-close Workflow timing',
'fetching-commands.required_if' => trans('lang.Please_choose_your_Email_Fetching_timing'),
'notification-commands.required_if' => trans('lang.Please_choose_your_ Email_ Notification_timing'),
'work-commands.required_if' => trans('lang.Please_choose_your_Auto-close_Workflow_timing'),
'workflow-dailyAt.required_if' => 'Please enter the time for Auto-close Workflow timing',
'notification-dailyAt.required_if' => 'Please enter the time for Email Notification timing',
'fetching-dailyAt.required_if' => 'Please enter the time for Email Fetching timing',