From e0b169b64b78aae59ca18e9d636c6a5fce0ce65e Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 10 Mar 2021 09:56:59 +1100
Subject: [PATCH] Fixes for billing subscriptions

---
 app/Http/Controllers/ConnectedAccountController.php  | 12 ++++++++++--
 app/Http/Controllers/OpenAPI/BillingSubscription.php |  1 +
 app/Http/Controllers/SetupController.php             |  1 +
 ..._08_123729_create_billing_subscriptions_table.php |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/ConnectedAccountController.php b/app/Http/Controllers/ConnectedAccountController.php
index a6f011bde5..d51638fc39 100644
--- a/app/Http/Controllers/ConnectedAccountController.php
+++ b/app/Http/Controllers/ConnectedAccountController.php
@@ -13,12 +13,18 @@ namespace App\Http\Controllers;
 
 use App\Libraries\MultiDB;
 use App\Libraries\OAuth\Providers\Google;
-use Illuminate\Http\Request;
+use App\Models\CompanyUser;
+use App\Transformers\CompanyUserTransformer;
 use Google_Client;
+use Illuminate\Http\Request;
 
 class ConnectedAccountController extends BaseController
 {
 
+    protected $entity_type = CompanyUser::class;
+
+    protected $entity_transformer = CompanyUserTransformer::class;
+    
     public function __construct()
     {
         parent::__construct();
@@ -128,8 +134,10 @@ class ConnectedAccountController extends BaseController
             auth()->user()->save();
 
             //$ct = CompanyUser::whereUserId(auth()->user()->id);
+            $ct = CompanyUser::whereUserId(auth()->user()->id);
 
-            return $this->listResponse(auth()->user());
+            return $this->listResponse($ct);
+            // return $this->listResponse(auth()->user());
         }
 
         return response()
diff --git a/app/Http/Controllers/OpenAPI/BillingSubscription.php b/app/Http/Controllers/OpenAPI/BillingSubscription.php
index 848a318542..c618f39c85 100644
--- a/app/Http/Controllers/OpenAPI/BillingSubscription.php
+++ b/app/Http/Controllers/OpenAPI/BillingSubscription.php
@@ -16,6 +16,7 @@
  *       @OA\Property(property="is_amount_discount", type="boolean", example="true", description="______"),
  *       @OA\Property(property="allow_cancellation", type="boolean", example="true", description="______"),
  *       @OA\Property(property="per_seat_enabled", type="boolean", example="true", description="______"),
+ *       @OA\Property(property="currency_id", type="integer", example="1", description="______"),
  *       @OA\Property(property="min_seats_limit", type="integer", example="1", description="______"),
  *       @OA\Property(property="max_seats_limit", type="integer", example="100", description="______"),
  *       @OA\Property(property="trial_enabled", type="boolean", example="true", description="______"),
diff --git a/app/Http/Controllers/SetupController.php b/app/Http/Controllers/SetupController.php
index 223d0943c2..d2bcc8708c 100644
--- a/app/Http/Controllers/SetupController.php
+++ b/app/Http/Controllers/SetupController.php
@@ -155,6 +155,7 @@ class SetupController extends Controller
 
             return redirect('/');
         } catch (Exception $e) {
+            
             nlog($e->getMessage());
 
             return redirect()
diff --git a/database/migrations/2021_03_08_123729_create_billing_subscriptions_table.php b/database/migrations/2021_03_08_123729_create_billing_subscriptions_table.php
index 27400a8fa6..6268b9638f 100644
--- a/database/migrations/2021_03_08_123729_create_billing_subscriptions_table.php
+++ b/database/migrations/2021_03_08_123729_create_billing_subscriptions_table.php
@@ -39,7 +39,7 @@ class CreateBillingSubscriptionsTable extends Migration
             $table->softDeletes('deleted_at', 6);
             $table->boolean('is_deleted')->default(false);
             $table->timestamps();
-            $table->foreign('product_id')->references('id')->on('products');
+
             $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade');
             $table->index(['company_id', 'deleted_at']);
         });