backend update

app/Http/Controllers/Admin/UserController.php

@@ -13,6 +13,7 @@ use App\Http\Resources\InvoiceCollection;
 use App\Http\Resources\UsersCollection;
 use App\Http\Resources\UserResource;
 use App\Http\Resources\UserStorageResource;
+use App\Http\Resources\UserSubscription;
 use App\Http\Tools\Demo;
 use App\Share;
 use App\User;
@@ -67,6 +68,19 @@ class UserController extends Controller
         );
     }
 
+    /**
+     * Get user subscription details
+     *
+     * @param $id
+     * @return UserSubscription
+     */
+    public function subscription($id)
+    {
+        return new UserSubscription(
+            User::findOrFail($id)->subscription('main')
+        );
+    }
+
     /**
      * Get all users
      *

app/Http/Controllers/User/AccountController.php

@@ -23,37 +23,9 @@ class AccountController extends Controller
     /**
      * Get all user data to frontend
      *
-     * @return array
-     */
-    public function user()
-    {
-        // Get User
-        $user = Auth::user();
-
-        // Get folder tree
-        $tree = FileManagerFolder::with(['folders.shared', 'shared:token,id,item_id,permission,protected'])
-            ->where('parent_id', 0)
-            ->where('user_id', $user->id)
-            ->get();
-
-        return [
-            'user'       => $user->only(['name', 'email', 'avatar', 'role']),
-            'favourites' => $user->favourite_folders->makeHidden(['pivot']),
-            'tree'       => $tree,
-            'storage'    => [
-                'used'       => Metric::bytes($user->used_capacity)->format(),
-                'capacity'   => format_gigabytes($user->settings->storage_capacity),
-                'percentage' => get_storage_fill_percentage($user->used_capacity, $user->settings->storage_capacity),
-            ],
-        ];
-    }
-
-    /**
-     * Get me
-     *
      * @return UserResource
      */
-    public function me()
+    public function user()
     {
         return new UserResource(
             Auth::user()

app/Http/Controllers/User/SubscriptionController.php

@@ -26,10 +26,22 @@ class SubscriptionController extends Controller
         $plan = app('rinvex.subscriptions.plan')
             ->find($request->input('plan.data.id'));
 
-        // Create subscription
-        $user->newSubscription('main', $plan);
+        // Check if user have subscription
+        if ($user->activeSubscriptions()->count() !== 0) {
 
-        // Update user storage limig
+            // Get old subscription
+            $subscription = $user->subscription('main');
+
+            // Change subscription plan
+            $subscription->changePlan($plan);
+
+        } else {
+
+            // Create subscription
+            $user->newSubscription('main', $plan);
+        }
+
+        // Update user storage limit
         $user->settings()->update([
             'storage_capacity' => $plan->features->first()->value
         ]);
@@ -41,4 +53,20 @@ class SubscriptionController extends Controller
 
         return response('Done!', 204);
     }
+
+    /**
+     * Cancel Subscription
+     *
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     */
+    public function cancel() {
+
+        // Get user
+        $user = Auth::user();
+
+        // Cancel subscription
+        $user->subscription('main')->cancel();
+
+        return response('Done!', 204);
+    }
 }