mirror of
https://github.com/VueFileManager/vuefilemanager.git
synced 2026-04-18 08:12:15 +00:00
v1.7 RC.2
This commit is contained in:
@@ -42,7 +42,7 @@ class FavouriteController extends Controller
|
||||
$user->favourite_folders()->syncWithoutDetaching($request->unique_id);
|
||||
|
||||
// Return updated favourites
|
||||
return $user->favourites;
|
||||
return $user->favourite_folders;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -64,6 +64,6 @@ class FavouriteController extends Controller
|
||||
$user->favourite_folders()->detach($unique_id);
|
||||
|
||||
// Return updated favourites
|
||||
return $user->favourites;
|
||||
return $user->favourite_folders;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -128,6 +128,11 @@ class PaymentMethodsController extends Controller
|
||||
// Get user
|
||||
$user = Auth::user();
|
||||
|
||||
// Check if is demo
|
||||
if (is_demo($user->id)) {
|
||||
return response('Done', 201);
|
||||
}
|
||||
|
||||
// Register new payment method
|
||||
$this->stripe->registerNewPaymentMethod($request, $user);
|
||||
|
||||
|
||||
@@ -171,7 +171,6 @@ function get_version()
|
||||
*/
|
||||
function is_demo($user_id)
|
||||
{
|
||||
|
||||
return env('APP_DEMO', false) && $user_id === 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -138,6 +138,6 @@ class Demo
|
||||
*/
|
||||
public static function favourites($user) {
|
||||
|
||||
return $user->favourites->makeHidden(['pivot']);
|
||||
return $user->favourite_folders->makeHidden(['pivot']);
|
||||
}
|
||||
}
|
||||
@@ -107,7 +107,6 @@ class User extends Authenticatable
|
||||
*/
|
||||
protected $casts = [
|
||||
'email_verified_at' => 'datetime',
|
||||
'favourites' => 'array',
|
||||
];
|
||||
|
||||
protected $appends = [
|
||||
|
||||
Reference in New Issue
Block a user