From ec989582cec5f81a8eec6f34007fb5f863b12952 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 7 Jul 2020 07:58:26 +1000 Subject: [PATCH 1/2] Add is_large to company transformer --- app/Transformers/CompanyTransformer.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 697190bd50cb..4d3de3076fe0 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -123,6 +123,7 @@ class CompanyTransformer extends EntityTransformer 'google_analytics_key' => (string)$company->google_analytics_key, 'enabled_item_tax_rates' => (int) $company->enabled_item_tax_rates, 'client_can_register' => (bool) $company->client_can_register, + 'is_large' => (bool) $company->is_large, ]; } From 256deea92a2e66fb9891c47ddf4d30e089603352 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Tue, 7 Jul 2020 08:35:28 +1000 Subject: [PATCH 2/2] Update index file for flutter --- app/Models/Company.php | 5 ++ app/Transformers/CompanyTransformer.php | 20 +++++++ resources/views/index/index.blade.php | 75 +++++++++++++++++++++++-- 3 files changed, 96 insertions(+), 4 deletions(-) diff --git a/app/Models/Company.php b/app/Models/Company.php index e0c4c66ce8bb..63da858ca36d 100644 --- a/app/Models/Company.php +++ b/app/Models/Company.php @@ -181,6 +181,11 @@ class Company extends BaseModel return $this->hasMany(Task::class)->withTrashed(); } + public function webhooks() + { + return $this->hasMany(Webhook::class); + } + /** * @return \Illuminate\Database\Eloquent\Relations\HasMany */ diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php index 4d3de3076fe0..cf883facedca 100644 --- a/app/Transformers/CompanyTransformer.php +++ b/app/Transformers/CompanyTransformer.php @@ -17,6 +17,7 @@ use App\Models\Client; use App\Models\Company; use App\Models\CompanyGateway; use App\Models\CompanyLedger; +use App\Models\CompanyToken; use App\Models\CompanyUser; use App\Models\Credit; use App\Models\Design; @@ -30,10 +31,13 @@ use App\Models\Quote; use App\Models\Task; use App\Models\TaxRate; use App\Models\User; +use App\Models\Webhook; use App\Transformers\CompanyLedgerTransformer; +use App\Transformers\CompanyTokenTransformer; use App\Transformers\CreditTransformer; use App\Transformers\PaymentTermTransformer; use App\Transformers\TaskTransformer; +use App\Transformers\WebhookTransformer; use App\Utils\Traits\MakesHash; /** @@ -77,6 +81,8 @@ class CompanyTransformer extends EntityTransformer 'projects', 'tasks', 'ledger', + 'webhooks', + 'tokens' ]; @@ -134,6 +140,20 @@ class CompanyTransformer extends EntityTransformer return $this->includeItem($company->company_users->where('user_id', auth()->user()->id)->first(), $transformer, CompanyUser::class); } + public function includeTokens(Company $company) + { + $transformer = new CompanyTokenTransformer($this->serializer); + + return $this->includeCollection($company->tokens, $transformer, CompanyToken::class); + } + + public function includeWebhooks(Company $company) + { + $transformer = new WebhookTransformer($this->serializer); + + return $this->includeCollection($company->webhooks, $transformer, Webhook::class); + } + public function includeActivities(Company $company) { $transformer = new ActivityTransformer($this->serializer); diff --git a/resources/views/index/index.blade.php b/resources/views/index/index.blade.php index 1c2f0cfbdf51..c67d7d8cb590 100644 --- a/resources/views/index/index.blade.php +++ b/resources/views/index/index.blade.php @@ -9,19 +9,86 @@ + + - + -
- Loading... +
+
- + \ No newline at end of file