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

Merge branch 'master' into fix-lang-duplicate-key

Browse Source
This commit is contained in:
Manish Verma
2018-08-06 11:33:02 +05:30
committed by GitHub
parent 36bcf0af30 c34daf6b99
commit 4f3cb1e644
10 changed files with 1763 additions and 1294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
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> <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. 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. 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.

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(); $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) { 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 = \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]); // $password_reset_table->update(['token' => $code]);
} else { } else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]); $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(); $password_reset_table = \DB::table('password_resets')->where('email', '=', $user->email)->first();
if (isset($password_reset_table)) { 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 = \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]); // $password_reset_table->update(['token' => $code]);
} else { } else {
$create_password_reset = \DB::table('password_resets')->insert(['email' => $user->email, 'token' => $code, 'created_at' => $date]); $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); // app()->setLocale($lang);
\Cache::forever('language', $lang); \Cache::forever('language', $lang);
// dd(Cache::get('language')); // dd(Cache::get('language'));
// dd() // dd()
} else { } else {
return false; return false;

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

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

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

File diff suppressed because it is too large Load Diff

1821
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', '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.', 'password' => 'Le password devono essere almeno di sei carattere e devono corrispondere.',
'user' => 'Non esiste un utente con questo indirizzo e-mail.', 'user' => "Non trovo nessun utente con l'email fornita.",
'token' => 'Il token per il reset della password non è valido.', 'token' => 'Il token di reset password non è valido.',
'sent' => 'Una email con il link al reset della passowrd ti è stato inviato!', 'sent' => 'Ti abbiamo inviato per email il link di reset della password!',
'reset' => 'La tua password è stata resettata!', 'reset' => 'La tua password è stata resettata!',
]; ];

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

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