v1.7 RC.2

This commit is contained in:
carodej
2020-07-21 09:27:57 +02:00
parent b67297f160
commit 6f6115d5cb
10 changed files with 38 additions and 13 deletions

View File

@@ -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;
}
}

View File

@@ -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);

View File

@@ -171,7 +171,6 @@ function get_version()
*/
function is_demo($user_id)
{
return env('APP_DEMO', false) && $user_id === 1;
}

View File

@@ -138,6 +138,6 @@ class Demo
*/
public static function favourites($user) {
return $user->favourites->makeHidden(['pivot']);
return $user->favourite_folders->makeHidden(['pivot']);
}
}

View File

@@ -107,7 +107,6 @@ class User extends Authenticatable
*/
protected $casts = [
'email_verified_at' => 'datetime',
'favourites' => 'array',
];
protected $appends = [