frontend/backend update

app/Http/Controllers/Admin/PlanController.php

@@ -5,8 +5,12 @@ namespace App\Http\Controllers\Admin;
 use App\Http\Controllers\Controller;
 use App\Http\Resources\PlanCollection;
 use App\Http\Resources\PlanResource;
+use App\Http\Resources\UserResource;
+use App\Http\Resources\UsersCollection;
 use App\Plan;
+use App\User;
 use Illuminate\Http\Request;
+use Rinvex\Subscriptions\Models\PlanFeature;
 
 class PlanController extends Controller
 {
@@ -15,9 +19,11 @@ class PlanController extends Controller
      *
      * @return PlanCollection
      */
-    public function index() {
-
-        return new PlanCollection(Plan::all());
+    public function index()
+    {
+        return new PlanCollection(
+            app('rinvex.subscriptions.plan')->all()
+        );
     }
 
     /**
@@ -28,9 +34,9 @@ class PlanController extends Controller
      */
     public function show($id)
     {
-        $plan = Plan::findOrFail($id);
-
-        return new PlanResource($plan);
+        return new PlanResource(
+            app('rinvex.subscriptions.plan')->find($id)
+        );
     }
 
     /**
@@ -41,9 +47,24 @@ class PlanController extends Controller
      */
     public function store(Request $request)
     {
-        // TODO: validation request
+        $plan = app('rinvex.subscriptions.plan')->create([
+            'description'    => $request->input('attributes.description'),
+            'price'          => $request->input('attributes.price'),
+            'name'           => $request->input('attributes.name'),
+            'currency'       => 'USD',
+            'invoice_period' => 1,
+            'sort_order'     => 1,
+            'signup_fee'     => 0,
+        ]);
 
-        $plan = Plan::create($request->input('attributes'));
+        // Create multiple plan features at once
+        $plan->features()->saveMany([
+            new PlanFeature([
+                'name' => 'Storage capacity',
+                'value' => $request->input('attributes.capacity'),
+                'sort_order' => 1
+            ]),
+        ]);
 
         return new PlanResource($plan);
     }
@@ -58,11 +79,32 @@ class PlanController extends Controller
     public function update(Request $request, $id)
     {
         // TODO: validation request
-        $plan = Plan::findOrFail($id);
+        $plan = app('rinvex.subscriptions.plan')->find($id);
 
-        // Update text data
-        $plan->update(make_single_input($request));
+        if ($request->name === 'capacity') {
+            $plan->getFeatureBySlug('storage-capacity')->update(['value' => $request->value]);
+        } else {
+            $plan->update(make_single_input($request));
+        }
 
         return response('Saved!', 204);
     }
+
+    /**
+     * Get subscriptions
+     *
+     * @param $id
+     * @return mixed
+     */
+    public function subscribers($id)
+    {
+        $subscribers = app('rinvex.subscriptions.plan')
+            ->find($id)
+            ->subscriptions
+            ->pluck('user_id');
+
+        return new UsersCollection(
+            User::findMany($subscribers)
+        );
+    }
 }

app/Http/Controllers/Admin/UserController.php

@@ -214,7 +214,7 @@ class UserController extends Controller
 
             // Delete thumbnail if exist
             if (!is_null($file->thumbnail)) {
-                Storage::delete('/file-manager/' . $file->getOriginal('thumbnail'));
+                Storage::delete('/file-manager/' . $file->getRawOriginal('thumbnail'));
             }
 
             // Delete file permanently
@@ -232,7 +232,7 @@ class UserController extends Controller
 
         // Remove favourites
         $user->settings->delete();
-        $user->favourites()->sync([]);
+        $user->favourite_folders()->sync([]);
 
         // Delete user
         $user->delete();

app/Http/Controllers/FileAccessController.php

@@ -206,12 +206,12 @@ class FileAccessController extends Controller
     private function thumbnail_file($file)
     {
         // Get file path
-        $path = '/file-manager/' . $file->getOriginal('thumbnail');
+        $path = '/file-manager/' . $file->getRawOriginal('thumbnail');
 
         // Check if file exist
         if (!Storage::exists($path)) abort(404);
 
         // Return image thumbnail
-        return Storage::download($path, $file->getOriginal('thumbnail'));
+        return Storage::download($path, $file->getRawOriginal('thumbnail'));
     }
 }

app/Http/Controllers/FileFunctions/FavouriteController.php

@@ -39,10 +39,10 @@ class FavouriteController extends Controller
         if ($folder->user_id !== $user->id) abort(403);
 
         // Add folder to user favourites
-        $user->favourites()->syncWithoutDetaching($request->unique_id);
+        $user->favourite_folders()->syncWithoutDetaching($request->unique_id);
 
         // Return updated favourites
-        return $user->favourites->makeHidden(['pivot']);
+        return $user->favourites;
     }
 
     /**
@@ -61,9 +61,9 @@ class FavouriteController extends Controller
         }
 
         // Remove folder from user favourites
-        $user->favourites()->detach($unique_id);
+        $user->favourite_folders()->detach($unique_id);
 
         // Return updated favourites
-        return $user->favourites->makeHidden(['pivot']);
+        return $user->favourites;
     }
 }

app/Http/Controllers/FileFunctions/TrashController.php

@@ -42,7 +42,7 @@ class TrashController extends Controller
             Storage::delete('/file-manager/' . $file->basename);
 
             // Delete thumbnail if exist
-            if ($file->thumbnail) Storage::delete('/file-manager/' . $file->getOriginal('thumbnail'));
+            if ($file->thumbnail) Storage::delete('/file-manager/' . $file->getRawOriginal('thumbnail'));
 
             // Delete file permanently
             $file->forceDelete();

app/Http/Controllers/General/PricingController.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Controllers\General;
+
+use App\Http\Controllers\Controller;
+use App\Http\Resources\PricingCollection;
+use Illuminate\Http\Request;
+
+class PricingController extends Controller
+{
+    /**
+     * Get all active plans
+     *
+     * @return PricingCollection
+     */
+    public function index() {
+
+        return new PricingCollection(
+            app('rinvex.subscriptions.plan')->where('is_active', 1)->get()
+        );
+    }
+}

app/Http/Controllers/User/AccountController.php

@@ -28,9 +28,7 @@ class AccountController extends Controller
     public function user()
     {
         // Get User
-        $user = User::with(['favourites'])
-            ->where('id', Auth::id())
-            ->first();
+        $user = Auth::user();
 
         // Get folder tree
         $tree = FileManagerFolder::with(['folders.shared', 'shared:token,id,item_id,permission,protected'])
@@ -40,7 +38,7 @@ class AccountController extends Controller
 
         return [
             'user'       => $user->only(['name', 'email', 'avatar', 'role']),
-            'favourites' => $user->favourites->makeHidden(['pivot']),
+            'favourites' => $user->favourite_folders->makeHidden(['pivot']),
             'tree'       => $tree,
             'storage'    => [
                 'used'       => Metric::bytes($user->used_capacity)->format(),

app/Http/Controllers/User/SubscriptionController.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Http\Controllers\User;
+
+use App\Http\Controllers\Controller;
+use App\Invoice;
+use Auth;
+use Illuminate\Http\Request;
+
+class SubscriptionController extends Controller
+{
+    /**
+     * Upgrade account to subscription
+     *
+     * @param Request $request
+     * @return \Illuminate\Contracts\Routing\ResponseFactory|\Illuminate\Http\Response
+     */
+    public function upgrade(Request $request)
+    {
+        // TODO: validation request
+
+        // Get user
+        $user = Auth::user();
+
+        // Get requested plan
+        $plan = app('rinvex.subscriptions.plan')
+            ->find($request->input('plan.data.id'));
+
+        // Create subscription
+        $user->newSubscription('main', $plan);
+
+        // Update user storage limig
+        $user->settings()->update([
+            'storage_capacity' => $plan->features->first()->value
+        ]);
+
+        // Store invoice
+        Invoice::create(
+            get_invoice_data($user, $plan)
+        );
+
+        return response('Done!', 204);
+    }
+}