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

Merge branch 'master' into language-suggestions

Browse Source
This commit is contained in:
Manish Verma
2018-08-06 12:43:31 +05:30
committed by GitHub
parent d0fa55e426 188add3afe
commit faf28b8bf0
18 changed files with 1824 additions and 1366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -2,8 +2,6 @@ Faveo Helpdesk Community
========
<br><img src="https://travis-ci.org/ladybirdweb/faveo-helpdesk.svg?branch=master">&nbsp;<img src="https://img.shields.io/badge/License-OSL-blue.svg">&nbsp;<a href="https://gitter.im/ladybirdweb/faveo-helpdesk" target="_blank"><img src="https://badges.gitter.im/ladybirdweb/faveo-helpdesk.svg"></a>&nbsp;<a href="https://styleci.io/repos/34716238"><img src="https://styleci.io/repos/34716238/shield" alt="StyleCI" height="19px"></a>&nbsp;<a href="http://squizlabs.github.io/PHP_CodeSniffer/analysis/ladybirdweb/faveo-helpdesk/index.html" target="_blank"><img src="http://squizlabs.github.io/PHP_CodeSniffer/analysis/ladybirdweb/faveo-helpdesk/grade.svg" height="20px"></a>&nbsp;<a href="https://scrutinizer-ci.com/g/ladybirdweb/faveo-helpdesk/?branch=master" target="_blank"><img src="https://scrutinizer-ci.com/g/mverma16/faveo-helpdesk/badges/quality-score.png?b=master" height="20px"></a></br>
#### :new: Faveo Helpdesk Community [v1.9.7-BETA](https://github.com/ladybirdweb/faveo-helpdesk/releases/tag/v1.9.7-BETA) is out. Click [here](https://github.com/ladybirdweb/faveo-helpdesk/archive/v1.9.7-BETA.zip) to download it now.
Faveo Helpdesk provides Businesses with an automated Helpdesk system to manage customer support.
The word Faveo comes from Latin which means to be favourable. Which truly highlights vision and the scope as well as the functionality of the product that Faveo is. In today’s competitive startup scenario customer retention is one of the major challenges. Handling client query diligently is all the difference between retaining or losing a long lasting relationship. The company is driven with passion of providing tools for managing consumer queries for strategic insights and helping companies take those decisive decisions.
@@ -17,7 +15,7 @@ Flavors of Faveo
* Faveo Community Edition – Free, Open source edition
* Faveo Pro Edition – Paid version with many advance features and integrations
* Faveo Service Desk - Paid version for IT Assest management
Faveo Documentation
--------------------------
* <a href="http://www.ladybirdweb.com/support/knowledgebase" target="_blank">Faveo user Manual</a>

27
app/Http/Controllers/Admin/helpdesk/EmailsController.php
View File

@@ -103,7 +103,7 @@ class EmailsController extends Controller
{
//dd($request->all());
try {
$service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode', 'code');
$service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'user_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode', 'code');
$service = $request->input('sending_protocol');
$validate = '/novalidate-cert';
$fetch = 1;
@@ -174,6 +174,7 @@ class EmailsController extends Controller
$email->email_address = $request->email_address;
$email->email_name = $request->email_name;
$email->user_name = $request->user_name;
$email->fetching_host = $request->fetching_host;
$email->fetching_port = $request->fetching_port;
$email->fetching_protocol = $request->fetching_protocol;
@@ -241,16 +242,17 @@ class EmailsController extends Controller
{
$mailservice_id = $request->input('sending_protocol');
$driver = $this->getDriver($mailservice_id);
$username = $request->input('email_address');
$address = $request->input('email_address');
$username = $request->input('user_name');
$password = $request->input('password');
$name = $request->input('email_name');
$host = $request->input('sending_host');
$port = $request->input('sending_port');
$enc = $request->input('sending_encryption');
$service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode');
$service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'user_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode');
$this->emailService($driver, $service_request);
$this->setMailConfig($driver, $username, $name, $password, $enc, $host, $port);
$this->setMailConfig($driver, $address, $name, $username, $password, $enc, $host, $port);
$transport = \Swift_SmtpTransport::newInstance($host, $port, $enc);
$transport->setUsername($username);
$transport->setPassword($password);
@@ -264,30 +266,31 @@ class EmailsController extends Controller
{
$mailservice_id = $request->input('sending_protocol');
$driver = $this->getDriver($mailservice_id);
$username = $request->input('email_address');
$address = $request->input('email_address');
$username = $request->input('user_name');
$password = $request->input('password');
$name = $request->input('email_name');
$host = $request->input('sending_host');
$port = $request->input('sending_port');
$enc = $request->input('sending_encryption');
$service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode');
$service_request = $request->except('sending_status', '_token', 'email_address', 'email_name', 'user_name', 'password', 'department', 'priority', 'help_topic', 'fetching_protocol', 'fetching_host', 'fetching_port', 'fetching_encryption', 'imap_authentication', 'sending_protocol', 'sending_host', 'sending_port', 'sending_encryption', 'smtp_authentication', 'internal_notes', '_wysihtml5_mode');
$this->emailService($driver, $service_request);
$this->setMailConfig($driver, $username, $name, $password, $enc, $host, $port);
$this->setMailConfig($driver, $address, $name, $username, $password, $enc, $host, $port);
$controller = new \App\Http\Controllers\Common\PhpMailController();
$subject = 'test';
$data = 'test';
//dd(\Config::get('mail'),\Config::get('services'));
$send = $controller->laravelMail($username, $name, $subject, $data, [], []);
$send = $controller->laravelMail($address, $name, $subject, $data, [], []);
return $send;
}
public function setMailConfig($driver, $username, $name, $password, $enc, $host, $port)
public function setMailConfig($driver, $address, $name, $username, $password, $enc, $host, $port)
{
$configs = [
'username' => $username,
'from' => ['address' => $username, 'name' => $name],
'from' => ['address' => $address, 'name' => $name],
'password' => $password,
'encryption' => $enc,
'host' => $host,
@@ -456,7 +459,7 @@ class EmailsController extends Controller
$service = $request->input('fetching_protocol');
$encryption = $request->input('fetching_encryption');
$validate = $request->input('imap_validate');
$username = $request->input('email_address');
$username = $request->input('user_name');
$password = $request->input('password');
$server = new Fetch($host, $port, $service);
//$server->setFlag('novalidate-cert');
@@ -510,7 +513,7 @@ class EmailsController extends Controller
$mail->isSMTP();
$mail->Host = $request->input('sending_host'); // Specify main and backup SMTP servers
//$mail->SMTPAuth = true; // Enable SMTP authentication
$mail->Username = $request->input('email_address'); // SMTP username
$mail->Username = $request->input('user_name'); // SMTP username
$mail->Password = $request->input('password'); // SMTP password
$mail->SMTPSecure = $request->input('sending_encryption'); // Enable TLS encryption, `ssl` also accepted
$mail->Port = $request->input('sending_port'); // TCP port to connect to

2
app/Http/Controllers/Api/v1/TokenAuthController.php
View File

@@ -172,7 +172,7 @@ class TokenAuthController extends Controller
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) {
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
// $password_reset_table->token = $code;
// $password_reset_table->token = $code;
// $password_reset_table->update(['token' => $code]);
} else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);

2
app/Http/Controllers/Auth/PasswordController.php
View File

@@ -62,7 +62,7 @@ class PasswordController extends Controller
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) {
$password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->update(['token' => $code, 'created_at' => $date]);
// $password_reset_table->token = $code;
// $password_reset_table->token = $code;
// $password_reset_table->update(['token' => $code]);
} else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]);

2
app/Http/Controllers/Client/helpdesk/UnAuthController.php
View File

@@ -339,7 +339,7 @@ class UnAuthController extends Controller
// app()->setLocale($lang);
\Cache::forever('language', $lang);
// dd(Cache::get('language'));
// dd(Cache::get('language'));
// dd()
} else {
return false;

2
app/Http/Middleware/CheckRoleAgent.php
View File

@@ -25,6 +25,6 @@ class CheckRoleAgent
return $next($request);
}
return redirect('dashboard')->with('fails', 'You are not Autherised');
return redirect('dashboard')->with('fails', 'You are not Authorised');
}
}

4
app/Http/Requests/helpdesk/EmailsEditRequest.php
View File

@@ -35,8 +35,8 @@ class EmailsEditRequest extends Request
// 'priority' => 'required',
// 'help_topic' => 'required',
// 'imap_config' => 'required',
'password' => 'required|min:6',
// 'user_name' => 'required',
'password' => 'required|min:6',
'user_name' => 'required',
// 'sending_host' => 'required',
// 'sending_port' => 'required',
//'mailbox_protocol' => 'required'

1149
resources/lang/de/lang.php
View File

File diff suppressed because it is too large Load Diff

5
resources/lang/en/lang.php
View File

@@ -51,7 +51,6 @@ return [
'password_confirmation' => 'Password confirmation',
'woops' => 'Whoops!',
'theirisproblem' => 'There were some problems with your input.',
'login' => 'Login',
'e-mail' => 'Email',
'reg_new_member' => 'Register a new membership',
'this_account_is_currently_inactive' => 'This account is currently inactive!',
@@ -756,7 +755,6 @@ return [
'edit' => 'Edit',
'departments' => 'Departments',
'groups' => 'Groups',
'select_a_time_zone' => 'Select a time zone',
'time_zones' => 'Time zones',
/*
|--------------------------------------
@@ -827,7 +825,6 @@ return [
'the_associated_helptopic_has_been_deactivated' => 'The associated helptopic has been deactivated',
'department_deleted_sucessfully' => 'Department deleted successfully',
'department_can_not_delete' => 'Department can not be deleted',
'select_a_department' => 'Select a department',
'make-default-department' => 'Make system\'s default department',
/*
|--------------------------------------
@@ -1361,7 +1358,6 @@ return [
'post_comment' => 'Post comment',
'plugin' => 'Plugin',
'edit_profile' => 'Edit profile',
'you_are_here' => 'You are here',
'Send' => 'SEND',
'no_article' => 'No article',
'profile_settings' => 'Profile settings',
@@ -1592,7 +1588,6 @@ return [
'banned-users' => 'Banned users',
'inactive-users' => 'Inactive users',
'all-users' => 'All users',
'search' => 'Search...',
//update 21-12-2016
'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
//updated 15-5-2017

4
resources/lang/fr/lang.php
View File

@@ -44,7 +44,6 @@ return [
'password' => 'Mot de passe',
'woops' => 'Oups!',
'theirisproblem' => 'Il y a eu un problème avec ce que vous avez saisi',
'login' => 'Connexion',
'e-mail' => 'E-mail',
'reg_new_member' => 'Inscrivez-vous',
'this_account_is_currently_inactive' => 'Ce compte est actuellement inactif!',
@@ -789,7 +788,6 @@ return [
'the_associated_helptopic_has_been_deactivated' => 'La branche de support associée a été désactivée',
'department_deleted_sucessfully' => 'Département supprimé avec succès',
'department_can_not_delete' => 'Le département ne peut pas être supprimé',
'select_a_department' => 'Sélectionner un département',
'make-default-department' => 'Marquer comme département par défaut du système',
/*
|--------------------------------------
@@ -1322,7 +1320,6 @@ return [
'post_comment' => 'Poster commentaire',
'plugin' => 'Plugin',
'edit_profile' => 'Modifier profil',
'you_are_here' => 'Vous êtes ici',
'Send' => 'VALIDER',
'no_article' => 'Pas d\'article',
'profile_settings' => 'Paramètres du profil',
@@ -1562,7 +1559,6 @@ return [
'banned-users' => 'Utilisateurs bannis',
'inactive-users' => 'Utilisateurs inactifs',
'all-users' => 'Tous les utilisateurs',
'search' => 'Rechercher...',
//update 21-12-2016
'selected-user-is-already-the-owner' => 'L\'utilisateur sélectionné est déjà le propriétaire du ticket.',
//updated 15-5-2017

1832
resources/lang/it/lang.php
View File

File diff suppressed because it is too large Load Diff

2
resources/lang/it/pagination.php
View File

@@ -14,5 +14,5 @@ return [
*/
'previous' => '&laquo; Precedente',
'next' => 'Prossimo &raquo;',
'next' => 'Successivo &raquo;',
];

8
resources/lang/it/passwords.php
View File

@@ -13,9 +13,9 @@ return [
|
*/
'password' => 'Le Passwords devono essere almeno di sei caratteri e combaciare.',
'user' => 'Non esiste un utente con questo indirizzo e-mail.',
'token' => 'Il token per il reset della password non è valido.',
'sent' => 'Una email con il link al reset della passowrd ti è stato inviato!',
'password' => 'Le password devono essere almeno di sei carattere e devono corrispondere.',
'user' => "Non trovo nessun utente con l'email fornita.",
'token' => 'Il token di reset password non è valido.',
'sent' => 'Ti abbiamo inviato per email il link di reset della password!',
'reset' => 'La tua password è stata resettata!',
];

124
resources/lang/it/validation.php
View File

@@ -2,77 +2,77 @@
return [
/*
|--------------------------------------------------------------------------
| Validation Language Lines
|--------------------------------------------------------------------------
|
| The following language lines contain the default error messages used by
| the validator class. Some of these rules have multiple versions such
| as the size rules. Feel free to tweak each of these messages here.
|
*/
/*
|--------------------------------------------------------------------------
| Validation Language Lines
|--------------------------------------------------------------------------
|
| The following language lines contain the default error messages used by
| the validator class. Some of these rules have multiple versions such
| as the size rules. Feel free to tweak each of these messages here.
|
*/
'accepted' => 'The :attribute must be accepted.',
'active_url' => 'The :attribute is not a valid URL.',
'after' => 'The :attribute must be a date after :date.',
'alpha' => 'The :attribute may only contain letters.',
'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
'alpha_num' => 'The :attribute may only contain letters and numbers.',
'array' => 'The :attribute must be an array.',
'before' => 'The :attribute must be a date before :date.',
'accepted' => ':attribute deve essere accettatp.',
'active_url' => ':attribute non è un URL valido.',
'after' => ':attribute deve essere una data dopo il :date.',
'alpha' => ':attribute può contenere lettere.',
'alpha_dash' => ':attribute può contenere lettere, numeri, e trattini.',
'alpha_num' => ':attribute può contenere lettere and numeri.',
'array' => ':attribute deve essere un array.',
'before' => ':attribute deve essere una data prima di :date.',
'between' => [
'numeric' => 'The :attribute must be between :min and :max.',
'file' => 'The :attribute must be between :min and :max kilobytes.',
'string' => 'The :attribute must be between :min and :max characters.',
'array' => 'The :attribute must have between :min and :max items.',
'numeric' => ':attribute deve essere fra :min e :max.',
'file' => ':attribute deve essere fra :min e :max kilobytes.',
'string' => ':attribute deve essere fra :min e :max caratteri.',
'array' => ':attribute deve contenere fra :min e :max oggetti.',
],
'boolean' => 'The :attribute field must be true or false.',
'confirmed' => 'The :attribute confirmation does not match.',
'date' => 'The :attribute is not a valid date.',
'date_format' => 'The :attribute does not match the format :format.',
'different' => 'The :attribute and :other must be different.',
'digits' => 'The :attribute must be :digits digits.',
'digits_between' => 'The :attribute must be between :min and :max digits.',
'email' => 'The :attribute must be a valid email address.',
'filled' => 'The :attribute field is required.',
'exists' => 'The selected :attribute is invalid.',
'image' => 'The :attribute must be an image.',
'in' => 'The selected :attribute is invalid.',
'integer' => 'The :attribute must be an integer.',
'ip' => 'The :attribute must be a valid IP address.',
'boolean' => ':attribute deve essere vero o falso.',
'confirmed' => ':attribute di conferma non corrisponde.',
'date' => ':attribute non è una data valida.',
'date_format' => ':attribute non corrisponde al formato :format.',
'different' => ':attribute e :other deveno essere differenti.',
'digits' => ':attribute deve essere :digits numeri.',
'digits_between' => ':attribute deve essere fra :min and :max numeri.',
'email' => ':attribute deve essere un indirizzo email valido.',
'filled' => ':attribute è obbligatorio.',
'exists' => ':attribute selezionato non è valido.',
'image' => ':attribute deve essere una immagine.',
'in' => ':attribute selezionato non è valido.',
'integer' => ':attribute deve essere un intero.',
'ip' => ':attribute deve essere un indirizzo IP valido.',
'max' => [
'numeric' => 'The :attribute may not be greater than :max.',
'file' => 'The :attribute may not be greater than :max kilobytes.',
'string' => 'The :attribute may not be greater than :max characters.',
'array' => 'The :attribute may not have more than :max items.',
'numeric' => ':attribute non può essere più grande di :max.',
'file' => ':attribute non può essere più grande di :max kilobytes.',
'string' => ':attribute non può essere più grande di :max caratteri.',
'array' => ':attribute non può avere più di :max oggetti.',
],
'mimes' => 'The :attribute must be a file of type: :values.',
'mimes' => ':attribute deve essere un file di tipo: :values.',
'min' => [
'numeric' => 'The :attribute must be at least :min.',
'file' => 'The :attribute must be at least :min kilobytes.',
'string' => 'The :attribute must be at least :min characters.',
'array' => 'The :attribute must have at least :min items.',
'numeric' => ':attribute deve essere almeno :min.',
'file' => ':attribute deve essere almeno :min kilobytes.',
'string' => ':attribute deve essere almeno :min caratteri.',
'array' => ':attribute deve avere almeno :min oggetti.',
],
'not_in' => 'The selected :attribute is invalid.',
'numeric' => 'The :attribute must be a number.',
'regex' => 'The :attribute format is invalid.',
'required' => 'The :attribute field is required.',
'required_if' => 'The :attribute field is required when :other is :value.',
'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values is present.',
'required_without' => 'The :attribute field is required when :values is not present.',
'required_without_all' => 'The :attribute field is required when none of :values are present.',
'same' => 'The :attribute and :other must match.',
'not_in' => ':attribute selezionato non è valido.',
'numeric' => ':attribute deve essere un numero.',
'regex' => ':attribute ha un formato non valido.',
'required' => ':attribute è richiesto.',
'required_if' => ':attribute è richiesto quando :other è :value.',
'required_with' => ':attribute è richiesto quando :values è presente.',
'required_with_all' => ':attribute è richiesto quando :values è presente.',
'required_without' => ':attribute è richiesto quando :values non è presente.',
'required_without_all' => ':attribute è richiesto quando nessuno dei :values è presente.',
'same' => ':attribute e :other devono corrispondere.',
'size' => [
'numeric' => 'The :attribute must be :size.',
'file' => 'The :attribute must be :size kilobytes.',
'string' => 'The :attribute must be :size characters.',
'array' => 'The :attribute must contain :size items.',
'numeric' => ':attribute deve essere :size.',
'file' => ':attribute deve essere :size kilobytes.',
'string' => ':attribute deve essere :size caratter.',
'array' => ':attribute deve contenere :size oggetti.',
],
'unique' => 'The :attribute has already been taken.',
'url' => 'The :attribute format is invalid.',
'timezone' => 'The :attribute must be a valid zone.',
'unique' => ':attribute è già stato utilizzato.',
'url' => ':attribute è in un formato non valido.',
'timezone' => ':attribute deve essere un valido fuso orario.',
/*
|--------------------------------------------------------------------------
| Custom Validation Language Lines

4
resources/lang/nl/lang.php
View File

@@ -64,7 +64,6 @@ return [
'password' => 'Wachtwoord',
'woops' => 'Oeps!!',
'theirisproblem' => 'Er is een probleem met je invoer.',
'login' => 'Login',
'e-mail' => 'E-mailadres',
'reg_new_member' => 'Registreren',
'this_account_is_currently_inactive' => 'Dit account is niet actief!',
@@ -852,7 +851,6 @@ return [
'the_associated_helptopic_has_been_deactivated' => 'Het gerelateerde help-onderwerp is uitgeschakeld',
'department_deleted_sucessfully' => 'Afdeling succesvol verwijderd',
'department_can_not_delete' => 'Afdeling kan niet verwijderd worden',
'select_a_department' => 'Selecteer een afdeling',
'make-default-department' => 'Maak hier de standaard afdeling van',
/*
|--------------------------------------
@@ -1378,7 +1376,6 @@ return [
'post_comment' => 'Plaats reactie',
'plugin' => 'Plugin',
'edit_profile' => 'Bewerk profiel',
'you_are_here' => 'Je bent hier',
'Send' => 'Verstuur',
'no_article' => 'Geen artikel',
'profile_settings' => 'Profiel instellingen',
@@ -1608,7 +1605,6 @@ return [
'banned-users' => 'Banned users',
'inactive-users' => 'Inactive users',
'all-users' => 'All users',
'search' => 'Search...',
//update 21-12-2016
'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
//updated 15-5-2017

4
resources/lang/pt/lang.php
View File

@@ -57,7 +57,6 @@ return [
'password' => 'Senha',
'woops' => 'Whoops!',
'theirisproblem' => 'Ocorreu um erro durante o login.',
'login' => 'Login',
'e-mail' => 'E-mail',
'reg_new_member' => 'Registrar uma nova associação.',
'this_account_is_currently_inactive' => 'Essa conta está inativa!',
@@ -788,7 +787,6 @@ return [
'the_associated_helptopic_has_been_deactivated' => 'O tópico de ajuda associado foi desativado',
'department_deleted_sucessfully' => 'Departamento deletado com sucesso',
'department_can_not_delete' => 'Departamento não pode ser deletado',
'select_a_department' => 'Selecione um departamento',
'make-default-department' => 'Criar departamento padrão',
/*
|--------------------------------------
@@ -1316,7 +1314,6 @@ return [
'post_comment' => 'Enviar comentário',
'plugin' => 'Plugin',
'edit_profile' => 'Editar Perfil',
'you_are_here' => 'Você está aqui',
'Send' => 'ENVIAR',
'no_article' => 'Nenhum artigo',
'profile_settings' => 'Configurações de perfil',
@@ -1553,7 +1550,6 @@ return [
'banned-users' => 'Banned users',
'inactive-users' => 'Inactive users',
'all-users' => 'All users',
'search' => 'Search...',
//update 21-12-2016
'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
//updated 15-5-2017

3
resources/lang/ru/lang.php
View File

@@ -34,7 +34,6 @@ return [
'password' => 'Пароль',
'woops' => 'Whoops!',
'theirisproblem' => 'There were some problems with your input.',
'login' => 'Login',
'e-mail' => 'E-mail',
'reg_new_member' => 'Register a new membership',
/*
@@ -830,7 +829,6 @@ return [
/* Translation reuired */
/*****************************************************************************************/
'edit_profile' => 'Edit profile',
'you_are_here' => 'You are here',
'Send' => 'SEND',
'no_article' => 'No article',
'profile_settings' => 'Profile settings',
@@ -1062,7 +1060,6 @@ return [
'banned-users' => 'Banned users',
'inactive-users' => 'Inactive users',
'all-users' => 'All users',
'search' => 'Search...',
//update 21-12-2016
'selected-user-is-already-the-owner' => 'Selected user is already the owner of this ticket.',
//updated 15-5-2017

12
resources/views/themes/default1/admin/helpdesk/emails/emails/edit.blade.php
View File

@@ -46,19 +46,25 @@ class="active"
<div class="box-body">
<div class="row">
<!-- email address -->
<div class="col-xs-4 form-group {{ $errors->has('email_address') ? 'has-error' : '' }}" id="email_address_error">
<div class="col-xs-6 form-group {{ $errors->has('email_address') ? 'has-error' : '' }}" id="email_address_error">
{!! Form::label('email_address',Lang::get('lang.email_address')) !!} <span class="text-red"> *</span>
{!! $errors->first('email_address', '<spam class="help-block">:message</spam>') !!}
{!! Form::text('email_address',null,['class' => 'form-control']) !!}
</div>
<!-- user name -->
<div class="col-xs-6 form-group {{ $errors->has('user_name') ? 'has-error' : '' }}" id="user_name_error">
{!! Form::label('user_name',Lang::get('lang.user_name')) !!} <span class="text-red"> *</span>
{!! $errors->first('user_name', '<spam class="help-block">:message</spam>') !!}
{!! Form::text('user_name',null,['class' => 'form-control']) !!}
</div>
<!-- Email name -->
<div class="col-xs-4 form-group {!! $errors->has('email_name') ? 'has-error' : ''!!}" id="email_name_error">
<div class="col-xs-6 form-group {!! $errors->has('email_name') ? 'has-error' : ''!!}" id="email_name_error">
{!! Form::label('email_name',Lang::get('lang.from_name')) !!} <span class="text-red"> *</span>
{!! $errors->first('email_name', '<spam class="help-block">:message</spam>') !!}
{!! Form::text('email_name',null,['class' => 'form-control', 'id' => 'email_name']) !!}
</div>
<!-- password -->
<div class="col-xs-4 form-group {!! $errors->has('password') ? 'has-error' : ''!!}" id="password_error">
<div class="col-xs-6 form-group {!! $errors->has('password') ? 'has-error' : ''!!}" id="password_error">
{!! Form::label('password',Lang::get('lang.password')) !!} <span class="text-red"> *</span>
{!! $errors->first('password', '<spam class="help-block">:message</spam>') !!}
<input type="password" name="password" class="form-control" id="password" value={!! $emails->password !!} >