frontend & backend update

app/Http/Controllers/Admin/InvoiceController.php

@@ -3,33 +3,44 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-use App\Http\Resources\InvoiceCollection;
+use App\Http\Resources\InvoiceAdminCollection;
 use App\Http\Resources\InvoiceResource;
 use App\Invoice;
+use App\Services\StripeService;
 use Illuminate\Http\Request;
 
 class InvoiceController extends Controller
 {
+    /**
+     * PlanController constructor.
+     */
+    public function __construct(StripeService $stripe)
+    {
+        $this->stripe = $stripe;
+    }
+
     /**
      * Get all invoices
      *
-     * @return InvoiceCollection
+     * @return InvoiceAdminCollection
      */
     public function index()
     {
-        return new InvoiceCollection(
-            Invoice::all()
+        return new InvoiceAdminCollection(
+            $this->stripe->getInvoices()['data']
         );
     }
 
     /**
      * Get single invoice by $token
+     *
+     * @param $customer
      * @param $token
      * @return InvoiceResource
      */
-    public function show($token)
+    public function show($customer, $token)
     {
-        $invoice = Invoice::where('token', $token)->firstOrFail();
+        $invoice = $this->stripe->getUserInvoice($customer, $token);
 
         return view('vuefilemanager.invoice')
             ->with('invoice', $invoice);

app/Http/Controllers/Admin/PlanController.php

@@ -11,6 +11,7 @@ use App\Plan;
 use App\Services\StripeService;
 use App\User;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use Rinvex\Subscriptions\Models\PlanFeature;
 
 class PlanController extends Controller
@@ -30,9 +31,18 @@ class PlanController extends Controller
      */
     public function index()
     {
-        return new PlanCollection(
-            $this->stripe->getPlans()
-        );
+        // Store or Get plans to cache
+        if (Cache::has('plans')) {
+
+            $plans = Cache::get('plans');
+        } else {
+
+            $plans = Cache::rememberForever('plans', function () {
+                return $this->stripe->getPlans();
+            });
+        }
+
+        return new PlanCollection($plans);
     }
 
     /**
@@ -43,9 +53,18 @@ class PlanController extends Controller
      */
     public function show($id)
     {
-        return new PlanResource(
-            $this->stripe->getPlan($id)
-        );
+        // Store or Get plan to cache
+        if (Cache::has('plan-' . $id)) {
+
+            $plan = Cache::get('plan-' . $id);
+        } else {
+
+            $plan = Cache::rememberForever('plan-' . $id, function () use ($id) {
+                return $this->stripe->getPlan($id);
+            });
+        }
+
+        return new PlanResource($plan);
     }
 
     /**
@@ -56,9 +75,14 @@ class PlanController extends Controller
      */
     public function store(Request $request)
     {
-        return new PlanResource(
+        $plan = new PlanResource(
             $this->stripe->createPlan($request)
         );
+
+        // Clear cached plans
+        cache_forget_many(['plans', 'pricing']);
+
+        return $plan;
     }
 
     /**
@@ -72,6 +96,9 @@ class PlanController extends Controller
     {
         $this->stripe->updatePlan($request, $id);
 
+        // Clear cached plans
+        cache_forget_many(['plans', 'pricing', 'plan-' . $id]);
+
         return response('Saved!', 204);
     }
 
@@ -85,6 +112,9 @@ class PlanController extends Controller
     {
         $this->stripe->deletePlan($id);
 
+        // Clear cached plans
+        cache_forget_many(['plans', 'pricing']);
+
         return response('Done!', 204);
     }
 

app/Http/Controllers/Admin/UserController.php

@@ -15,6 +15,7 @@ use App\Http\Resources\UserResource;
 use App\Http\Resources\UserStorageResource;
 use App\Http\Resources\UserSubscription;
 use App\Http\Tools\Demo;
+use App\Services\StripeService;
 use App\Share;
 use App\User;
 use App\UserSettings;
@@ -29,6 +30,11 @@ use Storage;
 
 class UserController extends Controller
 {
+    public function __construct(StripeService $stripe)
+    {
+        $this->stripe = $stripe;
+    }
+
     /**
      * Get user details
      *
@@ -58,13 +64,14 @@ class UserController extends Controller
     /**
      * Get user storage details
      *
-     * @param $id
      * @return InvoiceCollection
      */
-    public function invoices($id)
+    public function invoices()
     {
+        $user = \Auth::user();
+
         return new InvoiceCollection(
-            User::findOrFail($id)->invoices
+            $this->stripe->getUserInvoices($user)
         );
     }
 
@@ -77,7 +84,7 @@ class UserController extends Controller
     public function subscription($id)
     {
         return new UserSubscription(
-            User::findOrFail($id)->subscription('main')
+            User::find($id)
         );
     }
 

app/Http/Controllers/General/PricingController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Http\Resources\PricingCollection;
 use App\Services\StripeService;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 
 class PricingController extends Controller
 {
@@ -24,10 +25,22 @@ class PricingController extends Controller
      */
     public function index()
     {
-        $collection = new PricingCollection(
-            $this->stripe->getActivePlans()
-        );
+        if (Cache::has('pricing')) {
 
+            // Get pricing from cache
+            $pricing = Cache::get('pricing');
+        } else {
+
+            // Store pricing to cache
+            $pricing = Cache::rememberForever('pricing', function () {
+                return $this->stripe->getActivePlans();
+            });
+        }
+
+        // Format pricing to collection
+        $collection = new PricingCollection($pricing);
+
+        // Sort and return pricing
         return $collection->sortBy('product.metadata.capacity')
             ->values()
             ->all();

app/Http/Controllers/User/AccountController.php

@@ -44,9 +44,14 @@ class AccountController extends Controller
         );
     }
 
+    /**
+     * Get user invoices
+     *
+     * @return InvoiceCollection
+     */
     public function invoices() {
         return new InvoiceCollection(
-            Auth::user()->invoices
+            Auth::user()->invoices()
         );
     }
 

app/Http/Controllers/User/PaymentCardsController.php

@@ -1,107 +0,0 @@
-<?php
-
-namespace App\Http\Controllers\User;
-
-use App\Http\Controllers\Controller;
-use App\Http\Resources\PaymentCardCollection;
-use App\Http\Resources\PaymentCardResource;
-use App\Http\Resources\PaymentDefaultCardResource;
-use App\Services\PaymentService;
-use App\UserCard;
-use Auth;
-use Illuminate\Http\Request;
-use Laravel\Cashier\PaymentMethod;
-
-class PaymentCardsController extends Controller
-{
-    /**
-     * @var PaymentService
-     */
-    private $payment;
-
-    /**
-     * PaymentCardsController constructor.
-     */
-    public function __construct(PaymentService $payment)
-    {
-        $this->payment = $payment;
-    }
-
-    /**
-     * Update card detail
-     *
-     * @param Request $request
-     * @param $id
-     */
-    public function update(Request $request, $id)
-    {
-        $user = Auth::user();
-
-        // Update DefaultPayment Method
-        $user->updateDefaultPaymentMethod($id);
-
-        // Sync default payment method
-        $user->updateDefaultPaymentMethodFromStripe();
-    }
-
-    /**
-     * Delete user credit card
-     *
-     */
-    public function delete($id)
-    {
-        $user = Auth::user();
-
-        // Get payment method
-        $paymentMethod = $user->findPaymentMethod($id);
-
-        // Delete payment method
-        $paymentMethod->delete();
-
-        // Sync default payment method
-        $user->updateDefaultPaymentMethodFromStripe();
-
-        return response('Done!', 204);
-    }
-
-    /**
-     * Get user payment methods sorted by default and others
-     *
-     * @return array
-     */
-    public function payment_methods()
-    {
-        $user = Auth::user();
-
-        // Get default payment method
-        $defaultPaymentMethodObject = $user->defaultPaymentMethod();
-
-        $defaultPaymentMethod = $defaultPaymentMethodObject instanceof PaymentMethod
-            ? $defaultPaymentMethodObject->asStripePaymentMethod()
-            : $defaultPaymentMethodObject;
-
-        // filter payment methods without default payment
-        $paymentMethods = $user->paymentMethods()->filter(function ($paymentMethod) use ($defaultPaymentMethod) {
-            return $paymentMethod->id !== $defaultPaymentMethod->id;
-        });
-
-        // Get payment methods
-        $paymentMethodsMapped = $paymentMethods->map(function ($paymentMethod) {
-            return $paymentMethod->asStripePaymentMethod();
-        })->values()->all();
-
-        if (is_null($paymentMethodsMapped) && is_null($paymentMethodsMapped)) {
-            return [
-                'default' => null,
-                'others'  => [],
-            ];
-        }
-
-        return [
-            'default' => $defaultPaymentMethod instanceof PaymentMethod
-                ? new PaymentCardResource($defaultPaymentMethod)
-                : new PaymentDefaultCardResource($defaultPaymentMethod),
-            'others'  => new PaymentCardCollection($paymentMethodsMapped),
-        ];
-    }
-}

app/Http/Controllers/User/PaymentMethodsController.php

@@ -0,0 +1,122 @@
+<?php
+
+namespace App\Http\Controllers\User;
+
+use App\Http\Controllers\Controller;
+use App\Http\Resources\PaymentCardCollection;
+use App\Http\Resources\PaymentCardResource;
+use App\Http\Resources\PaymentDefaultCardResource;
+use Auth;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
+use Laravel\Cashier\PaymentMethod;
+
+class PaymentMethodsController extends Controller
+{
+    /**
+     * Get user payment methods grouped by default and others
+     *
+     * @return array
+     */
+    public function payment_methods()
+    {
+        $user = Auth::user();
+
+        $slug_payment_methods = 'payment-methods-user-' . $user->id;
+        $slug_default_payment_method = 'default-payment-methods-user-' . $user->id;
+
+        if (Cache::has($slug_payment_methods) && Cache::has($slug_default_payment_method)) {
+
+            $defaultPaymentMethod = Cache::get($slug_default_payment_method);
+            $paymentMethodsMapped = Cache::get($slug_payment_methods);
+
+        } else {
+
+            // Get default payment method
+            $defaultPaymentMethod = Cache::rememberForever($slug_default_payment_method, function () use ($user) {
+
+                $defaultPaymentMethodObject = $user->defaultPaymentMethod();
+
+                return $defaultPaymentMethodObject instanceof PaymentMethod
+                    ? $defaultPaymentMethodObject->asStripePaymentMethod()
+                    : $defaultPaymentMethodObject;
+            });
+
+            // filter payment methods without default payment
+            $paymentMethodsMapped = Cache::rememberForever($slug_payment_methods, function () use ($defaultPaymentMethod, $user) {
+
+                $paymentMethods = $user->paymentMethods()->filter(function ($paymentMethod) use ($defaultPaymentMethod) {
+                    return $paymentMethod->id !== $defaultPaymentMethod->id;
+                });
+
+                // Get payment methods
+                return $paymentMethods->map(function ($paymentMethod) {
+                    return $paymentMethod->asStripePaymentMethod();
+                })->values()->all();
+            });
+        }
+
+        if (! $user->card_brand || ! $user->stripe_id || is_null($paymentMethodsMapped) && is_null($paymentMethodsMapped)) {
+            return [
+                'default' => null,
+                'others'  => [],
+            ];
+        }
+
+        return [
+            'default' => $defaultPaymentMethod instanceof PaymentMethod
+                ? new PaymentCardResource($defaultPaymentMethod)
+                : new PaymentDefaultCardResource($defaultPaymentMethod),
+            'others'  => new PaymentCardCollection($paymentMethodsMapped),
+        ];
+    }
+
+    /**
+     * Update default payment method
+     *
+     * @param Request $request
+     * @param $id
+     */
+    public function update(Request $request, $id)
+    {
+        $user = Auth::user();
+
+        // Update DefaultPayment Method
+        $user->updateDefaultPaymentMethod($id);
+
+        // Sync default payment method
+        $user->updateDefaultPaymentMethodFromStripe();
+
+        // Clear cached payment methods
+        cache_forget_many([
+            'payment-methods-user-' . $user->id,
+            'default-payment-methods-user-' . $user->id
+        ]);
+    }
+
+    /**
+     * Delete user payment method
+     *
+     */
+    public function delete($id)
+    {
+        $user = Auth::user();
+
+        // Get payment method
+        $paymentMethod = $user->findPaymentMethod($id);
+
+        // Delete payment method
+        $paymentMethod->delete();
+
+        // Sync default payment method
+        $user->updateDefaultPaymentMethodFromStripe();
+
+        // Clear cached payment methods
+        cache_forget_many([
+            'payment-methods-user-' . $user->id,
+            'default-payment-methods-user-' . $user->id
+        ]);
+
+        return response('Done!', 204);
+    }
+}

app/Http/Controllers/User/SubscriptionController.php

@@ -6,12 +6,12 @@ use App\Http\Controllers\Controller;
 use App\Http\Requests\Subscription\StoreUpgradeAccountRequest;
 use App\Http\Resources\UserSubscription;
 use App\Invoice;
-use App\Services\PaymentService;
 use App\Services\StripeService;
 use Auth;
 use Cartalyst\Stripe\Exception\CardErrorException;
 use Illuminate\Contracts\Routing\ResponseFactory;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Cache;
 use Laravel\Cashier\Exceptions\IncompletePayment;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 
@@ -35,21 +35,29 @@ class SubscriptionController extends Controller
      */
     public function stripe_setup_intent()
     {
-        // Get user
         $user = Auth::user();
 
-        // Create stripe customer if not exist
-        $user->createOrGetStripeCustomer();
-
-        // Return setup intent
-        return $user->createSetupIntent();
+        return $this->stripe->getSetupIntent($user);
     }
 
+    /**
+     * Get user subscription detail
+     *
+     * @return UserSubscription
+     */
     public function show()
     {
-        return new UserSubscription(
-            Auth::user()
-        );
+        $slug_user_subscription = 'subscription-user-' . Auth::id();
+
+        if (Cache::has($slug_user_subscription)) {
+            return Cache::get($slug_user_subscription);
+        }
+
+        return Cache::rememberForever($slug_user_subscription, function () {
+            return new UserSubscription(
+                Auth::user()
+            );
+        });
     }
 
     /**
@@ -69,6 +77,9 @@ class SubscriptionController extends Controller
         // Set user billing
         $user->setBilling($request->input('billing'));
 
+        // Update stripe customer billing info
+        $this->stripe->updateCustomerDetails($user);
+
         // Make subscription
         $this->stripe->createOrReplaceSubscription($request, $user);
 
@@ -77,9 +88,6 @@ class SubscriptionController extends Controller
             'storage_capacity' => $plan['product']['metadata']['capacity']
         ]);
 
-        // Store invoice
-        Invoice::create(get_invoice_data($user, $plan, 'stripe'));
-
         return response('Done!', 204);
     }
 

app/Http/Helpers/helpers.php

@@ -27,55 +27,11 @@ function get_invoice_number()
     }
 }
 
-/**
- * Get data to render in invoice tempalte
- * @param $user
- * @param $plan
- * @param $provider
- * @return array
- */
-function get_invoice_data($user, $plan, $provider)
+function cache_forget_many($cache)
 {
-    $subscription = $user->subscription('main');
-    $order_number = get_invoice_number();
-    $token = \Illuminate\Support\Str::random(22);
-
-    return [
-        'token'    => $token,
-        'order'    => $order_number,
-        'provider' => $provider,
-        'user_id'  => $user->id,
-        'plan_id'  => $plan['plan']['id'],
-        'total'    => $plan['plan']['amount'],
-        'currency' => 'USD',
-        'bag'      => [
-            [
-                'description' => 'Subscription - ' . $plan['product']['name'],
-                //'date'        => format_date($subscription->starts_at, '%d. %B. %Y') . ' - ' . format_date($subscription->ends_at, '%d. %B. %Y'),
-                'date'        => format_date(Carbon::now(),'%d. %B. %Y'),
-                'amount'      => $plan['plan']['amount'],
-            ]
-        ],
-        'seller'   => [
-            'billing_name'         => 'VueFileManager',
-            'billing_address'      => 'Somewhere 32',
-            'billing_state'        => 'Washington',
-            'billing_city'         => 'Manchester',
-            'billing_postal_code'  => '04001',
-            'billing_country'      => 'The USA',
-            'billing_phone_number' => '490321-6354774',
-            'billing_vat_number'   => '7354724626246',
-        ],
-        'client'   => [
-            'billing_name'         => $user->settings->billing_name,
-            'billing_address'      => $user->settings->billing_address,
-            'billing_state'        => $user->settings->billing_state,
-            'billing_city'         => $user->settings->billing_city,
-            'billing_postal_code'  => $user->settings->billing_postal_code,
-            'billing_country'      => $user->settings->billing_country,
-            'billing_phone_number' => $user->settings->billing_phone_number,
-        ],
-    ];
+    foreach ($cache as $item) {
+        \Illuminate\Support\Facades\Cache::forget($item);
+    }
 }
 
 /**

app/Http/Resources/InvoiceAdminCollection.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\ResourceCollection;
+
+class InvoiceAdminCollection extends ResourceCollection
+{
+    public $collects = InvoiceAdminResource::class;
+
+    /**
+     * Transform the resource collection into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'data' => $this->collection,
+        ];
+    }
+}

app/Http/Resources/InvoiceAdminResource.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Http\Resources;
+
+use App\User;
+use Illuminate\Http\Resources\Json\JsonResource;
+use Laravel\Cashier\Cashier;
+
+class InvoiceAdminResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        $user = User::where('stripe_id', $this['customer'])->first();
+
+        return [
+            'data' => [
+                'id'         => $this['id'],
+                'type'       => 'invoices',
+                'attributes' => [
+                    'customer'             => $this['customer'],
+                    'total'                => Cashier::formatAmount($this['total']),
+                    'currency'             => $this['currency'],
+                    'created_at_formatted' => format_date($this['created']),
+                    'created_at'           => $this['created'],
+                    'order'                => $this['number'],
+                    'user_id'              => $user ? $user->id : null,
+                    'client'               => [
+                        'billing_address'      => $this['customer_address'],
+                        'billing_name'         => $this['customer_name'],
+                        'billing_phone_number' => $this['customer_phone'],
+                    ],
+                    'bag'                  => [
+                        'amount'      => $this['lines']['data'][0]['amount'],
+                        'currency'    => $this['lines']['data'][0]['currency'],
+                        'type'        => $this['lines']['data'][0]['type'],
+                        'description' => $this['lines']['data'][0]['description'],
+                    ],
+                    'seller'               => null,
+                ]
+            ],
+            $this->mergeWhen($user, function () use ($user) {
+                return [
+                    'relationships' => [
+                        'user' => [
+                            'data' => [
+                                'id'         => (string)$user->id,
+                                'type'       => 'user',
+                                'attributes' => [
+                                    'name'   => $user->name,
+                                    'avatar' => $user->avatar,
+                                ]
+                            ]
+                        ]
+                    ]
+                ];
+            }),
+        ];
+    }
+}

app/Http/Resources/InvoiceResource.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Resources;
 
+use App\User;
 use Illuminate\Http\Resources\Json\JsonResource;
 
 class InvoiceResource extends JsonResource
@@ -14,38 +15,49 @@ class InvoiceResource extends JsonResource
      */
     public function toArray($request)
     {
+        $user = User::where('stripe_id', $this->customer)->first();
+        $subscription = $this->subscriptions()[0];
+
         return [
-            'data'          => [
-                'id'         => (string)$this->id,
+            'data' => [
+                'id'         => $this->id,
                 'type'       => 'invoices',
                 'attributes' => [
-                    'token'                => $this->token,
-                    'order'                => $this->order,
-                    'user_id'              => $this->user_id,
-                    'plan_id'              => $this->plan_id,
-                    'notes'                => $this->notes,
-                    'total'                => $this->total,
+                    'customer'             => $this->customer,
+                    'total'                => $this->total(),
                     'currency'             => $this->currency,
-                    'seller'               => $this->seller,
-                    'client'               => $this->client,
-                    'bag'                  => $this->bag,
-                    'created_at_formatted' => format_date($this->created_at),
-                    'created_at'           => $this->created_at,
-                    'updated_at'           => $this->updated_at,
+                    'created_at_formatted' => format_date($this->date()),
+                    'created_at'           => $this->created,
+                    'order'                => $this->number,
+                    'user_id'              => $user ? $user->id : null,
+                    'client'               => [
+                        'billing_address'      => $this->customer_address,
+                        'billing_name'         => $this->customer_name,
+                        'billing_phone_number' => $this->customer_phone,
+                    ],
+                    'bag'                  => [
+                        'amount'      => $subscription->amount,
+                        'currency'    => $subscription->currency,
+                        'type'        => $subscription->type,
+                        'description' => $subscription->description,
+                    ],
+                    'seller'               => null,
                 ]
             ],
-            'relationships' => [
-                'user' => [
-                    'data' => [
-                        'id'         => (string)$this->user->id,
-                        'type'       => 'user',
-                        'attributes' => [
-                            'name'   => $this->user->name,
-                            'avatar' => $this->user->avatar,
+            $this->mergeWhen($user, [
+                'relationships' => [
+                    'user' => [
+                        'data' => [
+                            'id'         => (string)$user->id,
+                            'type'       => 'user',
+                            'attributes' => [
+                                'name'   => $user->name,
+                                'avatar' => $user->avatar,
+                            ]
                         ]
                     ]
                 ]
-            ]
+            ]),
         ];
     }
 }

app/Http/Resources/UserResource.php

@@ -26,18 +26,19 @@ class UserResource extends JsonResource
                 'id'         => (string)$this->id,
                 'type'       => 'user',
                 'attributes' => [
+                    'subscription'         => $this->subscribed('main'),
+                    'stripe_customer'      => is_null($this->stripe_id) ? false : true,
                     'name'                 => env('APP_DEMO') ? $faker->name : $this->name,
                     'email'                => env('APP_DEMO') ? $faker->email : $this->email,
                     'avatar'               => $this->avatar,
                     'role'                 => $this->role,
-                    'subscription'         => $this->subscribed('main'),
                     'created_at_formatted' => format_date($this->created_at, '%d. %B. %Y'),
                     'created_at'           => $this->created_at,
                     'updated_at'           => $this->updated_at,
                 ]
             ],
             'relationships' => [
-                'settings'        => [
+                'settings'   => [
                     'data' => [
                         'id'         => (string)$this->settings->id,
                         'type'       => 'settings',
@@ -52,14 +53,14 @@ class UserResource extends JsonResource
                         ]
                     ]
                 ],
-                'storage'         => [
+                'storage'    => [
                     'data' => [
                         'id'         => '1',
                         'type'       => 'storage',
                         'attributes' => $this->storage
                     ]
                 ],
-                'favourites'      => [
+                'favourites' => [
                     'data' => [
                         'id'         => '1',
                         'type'       => 'folders_favourite',
@@ -68,7 +69,7 @@ class UserResource extends JsonResource
                         ],
                     ],
                 ],
-                'tree'            => [
+                'tree'       => [
                     'data' => [
                         'id'         => '1',
                         'type'       => 'folders_tree',
@@ -76,8 +77,7 @@ class UserResource extends JsonResource
                             'folders' => $this->folder_tree
                         ],
                     ],
-                ],
-                'payment_methods' => new PaymentCardCollection($this->payment_cards)
+                ]
             ]
         ];
     }