Merge branch 'master' of https://gitlab.com/kluppsoftware/smart-energia-api
This commit is contained in:
commit
0512cda54b
@ -147,9 +147,8 @@ class UserController extends Controller
|
||||
|
||||
$filename = preg_replace("/imports\//", "", $user_imports_path);
|
||||
|
||||
Excel::import(new UsersWithSmartUsersImport($file_logos), $filename, $driver);
|
||||
Excel::import(new UsersWithSmartUsersImport($file_logos), $user_imports_path, $driver);
|
||||
|
||||
sleep(2000);
|
||||
Storage::disk($driver)->delete($filename);
|
||||
|
||||
return response()
|
||||
|
||||
@ -98,7 +98,7 @@ class UsersWithSmartUsersImport implements ToCollection
|
||||
|
||||
private function uploadProfilePictures()
|
||||
{
|
||||
$temp_extract_files_path = storage_path('app/extract');
|
||||
$temp_extract_files_path = storage_path('app/extracts');
|
||||
|
||||
$zip = Zip::open($this->files_logos);
|
||||
$zip->extract($temp_extract_files_path);
|
||||
|
||||
@ -74,6 +74,7 @@
|
||||
"@php artisan config:clear --ansi",
|
||||
"@php artisan schedule:clear-cache --ansi"
|
||||
],
|
||||
"authorized-files": "sudo chown -R www-data:www-data storage/ storage/framework/cache storage/framework/cache/data bootstrap/cache/ public/",
|
||||
"dev": "@php artisan serve --host=0.0.0.0 --port=8080 --ansi"
|
||||
},
|
||||
"extra": {
|
||||
|
||||
1
storage/framework/cache/.gitignore
vendored
1
storage/framework/cache/.gitignore
vendored
@ -1,3 +1,2 @@
|
||||
*
|
||||
!data/
|
||||
!.gitignore
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user