Merge branch 'master' of https://gitlab.com/kluppsoftware/smart-energia-api
This commit is contained in:
commit
a151758bbc
@ -149,7 +149,7 @@ class UserController extends Controller
|
|||||||
|
|
||||||
Excel::import(new UsersWithSmartUsersImport($file_logos), $user_imports_path, $driver);
|
Excel::import(new UsersWithSmartUsersImport($file_logos), $user_imports_path, $driver);
|
||||||
|
|
||||||
Storage::disk($driver)->delete($filename);
|
// Storage::disk($driver)->delete($filename);
|
||||||
|
|
||||||
return response()
|
return response()
|
||||||
->json(['message' => 'Dados importados com sucesso!'])
|
->json(['message' => 'Dados importados com sucesso!'])
|
||||||
|
|||||||
@ -24,7 +24,7 @@ class ImportUsersWithSmartUsersRequest extends FormRequest
|
|||||||
public function rules()
|
public function rules()
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
'file_users' => 'required|file|mimetypes:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel',
|
'file_users' => 'required|file|mimetypes:application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,text/csv',
|
||||||
'file_logos' => 'required|file|mimetypes:application/zip',
|
'file_logos' => 'required|file|mimetypes:application/zip',
|
||||||
'password' => function($attr, $value, $fail) {
|
'password' => function($attr, $value, $fail) {
|
||||||
if($value !== '78s7*a77xghhsa5219129382(*728292SPsk%%%shssajlk') $fail('Senha inválida');
|
if($value !== '78s7*a77xghhsa5219129382(*728292SPsk%%%shssajlk') $fail('Senha inválida');
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user